Changeset 700f9b4 in sasview

Timestamp:

Feb 23, 2009 5:24:24 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

2a8fac1

Parents:

353041d

Message:

small change on status bar

Location:

guiframe

Files:

• gui_manager.py (modified) (6 diffs)
• model_thread.py (modified) (1 diff)
• statusbar.py (modified) (5 diffs)

guiframe/gui_manager.py

@@ -225 +225 @@
         
         # History panel
-        self.histPanel     = history.HistoryPanel(self, style=wx.RAISED_BORDER)
+        #self.histPanel     = history.HistoryPanel(self, style=wx.RAISED_BORDER)
         # self.build_gui()
        
@@ -369 +369 @@
         self.panels["default"] = self.defaultPanel
          # History panel
-        self.panels["historyPanel"] = self.histPanel  
+        #self.panels["historyPanel"] = self.histPanel  
         
         self._mgr.AddPane(self.defaultPanel, wx.aui.AuiPaneInfo().
@@ -378 +378 @@
                               MinSize(wx.Size(self._window_width, self._window_height)).
                               Show())
+        """
         self._mgr.AddPane(self.histPanel, wx.aui.AuiPaneInfo().
                           Name("historyPanel").Caption("History").
@@ -392 +393 @@
                           BestSize(wx.Size(500,600)).
                           MinSize(wx.Size(200,150)))
+        """
 
         # Add the panels to the AUI manager
@@ -650 +652 @@
                 
             self._mgr.Update()
+    """
     def _onHistoryPanel(self, event):
         print "on history"
@@ -656 +659 @@
         self._mgr.Update()
         return
-        
+    """   
     def _on_open(self, event):
    
         from data_loader import plot_data
         path = self.choose_file()
-            
+        if path ==None:
+            return
         if path and os.path.isfile(path):
             plot_data(self, path)

guiframe/model_thread.py

@@ -158 +158 @@
                         value = self.model.runXY([self.x[i_x]-center_x, self.y[i_y]-center_y])
                         output[i_x] [i_y]=value   
+                       
                 except:
                      wx.PostEvent(self.parent, StatusEvent(status=\
                        "Error computing %s at [%g,%g]" %(self.model.name, self.x[i_x],self.y[i_y])))
-           
+                     pass
+        print "model thread ouput",output       
         elapsed = time.time()-self.starttime
         self.complete(

guiframe/statusbar.py

@@ -29 +29 @@
         """ 
         self.count +=1
-        if self.count ==20:
+        if self.count ==30:
             self.timer_stop.Stop() 
             self.gauge.Hide()
+            self.SetStatusText( "", 0)
             self.count=0
     def OnTimer(self, evt): 
@@ -48 +49 @@
             while(self.thread.isrunning()):
                 self.progress += 1
-                
-                # Update the Rqnge if it has changed 
-                #if self.range >= 0 and self.range != self.gauge.GetRange(): 
-                #    self.gauge.SetRange(self.range) 
-      
                 # Update the progress value if it is less than the range 
                 if self.progress < self.gauge.GetRange()-20: 
@@ -78 +74 @@
         else:
             self.thread= thread
-            #if self.thread !=None:
             self.gauge.Show(True)
             if type.lower()=="start":
@@ -95 +90 @@
                 self.SetStatusText( str(msg), 0)
                 self.gauge.Pulse()
-                print "in progress"
+                #print "in progress"
                 
             if  type.lower()=="update":
@@ -104 +99 @@
                 if self.progress < self.gauge.GetRange()-20:
                     self.gauge.SetValue(int(self.progress)) 
+                    
             if type.lower()=="stop":
-                print "it is complete"
                 self.gauge.Show(True)
                 self.timer.Stop()