Changeset 054f004 in sasview for fittingview

Timestamp:

Oct 21, 2011 1:32:53 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:

9cec2dd

Parents:

f3f6746

Message:

mask button disabled for batch

Location:

fittingview/src/sans/perspectives/fitting

Files:

• basepage.py (modified) (2 diffs)
• fitpage.py (modified) (1 diff)

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

@@ -1447 +1447 @@
             else:
                 #self.btFit.Enable(True)
-                if is_2Ddata: self.btEditMask.Enable(True)
+                if is_2Ddata  and not self.batch_on: 
+                    self.btEditMask.Enable(True)
             if is_modified and self.fitrange:
                 #if self.data == None:
@@ -1544 +1545 @@
         else:
             #self.btFit.Enable(True)
-            if self._is_2D() and  self.data != None:
+            if self._is_2D() and  self.data != None and not self.batch_on:
                 self.btEditMask.Enable(True)
 

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

@@ -1326 +1326 @@
             self.slit_smearer.Enable(False)
             self.pinhole_smearer.Enable(False)
+            self.btEditMask.Disable()  
+            self.EditMask_title.Disable()
             
         self.Show(True)