Changeset 4ed199e in sasview for src/sas/sasgui/perspectives/fitting

Timestamp:

Oct 8, 2016 3:29:53 PM (8 years ago)

Author:

wojciech

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

1404cce

Parents:

47f2b5d (diff), b4818d9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

wpotrzebowski <Wojciech.Potrzebowski@…> (10/08/16 15:22:49)

git-committer:

wpotrzebowski <Wojciech.Potrzebowski@…> (10/08/16 15:29:53)

Message:

Removing an extra Iq evaluation when model is loaded

Location:

src/sas/sasgui/perspectives/fitting

Files:

• basepage.py (modified) (3 diffs)
• fitpage.py (modified) (1 diff)

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -514 +514 @@
     def initialize_combox(self):
         """
-        put default value in the combobox
-        """
-        ## fill combox box
-        if self.model_list_box is None:
-            return
-        if len(self.model_list_box) > 0:
+        put default value in the combo box
+        """
+        if self.model_list_box is not None and len(self.model_list_box) > 0:
             self._populate_box(self.structurebox,
                                self.model_list_box["Structure Factors"])
@@ -528 +525 @@
             self.structurebox.Disable()
             self.text2.Disable()
-
-            if self.model.__class__ in self.model_list_box["P(Q)*S(Q)"]:
-                self.structurebox.Show()
-                self.text2.Show()
-                self.structurebox.Enable()
-                self.text2.Enable()
 
     def set_dispers_sizer(self):
@@ -1962 +1953 @@
             form_factor = self.formfactorbox.GetClientData(f_id)
 
-        if not form_factor in  self.model_list_box["multiplication"]:
+        if form_factor is None or not form_factor.is_form_factor:
             self.structurebox.Hide()
             self.text2.Hide()

src/sas/sasgui/perspectives/fitting/fitpage.py

@@ -364 +364 @@
         self.Bind(wx.EVT_RADIOBUTTON, self.onSlitSmear,
                   id=self.slit_smearer.GetId())
-        self.disable_smearer.SetValue(True)
+        self.enable_smearer.SetValue(True)
 
         sizer_smearer.Add(self.disable_smearer, 0, wx.LEFT, 10)