Version 4.0

DomainInterface/DomainBehavior.py

@@ -62,6 +62,8 @@
 class DomainBehavior(BaseDEVS.AtomicDEVS):
 	""" Abstract DomainBehavior class.
 	"""
+
+	__slots__ = ('state')
 
 	###
 	def __init__(self, name:str=""):
@@ -140,19 +142,19 @@ def getPortIdFromPyPDEVS(self,p):
 			return p.port_id
 
 	def getMsgPyDEVSValue(self, msg):
-		return msg.value					
+		return msg.value if msg else "Msg is none"		
 
 	def getMsgPyPDEVSValue(self, msg):
-		return msg[0]
+		return msg[0] if msg else "Msg is none"
 
 	def getMsgPyDEVSTime(self, msg):
-		return msg.time					
+		return msg.time	if msg else "Msg is none"
 
 	def getMsgPyPDEVSTime(self, msg):
-		return msg[1][0]
+		return msg[1][0] if msg else "Msg is nore"
 
 	def getFlatComponentSet(self):
-		return {self.name : self}
+		return {self.name:self}
 
 	def getSigma(self)->float:
 		return self.state['sigma']

Editor.py

@@ -1758,8 +1758,9 @@ def OnAbout(self, event):
 
 ### ----------------------------------------------------------------
 class EditorPanel(Base, wx.Panel):
-	""" Editor class which is a Panel
+	""" Editor class which is a Panel.
 	"""
+
 	def __init__(self, parent, id, title):
 		""" Constructor.
 		"""
@@ -1858,10 +1859,7 @@ def OnInsertPeekPoke(self, event):
 
 		if sins:
 			dlg = wx.SingleChoiceDialog(self, _('Port number'), _(' %s on which port?')%label, sins, wx.CHOICEDLG_STYLE)
-			if dlg.ShowModal() == wx.ID_OK:
-				port = dlg.GetStringSelection()
-			else:
-				port = None
+			port = dlg.GetStringSelection() if dlg.ShowModal() == wx.ID_OK else None
 			dlg.Destroy()
 
 			if port is not None:
@@ -1870,9 +1868,6 @@ def OnInsertPeekPoke(self, event):
 					cp.AddText("self.peek(self.IPorts[%d], *args)" % int(port))
 				elif "poke" in label:
 					cp.AddText("return self.poke(self.OPorts[%d], Message(<>, self.timeNext))" % int(port))
-				else:
-					pass
-
 				cp.modify = True
 
 	def OnInsertInitPhase(self, event):
@@ -1904,97 +1899,97 @@ def OnInsertSetSigma(self, event):
 		cp.modify = True
 
 	def OnInsertGetState(self, event):
-		""" Insert a sentence to get the state object
+		""" Insert a sentence to get the state object.
 		"""
 		cp = self.nb.GetCurrentPage()
-		cp.AddText("state = self.getState()")
+		cp.AddText("self.getState()")
 		cp.modify = True
 
 	def OnInsertGetStatus(self, event):
-		""" Insert a sentence to get the status
+		""" Insert a sentence to get the status.
 		"""
 		cp = self.nb.GetCurrentPage()
-		cp.AddText("status = self.getStatus()")
+		cp.AddText("self.getStatus()")
 		cp.modify = True
 
 	def OnInsertGetSigma(self, event):
-		""" Insert a sentence to get the sigma value
+		""" Insert a sentence to get the sigma value.
 		"""
 		cp = self.nb.GetCurrentPage()
-		cp.AddText("sigma = self.getSigma()")
+		cp.AddText("self.getSigma()")
 		cp.modify = True
 
 	def OnInsertGetPortId(self, event):
-		""" Insert a sentence to get the port ID
+		""" Insert a sentence to get the port ID.
 		"""
 		cp = self.nb.GetCurrentPage()
-		cp.AddText("id = self.getPortId(<port>)")
+		cp.AddText("self.getPortId(<port>)")
 		cp.modify = True
 
 	def OnInsertGetMsgValue(self, event):
-		""" Insert a sentence to get the message value
+		""" Insert a sentence to get the message value.
 		"""
 		cp = self.nb.GetCurrentPage()
-		cp.AddText("v = self.getMsgValue(<msg>)")
+		cp.AddText("self.getMsgValue(<msg>)")
 		cp.modify = True
 
 	def OnInsertGetMsgTime(self, event):
-		""" Insert a sentence to get the message time
+		""" Insert a sentence to get the message time.
 		"""
 		cp = self.nb.GetCurrentPage()
-		cp.AddText("t = self.getMsgTime(<msg>)")
+		cp.AddText("self.getMsgTime(<msg>)")
 		cp.modify = True
 
 	def OnInsertGetElapsed(self, event):
-		""" Insert a sentence to get the elapsed time
+		""" Insert a sentence to get the elapsed time.
 		"""
 		cp = self.nb.GetCurrentPage()
-		cp.AddText("e = self.getElasped()")
+		cp.AddText("self.getElapsed()")
 		cp.modify = True
 
 	###
 	def OnInsertHoldInState(self, event):
-		""" Insert a sentence to change the state
+		""" Insert a sentence to change the state.
 		"""
 		cp = self.nb.GetCurrentPage()
 		cp.AddText("self.holdIn('<phase>',<sigma>)")
 		cp.modify = True
 
 	###
 	def OnInsertPhaseIs(self, event):
-		""" Insert a sentence to test the phase
+		""" Insert a sentence to test the phase.
 		"""
 		cp = self.nb.GetCurrentPage()
 		cp.AddText("self.phaseIs('<phase>')")
 		cp.modify = True
 
 	###
 	def OnInsertPassivateInState(self, event):
-		""" Insert a sentence to change the state
+		""" Insert a sentence to change the state.
 		"""
 		cp = self.nb.GetCurrentPage()
 		cp.AddText("self.passivateIn('<phase>')")
 		cp.modify = True
 
 	###
 	def OnInsertPassivateState(self, event):
-		""" Insert a sentence to change the state
+		""" Insert a sentence to change the state.
 		"""
 		cp = self.nb.GetCurrentPage()
 		cp.AddText("self.passivate()")
 		cp.modify = True
 
 	###
 	def OnInsertDebug(self, event):
-		""" Insert a sentence to invoke the debugger function that trace message into the log of model
+		""" Insert a sentence to invoke the debugger function that trace message into the log of model.
 		"""
 		cp = self.nb.GetCurrentPage()
 		cp.AddText("self.debugger('<message>')")
 		cp.modify = True
 
 	###
 	def ConfigSaving(self, base_name, dir_name, code):
-		""" Saving method
+		""" Saving method.
 		"""
 
 		new_instance = None
@@ -2015,7 +2010,7 @@ def ConfigSaving(self, base_name, dir_name, code):
 
 	###
 	def UpdateArgs(self, new_args):
-		""" Update the args or constructor class from new_args
+		""" Update the args or constructor class from new_args.
 		"""
 
 		### update args (behavioral attributes) before saving
@@ -2247,7 +2242,8 @@ def ConfigureGUI(self):
 
 		### insert new icon in toolbar (icon are not available in embeded editor (Show menu)
 		tb = self.GetToolBar()
-		tb.InsertSeparator(tb.GetToolsCount())
+		tb.AddSeparator()
+		#tb.InsertSeparator(tb.GetToolsCount())
 
 		if wx.VERSION_STRING < '4.0':
 			tb.AddTool(peek.GetId(), peek.GetBitmap(), shortHelpString=_('New peek'), longHelpString=_('Insert a code for a new peek'))