Beremiz.py
changeset 725 31dade089db5
parent 724 e0630d262ac3
child 726 ae63ccc29444
equal deleted inserted replaced
724:e0630d262ac3 725:31dade089db5
   145 import wx.lib.buttons, wx.lib.statbmp
   145 import wx.lib.buttons, wx.lib.statbmp
   146 from util.TextCtrlAutoComplete import TextCtrlAutoComplete
   146 from util.TextCtrlAutoComplete import TextCtrlAutoComplete
   147 import cPickle
   147 import cPickle
   148 from util.BrowseValuesLibraryDialog import BrowseValuesLibraryDialog
   148 from util.BrowseValuesLibraryDialog import BrowseValuesLibraryDialog
   149 import types, time, re, platform, time, traceback, commands
   149 import types, time, re, platform, time, traceback, commands
   150 from ConfigTree import ConfigTreeRoot, MiniTextControler, MATIEC_ERROR_MODEL
   150 from ProjectController import ProjectController, MATIEC_ERROR_MODEL
       
   151 from util import MiniTextControler
   151 from ProcessLogger import ProcessLogger
   152 from ProcessLogger import ProcessLogger
   152 
   153 
   153 from docutils import *
   154 from docutils import *
   154 from PLCOpenEditor import IDEFrame, AppendMenu, TITLE, EDITORTOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU, TYPESTREE, INSTANCESTREE, LIBRARYTREE, SCALING, PAGETITLES, USE_AUI
   155 from PLCOpenEditor import IDEFrame, AppendMenu, TITLE, EDITORTOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU, TYPESTREE, INSTANCESTREE, LIBRARYTREE, SCALING, PAGETITLES, USE_AUI
   155 from PLCOpenEditor import EditorPanel, Viewer, TextViewer, GraphicViewer, ResourceEditor, ConfigurationEditor, DataTypeEditor
   156 from PLCOpenEditor import EditorPanel, Viewer, TextViewer, GraphicViewer, ResourceEditor, ConfigurationEditor, DataTypeEditor
   554             projectOpen = str(self.Config.Read("currenteditedproject"))
   555             projectOpen = str(self.Config.Read("currenteditedproject"))
   555             if projectOpen == "":
   556             if projectOpen == "":
   556                 projectOpen = None
   557                 projectOpen = None
   557         
   558         
   558         if projectOpen is not None and os.path.isdir(projectOpen):
   559         if projectOpen is not None and os.path.isdir(projectOpen):
   559             self.CTR = ConfigTreeRoot(self, self.Log)
   560             self.CTR = ProjectController(self, self.Log)
   560             self.Controler = self.CTR
   561             self.Controler = self.CTR
   561             result = self.CTR.LoadProject(projectOpen, buildpath)
   562             result = self.CTR.LoadProject(projectOpen, buildpath)
   562             if not result:
   563             if not result:
   563                 self.LibraryPanel.SetControler(self.Controler)
   564                 self.LibraryPanel.SetControler(self.Controler)
   564                 self.RefreshConfigRecentProjects(os.path.abspath(projectOpen))
   565                 self.RefreshConfigRecentProjects(os.path.abspath(projectOpen))
  1675         if dialog.ShowModal() == wx.ID_OK:
  1676         if dialog.ShowModal() == wx.ID_OK:
  1676             projectpath = dialog.GetPath()
  1677             projectpath = dialog.GetPath()
  1677             self.Config.Write("lastopenedfolder", os.path.dirname(projectpath))
  1678             self.Config.Write("lastopenedfolder", os.path.dirname(projectpath))
  1678             self.Config.Flush()
  1679             self.Config.Flush()
  1679             self.ResetView()
  1680             self.ResetView()
  1680             ctr = ConfigTreeRoot(self, self.Log)
  1681             ctr = ProjectController(self, self.Log)
  1681             result = ctr.NewProject(projectpath)
  1682             result = ctr.NewProject(projectpath)
  1682             if not result:
  1683             if not result:
  1683                 self.CTR = ctr
  1684                 self.CTR = ctr
  1684                 self.Controler = self.CTR
  1685                 self.Controler = self.CTR
  1685                 self.LibraryPanel.SetControler(self.Controler)
  1686                 self.LibraryPanel.SetControler(self.Controler)
  1711     def OpenProject(self, projectpath):
  1712     def OpenProject(self, projectpath):
  1712         if os.path.isdir(projectpath):
  1713         if os.path.isdir(projectpath):
  1713             self.Config.Write("lastopenedfolder", os.path.dirname(projectpath))
  1714             self.Config.Write("lastopenedfolder", os.path.dirname(projectpath))
  1714             self.Config.Flush()
  1715             self.Config.Flush()
  1715             self.ResetView()
  1716             self.ResetView()
  1716             self.CTR = ConfigTreeRoot(self, self.Log)
  1717             self.CTR = ProjectController(self, self.Log)
  1717             self.Controler = self.CTR
  1718             self.Controler = self.CTR
  1718             result = self.CTR.LoadProject(projectpath)
  1719             result = self.CTR.LoadProject(projectpath)
  1719             if not result:
  1720             if not result:
  1720                 self.LibraryPanel.SetControler(self.Controler)
  1721                 self.LibraryPanel.SetControler(self.Controler)
  1721                 self.RefreshConfigRecentProjects(projectpath)
  1722                 self.RefreshConfigRecentProjects(projectpath)