Changeset 9853ad0 in sasview for sansview/perspectives/fitting/basepage.py

Timestamp:

Mar 31, 2009 11:50:18 AM (15 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

59a7f2d

Parents:

a68efd1

Message:

setting default model value on combobox

File:

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

sansview/perspectives/fitting/basepage.py

@@ -653 +653 @@
             self._populate_box( self.formfactorbox,
                                 self.model_list_box["Added models"])
-            
-            
-        if self.multip_cb.GetValue():
+        if not self.multip_cb.GetValue(): 
+            model = self.formfactorbox.GetClientData(0)
+            self.model = model()
+            
+        else:
             ## multplication not available for structure factor
             if self.struct_rbutton.GetValue():
@@ -664 +666 @@
             self.structurebox.Show(True)
             self.text2.Show(True)
-            ## draw empty model
-            from sans.models.NullModel import NullModel
-            self.model = NullModel()
-            self.model.name = "Select P(Q) and S(Q)"
-            self.set_model_param_sizer(self.model)
-            self.sizer4_4.Clear()
-            self.sizer4.Layout()
-            self._draw_model()
-            
+            ## draw multplication  model
+            form_factor = self.formfactorbox.GetClientData(0)
+            struct_factor = self.structurebox.GetClientData(0)
+            
+            from sans.models.MultiplicationModel import MultiplicationModel
+            self.model= MultiplicationModel(form_factor(),struct_factor())
+
+        self.set_model_param_sizer(self.model)
+        self.sizer4_4.Clear()
+        self.sizer4.Layout()
+            
+        self._draw_model()
         self.set_scroll()
         
@@ -691 +696 @@
                     name = model.name
                 combobox.Append(name,models)
-            
+        try:
+            combobox.SetSelection(0)
+        except:
+            pass
         wx.EVT_COMBOBOX(combobox,-1, self._on_select_model) 
         return 0
@@ -706 +714 @@
        
         if self.multip_cb.GetValue():
-            if struct_factor != None and form_factor != None:
-                from sans.models.MultiplicationModel import MultiplicationModel
-                self.model= MultiplicationModel(form_factor(),struct_factor())
-            else:
-                from sans.models.NullModel import NullModel
-                self.model = NullModel()
-                self.model.name = "Select P(Q) and S(Q)"
-                msg= "select one P(Q) and one S(Q) to plot"
-                wx.PostEvent(self.parent.parent, StatusEvent(status= msg))
+            from sans.models.MultiplicationModel import MultiplicationModel
+            self.model= MultiplicationModel(form_factor(),struct_factor())
+            
         else:
-            if form_factor != None:
-                self.model= form_factor()
+            self.model= form_factor()
        
         
@@ -753 +754 @@
                     is_modified = True    
             except:
-                msg= "Model Drawing  Error:wrong value entered : %s"% sys.exc_value
-                wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
-                return 
+                raise
+                #msg= "Model Drawing  Error:wrong value entered : %s"% sys.exc_value
+                #wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
+                #return 
         
         return is_modified