Changeset dd66fbd in sasview

Timestamp:

Feb 16, 2009 6:53:18 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:

f69bc394

Parents:

8f274b11

Message:

status bar changed—-removed error from data remove

Location:

guiframe

Files:

• gui_manager.py (modified) (2 diffs)
• local_perspectives/plotting/Plotter1D.py (modified) (3 diffs)
• model_thread.py (modified) (2 diffs)
• statusbar.py (added)

guiframe/gui_manager.py

@@ -264 +264 @@
         """
         # Status bar
-        self.sb = self.CreateStatusBar()
-        self.SetStatusText("")
+        from statusbar import MyStatusBar
+        self.sb = MyStatusBar(self,wx.ID_ANY)
+        self.SetStatusBar(self.sb)
 
         # Add panel
@@ -615 +616 @@
             Display status message
         """
-        self.SetStatusText(str(evt.status))
+        self.sb.clear_gauge( msg="")
+        mythread=None
+        mytype= None
+        if hasattr(evt, "curr_thread"):
+            mythread= evt.curr_thread
+        if hasattr(evt, "type"):
+            mytype= evt.type
+        self.sb.set_status( type=mytype,msg=str(evt.status),thread=mythread)
+       
 
         

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -226 +226 @@
                 #print "cyllinder before adding error", self.plots[self.graph.selected_plottable].x
                 wx.EVT_MENU(self, id, self._on_add_errors)
-            elif self.plots[self.graph.selected_plottable].__class__.__name__=="Data1D":
-                id = wx.NewId()
-                slicerpop.Append(id, '&Remove errors From data')
-                #print "panel scale before  ",self.xLabel, self.yLabel
-                #print "cyllinder before adding error", self.plots[self.graph.selected_plottable].x
-                wx.EVT_MENU(self, id, self._on_remove_errors)
+                """
+                elif self.plots[self.graph.selected_plottable].__class__.__name__=="Data1D":
+                    id = wx.NewId()
+                    slicerpop.Append(id, '&Remove errors From data')
+                    #print "panel scale before  ",self.xLabel, self.yLabel
+                    #print "cyllinder before adding error", self.plots[self.graph.selected_plottable].x
+                    wx.EVT_MENU(self, id, self._on_remove_errors)
+                """
             else:
                 id = wx.NewId()
@@ -285 +287 @@
             self.graph.delete_plottable(self.plots[self.graph.selected_plottable])
             
-            self.graph.add_plottable(new_plot,color)
+            self.graph.add(new_plot,color)
             # transforming the view of the new data into the same of the previous data
             self._onEVT_FUNC_PROPERTY()
@@ -332 +334 @@
             new_plot.yaxis(label, unit)
             #print "panel scale ",self.xLabel, self.yLabel
-            color=self.graph.plottables[self.plots[self.graph.selected_plottable]]
+            #color=self.graph.plottables[self.plots[self.graph.selected_plottable]]
             self.graph.delete_plottable(self.plots[self.graph.selected_plottable])
-            self.graph.add_plottable(new_plot, color)
-            #self.graph.add(new_plot)
+            #self.graph.add_plottable(new_plot, color)
+            self.graph.add(new_plot)
             # transforming the view of the new data into the same of the previous data
             self._onEVT_FUNC_PROPERTY()

guiframe/model_thread.py

@@ -125 +125 @@
         
         wx.PostEvent(self.parent, StatusEvent(status="Plot \
-        updating ... %g sec" % time))
+        #updating ... %g sec" % time,curr_thread=self,type="update"))
+        
         
     def compute(self):
@@ -135 +136 @@
         center_x=0
         center_y=0
-       
+        
         self.starttime = time.time()
+        print "model_thread"
         wx.PostEvent(self.parent, StatusEvent(status=\
-                       "Start Drawing model %g " % self.starttime))
+                    "Start Drawing model %g " % (self.starttime)))
         lx = len(self.x)