Changeset d493f66 in sasview

Timestamp:

Mar 29, 2010 10:39:13 AM (15 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:

ba69349

Parents:

e5d76ce

Message:

found and fixed minor bugs: 1)remaining unchanged the smearer option checked if already checked on the empty fit panel before data for fitting selected, 2) Error on resetting the page from bookmark

File:

• sansview/perspectives/fitting/fitpage.py (modified) (6 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -193 +193 @@
       
         
-        sizer_fit.Add((5,5),1, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 5)        
-        sizer_fit.Add(self.btFit,0, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 63) 
-        sizer_fit.Layout()
+
         self.sizer_set_smearer = wx.BoxSizer(wx.VERTICAL)
         sizer_smearer = wx.BoxSizer(wx.HORIZONTAL)
@@ -306 +304 @@
         sizer_chi2.Add((-1,5))
         self.sizer_set_masking.Add((305,-1))
-        self.sizer_set_masking.Add(boxsizer1,0, wx.RIGHT, 10)
+        #self.sizer_set_masking.Add(boxsizer1,0, wx.RIGHT, 10)
         sizer_chi2.Add(self.sizer_set_masking )
-
+          
+        sizer_fit.Add(boxsizer1,0, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 63)
+        #sizer_fit.Add((-1,1),0, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 1) 
+        sizer_fit.Add(self.btFit,0, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 63) 
+        sizer_fit.Layout()
         #sizer_smearer_box.Add(sizer_chi2)
         # hide all smear messages and textctrl
@@ -1097 +1099 @@
         else:
             self.smearer = smear_selection( self.data )
+            self.disable_smearer.SetValue(True)
             if self.smearer == None:
                 self.enable_smearer.Disable()
@@ -1108 +1111 @@
                 self.pinhole_smearer.Disable()
                 self.slit_smearer.Disable()
+                
                 
             self.formfactorbox.Enable()
@@ -1350 +1354 @@
             else:
                 is_new_pinhole = self._is_changed_pinhole()
+        else:
+            is_new_pinhole = self._is_changed_pinhole()
         # if any value is changed
         if is_new_pinhole:
@@ -1487 +1493 @@
             else:
                 is_new_slit = self._is_changed_slit()
+        else:
+            is_new_slit = self._is_changed_slit()
                 
         # if any value is changed