Changeset 247cb58 in sasview for sansview/perspectives/fitting

Timestamp:

Apr 15, 2010 12:57:33 PM (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:

2339249f

Parents:

8ea48a0

Message:

fixed a bug, not exiting mask panel when no model was selected.

Location:

sansview/perspectives/fitting

Files:

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

sansview/perspectives/fitting/basepage.py

@@ -1035 +1035 @@
                     # set mask   
                     is_modified = self._validate_Npts()
-
+                    
             else:
                 self.fitrange = False    
@@ -1041 +1041 @@
             ## if any value is modify draw model with new value
             if not self.fitrange:
-                self.btFit.Disable()
+                #self.btFit.Disable()
                 if is_2Ddata: self.btEditMask.Disable()
             else:
-                self.btFit.Enable(True)
+                #self.btFit.Enable(True)
                 if is_2Ddata: self.btEditMask.Enable(True)
 
@@ -1116 +1116 @@
         #For invalid q range, disable the mask editor and fit button, vs.    
         if not self.fitrange:
-            self.btFit.Disable()
+            #self.btFit.Disable()
             self.btEditMask.Disable()
         else:
-            self.btFit.Enable(True)
+            #self.btFit.Enable(True)
             self.btEditMask.Enable(True)
 

sansview/perspectives/fitting/fitpage.py

@@ -1129 +1129 @@
 
         is_valid_qrange = self._update_paramv_on_fit()
+
         if is_valid_qrange:
+            # try re draw the model plot if it exists
             self._draw_model()
             self.panel.Destroy() # frame
             self.set_npts2fit()
+        elif self.model == None:
+            self.panel.Destroy()
+            self.set_npts2fit()
+            msg= "No model is found on updating MASK in the model plot... "
+            wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
         else:
-            msg = ' Please consider your Q range.'
+            msg = ' Please consider your Q range, too.'
             self.panel.ShowMessage(msg)