Changeset df7a7e3 in sasview for fittingview/src/sans/perspectives/fitting/fitpage.py

Timestamp:

Sep 17, 2012 7:11:50 PM (12 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

b71a53b

Parents:

cf7653d3

Message:

merging category branch

File:

• fittingview/src/sans/perspectives/fitting/fitpage.py (modified) (6 diffs)

fittingview/src/sans/perspectives/fitting/fitpage.py

@@ -36 +36 @@
     """
 
-    def __init__(self, parent, color='rand'):
+    def __init__(self, parent, m_dict, color='rand'):
         """
         Initialization of the Panel
         """
         BasicPage.__init__(self, parent, color=color)
-        
+        self.populate_box(m_dict)
+
         ## draw sizer
         self._fill_data_sizer()
@@ -67 +68 @@
         #create a default data for an empty panel
         self.create_default_data()
-    
+
     def enable_fit_button(self):
         """
@@ -1087 +1088 @@
         call back for model selection
         """
+        # if we're just clearing the box then do nothing
+        if self.model_box.GetCount() == 0 or \
+                self.model_box.GetStringSelection() == '':
+            return
+
+
         self.Show(False)
         copy_flag = False
         is_poly_enabled = None
         if event != None:
-            if (event.GetEventObject() == self.formfactorbox\
-                        and self.structurebox.GetLabel() != 'None')\
-                        or event.GetEventObject() == self.structurebox\
-                        or event.GetEventObject() == self.multifactorbox:
-                copy_flag = self.get_copy_params()
-                is_poly_enabled = self.enable_disp.GetValue()
-
+            # if (event.GetEventObject() == self.formfactorbox\
+            #             and self.structurebox.GetLabel() != 'None')\
+            #             or event.GetEventObject() == self.structurebox\
+            #             or event.GetEventObject() == self.multifactorbox:
+            copy_flag = self.get_copy_params()
+            is_poly_enabled = self.enable_disp.GetValue()
+
+        self.model_name = self.model_box.GetStringSelection()
         self._on_select_model_helper()
         self.set_model_param_sizer(self.model)
@@ -1116 +1124 @@
     
         self.state.structurecombobox = self.structurebox.GetLabel()
-        self.state.formfactorcombobox = self.formfactorbox.GetLabel()
+        self.state.formfactorcombobox = self.model_box.GetStringSelection()
         self.enable_fit_button()
         if self.model != None:
@@ -1175 +1183 @@
             wx.PostEvent(self.parent, new_event)
             #update list of plugins if new plugin is available
-            if self.plugin_rbutton.GetValue():
-                temp = self.parent.update_model_list()
-                if temp:
-                    self.model_list_box = temp
-                    current_val = self.formfactorbox.GetLabel()
-                    pos = self.formfactorbox.GetSelection()
-                    self._show_combox_helper()
-                    self.formfactorbox.SetSelection(pos)
-                    self.formfactorbox.SetValue(current_val)
+            # if self.plugin_rbutton.GetValue():
+            #     temp = self.parent.update_model_list()
+            #     if temp:
+            #         self.model_list_box = temp
+                    # current_val = self.formfactorbox.GetLabel()
+                    # pos = self.formfactorbox.GetSelection()
+                    # self._show_combox_helper()
+                    # self.formfactorbox.SetSelection(pos)
+                    # self.formfactorbox.SetValue(current_val)
             # when select a model only from guictr/button
             if is_poly_enabled != None:
@@ -1814 +1822 @@
             self.dI_idata.Enable(True)
               
-            self.formfactorbox.Enable()
+#            self.formfactorbox.Enable()
             self.structurebox.Enable()
             data_name = self.data.name