From 84d1c86445bac775c4c3d857e4308c5a29c64a6d Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Fri, 20 Nov 2020 15:10:29 +0100 Subject: [PATCH 1/3] bug fix --- DomainInterface/DomainBehavior.py | 8 ++++---- Editor.py | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/DomainInterface/DomainBehavior.py b/DomainInterface/DomainBehavior.py index 87201585..07f1f46d 100644 --- a/DomainInterface/DomainBehavior.py +++ b/DomainInterface/DomainBehavior.py @@ -140,16 +140,16 @@ 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 id msg else "Msg is none" def getMsgPyPDEVSTime(self, msg): - return msg[1][0] + return msg[1][0] is msg else "Msg is nore" def getFlatComponentSet(self): return {self.name : self} diff --git a/Editor.py b/Editor.py index ca100971..673f5b40 100644 --- a/Editor.py +++ b/Editor.py @@ -1949,7 +1949,7 @@ def OnInsertGetElapsed(self, event): """ Insert a sentence to get the elapsed time """ cp = self.nb.GetCurrentPage() - cp.AddText("e = self.getElasped()") + cp.AddText("e = self.getElapsed()") cp.modify = True ### @@ -2247,7 +2247,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')) From 59b2ee060a4dc901e8e141013b9448d122434ef1 Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Fri, 20 Nov 2020 15:11:37 +0100 Subject: [PATCH 2/3] remove statement for the getter --- Editor.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Editor.py b/Editor.py index 673f5b40..4df72a9c 100644 --- a/Editor.py +++ b/Editor.py @@ -1907,49 +1907,49 @@ def OnInsertGetState(self, event): """ 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 """ 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 """ 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 """ cp = self.nb.GetCurrentPage() - cp.AddText("id = self.getPortId()") + cp.AddText("self.getPortId()") cp.modify = True def OnInsertGetMsgValue(self, event): """ Insert a sentence to get the message value """ cp = self.nb.GetCurrentPage() - cp.AddText("v = self.getMsgValue()") + cp.AddText("self.getMsgValue()") cp.modify = True def OnInsertGetMsgTime(self, event): """ Insert a sentence to get the message time """ cp = self.nb.GetCurrentPage() - cp.AddText("t = self.getMsgTime()") + cp.AddText("self.getMsgTime()") cp.modify = True def OnInsertGetElapsed(self, event): """ Insert a sentence to get the elapsed time """ cp = self.nb.GetCurrentPage() - cp.AddText("e = self.getElapsed()") + cp.AddText("self.getElapsed()") cp.modify = True ### From 3f68e744d8a74824d2f474fc5783d607d670b9a7 Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Fri, 20 Nov 2020 16:34:40 +0100 Subject: [PATCH 3/3] add __slots__ to DomainBehavior --- DomainInterface/DomainBehavior.py | 8 ++++--- Editor.py | 39 ++++++++++++++----------------- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/DomainInterface/DomainBehavior.py b/DomainInterface/DomainBehavior.py index 07f1f46d..170f4484 100644 --- a/DomainInterface/DomainBehavior.py +++ b/DomainInterface/DomainBehavior.py @@ -62,6 +62,8 @@ class DomainBehavior(BaseDEVS.AtomicDEVS): """ Abstract DomainBehavior class. """ + + __slots__ = ('state') ### def __init__(self, name:str=""): @@ -146,13 +148,13 @@ def getMsgPyPDEVSValue(self, msg): return msg[0] if msg else "Msg is none" def getMsgPyDEVSTime(self, msg): - return msg.time id msg else "Msg is none" + return msg.time if msg else "Msg is none" def getMsgPyPDEVSTime(self, msg): - return msg[1][0] is msg else "Msg is nore" + 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'] diff --git a/Editor.py b/Editor.py index 4df72a9c..72398af3 100644 --- a/Editor.py +++ b/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,49 +1899,49 @@ 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("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("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("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("self.getPortId()") 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("self.getMsgValue()") 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("self.getMsgTime()") 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("self.getElapsed()") @@ -1954,7 +1949,7 @@ def OnInsertGetElapsed(self, event): ### 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('',)") @@ -1962,7 +1957,7 @@ def OnInsertHoldInState(self, event): ### 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('')") @@ -1970,7 +1965,7 @@ def OnInsertPhaseIs(self, event): ### 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('')") @@ -1978,7 +1973,7 @@ def OnInsertPassivateInState(self, event): ### 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()") @@ -1986,7 +1981,7 @@ def OnInsertPassivateState(self, event): ### 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('')") @@ -1994,7 +1989,7 @@ def OnInsertDebug(self, event): ### 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