Changeset 7360816 in sasview

Timestamp:

Oct 13, 2011 2:49:44 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:

99b86c1

Parents:

9400de6

Message:

active radio buttons for single/batch modes

Files:

• fittingview/src/sans/perspectives/fitting/fitting.py (modified) (1 diff)
• sansguiframe/src/sans/guiframe/data_panel.py (modified) (3 diffs)
• sansguiframe/src/sans/guiframe/plugin_base.py (modified) (1 diff)

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -113 +113 @@
         # Log startup
         logging.info("Fitting plug-in started") 
+        self.batch_capable = self.get_batch_capable()
+    
+    def get_batch_capable(self):
+        """
+        Check if the plugin has a batch capability
+        """
+        return True
     
     def create_fit_problem(self, page_id):

sansguiframe/src/sans/guiframe/data_panel.py

@@ -279 +279 @@
         self.bt_freeze = wx.Button(self, wx.NewId(), "Freeze Theory", 
                                    size=(BUTTON_WIDTH, -1))
-        freeze_tip = "To trigger freeze a theory: making a copy to Data box,\n"
+        freeze_tip = "To trigger freeze a theory: making a copy\n"
+        freeze_tip += "of the theory checked to Data box,\n"
         freeze_tip += "     so that it can act like a real data set."
         self.bt_freeze.SetToolTipString(freeze_tip)
@@ -299 +300 @@
                              (self.bt_remove),
                              ((10, 10)),
+                             (self.bt_freeze),
+                             ((10, 10)),
+                             (self.bt_plot),
+                             ((10, 10)),
+                             (self.bt_append_plot),
+                             (self.cb_plotpanel, wx.EXPAND|wx.ADJUST_MINSIZE, 5),
+                             ((10, 10)),
+                             ((10, 10)),
                              (self.bt_import, 0, wx.EXPAND|wx.RIGHT, 5),
-                              (self.perspective_cbox, wx.EXPAND|wx.ADJUST_MINSIZE, 5),
-                              (self.bt_append_plot),
-                              (self.cb_plotpanel, wx.EXPAND|wx.ADJUST_MINSIZE, 5),
-                              (self.bt_plot),
-                              ((10, 10)),
-                              (self.bt_freeze),
-                              #((10, 10)),
-                              #(self.bt_close_plot),
-                              ((10, 10))])
+                             (self.perspective_cbox, wx.EXPAND|wx.ADJUST_MINSIZE, 5)])
 
         self.sizer3.AddGrowableCol(1, 1)
@@ -803 +804 @@
             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)
+                
     def _on_plot_selection(self, event=None):
         """

sansguiframe/src/sans/guiframe/plugin_base.py

@@ -52 +52 @@
         self.color = None
         self.id = -1
-        
+        self.batch_capable = self.get_batch_capable()
+    
+    def get_batch_capable(self):
+        """
+        Check if the plugin has a batch capability
+        """
+        return False
+         
     def add_color(self, color, id):
         """