Changeset 10501

Timestamp:

11/11/10 09:47:10 (3 years ago)

Author:

Snyder.Jason

Message:

added a button to start nodebooter, reworked startup sequence to offer to start the naming service and to inform the user if nodebooter hasnt been started

Files:

• ossiedev/trunk/tools/alf/ALF.py (modified) (8 diffs)

ossiedev/trunk/tools/alf/ALF.py

@@ -59 +59 @@
 import shlex
 import subprocess
+import ConfigParser
 from ALFNodeBooterUtils import ALFNodeBooterUtils
+from ALFNSChoiceDialog import ALFNSChoiceDialog
+from ALFNodeBooterDialog import ALFNodeBooterDialog
 
 import wx.lib.foldpanelbar as fpb
@@ -68 +71 @@
 [wxID_TOOLBAR_TIMING_TOOL, wxID_TOOLBAR_REFRESH_TOOL,
 wxID_TOOLBAR_TIMING_DISPLAY_TOOL, wxID_TOOLBAR_CONNECT_TOOL,
-wxID_TOOLBAR_NAMINGSERVICE_DIALOG, wxID_TOOLBAR_LAUNCH_WAVEDASH] = [wx.NewId() for x in range(6)]
+wxID_TOOLBAR_NAMINGSERVICE_DIALOG, wxID_TOOLBAR_LAUNCH_WAVEDASH,
+wxID_TOOLBAR_START_NODEBOOTER] = [wx.NewId() for x in range(7)]
 
 [wxID_NSBOX_POPUP_DISPLAY, wxID_NSBOX_POPUP_START, 
@@ -77 +81 @@
  wxID_INSTALLBOX_POPUP_INSTALL, wxID_COMPONENTSBOX_POPUP_INSTALL] = [wx.NewId() for x in range(4)]
 
+OSSIE_CONFIG_FILE = '.ossie.cfg'
 #----------------------------------------------------------------------
 class alfApp(wx.App):
@@ -141 +146 @@
         
         self.Bind(wx.EVT_CLOSE, self.OnClose)
-
+        self.connections = {'127.0.0.1': []}
+        self.namingservice = ['127.0.0.1', '']
         self.nodeBooterProcess = None
-        nbUtils = ALFNodeBooterUtils()
-        if not nbUtils.namingServiceIsRunning():
-            nbUtils.startNamingService()
-        if not nbUtils.nodeBooterIsRunning():
-            self.nodeBooterProcess = nbUtils.startNodeBooter()
+        self.nbUtils = ALFNodeBooterUtils()
+        if not self.nbUtils.namingServiceIsRunning():
+            anscd = ALFNSChoiceDialog(self)
+        
 
     def __init__(self,parent):
@@ -166 +171 @@
         self.fileMgr = None
         
-        self.connections = {'127.0.0.1': []}
-        self.namingservice = ['127.0.0.1', '']
+        
         self.init_CORBA()
         
@@ -410 +414 @@
         toolbar.AddSimpleTool(wxID_TOOLBAR_LAUNCH_WAVEDASH, wavedash_bmp, shortHelpString="Launch Wavedash to configure waveforms")
 
+        toolbar.AddSeparator()
+        nodeBooter_img = wx.Image(root + '/images/nbstart.png', type = wx.BITMAP_TYPE_PNG)
+        nodeBooter_img.Rescale(24, 24)
+        nodeBooter_bmp = wx.BitmapFromImage(nodeBooter_img)
+        toolbar.AddSimpleTool(wxID_TOOLBAR_START_NODEBOOTER, nodeBooter_bmp, shortHelpString="Start NodeBooter")
         toolbar.Bind(wx.EVT_TOOL, self.OnToolBarClick)
         
@@ -469 +478 @@
             self.DisplayAvailableComponents()
             tb.ToggleTool(wxID_TOOLBAR_REFRESH_TOOL, False)
+        
+        elif event.GetId() == wxID_TOOLBAR_START_NODEBOOTER:
+            anbd = ALFNodeBooterDialog(self)
+            
+            if anbd.GetReturnCode() == 0:
+                self.namingservice[0] = '127.0.0.1'
+                self.init_CORBA()
+                self.refreshDisplay(True)
+                self.DisplayInstalledWaveforms()
+                self.DisplayAvailableWaveforms()
+                self.DisplayAvailableComponents()
             
     def processTimingEvent(self, component_name, port_name, function_name, description, time_s, time_us, number_samples):
@@ -1131 +1151 @@
                 shape.Destroy()
         self.diagram.Destroyparent
+        
+    def setOSSIEProperty(self, sectionName, propertyName, propertyValue):
+        configFile = os.getenv('HOME') + '/' + OSSIE_CONFIG_FILE
+        configParser = ConfigParser.SafeConfigParser()
+        #check to see if a config file already exists
+        if os.path.exists(configFile):
+            #if so, read in its properties so they don't get lost
+            configParser.read(configFile)
+        if not configParser.has_section(sectionName):
+            configParser.add_section(sectionName)
+        configParser.set(sectionName, propertyName, propertyValue)
+        f = open(configFile, 'w')
+        configParser.write(f)
+        f.close()
+            
+    def getOSSIEProperty(self, sectionName, propertyName):
+        configFile = os.getenv('HOME') + '/' + OSSIE_CONFIG_FILE
+        if os.path.exists(configFile):
+            configParser = ConfigParser.SafeConfigParser()
+            configParser.read(configFile)
+            if configParser.has_option(sectionName, propertyName):
+                return configParser.get(sectionName, propertyName)
+        return None
 #----------------------------------------------------------------------