Changeset fbf4bf8 in sasview for sansview

Timestamp:

Apr 29, 2009 11:46:46 AM (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:

1f9ff448

Parents:

6dd2be3

Message:

now no default model displayed initially: it took long to get your model

Location:

sansview/perspectives/fitting

Files:

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

sansview/perspectives/fitting/basepage.py

@@ -1036 +1036 @@
                     name = model.name
                 combobox.Append(name,models)
-        try:
+        #try:
 
-            combobox.SetSelection(0)
-            
-        except:
-            pass
+            #combobox.SetSelection(0)
+            
+        #except:
+            #pass
     
         return 0
@@ -1070 +1070 @@
             self.model= MultiplicationModel(form_factor(),struct_factor())
         else:
-            self.model= form_factor()
+            if form_factor != None:
+                self.model= form_factor()
+            else:
+                self.model = None
+                return self.model
         
         ## post state to fit panel

sansview/perspectives/fitting/fitpage.py

@@ -49 +49 @@
         self._fill_model_sizer( self.sizer1)
         self._fill_range_sizer() 
-        self._on_select_model(event=None)
+        #self._on_select_model(event=None)
         if self.data !=None:
             self.smearer = smear_selection( self.data )
@@ -522 +522 @@
         """    
         self._on_select_model_helper() 
-        self.set_model_param_sizer(self.model)
+        if self.model == None:    
+            self.set_model_param_sizer(self.model)                   
+            return
+        else:
+            self.set_model_param_sizer(self.model)
         try:
             temp_smear= None

sansview/perspectives/fitting/fitpanel.py

@@ -264 +264 @@
                 self.count +=1
             else:
-                self.model_page.select_model(model, page_title)
+                self.model_page.select_model(model)
                 self.fit_page_name[page_title].insert(0,self.model_page.createMemento())
       

sansview/perspectives/fitting/modelpage.py

@@ -37 +37 @@
             description = self.model.description
             
-            self.select_model(self.model, self.model.name)
+            self.select_model(self.model)
             self.set_model_description(description,self.sizer2)
             
@@ -101 +101 @@
         """    
         self._on_select_model_helper() 
-        self.select_model(self.model, self.model.name)
+
+        self.select_model(self.model)
         
        
@@ -323 +324 @@
         
         
-    def select_model(self, model, name):
+    def select_model(self, model):
         """
             Select a new model
@@ -329 +330 @@
         """
         self.model = model
-        self.set_model_param_sizer(self.model)
-       
+        if self.model ==None:
+            self.set_model_param_sizer(self.model)
+            return 
+        self.set_model_param_sizer(self.model)  
         ## keep the sizer view consistent with the model menu selecting
         self._set_model_sizer_selection( self.model )
@@ -448 +451 @@
         if model ==None:
             ##no model avaiable to draw sizer 
+            self.sizer3.Layout()
+            self.SetScrollbars(20,20,200,100)
             return
         box_description= wx.StaticBox(self, -1,str("Model Parameters"))