beremiz: comparison ProjectController.py

equal deleted inserted replaced

-:7b421e080636
+:413946c04c87
 import targets
 import connectors
 from util import MiniTextControler, opjimg, CheckPathPerm, GetClassImporter
 from util.ProcessLogger import ProcessLogger
 from PLCControler import PLCControler
-from PLCOpenEditor import ProjectDialog
+from PLCOpenEditor import CWD
 from TextViewer import TextViewer
 from plcopen.structures import IEC_KEYWORDS
 from targets.typemapping import DebugTypesSize
 from util.discovery import DiscoveryDialog
 from ConfigTreeNode import ConfigTreeNode
+from ProjectNodeEditor import ProjectNodeEditor
 base_folder = os.path.split(sys.path[0])[0]
 MATIEC_ERROR_MODEL = re.compile(".*\.st:(\d+)-(\d+)\.\.(\d+)-(\d+): error : (.*)$")
 DEBUG_RETRIES_WARN = 3
 DEBUG_RETRIES_REREGISTER = 4
+ITEM_CONFNODE = 25
 class ProjectController(ConfigTreeNode, PLCControler):
 """
 This class define Root object of the confnode tree.
 It is responsible of :
 <xsd:attribute name="Disable_Extensions" type="xsd:boolean" use="optional" default="false"/>
 </xsd:complexType>
 </xsd:element>
 </xsd:schema>
 """
+EditorType = ProjectNodeEditor
 def __init__(self, frame, logger):
 PLCControler.__init__(self)
 self.MandatoryParams = None
 self.SetAppFrame(frame, logger)
 # root have no parent
 self.CTNParent = None
 # Keep track of the confnode type name
 self.CTNType = "Beremiz"
 self.Children = {}
+self._View = None
 # After __init__ root confnode is not valid
 self.ProjectPath = None
 self._setBuildPath(None)
 self.DebugThread = None
 self.debug_break = False
 def __del__(self):
 if self.DebugTimer:
 self.DebugTimer.cancel()
 self.KillDebugThread()
 def SetAppFrame(self, frame, logger):
 self.AppFrame = frame
 self.logger = logger
 self.StatusTimer = None
 self.StatusTimer = None
 self.AppFrame = None
 self.logger = logger
+def CTNName(self):
+return "Project"
 def CTNTestModified(self):
 return self.ChangesToSave or not self.ProjectIsSaved()
 def CTNFullName(self):
 return ""
 def GetProjectPath(self):
 return self.ProjectPath
 def GetProjectName(self):
 return os.path.split(self.ProjectPath)[1]
+def GetIconPath(self):
+return os.path.join(CWD, "Images", "PROJECT.png")
 def GetDefaultTargetName(self):
 if wx.Platform == '__WXMSW__':
 return "Win32"
 else:
 wx.YES_NO | wx.NO_DEFAULT | wx.ICON_QUESTION)
 answer = dialog.ShowModal()
 dialog.Destroy()
 if answer == wx.ID_YES:
 if self.SaveProjectAs():
-self.AppFrame.RefreshAll()
 self.AppFrame.RefreshTitle()
 self.AppFrame.RefreshFileMenu()
+self.AppFrame.RefreshPageTitles()
 return True
 return False
 def NewProject(self, ProjectPath, BuildPath=None):
 """
 """
 # Verify that chosen folder is empty
 if not os.path.isdir(ProjectPath) or len(os.listdir(ProjectPath)) > 0:
 return _("Chosen folder isn't empty. You can't use it for a new project!")
-dialog = ProjectDialog(self.AppFrame)
-if dialog.ShowModal() == wx.ID_OK:
-values = dialog.GetValues()
-values["creationDateTime"] = datetime(*localtime()[:6])
-dialog.Destroy()
-else:
-dialog.Destroy()
-return _("Project not created")
 # Create PLCOpen program
-self.CreateNewProject(values)
+self.CreateNewProject(
+{"projectName": _("Unnamed"),
+"productName": _("Unnamed"),
+"productVersion": _("1"),
+"companyName": _("Unknown"),
+"creationDateTime": datetime(*localtime()[:6])})
+self.ProjectAddConfiguration("config")
+self.ProjectAddConfigurationResource("config", "resource1")
 # Change XSD into class members
 self._AddParamsMembers()
 self.Children = {}
 # Keep track of the root confnode (i.e. project path)
 self.ProjectPath = ProjectPath
 if os.path.isfile(self._getIECrawcodepath()):
 self.ShowMethod("_showIECcode", True)
 return None
+def RecursiveConfNodeInfos(self, confnode):
+values = []
+for CTNChild in confnode.IECSortedChildren():
+values.append(
+{"name": "%s: %s" % (CTNChild.GetFullIEC_Channel(),
+CTNChild.CTNName()),
+"type": ITEM_CONFNODE,
+"confnode": CTNChild,
+"icon": CTNChild.GetIconPath(),
+"values": self.RecursiveConfNodeInfos(CTNChild)})
+return values
+def GetProjectInfos(self):
+infos = PLCControler.GetProjectInfos(self)
+configurations = infos["values"].pop(-1)
+resources = None
+for config_infos in configurations["values"]:
+if resources is None:
+resources = config_infos["values"][0]
+else:
+resources["values"].extend(config_infos["values"][0]["values"])
+if resources is not None:
+infos["values"].append(resources)
+infos["values"].extend(self.RecursiveConfNodeInfos(self))
+return infos
 def CloseProject(self):
 self.ClearChildren()
 self.ResetAppFrame(None)
 self.AppFrame.EditProjectElement(IEC_code_viewer, name)
 return IEC_code_viewer
 elif name == "IEC raw code":
-controler = MiniTextControler(self._getIECrawcodepath())
+controler = MiniTextControler.MiniTextControler(self._getIECrawcodepath())
 IEC_raw_code_viewer = TextViewer(self.AppFrame.TabsOpened, "", None, controler, instancepath=name)
 #IEC_raw_code_viewer.Enable(False)
 IEC_raw_code_viewer.SetTextSyntax("ALL")
 IEC_raw_code_viewer.SetKeywords(IEC_KEYWORDS)
 IEC_raw_code_viewer.RefreshView()
 self.AppFrame.EditProjectElement(IEC_raw_code_viewer, name)
 return IEC_raw_code_viewer
-return None
+else:
+return ConfigTreeNode._OpenView(self, name)
 def _Clean(self):
 if os.path.isdir(os.path.join(self._getBuildPath())):
 self.logger.write(_("Cleaning the build directory\n"))
 shutil.rmtree(os.path.join(self._getBuildPath()))
 status = _(self.previous_plcstate)
 {"Broken": self.logger.write_error,
 None: lambda x: None}.get(
 self.previous_plcstate, self.logger.write)(_("PLC is %s\n")%status)
-self.AppFrame.RefreshAll()
+self.AppFrame.RefreshStatusToolBar()
 def RegisterDebugVarToConnector(self):
 self.DebugTimer=None
 Idxs = []
 self.TracedIECPath = []
 else:
 self.logger.write_error(_("No PLC to transfer (did build succeed ?)\n"))
 wx.CallAfter(self.UpdateMethodsFromPLCStatus)
-ConfNodeMethods = [
+StatusMethods = [
 {"bitmap" : "Build",
 "name" : _("Build"),
 "tooltip" : _("Build project into build folder"),
 "method" : "_Build"},
 {"bitmap" : "Clean",
 {"bitmap" : "ShowIECcode",
 "name" : _("Show code"),
 "shown" : False,
 "tooltip" : _("Show IEC code generated by PLCGenerator"),
 "method" : "_showIECcode"},
+]
+ConfNodeMethods = [
 {"bitmap" : "editIECrawcode",
 "name" : _("Raw IEC code"),
 "tooltip" : _("Edit raw IEC code added to code generated by PLCGenerator"),
 "method" : "_editIECrawcode"},
 ]
+def EnableMethod(self, method, value):
+for d in self.StatusMethods:
+if d["method"]==method:
+d["enabled"]=value
+return True
+return False
+def ShowMethod(self, method, value):
+for d in self.StatusMethods:
+if d["method"]==method:
+d["shown"]=value
+return True
+return False
+def CallMethod(self, method):
+for d in self.StatusMethods:
+if d["method"]==method and d.get("enabled", True) and d.get("shown", True):
+getattr(self, method)()

changeset 738	413946c04c87
parent 737	7b421e080636
child 740	cee825fbe9b3