Changeset 10508

Timestamp:

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

Author:

Snyder.Jason

Message:

moved call to show() to the constructor, changed startup sequence: now checks for naming service and offers to start locally or connect to a remote, then displays a warning if nodebooter has not been run. added a button to the toolbar to start nodebooter

Files:

• ossiedev/trunk/tools/wavedash/src/WavedashView.py (modified) (9 diffs)

ossiedev/trunk/tools/wavedash/src/WavedashView.py

@@ -28 +28 @@
 from WavedashController import Controller
 from WavedashPreferencePage import WavedashPreferencePage
+from NSChoiceDialog import NSChoiceDialog
+from NodeBooterDialog import NodeBooterDialog
 
 OSSIE_WAVEAPP_DIMENSION = (600,600)                                                    
@@ -36 +38 @@
 NAMINGSERVICE_ICON_FILE = "/resources/network.png"
 REFRESH_ICON_FILE = "/resources/refresh.png"
-
+NODEBOOTER_ICON_FILE = "/resources/nbstart.png"
 
 
 class WavedashView(wx.Frame, WaveformListener, 
-                   ComponentListener, PropertyListener ):
+                   ComponentListener, PropertyListener):
     """ This is top level frame that acts as primary UI """
     def __init__(self, controller, amodel):
@@ -84 +86 @@
         self.trueValues = ["t", "true", "yes", "on", "1"]
         
+            
         self.Bind(wx.EVT_CLOSE, self.OnClose)
         
         self.SetSize(OSSIE_WAVEAPP_DIMENSION)
         self.Center()
+        self.Show()
+        
+        if not self.controller.namingServiceIsRunning():
+            nscd = NSChoiceDialog(self)        
+    
           
     def createToolBar(self):
@@ -108 +116 @@
         uninstall = self.toolbar.AddSimpleTool(-1, uninstallIcon, shortHelpString="Uninstall waveform")
         
+        startNodeBooterIcon = wx.Image(root + NODEBOOTER_ICON_FILE, wx.BITMAP_TYPE_ANY).ConvertToBitmap()
+        startNodeBooter = self.toolbar.AddSimpleTool(-1, startNodeBooterIcon, shortHelpString="Start NodeBooter")
+        
         
         self.Bind(wx.EVT_TOOL, self.OnStart, start)
@@ -113 +124 @@
         self.Bind(wx.EVT_TOOL, self.OnUninstall, uninstall)
         self.Bind(wx.EVT_TOOL, self.OnSelectNS, selectNS)
+        self.Bind(wx.EVT_TOOL, self.OnStartNodeBooter, startNodeBooter)
     
     def OnStart(self, event):
@@ -130 +142 @@
         status = self.controller.stopWaveform(activeWform.getName())
     
-    def OnUninstall(self, event):
-      
-            
+    def OnUninstall(self, event):    
         selWform = self.model.getActiveWaveform()
         if selWform is None:
@@ -148 +158 @@
             if(button.isComponentButton == True and button.getGrandParentName() == selWform.getName()):
                 self.configureButtons.remove(button)
-                
-            
+                 
         success = self.model.removeWaveform(selWform)
             
     def OnSelectNS(self, event):
         self.controller.selectNS()
-    
-    
+        
+    def OnStartNodeBooter(self, event):
+        nbd = NodeBooterDialog(self)
+        
+        if nbd.GetReturnCode() == 0:
+            self.controller.CORBAutils.setNamingService('127.0.0.1')
+            self.controller.CORBAutils.init_CORBA()
+            self.controller.refresh()
+
     def createMenus(self):
         menuBar = wx.MenuBar()
@@ -1065 +1081 @@
         
     def OnRefresh(self, event):
-        
         self.controller.refresh()
         
@@ -1225 +1240 @@
    
     frame = WavedashView(ctrlr, ctrlr.model)
-    frame.Show()
+
     ctrlr.CORBAutils.init_CORBA()
     ctrlr.buildModel()