Changeset d2c4c06 in sasview for fittingview/src/sans/perspectives

Timestamp:

Jan 22, 2012 4:07:02 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:

e499ca0

Parents:

cdf515f

Message:

fixed compute update w/ no data set

Location:

fittingview/src/sans/perspectives/fitting

Files:

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

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

@@ -1437 +1437 @@
             except:
                 pass
-            #if is_modified:
 
             # Here we should check whether the boundaries have been modified.
@@ -1458 +1457 @@
             else:
                 self.fitrange = False    
+                
+            if not self.data.is_data:
+                is_modified = True
+
             ## if any value is modify draw model with new value
             if not self.fitrange:

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

@@ -1066 +1066 @@
 
             return
-        flag = self._update_paramv_on_fit()         
+        if not self.data.is_data:
+            self.npts_x = self.Npts_total.GetValue()
+            self.Npts_fit.SetValue(self.npts_x)
+            self.create_default_data() 
+        flag = self._update_paramv_on_fit()  
+    
         wx.CallAfter(self._onparamEnter_helper)
         if not flag:
@@ -1445 +1450 @@
         # For theory mode
         if not self.data.is_data:
+            self.npts_x = self.Npts_total.GetValue()
+            self.Npts_fit.SetValue(self.npts_x)
             self.create_default_data()
         # Flag to register when a parameter has changed.