beremiz: comparison plugger.py

equal deleted inserted replaced

-:5371e3d32f05
+:433fd448dd31
 from xml.dom import minidom
 import wx
 #Quick hack to be able to find Beremiz IEC tools. Should be config params.
 base_folder = os.path.split(sys.path[0])[0]
-sys.path.append(os.path.join(base_folder, "plcopeneditor"))
-sys.path.append(os.path.join(base_folder, "docutils"))
 from docpdf import *
 from xmlclass import GenerateClassesFromXSDstring
 from wxPopen import ProcessLogger
 if self.MandatoryParams and parts[0] == self.MandatoryParams[0]:
 self.MandatoryParams[1].setElementValue(parts[1], value)
 elif self.PlugParams and parts[0] == self.PlugParams[0]:
 self.PlugParams[1].setElementValue(parts[1], value)
 return value, False
+def PlugMakeDir(self):
+os.mkdir(self.PlugPath())
 def PlugRequestSave(self):
 # If plugin do not have corresponding directory
 plugpath = self.PlugPath()
 if not os.path.isdir(plugpath):
 _self.LoadChilds()
 #just loaded, nothing to saved
 _self.ChangesToSave = False
 else:
 # If plugin do not have corresponding file/dirs - they will be created on Save
-os.mkdir(_self.PlugPath())
+_self.PlugMakeDir()
 # Find an IEC number
 _self.FindNewIEC_Channel(0)
 # Call the plugin real __init__
 if getattr(PlugClass, "__init__", None):
 PlugClass.__init__(_self)
 self.MandatoryParams = None
 self.AppFrame = frame
 self.logger = logger
 self._builder = None
 self._connector = None
+self.Deleting = False
 # Setup debug information
 self.IECdebug_datas = {}
 self.IECdebug_lock = Lock()
 # Keep track of the plugin type name
 self.PlugType = "Beremiz"
 # After __init__ root plugin is not valid
 self.ProjectPath = None
 self.BuildPath = None
-self.PLCEditor = None
-self.PLCDebug = None
 self.DebugThread = None
 self.debug_break = False
 self.previous_plcstate = None
 self.StatusPrint = {"Broken": self.logger.write_error,
 None: lambda x: None}
 # copy PluginMethods so that it can be later customized
 self.PluginMethods = [dic.copy() for dic in self.PluginMethods]
 self.LoadSTLibrary()
+def __del__(self):
+self.Deleting = True
 def PluginLibraryFilePath(self):
 return os.path.join(os.path.split(__file__)[0], "pous.xml")
 def PlugTestModified(self):
 return None
 def SaveProject(self):
 if not self.SaveXMLFile():
 self.SaveXMLFile(os.path.join(self.ProjectPath, 'plc.xml'))
-if self.PLCEditor:
-self.PLCEditor.RefreshTitle()
 result = self.PlugRequestSave()
 if result:
 self.logger.write_error(result)
-def CloseProject(self):
-if self.PLCEditor is not None:
-self.PLCEditor.Close()
-if self.PLCDebug is not None:
-self.PLCDebug.Close()
 # Update PLCOpenEditor Plugin Block types from loaded plugins
 def RefreshPluginsBlockLists(self):
 if getattr(self, "PluggedChilds", None) is not None:
 self.ClearPluginTypes()
 self.AddPluginBlockList(self.PluginsBlockTypesFactory())
-if self.PLCEditor is not None:
+if self.AppFrame is not None:
-self.PLCEditor.RefreshEditor()
+self.AppFrame.RefreshLibraryTree()
+self.AppFrame.RefreshEditor()
 def PluginPath(self):
 return os.path.join(os.path.split(__file__)[0], "plugins")
 def PlugPath(self, PlugName=None):
 def _build(self):
 """
 Method called by user to (re)build SoftPLC and plugin tree
 """
-if self.PLCEditor is not None:
+if self.AppFrame is not None:
-self.PLCEditor.ClearErrors()
+self.AppFrame.ClearErrors()
 buildpath = self._getBuildPath()
 # Eventually create build dir
 if not os.path.exists(buildpath):
 chunk_infos = self.GetChunkInfos(from_location, to_location)
 self._EditPLC()
 for infos, (start_row, start_col) in chunk_infos:
 start = (from_location[0] - start_row, from_location[1] - start_col)
 end = (to_location[0] - start_row, to_location[1] - start_col)
-self.PLCEditor.ShowError(infos, start, end)
+self.AppFrame.ShowError(infos, start, end)
 def _showIECcode(self):
 plc_file = self._getIECcodepath()
 new_dialog = wx.Frame(self.AppFrame)
 ST_viewer = TextViewer(new_dialog, "", None, None)
 def ReArmDebugRegisterTimer(self):
 if self.DebugTimer is not None:
 self.DebugTimer.cancel()
-# Timer to prevent rapid-fire when registering many variables
+if not self.Deleting:
-# use wx.CallAfter use keep using same thread. TODO : use wx.Timer instead
+# Timer to prevent rapid-fire when registering many variables
-self.DebugTimer=Timer(0.5,wx.CallAfter,args = [self.RegisterDebugVarToConnector])
+# use wx.CallAfter use keep using same thread. TODO : use wx.Timer instead
-# Rearm anti-rapid-fire timer
+self.DebugTimer=Timer(0.5,wx.CallAfter,args = [self.RegisterDebugVarToConnector])
-self.DebugTimer.start()
+# Rearm anti-rapid-fire timer
+self.DebugTimer.start()
 def SubscribeDebugIECVariable(self, IECPath, callableobj, *args, **kwargs):
 """
 Dispatching use a dictionnary linking IEC variable paths
 Start PLC (Debug Mode)
 """
 if self.GetIECProgramsAndVariables():
 self._connector.StartPLC(debug=True)
 self.logger.write(_("Starting PLC (debug mode)\n"))
-if self.PLCDebug is None:
+if self.AppFrame:
-self.RefreshPluginsBlockLists()
+self.AppFrame.ResetGraphicViewers()
-def _onclose():
-self.PLCDebug = None
-self.PLCDebug = PLCOpenEditor(self.AppFrame, self, debug=True)
-self.PLCDebug._onclose = _onclose
-self.PLCDebug.Show()
-else:
-self.PLCDebug.ResetGraphicViewers()
 self.DebugThread = Thread(target=self.DebugThreadProc)
 self.DebugThread.start()
 else:
 self.logger.write_error(_("Couldn't start PLC debug !\n"))
 self.UpdateMethodsFromPLCStatus()
 builder = self.GetBuilder()
 if builder is not None:
 data = builder.GetBinaryCode()
 if data is not None :
 if self._connector.NewPLC(MD5, data, extrafiles):
-if self.PLCDebug is not None:
+if self.AppFrame is not None:
-self.PLCDebug.Close()
+self.AppFrame.CloseDebugTabs()
-self.PLCDebug = None
 self.UnsubscribeAllDebugIECVariable()
 self.ProgramTransferred()
 self.logger.write(_("Transfer completed successfully.\n"))
 else:
 self.logger.write_error(_("Transfer failed\n"))
 else:
 self.logger.write_error(_("No PLC to transfer (did build success ?)\n"))
 self.UpdateMethodsFromPLCStatus()
 PluginMethods = [
-{"bitmap" : opjimg("editPLC"),
-"name" : _("Edit PLC"),
-"tooltip" : _("Edit PLC program with PLCOpenEditor"),
-"method" : "_EditPLC"},
 {"bitmap" : opjimg("Build"),
 "name" : _("Build"),
 "tooltip" : _("Build project into build folder"),
 "method" : "_build"},
 {"bitmap" : opjimg("Clean"),

changeset 395	433fd448dd31
parent 392	6617d3fb43e2
child 396	d1083f580ca1