Changeset 70c57ebf in sasview

Timestamp:

Apr 29, 2009 1:41:27 PM (16 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:

2cded48

Parents:

24b8d5c

Message:

fixed errors on polydis. on no_model

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (5 diffs)
• fitpage.py (modified) (1 diff)
• modelpage.py (modified) (2 diffs)

sansview/perspectives/fitting/basepage.py

@@ -62 +62 @@
         if self.model !=None:
             self.disp_list= self.model.getDispParamList()
+        
         ##enable model 2D draw
         self.enable2D= False
@@ -451 +452 @@
         
         self.state.enable2D = copy.deepcopy(self.enable2D)
-        
-        if hasattr(self,"cb1"):
-            self.state.cb1= self.cb1.GetValue()
+        try:
+            n = self.disp_box.GetCurrentSelection()
+            dispersity= self.disp_box.GetClientData(n)
+            name= dispersity.__name__
+            if name == "GaussianDispersion":
+               if hasattr(self,"cb1"):
+                   self.state.cb1= self.cb1.GetValue()
            
+        except:
+            pass
+        
         if hasattr(self,"enable_disp"):
             self.state.enable_disp= self.enable_disp.GetValue()
@@ -768 +776 @@
             Display the sizer according to the type of the current model
         """
+        if model ==None:
+            return
         if hasattr(model ,"model2"):
             
@@ -1169 +1179 @@
         """
         self._reset_dispersity()
-       
+        if self.model ==None:
+            self.model_disp.Hide()
+            self.disp_box.Hide()
+            self.sizer4_4.Clear(True)
+            self._reset_dispersity()
+            ## post state to fit panel
+            self.save_current_state()
+            return
+            
         if self.enable_disp.GetValue():
             self.model_disp.Show(True)
@@ -1322 +1340 @@
         self.sizer4.Layout()
         self.SetScrollbars(20,20,200,100)
-        
-        
+
     def _set_range_sizer(self, title, object1=None,object=None):
         """

sansview/perspectives/fitting/fitpage.py

@@ -522 +522 @@
         """    
         self._on_select_model_helper() 
-        if self.model == None:    
-            self.set_model_param_sizer(self.model)                   
-            return
-        else:
-            self.set_model_param_sizer(self.model)
-        try:
-            temp_smear= None
-            if self.enable_smearer.GetValue():
-                temp_smear= self.smearer
-            self.compute_chisqr(temp_smear)
-        except:
-            ## error occured on chisqr computation
-            pass
+        self.set_model_param_sizer(self.model)                   
+       
         self.enable_disp.SetValue(False)
         self.disable_disp.SetValue(True)
         self.set_dispers_sizer()
-        
-        evt = ModelEventbox(model=self.model)
-        wx.PostEvent(self.event_owner, evt)   
+        if self.model !=None:
+            try:
+                temp_smear= None
+                if self.enable_smearer.GetValue():
+                    temp_smear= self.smearer
+                self.compute_chisqr(temp_smear)
+            except:
+                ## error occured on chisqr computation
+                pass
+            evt = ModelEventbox(model=self.model)
+            wx.PostEvent(self.event_owner, evt)   
         
    

sansview/perspectives/fitting/modelpage.py

@@ -330 +330 @@
         """
         self.model = model
-        if self.model ==None:
-            self.set_model_param_sizer(self.model)
-            return 
+        
+        self.set_model_param_sizer(self.model)
         self.set_model_param_sizer(self.model)  
         ## keep the sizer view consistent with the model menu selecting
@@ -340 +339 @@
         self.set_dispers_sizer()
         self.model_view.SetFocus()
-        self._draw_model()
+        if self.model !=None:
+            self._draw_model()