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
0ce9bf46
Commit
0ce9bf46
authored
Jun 19, 2014
by
Ioannis Papagiannopoulos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
new attribute added to order to correct readWip setStartWIP method
parent
505e5b65
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
dream/simulation/Order.py
dream/simulation/Order.py
+2
-0
dream/simulation/readWip.py
dream/simulation/readWip.py
+2
-1
No files found.
dream/simulation/Order.py
View file @
0ce9bf46
...
...
@@ -57,6 +57,8 @@ class Order(Job):
self
.
basicsEnded
=
basicsEnded
# flag that informs that the basic components of the order are finished
# flag that informs weather the components needed for the assembly are present in the Assembly Buffer
self
.
componentsReadyForAssembly
=
componentsReadyForAssembly
self
.
decomposed
=
False
dream/simulation/readWip.py
View file @
0ce9bf46
...
...
@@ -751,7 +751,7 @@ def setStartWip():
# XXX if they are not in the WIP the it is possible that the must be set because only an other part of the same order is in the WIP (but no mould)
if
not
entity
.
id
in
WIP
.
keys
()
and
not
decomposed
:
pass
if
not
entity
.
id
in
WIP
.
keys
()
and
decomposed
:
if
not
entity
.
id
in
WIP
.
keys
()
and
decomposed
and
not
entity
.
order
.
decomposed
:
# perform the default action
setWIP
([
entity
])
# if the entity is in the WIP dict then move it to the station defined.
...
...
@@ -908,6 +908,7 @@ def breakOrderDesing(orderDesign):
if
G
.
orderToBeDecomposed
:
from
Globals
import
setWIP
setWIP
(
G
.
newlyCreatedComponents
)
#set the new components as wip
G
.
orderToBeDecomposed
.
decomposed
=
True
# TODO: consider signalling the receivers if any WIP is set now
#reset attributes
G
.
orderToBeDecomposed
=
None
...
...
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