]> rtime.felk.cvut.cz Git - CanFestival-3.git/blobdiff - objdictgen/networkedit.py
Added embedded mode in objdictedit, for integration in Beremiz.
[CanFestival-3.git] / objdictgen / networkedit.py
index 09e16d391ce6c264a2fe4714d0a5d364bdbb4bb3..3d82fa4caca6fc16284259ff4d114a873cc2dc12 100644 (file)
@@ -27,7 +27,7 @@ import wx.grid
 from types import *
 import os, re, platform, sys, time, traceback, getopt
 
-__version__ = "$Revision: 1.9 $"
+__version__ = "$Revision: 1.23 $"
 
 from nodelist import *
 from nodemanager import *
@@ -35,33 +35,7 @@ from subindextable import *
 from commondialogs import *
 from doc_index.DS301_index import *
 
-def create(parent):
-    return networkedit(parent)
-
-def usage():
-    print "\nUsage of networkedit.py :"
-    print "\n   %s [Projectpath]\n"%sys.argv[0]
-
-try:
-    opts, args = getopt.getopt(sys.argv[1:], "h", ["help"])
-except getopt.GetoptError:
-    # print help information and exit:
-    usage()
-    sys.exit(2)
-
-for o, a in opts:
-    if o in ("-h", "--help"):
-        usage()
-        sys.exit()
-
-if len(args) == 0:
-    projectOpen = None 
-elif len(args) == 1:
-    projectOpen = args[0]
-else:
-    usage()
-    sys.exit(2)
-ScriptDirectory = os.path.split(__file__)[0]
+ScriptDirectory = os.path.split(os.path.realpath(__file__))[0]
 
 try:
     import wx.html
@@ -100,7 +74,7 @@ try:
             wx.Frame.__init__(self, id=ID_HTMLFRAME, name='HtmlFrame',
                   parent=prnt, pos=wx.Point(320, 231), size=wx.Size(853, 616),
                   style=wx.DEFAULT_FRAME_STYLE, title='')
-            self.Bind(wx.EVT_CLOSE, self.OnCloseFrame, id=ID_HTMLFRAME)
+            self.Bind(wx.EVT_CLOSE, self.OnCloseFrame)
             
             self.HtmlContent = UrlClickHtmlWindow(id=ID_HTMLFRAMEHTMLCONTENT,
                   name='HtmlContent', parent=self, pos=wx.Point(0, 0),
@@ -139,33 +113,20 @@ except:
  ID_NETWORKEDITHELPBAR,
 ] = [wx.NewId() for _init_ctrls in range(3)]
 
-[ID_NETWORKEDITADDMENUITEMS0, ID_NETWORKEDITADDMENUITEMS1, 
- ID_NETWORKEDITADDMENUITEMS2, ID_NETWORKEDITADDMENUITEMS3, 
- ID_NETWORKEDITADDMENUITEMS4, ID_NETWORKEDITADDMENUITEMS5, 
-] = [wx.NewId() for _init_coll_AddMenu_Items in range(6)]
-
-[ID_NETWORKEDITFILEMENUITEMS0, ID_NETWORKEDITFILEMENUITEMS1, 
- ID_NETWORKEDITFILEMENUITEMS2, ID_NETWORKEDITFILEMENUITEMS4, 
- ID_NETWORKEDITFILEMENUITEMS5, ID_NETWORKEDITFILEMENUITEMS6,
-] = [wx.NewId() for _init_coll_FileMenu_Items in range(6)]
-
-[ID_NETWORKEDITNETWORKMENUITEMS0, ID_NETWORKEDITNETWORKMENUITEMS1, 
- ID_NETWORKEDITNETWORKMENUITEMS3, 
-] = [wx.NewId() for _init_coll_AddMenu_Items in range(3)]
+[ID_NETWORKEDITNETWORKMENUBUILDMASTER, 
+] = [wx.NewId() for _init_coll_AddMenu_Items in range(1)]
 
+[ID_NETWORKEDITEDITMENUNODEINFOS, ID_NETWORKEDITEDITMENUDS301PROFILE, 
+ ID_NETWORKEDITEDITMENUDS302PROFILE, ID_NETWORKEDITEDITMENUOTHERPROFILE, 
+] = [wx.NewId() for _init_coll_EditMenu_Items in range(4)]
 
-[ID_NETWORKEDITEDITMENUITEMS0, ID_NETWORKEDITEDITMENUITEMS1, 
- ID_NETWORKEDITEDITMENUITEMS2, ID_NETWORKEDITEDITMENUITEMS4, 
- ID_NETWORKEDITEDITMENUITEMS6, ID_NETWORKEDITEDITMENUITEMS7, 
- ID_NETWORKEDITEDITMENUITEMS8, 
-] = [wx.NewId() for _init_coll_EditMenu_Items in range(7)]
-
-[ID_NETWORKEDITHELPMENUITEMS0, ID_NETWORKEDITHELPMENUITEMS1,
- ID_NETWORKEDITHELPMENUITEMS2,
-] = [wx.NewId() for _init_coll_HelpMenu_Items in range(3)]
+[ID_NETWORKEDITADDMENUSDOSERVER, ID_NETWORKEDITADDMENUSDOCLIENT, 
+ ID_NETWORKEDITADDMENUPDOTRANSMIT, ID_NETWORKEDITADDMENUPDORECEIVE, 
+ ID_NETWORKEDITADDMENUMAPVARIABLE, ID_NETWORKEDITADDMENUUSERTYPE, 
+] = [wx.NewId() for _init_coll_AddMenu_Items in range(6)]
 
 class networkedit(wx.Frame):
-    def _init_coll_menuBar1_Menus(self, parent):
+    def _init_coll_MenuBar_Menus(self, parent):
         if self.ModeSolo:
             parent.Append(menu=self.FileMenu, title='File')
         parent.Append(menu=self.NetworkMenu, title='Network')
@@ -173,116 +134,104 @@ class networkedit(wx.Frame):
         parent.Append(menu=self.AddMenu, title='Add')
         parent.Append(menu=self.HelpMenu, title='Help')
 
+    def _init_coll_FileMenu_Items(self, parent):
+        parent.Append(help='', id=wx.ID_NEW,
+              kind=wx.ITEM_NORMAL, text='New\tCTRL+N')
+        parent.Append(help='', id=wx.ID_OPEN,
+              kind=wx.ITEM_NORMAL, text='Open\tCTRL+O')
+        parent.Append(help='', id=wx.ID_CLOSE,
+              kind=wx.ITEM_NORMAL, text='Close\tCTRL+W')
+        parent.AppendSeparator()
+        parent.Append(help='', id=wx.ID_SAVE,
+              kind=wx.ITEM_NORMAL, text='Save\tCTRL+S')
+        parent.AppendSeparator()
+        parent.Append(help='', id=wx.ID_EXIT,
+              kind=wx.ITEM_NORMAL, text='Exit')
+        self.Bind(wx.EVT_MENU, self.OnNewProjectMenu, id=wx.ID_NEW)
+        self.Bind(wx.EVT_MENU, self.OnOpenProjectMenu, id=wx.ID_OPEN)
+        self.Bind(wx.EVT_MENU, self.OnCloseProjectMenu, id=wx.ID_CLOSE)
+        self.Bind(wx.EVT_MENU, self.OnSaveProjectMenu, id=wx.ID_SAVE)
+        self.Bind(wx.EVT_MENU, self.OnQuitMenu, id=wx.ID_EXIT)
+
+    def _init_coll_NetworkMenu_Items(self, parent):
+        parent.Append(help='', id=wx.ID_ADD,
+              kind=wx.ITEM_NORMAL, text='Add Slave Node')
+        parent.Append(help='', id=wx.ID_DELETE,
+              kind=wx.ITEM_NORMAL, text='Remove Slave Node')
+        parent.AppendSeparator()
+        parent.Append(help='', id=ID_NETWORKEDITNETWORKMENUBUILDMASTER,
+              kind=wx.ITEM_NORMAL, text='Build Master Dictionary')
+        self.Bind(wx.EVT_MENU, self.OnAddSlaveMenu, id=wx.ID_ADD)
+        self.Bind(wx.EVT_MENU, self.OnRemoveSlaveMenu, id=wx.ID_DELETE)
+##        self.Bind(wx.EVT_MENU, self.OnBuildMasterMenu,
+##              id=ID_NETWORKEDITNETWORKMENUBUILDMASTER)
+
     def _init_coll_EditMenu_Items(self, parent):
-        parent.Append(help='', id=ID_NETWORKEDITEDITMENUITEMS4,
+        parent.Append(help='', id=wx.ID_REFRESH,
               kind=wx.ITEM_NORMAL, text='Refresh\tCTRL+R')
         parent.AppendSeparator()
-        parent.Append(help='', id=ID_NETWORKEDITEDITMENUITEMS1,
+        parent.Append(help='', id=wx.ID_UNDO,
               kind=wx.ITEM_NORMAL, text='Undo\tCTRL+Z')
-        parent.Append(help='', id=ID_NETWORKEDITEDITMENUITEMS0,
+        parent.Append(help='', id=wx.ID_REDO,
               kind=wx.ITEM_NORMAL, text='Redo\tCTRL+Y')
         parent.AppendSeparator()
-        parent.Append(help='', id=ID_NETWORKEDITEDITMENUITEMS6,
+        parent.Append(help='', id=ID_NETWORKEDITEDITMENUNODEINFOS,
               kind=wx.ITEM_NORMAL, text='Node infos')
-        parent.Append(help='', id=ID_NETWORKEDITEDITMENUITEMS2,
+        parent.Append(help='', id=ID_NETWORKEDITEDITMENUDS301PROFILE,
               kind=wx.ITEM_NORMAL, text='DS-301 Profile')
-        parent.Append(help='', id=ID_NETWORKEDITEDITMENUITEMS8,
+        parent.Append(help='', id=ID_NETWORKEDITEDITMENUDS302PROFILE,
               kind=wx.ITEM_NORMAL, text='DS-302 Profile')
-        parent.Append(help='', id=ID_NETWORKEDITEDITMENUITEMS7,
+        parent.Append(help='', id=ID_NETWORKEDITEDITMENUOTHERPROFILE,
               kind=wx.ITEM_NORMAL, text='Other Profile')
-        self.Bind(wx.EVT_MENU, self.OnUndoMenu,
-              id=ID_NETWORKEDITEDITMENUITEMS1)
-        self.Bind(wx.EVT_MENU, self.OnRedoMenu,
-              id=ID_NETWORKEDITEDITMENUITEMS0)
-        self.Bind(wx.EVT_MENU, self.OnCommunicationMenu,
-              id=ID_NETWORKEDITEDITMENUITEMS2)
-        self.Bind(wx.EVT_MENU, self.OnRefreshMenu,
-              id=ID_NETWORKEDITEDITMENUITEMS4)
+        self.Bind(wx.EVT_MENU, self.OnRefreshMenu, id=wx.ID_REFRESH)
+        self.Bind(wx.EVT_MENU, self.OnUndoMenu, id=wx.ID_UNDO)
+        self.Bind(wx.EVT_MENU, self.OnRedoMenu, id=wx.ID_REDO)
         self.Bind(wx.EVT_MENU, self.OnNodeInfosMenu,
-              id=ID_NETWORKEDITEDITMENUITEMS6)
-        self.Bind(wx.EVT_MENU, self.OnEditProfileMenu,
-              id=ID_NETWORKEDITEDITMENUITEMS7)
+              id=ID_NETWORKEDITEDITMENUNODEINFOS)
+        self.Bind(wx.EVT_MENU, self.OnCommunicationMenu,
+              id=ID_NETWORKEDITEDITMENUDS301PROFILE)
         self.Bind(wx.EVT_MENU, self.OnOtherCommunicationMenu,
-              id=ID_NETWORKEDITEDITMENUITEMS8)
-
-    def _init_coll_HelpMenu_Items(self, parent):
-        parent.Append(help='', id=ID_NETWORKEDITHELPMENUITEMS0,
-              kind=wx.ITEM_NORMAL, text='DS-301 Standard\tF1')
-        self.Bind(wx.EVT_MENU, self.OnHelpDS301Menu,
-              id=ID_NETWORKEDITHELPMENUITEMS0)
-        parent.Append(help='', id=ID_NETWORKEDITHELPMENUITEMS1,
-              kind=wx.ITEM_NORMAL, text='CAN Festival Docs\tF2')
-        self.Bind(wx.EVT_MENU, self.OnHelpCANFestivalMenu,
-              id=ID_NETWORKEDITHELPMENUITEMS1)
-        if Html_Window and self.ModeSolo:
-            parent.Append(help='', id=ID_NETWORKEDITHELPMENUITEMS2,
-                  kind=wx.ITEM_NORMAL, text='About')
-            self.Bind(wx.EVT_MENU, self.OnAboutMenu,
-                  id=ID_NETWORKEDITHELPMENUITEMS2)
+              id=ID_NETWORKEDITEDITMENUDS302PROFILE)
+        self.Bind(wx.EVT_MENU, self.OnEditProfileMenu,
+              id=ID_NETWORKEDITEDITMENUOTHERPROFILE)
 
-    def _init_coll_FileMenu_Items(self, parent):
-        parent.Append(help='', id=ID_NETWORKEDITFILEMENUITEMS5,
-              kind=wx.ITEM_NORMAL, text='New\tCTRL+N')
-        parent.Append(help='', id=ID_NETWORKEDITFILEMENUITEMS0,
-              kind=wx.ITEM_NORMAL, text='Open\tCTRL+O')
-        parent.Append(help='', id=ID_NETWORKEDITFILEMENUITEMS1,
-              kind=wx.ITEM_NORMAL, text='Save\tCTRL+S')
-        parent.Append(help='', id=ID_NETWORKEDITFILEMENUITEMS2,
-              kind=wx.ITEM_NORMAL, text='Close\tCTRL+W')
-        parent.AppendSeparator()
-        parent.Append(help='', id=ID_NETWORKEDITFILEMENUITEMS4,
-              kind=wx.ITEM_NORMAL, text='Exit')
-        self.Bind(wx.EVT_MENU, self.OnOpenProjectMenu,
-              id=ID_NETWORKEDITFILEMENUITEMS0)
-        self.Bind(wx.EVT_MENU, self.OnSaveProjectMenu,
-              id=ID_NETWORKEDITFILEMENUITEMS1)
-        self.Bind(wx.EVT_MENU, self.OnCloseProjectMenu,
-              id=ID_NETWORKEDITFILEMENUITEMS2)
-        self.Bind(wx.EVT_MENU, self.OnQuitMenu,
-              id=ID_NETWORKEDITFILEMENUITEMS4)
-        self.Bind(wx.EVT_MENU, self.OnNewProjectMenu,
-              id=ID_NETWORKEDITFILEMENUITEMS5)
-    
-    def _init_coll_NetworkMenu_Items(self, parent):
-        parent.Append(help='', id=ID_NETWORKEDITNETWORKMENUITEMS0,
-              kind=wx.ITEM_NORMAL, text='Add Slave Node')
-        parent.Append(help='', id=ID_NETWORKEDITNETWORKMENUITEMS1,
-              kind=wx.ITEM_NORMAL, text='Remove Slave Node')
-        parent.AppendSeparator()
-        parent.Append(help='', id=ID_NETWORKEDITNETWORKMENUITEMS3,
-              kind=wx.ITEM_NORMAL, text='Build Master Dictionary')
-        self.Bind(wx.EVT_MENU, self.OnAddSlaveMenu,
-              id=ID_NETWORKEDITNETWORKMENUITEMS0)
-        self.Bind(wx.EVT_MENU, self.OnRemoveSlaveMenu,
-              id=ID_NETWORKEDITNETWORKMENUITEMS1)
-##        self.Bind(wx.EVT_MENU, self.OnBuildMasterMenu,
-##              id=ID_NETWORKEDITNETWORKMENUITEMS3)
-    
     def _init_coll_AddMenu_Items(self, parent):
-        parent.Append(help='', id=ID_NETWORKEDITADDMENUITEMS0,
+        parent.Append(help='', id=ID_NETWORKEDITADDMENUSDOSERVER,
               kind=wx.ITEM_NORMAL, text='SDO Server')
-        parent.Append(help='', id=ID_NETWORKEDITADDMENUITEMS1,
+        parent.Append(help='', id=ID_NETWORKEDITADDMENUSDOCLIENT,
               kind=wx.ITEM_NORMAL, text='SDO Client')
-        parent.Append(help='', id=ID_NETWORKEDITADDMENUITEMS2,
+        parent.Append(help='', id=ID_NETWORKEDITADDMENUPDOTRANSMIT,
               kind=wx.ITEM_NORMAL, text='PDO Transmit')
-        parent.Append(help='', id=ID_NETWORKEDITADDMENUITEMS3,
+        parent.Append(help='', id=ID_NETWORKEDITADDMENUPDORECEIVE,
               kind=wx.ITEM_NORMAL, text='PDO Receive')
-        parent.Append(help='', id=ID_NETWORKEDITADDMENUITEMS4,
+        parent.Append(help='', id=ID_NETWORKEDITADDMENUMAPVARIABLE,
               kind=wx.ITEM_NORMAL, text='Map Variable')
-        parent.Append(help='', id=ID_NETWORKEDITADDMENUITEMS5,
+        parent.Append(help='', id=ID_NETWORKEDITADDMENUUSERTYPE,
               kind=wx.ITEM_NORMAL, text='User Type')
         self.Bind(wx.EVT_MENU, self.OnAddSDOServerMenu,
-              id=ID_NETWORKEDITADDMENUITEMS0)
+              id=ID_NETWORKEDITADDMENUSDOSERVER)
         self.Bind(wx.EVT_MENU, self.OnAddSDOClientMenu,
-              id=ID_NETWORKEDITADDMENUITEMS1)
+              id=ID_NETWORKEDITADDMENUSDOCLIENT)
         self.Bind(wx.EVT_MENU, self.OnAddPDOTransmitMenu,
-              id=ID_NETWORKEDITADDMENUITEMS2)
+              id=ID_NETWORKEDITADDMENUPDOTRANSMIT)
         self.Bind(wx.EVT_MENU, self.OnAddPDOReceiveMenu,
-              id=ID_NETWORKEDITADDMENUITEMS3)
+              id=ID_NETWORKEDITADDMENUPDORECEIVE)
         self.Bind(wx.EVT_MENU, self.OnAddMapVariableMenu,
-              id=ID_NETWORKEDITADDMENUITEMS4)
+              id=ID_NETWORKEDITADDMENUMAPVARIABLE)
         self.Bind(wx.EVT_MENU, self.OnAddUserTypeMenu,
-              id=ID_NETWORKEDITADDMENUITEMS5)
+              id=ID_NETWORKEDITADDMENUUSERTYPE)
+
+    def _init_coll_HelpMenu_Items(self, parent):
+        parent.Append(help='', id=wx.ID_HELP,
+              kind=wx.ITEM_NORMAL, text='DS-301 Standard\tF1')
+        self.Bind(wx.EVT_MENU, self.OnHelpDS301Menu, id=wx.ID_HELP)
+        parent.Append(help='', id=wx.ID_HELP_CONTEXT,
+              kind=wx.ITEM_NORMAL, text='CAN Festival Docs\tF2')
+        self.Bind(wx.EVT_MENU, self.OnHelpCANFestivalMenu, id=wx.ID_HELP_CONTEXT)
+        if Html_Window and self.ModeSolo:
+            parent.Append(help='', id=wx.ID_ABOUT,
+                  kind=wx.ITEM_NORMAL, text='About')
+            self.Bind(wx.EVT_MENU, self.OnAboutMenu, id=wx.ID_ABOUT)
 
     def _init_coll_HelpBar_Fields(self, parent):
         parent.SetFieldsCount(3)
@@ -294,8 +243,8 @@ class networkedit(wx.Frame):
         parent.SetStatusWidths([100, 110, -1])
 
     def _init_utils(self):
-        self.menuBar1 = wx.MenuBar()
-        self.menuBar1.SetEvtHandlerEnabled(True)
+        self.MenuBar = wx.MenuBar()
+        self.MenuBar.SetEvtHandlerEnabled(True)
         
         if self.ModeSolo:
             self.FileMenu = wx.Menu(title='')
@@ -304,7 +253,7 @@ class networkedit(wx.Frame):
         self.AddMenu = wx.Menu(title='')
         self.HelpMenu = wx.Menu(title='')
 
-        self._init_coll_menuBar1_Menus(self.menuBar1)
+        self._init_coll_MenuBar_Menus(self.MenuBar)
         if self.ModeSolo:
             self._init_coll_FileMenu_Items(self.FileMenu)
         self._init_coll_NetworkMenu_Items(self.NetworkMenu)
@@ -318,11 +267,11 @@ class networkedit(wx.Frame):
               style=wx.DEFAULT_FRAME_STYLE, title='Networkedit')
         self._init_utils()
         self.SetClientSize(wx.Size(1000, 700))
-        self.SetMenuBar(self.menuBar1)
-        self.Bind(wx.EVT_CLOSE, self.OnCloseFrame, id=ID_NETWORKEDIT)
+        self.SetMenuBar(self.MenuBar)
+        self.Bind(wx.EVT_CLOSE, self.OnCloseFrame)
         if not self.ModeSolo:
-            self.Bind(wx.EVT_MENU, self.OnSaveProjectMenu, id=ID_NETWORKEDITFILEMENUITEMS1)
-            accel = wx.AcceleratorTable([wx.AcceleratorEntry(wx.ACCEL_CTRL, 83, ID_NETWORKEDITFILEMENUITEMS1)])
+            self.Bind(wx.EVT_MENU, self.OnSaveProjectMenu, id=wx.ID_SAVE)
+            accel = wx.AcceleratorTable([wx.AcceleratorEntry(wx.ACCEL_CTRL, 83, wx.ID_SAVE)])
             self.SetAcceleratorTable(accel)
 
         self.NetworkNodes = wx.Notebook(id=ID_NETWORKEDITNETWORKNODES,
@@ -336,12 +285,15 @@ class networkedit(wx.Frame):
         self._init_coll_HelpBar_Fields(self.HelpBar)
         self.SetStatusBar(self.HelpBar)
 
-    def __init__(self, parent, nodelist = None):
+    def __init__(self, parent, nodelist = None, projectOpen = None):
         self.ModeSolo = nodelist == None
         self._init_ctrls(parent)
         self.HtmlFrameOpened = []
         self.BusId = None
         
+        icon = wx.Icon(os.path.join(ScriptDirectory,"networkedit.ico"),wx.BITMAP_TYPE_ICO)
+        self.SetIcon(icon)
+                 
         if self.ModeSolo:
             self.Manager = NodeManager()
             if projectOpen:
@@ -388,9 +340,6 @@ class networkedit(wx.Frame):
             self._onsave()
         event.Skip()
 
-    def GetNoteBook(self):
-        return self.NetworkNodes
-
     def OnQuitMenu(self, event):
         self.Close()
         event.Skip()
@@ -430,11 +379,11 @@ class networkedit(wx.Frame):
     def OnNodeSelectedChanged(self, event):
         selected = event.GetSelection()
         # At init selected = -1
-        if selected > 0:
+        if selected >= 0:
             window = self.NetworkNodes.GetPage(selected)
             self.NodeList.SetCurrentSelected(window.GetIndex())
-        self.RefreshMainMenu()
-        self.RefreshStatusBar()
+        wx.CallAfter(self.RefreshMainMenu)
+        wx.CallAfter(self.RefreshStatusBar)
         event.Skip()
 
 #-------------------------------------------------------------------------------
@@ -542,7 +491,7 @@ class networkedit(wx.Frame):
             values = dialog.GetValues()
             result = self.NodeList.AddSlaveNode(values["slaveName"], values["slaveNodeID"], values["edsFile"])
             if not result:
-                new_editingpanel = EditingPanel(self, self.NodeList, False)
+                new_editingpanel = EditingPanel(self.NetworkNodes, self, self.NodeList, False)
                 new_editingpanel.SetIndex(values["slaveNodeID"])
                 idx = self.NodeList.GetOrderNumber(values["slaveNodeID"])
                 self.NetworkNodes.InsertPage(idx, new_editingpanel, "")
@@ -605,85 +554,87 @@ class networkedit(wx.Frame):
         if self.NetworkNodes.GetPageCount() > 0:
             self.NetworkNodes.DeleteAllPages()
         if self.NodeList:
-            new_editingpanel = EditingPanel(self, self.Manager)
+            new_editingpanel = EditingPanel(self.NetworkNodes, self, self.Manager)
             new_editingpanel.SetIndex(0)
             self.NetworkNodes.AddPage(new_editingpanel, "")
             for idx in self.NodeList.GetSlaveIDs():
-                new_editingpanel = EditingPanel(self, self.NodeList, False)
+                new_editingpanel = EditingPanel(self.NetworkNodes, self, self.NodeList, False)
                 new_editingpanel.SetIndex(idx)
                 self.NetworkNodes.AddPage(new_editingpanel, "")
 
     def RefreshStatusBar(self):
-        if self.HelpBar:
-            window = self.NetworkNodes.GetPage(self.NetworkNodes.GetSelection())
-            selection = window.GetSelection()
-            if selection:
-                index, subIndex = selection
-                if self.NodeList.IsCurrentEntry(index):
-                    self.HelpBar.SetStatusText("Index: 0x%04X"%index, 0)
-                    self.HelpBar.SetStatusText("Subindex: 0x%02X"%subIndex, 1)
-                    entryinfos = self.NodeList.GetEntryInfos(index)
-                    name = entryinfos["name"]
-                    category = "Optional"
-                    if entryinfos["need"]:
-                        category = "Mandatory"
-                    struct = "VAR"
-                    number = ""
-                    if entryinfos["struct"] & OD_IdenticalIndexes:
-                        number = " possibly defined %d times"%entryinfos["nbmax"]
-                    if entryinfos["struct"] & OD_IdenticalSubindexes:
-                        struct = "REC"
-                    elif entryinfos["struct"] & OD_MultipleSubindexes:
-                        struct = "ARRAY"
-                    text = "%s: %s entry of struct %s%s."%(name,category,struct,number)
-                    self.HelpBar.SetStatusText(text, 2)
+        if self:
+            selected = self.NetworkNodes.GetSelection()
+            if self.HelpBar and selected >= 0:
+                window = self.NetworkNodes.GetPage(selected)
+                selection = window.GetSelection()
+                if selection:
+                    index, subIndex = selection
+                    if self.NodeList.IsCurrentEntry(index):
+                        self.HelpBar.SetStatusText("Index: 0x%04X"%index, 0)
+                        self.HelpBar.SetStatusText("Subindex: 0x%02X"%subIndex, 1)
+                        entryinfos = self.NodeList.GetEntryInfos(index)
+                        name = entryinfos["name"]
+                        category = "Optional"
+                        if entryinfos["need"]:
+                            category = "Mandatory"
+                        struct = "VAR"
+                        number = ""
+                        if entryinfos["struct"] & OD_IdenticalIndexes:
+                            number = " possibly defined %d times"%entryinfos["nbmax"]
+                        if entryinfos["struct"] & OD_IdenticalSubindexes:
+                            struct = "REC"
+                        elif entryinfos["struct"] & OD_MultipleSubindexes:
+                            struct = "ARRAY"
+                        text = "%s: %s entry of struct %s%s."%(name,category,struct,number)
+                        self.HelpBar.SetStatusText(text, 2)
+                    else:
+                        for i in xrange(3):
+                            self.HelpBar.SetStatusText("", i)
                 else:
                     for i in xrange(3):
                         self.HelpBar.SetStatusText("", i)
-            else:
-                for i in xrange(3):
-                    self.HelpBar.SetStatusText("", i)
 
     def RefreshMainMenu(self):
-        if self.menuBar1:
-            self.NetworkMenu.Enable(ID_NETWORKEDITNETWORKMENUITEMS3, False)
+        if self and self.MenuBar:
+            self.NetworkMenu.Enable(ID_NETWORKEDITNETWORKMENUBUILDMASTER, False)
             if self.NodeList == None:
                 if self.ModeSolo:
-                    self.menuBar1.EnableTop(1, False)
-                    self.menuBar1.EnableTop(2, False)
-                    self.menuBar1.EnableTop(3, False)
+                    self.MenuBar.EnableTop(1, False)
+                    self.MenuBar.EnableTop(2, False)
+                    self.MenuBar.EnableTop(3, False)
                     if self.FileMenu:
-                        self.FileMenu.Enable(ID_NETWORKEDITFILEMENUITEMS1, False)
-                        self.FileMenu.Enable(ID_NETWORKEDITFILEMENUITEMS2, False)
+                        self.FileMenu.Enable(wx.ID_CLOSE, False)
+                        self.FileMenu.Enable(wx.ID_SAVE, False)
                 else:
-                    self.menuBar1.EnableTop(0, False)
-                    self.menuBar1.EnableTop(1, False)
-                    self.menuBar1.EnableTop(2, False)
+                    self.MenuBar.EnableTop(0, False)
+                    self.MenuBar.EnableTop(1, False)
+                    self.MenuBar.EnableTop(2, False)
             else:
                 if self.ModeSolo:
-                    self.menuBar1.EnableTop(1, True)
+                    self.MenuBar.EnableTop(1, True)
                     if self.FileMenu:
-                        self.FileMenu.Enable(ID_NETWORKEDITFILEMENUITEMS1, True)
-                        self.FileMenu.Enable(ID_NETWORKEDITFILEMENUITEMS2, True)
+                        self.FileMenu.Enable(wx.ID_CLOSE, True)
+                        self.FileMenu.Enable(wx.ID_SAVE, True)
                     if self.NetworkNodes.GetSelection() == 0:
-                        self.menuBar1.EnableTop(2, True)
-                        self.menuBar1.EnableTop(3, True)
+                        self.MenuBar.EnableTop(2, True)
+                        self.MenuBar.EnableTop(3, True)
                     else:
-                        self.menuBar1.EnableTop(2, False)      
-                        self.menuBar1.EnableTop(3, False)
+                        self.MenuBar.EnableTop(2, False)      
+                        self.MenuBar.EnableTop(3, False)
                 else:
-                    self.menuBar1.EnableTop(0, True)
+                    self.MenuBar.EnableTop(0, True)
                     if self.NetworkNodes.GetSelection() == 0:
-                        self.menuBar1.EnableTop(1, True)
-                        self.menuBar1.EnableTop(2, True)
+                        self.MenuBar.EnableTop(1, True)
+                        self.MenuBar.EnableTop(2, True)
                     else:
-                        self.menuBar1.EnableTop(1, False)      
-                        self.menuBar1.EnableTop(2, False)
+                        self.MenuBar.EnableTop(1, False)      
+                        self.MenuBar.EnableTop(2, False)
 
     def RefreshProfileMenu(self):
         if self.EditMenu:
             profile = self.Manager.GetCurrentProfileName()
-            edititem = self.EditMenu.FindItemById(ID_NETWORKEDITEDITMENUITEMS7)
+            edititem = self.EditMenu.FindItemById(ID_NETWORKEDITEDITMENUOTHERPROFILE)
             if edititem:
                 length = self.AddMenu.GetMenuItemCount()
                 for i in xrange(length-6):
@@ -701,6 +652,14 @@ class networkedit(wx.Frame):
                     edititem.SetText("Other Profile")
                     edititem.Enable(False)
 
+    def GetProfileCallBack(self, text):
+        def ProfileCallBack(event):
+            self.Manager.AddSpecificEntryToCurrent(text)
+            self.RefreshBufferState()
+            self.RefreshCurrentIndexList()
+            event.Skip()
+        return ProfileCallBack
+
 #-------------------------------------------------------------------------------
 #                              Buffer Functions
 #-------------------------------------------------------------------------------
@@ -757,7 +716,13 @@ class networkedit(wx.Frame):
         
     def OnHelpCANFestivalMenu(self, event):
         #self.OpenHtmlFrame("CAN Festival Reference", os.path.join(ScriptDirectory, "doc/canfestival.html"), wx.Size(1000, 600))
-        os.system("xpdf -remote CANFESTIVAL %s %d &"%(os.path.join(ScriptDirectory, "doc/manual_en.pdf"),16))
+        if wx.Platform == '__WXMSW__':
+            readerpath = get_acroversion()
+            readerexepath = os.path.join(readerpath,"AcroRd32.exe")
+            if(os.path.isfile(readerexepath)):
+                os.spawnl(os.P_DETACH, readerexepath, "AcroRd32.exe", '"%s"'%os.path.join(ScriptDirectory, "doc","manual_en.pdf"))
+        else:
+            os.system("xpdf -remote CANFESTIVAL %s %d &"%(os.path.join(ScriptDirectory, "doc/manual_en.pdf"),16))
         event.Skip()
 
     def OnAboutMenu(self, event):
@@ -810,7 +775,6 @@ class networkedit(wx.Frame):
                 if index not in new_profile:
                     removinglist.append(index)
             self.Manager.ManageEntriesOfCurrent(addinglist, removinglist)
-            self.Manager.GenerateMapList()
             self.Manager.BufferCurrentNode()
             self.RefreshBufferState()
             self.RefreshCurrentIndexList()
@@ -823,10 +787,12 @@ class networkedit(wx.Frame):
     def OnNodeInfosMenu(self, event):
         dialog = NodeInfosDialog(self)
         name, id, type, description = self.Manager.GetCurrentNodeInfos()
-        dialog.SetValues(name, id, type, description)
+        defaultstringsize = self.Manager.GetCurrentNodeDefaultStringSize()
+        dialog.SetValues(name, id, type, description, defaultstringsize)
         if dialog.ShowModal() == wx.ID_OK:
-            name, id, type, description = dialog.GetValues()
+            name, id, type, description, defaultstringsize = dialog.GetValues()
             self.Manager.SetCurrentNodeInfos(name, id, type, description)
+            self.Manager.SetCurrentNodeDefaultStringSize(defaultstringsize)
             self.RefreshBufferState()
             self.RefreshProfileMenu()
             selected = self.NetworkNodes.GetSelection()
@@ -876,6 +842,10 @@ class networkedit(wx.Frame):
                 message.Destroy()
         dialog.Destroy()
 
+    def OpenMasterDCFDialog(self, node_id):
+        self.NetworkNodes.SetSelection(0)
+        self.NetworkNodes.GetPage(0).OpenDCFDialog(node_id)
+
 #-------------------------------------------------------------------------------
 #                               Exception Handler
 #-------------------------------------------------------------------------------
@@ -980,13 +950,37 @@ def AddExceptHook(path, app_version='[No version]'):#, ignored_exceptions=[]):
     sys.excepthook = handle_exception
 
 if __name__ == '__main__':
+    def usage():
+        print "\nUsage of networkedit.py :"
+        print "\n   %s [Projectpath]\n"%sys.argv[0]
+
+    try:
+        opts, args = getopt.getopt(sys.argv[1:], "h", ["help"])
+    except getopt.GetoptError:
+        # print help information and exit:
+        usage()
+        sys.exit(2)
+
+    for o, a in opts:
+        if o in ("-h", "--help"):
+            usage()
+            sys.exit()
+
+    if len(args) == 0:
+        projectOpen = None 
+    elif len(args) == 1:
+        projectOpen = args[0]
+    else:
+        usage()
+        sys.exit(2)
+    
     app = wx.PySimpleApp()
     wx.InitAllImageHandlers()
     
     # Install a exception handle for bug reports
     AddExceptHook(os.getcwd(),__version__)
     
-    frame = networkedit(None)
+    frame = networkedit(None, projectOpen=projectOpen)
 
     frame.Show()
     app.MainLoop()