OrderComponent and Mould updated to incorporate hot flag and pendingEntities requirements

parent 97017a23
...@@ -51,5 +51,9 @@ class Mould(Job): # inherits from the Job class ...@@ -51,5 +51,9 @@ class Mould(Job): # inherits from the Job class
# if the order is not None, and the order.manager is given # if the order is not None, and the order.manager is given
if self.order.manager: if self.order.manager:
self.manager=self.order.manager self.manager=self.order.manager
# variables to be used by OperatorRouter
self.hot=self.order.hot
if self.order in G.pendingEntities:
G.pendingEntites.append(self)
# TODO: isCritical argument is deprecated # TODO: isCritical argument is deprecated
# self.isCritical=isCritical # this should be self.order.isCritical. Added now for testing # self.isCritical=isCritical # this should be self.order.isCritical. Added now for testing
\ No newline at end of file
...@@ -54,6 +54,10 @@ class OrderComponent(Job): # inherits from the ...@@ -54,6 +54,10 @@ class OrderComponent(Job): # inherits from the
# if the order is not None, and the order.manager is given # if the order is not None, and the order.manager is given
if self.order.manager: if self.order.manager:
self.manager=self.order.manager self.manager=self.order.manager
# variables to be used by OperatorRouter
self.hot=self.order.hot
if self.order in G.pendingEntities:
G.pendingEntites.append(self)
# TODO: isCritical argument is deprecated # TODO: isCritical argument is deprecated
# self.isCritical=isCritical # this should be self.order.isCritical. Added now for testing # self.isCritical=isCritical # this should be self.order.isCritical. Added now for testing
self.componentType = componentType # the type of the component which can be Basic/Secondary/Auxiliary self.componentType = componentType # the type of the component which can be Basic/Secondary/Auxiliary
...@@ -63,3 +67,5 @@ class OrderComponent(Job): # inherits from the ...@@ -63,3 +67,5 @@ class OrderComponent(Job): # inherits from the
self.requestingComponent = requestingComponent # the id of the requesting component self.requestingComponent = requestingComponent # the id of the requesting component
self.readyForAssembly = readyForAssembly # flag informing weather the component was received self.readyForAssembly = readyForAssembly # flag informing weather the component was received
# by the MouldAssembleBuffer # by the MouldAssembleBuffer
# variables that are used by OperatorRouter
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment