Changeset 48665ed in sasview

Timestamp:

Apr 19, 2011 12:17:35 PM (14 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:

7ad8faa

Parents:

52f3c98

Message:

fixed freeze button

Location:

guiframe

Files:

• data_panel.py (modified) (6 diffs)
• gui_manager.py (modified) (2 diffs)

guiframe/data_panel.py

@@ -247 +247 @@
         wx.EVT_BUTTON(self, self.bt_plot.GetId(), self.on_plot)
         
-        self.bt_freeze = wx.Button(self, wx.NewId(), "Freeze")
-        self.bt_freeze.SetToolTipString("To trigger freeze")
+        self.bt_freeze = wx.Button(self, wx.NewId(), "Freeze Theory")
+        self.bt_freeze.SetToolTipString("To trigger freeze a theory")
         wx.EVT_BUTTON(self, self.bt_freeze.GetId(), self.on_freeze)
         
@@ -363 +363 @@
         """
         """
+        # Not implemented
+        return
+        """
         _, data_class, _= self.tree_ctrl.GetItemPyData(item) 
         if item.IsChecked():
@@ -377 +380 @@
             else:
                 self.bt_freeze.Disable()
-               
+        """       
     def load_data_list(self, list):
         """
@@ -384 +387 @@
         if not list:
             return
-        
+        # uncheck previous items
+        self._uncheck_all()    
+           
         for state_id, dstate in list.iteritems():
             data = dstate.get_data()
@@ -435 +440 @@
             self.append_theory(state_id, theory_list)
         
-   
+    def _uncheck_all(self):
+        """
+        Uncheck all check boxes
+        """
+        for item in self.list_cb_data.values():
+            data_ctrl, _, _, _,_, _ = item
+            self.tree_ctrl.CheckItem(data_ctrl, False) 
+        
     def old_append_theory(self, state_id, theory_list):
         """
@@ -652 +664 @@
                               theory_id=theory_id,
                               append=False)
-        
+         
     def on_close_page(self, event=None):
         """

guiframe/gui_manager.py

@@ -214 +214 @@
             if self._data_panel is not None:
                 panel_name = self.panel_on_focus.window_caption
-                self._data_panel.set_panel_on_focus(ID)#panel_name)
+                ID = self.panel_on_focus.uid
+                self._data_panel.set_panel_on_focus(ID)
                 #update combo
                 if self.panel_on_focus in self.plot_panels.values():
@@ -2020 +2021 @@
             if panel != plot:
                 plot.on_kill_focus(None)
+
         panel.on_set_focus(None)  
         # set focusing panel