Commit 946964e4 authored by Ioannis Papagiannopoulos's avatar Ioannis Papagiannopoulos Committed by Georgios Dagkakis

cherry-pick. new print phrase added

parent 2f360021
...@@ -317,7 +317,7 @@ def getSupportedPrintKwrds(): ...@@ -317,7 +317,7 @@ def getSupportedPrintKwrds():
"preempt", "preempted", "preempt", "preempted",
"startWork", "finishWork", "startWork", "finishWork",
"processEnd", "interrupted", "processEnd", "interrupted",
"enter", "enter", "destroy",
"waitEvent", "received", "isRequested","canDispose", "waitEvent", "received", "isRequested","canDispose",
"interruptionEnd", "loadOperatorAvailable", 'resourceAvailable', "interruptionEnd", "loadOperatorAvailable", 'resourceAvailable',
'conveyerEnd', 'conveyerFull','moveEnd') 'conveyerEnd', 'conveyerFull','moveEnd')
...@@ -327,6 +327,7 @@ def getSupportedPrintKwrds(): ...@@ -327,6 +327,7 @@ def getSupportedPrintKwrds():
#=========================================================================== #===========================================================================
def getPhrase(): def getPhrase():
printKwrds={'create':{'phrase':'created an entity'}, printKwrds={'create':{'phrase':'created an entity'},
"destroy":{'phrase':'destroyed at', 'suffix':' * '},
'signal':{'phrase':'signalling'}, 'signal':{'phrase':'signalling'},
'signalGiver':{'phrase':'signalling giver', 'prefix':'_'}, 'signalGiver':{'phrase':'signalling giver', 'prefix':'_'},
'signalReceiver':{'phrase':'signalling receiver','prefix':'_'}, 'signalReceiver':{'phrase':'signalling receiver','prefix':'_'},
......
...@@ -184,6 +184,7 @@ class OrderDecomposition(CoreObject): ...@@ -184,6 +184,7 @@ class OrderDecomposition(CoreObject):
if entity.type=='OrderDesign': if entity.type=='OrderDesign':
self.orderToBeDecomposed=entity.order self.orderToBeDecomposed=entity.order
activeObjectQueue.remove(entity) #remove the order from the internal Queue activeObjectQueue.remove(entity) #remove the order from the internal Queue
self.printTrace(entity.id, destroy=self.id)
# if the entity is in G.pendingEntities list remove it from there # if the entity is in G.pendingEntities list remove it from there
if entity in G.pendingEntities: if entity in G.pendingEntities:
G.pendingEntities.remove(entity) G.pendingEntities.remove(entity)
...@@ -209,7 +210,6 @@ class OrderDecomposition(CoreObject): ...@@ -209,7 +210,6 @@ class OrderDecomposition(CoreObject):
#reset attributes #reset attributes
self.orderToBeDecomposed=None self.orderToBeDecomposed=None
self.newlyCreatedComponents=[] self.newlyCreatedComponents=[]
# ======================================================================= # =======================================================================
# creates the components # creates the components
......
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