Changeset 63f4b8e in sasview

Timestamp:

Oct 19, 2011 5:12:34 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

166f2f8

Parents:

ff04dfc

Message:

fixed group id problems

Location:

sansguiframe/src/sans/guiframe

Files:

• data_processor.py (modified) (2 diffs)
• gui_manager.py (modified) (3 diffs)

sansguiframe/src/sans/guiframe/data_processor.py

@@ -500 +500 @@
         self.AddPage(grid, "", True)
         pos = self.GetPageIndex(grid)
-        title = "Batch " + str(self.GetPageCount())
+        title = "Batch" + str(self.GetPageCount())
         self.SetPageText(pos, title)
         self.SetSelection(pos)
@@ -797 +797 @@
                             time.sleep(0.5)
                             continue
-                        
+                        #new_plot.name =  title + ': ' + new_plot.title
                         if issubclass(new_plot.__class__, Data1D):
                             if label in grid.list_plot_panels.keys():

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -998 +998 @@
         for item in self.panels:
             if self.panels[item].window_name.startswith(p.window_name)\
-                and not self._mgr.GetPane(p.window_name).IsOk(): 
+               or self._mgr.GetPane(p.window_name).IsOk(): 
                 count += 1
         windowname = p.window_name
@@ -1717 +1717 @@
             if panel in self.schedule_full_draw_list:
                self.schedule_full_draw_list.remove(panel) 
-            #CallAfter: make sure panel is clear before updating mgr
-            wx.CallAfter(self._mgr.Update)
+            
             #delete uid number not str(uid)
             if ID in self.plot_panels.keys():
@@ -1724 +1723 @@
             if ID in self.panels.keys():
                 del self.panels[ID]
+            #CallAfter: make sure panel is clear before updating mgr
+            wx.CallAfter(self._mgr.Update)
             return