Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
dream
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
dream
Commits
05f5005e
Commit
05f5005e
authored
Mar 10, 2015
by
Ioannis Papagiannopoulos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
completed attribute of the route steps, is now a list (setup and process have different fields)
parent
436de630
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
1 deletion
+7
-1
dream/plugins/MergeSteps.py
dream/plugins/MergeSteps.py
+7
-1
No files found.
dream/plugins/MergeSteps.py
View file @
05f5005e
...
@@ -60,7 +60,7 @@ class MergeSteps(plugin.InputPreparationPlugin):
...
@@ -60,7 +60,7 @@ class MergeSteps(plugin.InputPreparationPlugin):
technologySequence
.
pop
(
-
1
)
technologySequence
.
pop
(
-
1
)
stepToMerge
=
route
[
idxToMerge
]
stepToMerge
=
route
[
idxToMerge
]
# parts needed
# parts needed
step
[
"
partsneeded"
]
=
stepToMerge
[
"partsneeded
"
]
step
[
"
requiredParts"
]
=
stepToMerge
[
"requiredParts
"
]
# technology
# technology
step
[
"technology"
]
=
technology
step
[
"technology"
]
=
technology
# setupTime
# setupTime
...
@@ -80,6 +80,12 @@ class MergeSteps(plugin.InputPreparationPlugin):
...
@@ -80,6 +80,12 @@ class MergeSteps(plugin.InputPreparationPlugin):
step
[
"operator"
][
"load"
]
=
route
[
idxToMerge
][
"operator"
][
"load"
]
step
[
"operator"
][
"load"
]
=
route
[
idxToMerge
][
"operator"
][
"load"
]
if
tempOperator
:
if
tempOperator
:
step
[
"operator"
][
"processing"
]
=
tempOperator
[
"processing"
]
step
[
"operator"
][
"processing"
]
=
tempOperator
[
"processing"
]
'''find out if the setup is completed, but no processing is performed yet; in that case the part should be placed in WIP (though the route is not split yet) '''
step
[
"completed"
]
=
[
stepToMerge
[
"completed"
][
0
],
step
[
"completed"
]]
else
:
'''make the completed attribute a list '''
step
[
"completed"
]
=
[
step
[
"completed"
]]
technologySequence
.
append
(
technology
)
technologySequence
.
append
(
technology
)
# append the (updated) step to the temporary route
# append the (updated) step to the temporary route
updatedRoute
.
append
(
step
)
updatedRoute
.
append
(
step
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment