Changeset 9598

Timestamp:

09/29/09 11:50:01 (4 years ago)

Author:

deepanns

Message:

Added wavedash support to ALF;fixed ticket 272

Location:

ossiedev/branches/0.7.x/tools/alf

Files:

• ALF.py (modified) (5 diffs)
• images/launch_wavedash.png (added)

ossiedev/branches/0.7.x/tools/alf/ALF.py

@@ -65 +65 @@
 [wxID_TOOLBAR_TIMING_TOOL, wxID_TOOLBAR_REFRESH_TOOL,
 wxID_TOOLBAR_TIMING_DISPLAY_TOOL, wxID_TOOLBAR_CONNECT_TOOL,
-wxID_TOOLBAR_NAMINGSERVICE_DIALOG] = [wx.NewId() for x in range(5)]
+wxID_TOOLBAR_NAMINGSERVICE_DIALOG, wxID_TOOLBAR_LAUNCH_WAVEDASH] = [wx.NewId() for x in range(6)]
 
 [wxID_NSBOX_POPUP_DISPLAY, wxID_NSBOX_POPUP_START, 
@@ -361 +361 @@
         net_bmp = wx.BitmapFromImage(net_img)
         toolbar.AddSimpleTool(wxID_TOOLBAR_NAMINGSERVICE_DIALOG,net_bmp,shortHelpString="Select Naming Service")
+        
+        toolbar.AddSeparator()
+        wavedash_img = wx.Image(root + '/images/launch_wavedash.png', type=wx.BITMAP_TYPE_PNG)
+        wavedash_img.Rescale(24,24)
+        wavedash_bmp = wx.BitmapFromImage(wavedash_img)
+        toolbar.AddSimpleTool(wxID_TOOLBAR_LAUNCH_WAVEDASH, wavedash_bmp, shortHelpString="Launch Wavedash to configure waveforms")
 
         toolbar.Bind(wx.EVT_TOOL, self.OnToolBarClick)
@@ -402 +408 @@
         elif event.GetId() == wxID_TOOLBAR_NAMINGSERVICE_DIALOG:
             self.namingservice_dialog = NamingserviceDialog(self)
+            
+        elif event.GetId() == wxID_TOOLBAR_LAUNCH_WAVEDASH:
+            print "current working dir is " , os.getcwd()
+            if (os.path.exists("/usr/bin/WAVEDASH")):
+                os.system("/usr/bin/WAVEDASH")
+            else:
+                errorMsg(self, "Failed to launch WAVEDASH. Executable(WAVEDASH) not found in /usr/bin/ !!!")
+                return
+            
 
         # Refresh the display: Naming Service, Waveform List, and Canvas
@@ -834 +849 @@
                 os.mkdir(tmp_dir_name)   
             except:
-                errorMsg(self,"Cannot create temporary directory in the waveform directory.  You may need to change the temporary directory to one that you have write permissions to")
+                errorMsg(self,"Cannot create temporary directory in the waveform directory.\n"
+                              "You may need to change the temporary directory to one that you have write permissions to")
+        
+        #Ticket#272: loop into /sdr/_tmp_alf_waveforms/ directory and see if tmp waveforms exists already
+        #with the same name. If found, increment the counter and form a new name for the temp
+        #waveform. Repeat this until you find a new name.
+        while (os.path.exists(tmp_dir_name + tmp_wave_name) == True ):
+            print "InstallCompform(): ", tmp_wave_name + " exists already...Regenerating new name "
+            self.compform_counter = self.compform_counter + 1
+            tmp_wave_name = "_" + compName + str(self.compform_counter)
 
         if os.path.exists(tmp_dir_name + tmp_wave_name) == False:   
@@ -840 +864 @@
                 os.mkdir(tmp_dir_name + tmp_wave_name)
             except:
-                errorMsg(self,"Cannot create temporary directory in the waveform directory.  You may need to change the temporary directory to one that you have write permissions to")
+                errorMsg(self,"Cannot create temporary directory in the waveform directory.\n"
+                              "You may need to change the temporary directory to one that you have write permissions to")
                 return