Changeset fbf4bf8 in sasview for sansview/perspectives/fitting/basepage.py

Timestamp:

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

1f9ff448

Parents:

6dd2be3

Message:

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

File:

• sansview/perspectives/fitting/basepage.py (modified) (2 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