Changeset f7d0b74 in sasview

Timestamp:

Apr 22, 2011 11:36:50 AM (14 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:

29d6fa5

Parents:

6ce7201

Message:

working on remove data ,remove data manager unexisting method call

Location:

guiframe

Files:

• data_panel.py (modified) (8 diffs)
• gui_manager.py (modified) (5 diffs)

guiframe/data_panel.py

@@ -110 +110 @@
         self.do_layout()
         self.Bind(wx.EVT_SHOW, self.on_close_page)
-        self.enable_remove()
-        self.enable_import()
+       
         
     def do_layout(self):
@@ -331 +330 @@
         self.sizer3.Add(self.bt_freeze,( iy, ix),(1,1),  
                              wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 5)
+        self.enable_remove()
+        self.enable_import()
+        self.enable_plot()
+        self.enable_append()
+        self.enable_freeze()
         
     def layout_batch(self):
@@ -418 +422 @@
         if not list:
             self.enable_remove()
+            self.enable_import()
+            self.enable_plot()
+            self.enable_freeze()
             return
         # uncheck previous items
@@ -472 +479 @@
             self.append_theory(state_id, theory_list)
         self.enable_remove()
+        self.enable_import()
+        self.enable_plot()
+        self.enable_freeze()
         
     def _uncheck_all(self):
@@ -773 +783 @@
                                   theory_id=theory_to_remove)
         self.enable_remove()
+        self.enable_freeze()
         
     def on_import(self, event=None):
@@ -839 +850 @@
                 self.cb_plotpanel.Append(name_plot_panel, value)
             self.cb_plotpanel.SetStringSelection(name_plot_panel)
-
+        self.enable_append()
  
     def _on_plot_selection(self, event = None):
@@ -862 +873 @@
         n_t = self.tree_ctrl.GetCount()
         n_t_t = self.tree_ctrl_theory.GetCount()
-        
         if n_t + n_t_t <= 0:
             self.bt_remove.Disable()
@@ -876 +886 @@
         else:
             self.bt_import.Enable()
-
-
+            
+    def enable_plot(self):
+        """
+        enable or disable plot button
+        """
+        n_t = self.tree_ctrl.GetCount()
+        n_t_t = self.tree_ctrl_theory.GetCount()
+        if n_t + n_t_t <= 0:
+            self.bt_plot.Disable()
+        else:
+            self.bt_plot.Enable()
+            
+    def enable_append(self):
+        """
+        enable or disable append button
+        """
+        if self.cb_plotpanel.GetValue() == 'None':
+            self.bt_append_plot.Disable()
+        else:
+            self.bt_append_plot.Enable()
+            
+    def enable_freeze(self):
+        """
+        enable or disable the freeze button
+        """
+        n_t_t = self.tree_ctrl_theory.GetCount()
+        n_l = len(self.list_cb_theory)
+        if (n_t_t <= 0) and (n_l <= 0):
+            self.bt_freeze.Disable()
+        else:
+            self.bt_freeze.Enable()
+        
+        
+        
 class DataFrame(wx.Frame):
     ## Internal name for the AUI manager

guiframe/gui_manager.py

@@ -1109 +1109 @@
         caption = self.panels[ID].window_caption
         if ID in self.panels.keys():
+            self.panel_on_focus = None
             panel = self.panels[ID]
             self._plotting_plugin.delete_panel(panel.group_id)
             self._mgr.DetachPane(panel)
-            panel.Destroy()
+            panel.Hide()
+            panel.clear()
+            panel.Close()
+            self._mgr.Update()
+            print "here here "
+            return 
             if ID in self.panels.keys():
                 del self.panels[ID]
@@ -1121 +1127 @@
                 if ind != wx.NOT_FOUND:
                    self._data_panel.cb_plotpanel.Delete(ind)
+            
             self._mgr.Update()
+ 
       
     def clear_panel(self):
@@ -1169 +1177 @@
         if style == GUIFRAME.MANAGER_ON:
             if self._data_panel is not None:
-                data_state = self._data_manager.get_selected_data()
-                self._data_panel.load_data_list(data_state)
+                #data_state = self._data_manager.get_selected_data()
+                #self._data_panel.load_data_list(data_state)
                 self._mgr.GetPane(self._data_panel.window_name).Show(True)
       
@@ -1295 +1303 @@
             plug_wlist = PLUGINS_WLIST 
             
-        return plug_wlist
-    
     def _on_open_state_project(self, event):
         """
@@ -1308 +1314 @@
                             self._default_save_location, "",
                              APPLICATION_WLIST)
-        print dlg.GetFilterIndex()
         if dlg.ShowModal() == wx.ID_OK:
             path = dlg.GetPath()