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

cherry-pick. new print phrase added

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