Changeset 1a74523 in sasview for sansview/perspectives/fitting

Timestamp:

Apr 18, 2011 9:48:37 AM (14 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:

0c68c27

Parents:

ba1f0b2

Message:

Theory: fixed not updating TotalNpts? on clicking compute button

File:

• sansview/perspectives/fitting/basepage.py (modified) (4 diffs)

sansview/perspectives/fitting/basepage.py

@@ -1176 +1176 @@
             else:
                 self.fitrange = False    
-
+            
             ## if any value is modify draw model with new value
             if not self.fitrange:
@@ -1184 +1184 @@
                 #self.btFit.Enable(True)
                 if is_2Ddata: self.btEditMask.Enable(True)
-
             if is_modified and self.fitrange:
+                if self.data == None:
+                    # Theory case: need to get npts value to draw
+                    self.npts_x = float(self.Npts_total.GetValue())
                 self.state_change= True
                 self._draw_model() 
@@ -1257 +1259 @@
                     flag = True
                 if self._is_2D():
-                    # only 2D case set mask   
+                    # only 2D case set mask  
                     flag = self._validate_Npts()
                     if not flag:
@@ -1911 +1913 @@
         #default flag
         flag = True
+        # Theory
+        if self.data == None and self.enable2D:
+            return flag
 
         # q value from qx and qy