Changeset e4d790f in sasview

Timestamp:

Oct 21, 2011 11:29:48 AM (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:

81a7b6c

Parents:

04b744d

Message:

model cb in data panel enabled by application menu too

Location:

sansguiframe/src/sans/guiframe

Files:

• data_panel.py (modified) (1 diff)
• gui_manager.py (modified) (1 diff)
• plugin_base.py (modified) (1 diff)

sansguiframe/src/sans/guiframe/data_panel.py

@@ -842 +842 @@
         """
         selection = self.perspective_cbox.GetSelection()
-
         if self.perspective_cbox.GetValue() != 'None':
             perspective = self.perspective_cbox.GetClientData(selection)
             perspective.on_perspective(event=None)
-            flag = perspective.get_batch_capable()
-            flag_on = perspective.batch_on
-            if flag:
-                self.rb_single_mode.SetValue(not flag_on)
-                self.rb_batch_mode.SetValue(flag_on)
-            else:
-                self.rb_single_mode.SetValue(True)
-                self.rb_batch_mode.SetValue(False)
-            self.rb_single_mode.Enable(flag)
-            self.rb_batch_mode.Enable(flag)
+            self.parent.check_multimode(perspective=perspective)
                 
     def _on_plot_selection(self, event=None):

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -2572 +2572 @@
         return is_data1d and not is_data2d and not is_theory and not is_state_data
     
+    def check_multimode(self, perspective=None):
+        """
+        Check the perspective have batch mode capablitity
+        """
+        if perspective == None or self._data_panel == None:
+            return
+        flag = perspective.get_batch_capable()
+        flag_on = perspective.batch_on
+        if flag:
+            self._data_panel.rb_single_mode.SetValue(not flag_on)
+            self._data_panel.rb_batch_mode.SetValue(flag_on)
+        else:
+            self._data_panel.rb_single_mode.SetValue(True)
+            self._data_panel.rb_batch_mode.SetValue(False)
+        self._data_panel.rb_single_mode.Enable(flag)
+        self._data_panel.rb_batch_mode.Enable(flag)
+                
+
+    
     def enable_edit_menu(self):
         """

sansguiframe/src/sans/guiframe/plugin_base.py

@@ -212 +212 @@
         
         """
+        self.parent.check_multimode(self)
         self.parent.set_current_perspective(self)
         self.parent.set_perspective(self.perspective)
+        
         
     def set_batch_selection(self, flag):