Changeset 4470b10 in sasview

Timestamp:

May 14, 2010 11:46:29 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:

f151ddf

Parents:

9266c66

Message:

Fitpanel: fixed wrong behaviors of buttons and textctr on no model and/or data is selected.

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (5 diffs)
• fitpage.py (modified) (13 diffs)

sansview/perspectives/fitting/basepage.py

@@ -554 +554 @@
         """
         if self.model==None:
+            msg="Can not bookmark; Please select Data and Model first..."
+            wx.MessageBox(msg, 'Info')
             return 
         if hasattr(self,"enable_disp"):
@@ -802 +804 @@
         """ 
         flag = False
-        if self.data is None and self.model is None:
-            msg = "Please load a Data to start"
+        if self.data is None:
+            self.disable_smearer.SetValue(True)
+            self.disable_disp.SetValue(True)
+            msg = "Please load Data and select Model to start..."
             wx.MessageBox(msg, 'Info')
             return  True
@@ -1128 +1132 @@
         
         self.save_current_state()
-            
+   
         return flag                           
                
@@ -1455 +1459 @@
         """
         if self.check_invalid_panel():
+            self.shape_rbutton.SetValue(True)
             return
 
@@ -1813 +1818 @@
         if self.check_invalid_panel():
             return 
+        ## On selction if no model exists.
+        if self.model ==None:
+            self.disable_disp.SetValue(True)
+            msg="Please select a Model first..."
+            wx.MessageBox(msg, 'Info')
+            wx.PostEvent(self.manager.parent, StatusEvent(status=\
+                            "Polydispersion: %s"%msg))
+            return
+
         self._reset_dispersity()
     

sansview/perspectives/fitting/fitpage.py

@@ -777 +777 @@
         if self.check_invalid_panel():
             return
+        if self.model ==None:
+            msg="Please select a Model first..."
+            wx.MessageBox(msg, 'Info')
+            wx.PostEvent(self.manager.parent, StatusEvent(status=\
+                            "Fit: %s"%msg))
+            return
+
         flag = self._update_paramv_on_fit() 
                 
@@ -851 +858 @@
             try:
                 temp_smear= None
+                self.disable_smearer.SetValue(True)
                 if self.enable_smearer.GetValue():
                     temp_smear= self.smearer
@@ -878 +886 @@
             when enter value on panel redraw model according to changed
         """
+        if self.model ==None:
+            msg="Please select a Model first..."
+            wx.MessageBox(msg, 'Info')
+            #wx.PostEvent(self.manager.parent, StatusEvent(status=\
+            #                "Parameters: %s"%msg))
+            return
+
         #default flag
         flag = False
@@ -1217 +1232 @@
         
         # Check if the accuracy is same as before
-        # Mac does not get the GetEventObject; use the line below
+        
         #self.smear2d_accuracy = event.GetEventObject().GetValue()
         self.smear2d_accuracy = self.smear_accuracy.GetValue()
@@ -1539 +1554 @@
             return
         if self.model ==None:
-            msg="Need model and data to smear plot"
+            self.disable_smearer.SetValue(True)
+            msg="Please select a Model first..."
+            wx.MessageBox(msg, 'Info')
             wx.PostEvent(self.manager.parent, StatusEvent(status=\
                             "Smear: %s"%msg))
             return
-        
+
         # Need update param values
         self._update_paramv_on_fit()     
@@ -1701 +1718 @@
             are compute when fitting
         """
-
-               
+ 
         if self.check_invalid_panel():
             return
+
         if self.model ==None:
-            msg="Need model and data to smear plot"
+            self.disable_smearer.SetValue(True)
+            
+            msg="Please select a Model first..."
+            wx.MessageBox(msg, 'Info')
             wx.PostEvent(self.manager.parent, StatusEvent(status=\
                             "Smear: %s"%msg))
             return
+
         # Need update param values
         self._update_paramv_on_fit()
@@ -1727 +1748 @@
         else:
             is_new_slit = True 
-                
+        
         # if any value is changed
         if is_new_slit:
             msg = self._set_slit_smear()
+            
         # hide all silt sizer
         self._hide_all_smear_info()        
@@ -1739 +1761 @@
         self.sizer_set_smearer.Layout()
         self.Layout()
-        
+
         if event != None:
             event.Skip()     
@@ -1749 +1771 @@
             wx.PostEvent(self.manager.parent, StatusEvent(status = msg))
 
-            
+
     def _is_changed_slit(self):  
         """
@@ -1755 +1777 @@
             return: True or False
         """
+        
         # get the values
         width = self.smear_slit_width.GetValue()
@@ -1787 +1810 @@
         if self.dxl != dxl:
             return True
+
         return False
     
@@ -1825 +1849 @@
             else:
                 self.smear_slit_width.SetBackgroundColour(wx.WHITE)
-                
+              
         self.current_smearer = smear_selection(data)
         #temp_smearer = self.current_smearer
@@ -1864 +1888 @@
             return
         if self.model ==None:
-            msg="Need model and data to smear plot"
+            self.disable_smearer.SetValue(True)
+            msg="Please select a Model first..."
+            wx.MessageBox(msg, 'Info')
             wx.PostEvent(self.manager.parent, StatusEvent(status=\
                             "Smear: %s"%msg))