Changeset c66a0bb in sasview for src/sas/sasgui/perspectives/fitting

Timestamp:

Nov 30, 2017 10:51:13 AM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

0a9cbc3

Parents:

ee6ab94 (diff), 882cfec (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:

Paul Kienzle <pkienzle@…> (11/30/17 10:51:13)

git-committer:

GitHub <noreply@…> (11/30/17 10:51:13)

Message:

Merge branch 'master' into ticket1007

Location:

src/sas/sasgui/perspectives/fitting

Files:

• fitpage.py (modified) (2 diffs)
• fitproblem.py (modified) (3 diffs)
• fitting.py (modified) (5 diffs)
• fitting_widgets.py (modified) (1 diff)
• gpu_options.py (modified) (1 diff)
• media/fitting.rst (modified) (1 diff)
• simfitpage.py (modified) (1 diff)
• basepage.py (modified) (4 diffs)

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

@@ -1733 +1733 @@
         ind = 0
         while(ind < len(list)):
-            fun_box.Append(list[ind])        
+            for key, val in list.items():
+                if val == ind:
+                    fun_box.Append(key, val)
+                    break
             ind += 1
 
@@ -1762 +1765 @@
         value = fun_box.GetValue()
         if value in self.model.fun_list:
-            fun_val = fun_box.GetSelection()
+            fun_val = self.model.fun_list[value]
 
         self.model.setParam(name, fun_val)

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

@@ -1 +1 @@
 """
 Inferface containing information to store data, model, range of data, etc...
-and retreive this information. This is an inferface
+and retrieve this information. This is an inferface
 for a fitProblem i.e relationship between data and model.
 """
@@ -56 +56 @@
         """
         :param flag: bool.When flag is 1 get the computer smear value. When
-            flag is 0 ingore smear value.
+            flag is 0 ignore smear value.
         """
         self.smearer_enable = flag
@@ -305 +305 @@
         """
         :param flag: bool.When flag is 1 get the computer smear value. When
-            flag is 0 ingore smear value.
+            flag is 0 ignore smear value.
         """
         self._smear_on = flag

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

@@ -763 +763 @@
         the current page and set value.
         :param value: integer 0 or 1
-        :param uid: the id related to a page contaning fitting information
+        :param uid: the id related to a page containing fitting information
         """
         if uid in self.page_finder.keys():
@@ -778 +778 @@
         Used by simfitpage.py to reset a parameter given the string constrainst.
 
-        :param modelname: the name ot the model for with the parameter
+        :param modelname: the name of the model for with the parameter
                             has to reset
         :param value: can be a string in this case.
-        :param names: the paramter name
+        :param names: the parameter name
         """
         sim_page_id = self.sim_page.uid
@@ -797 +797 @@
         name into model name and parameter name example: ::
 
-            paramaterset (item) = M1.A
+            parameterset (item) = M1.A
             Will return model_name = M1 , parameter name = A
 
@@ -1117 +1117 @@
     def store_data(self, uid, data_list=None, caption=None):
         """
-        Recieve a list of data and store them ans well as a caption of
+        Receive a list of data and store them ans well as a caption of
         the fit page where they come from.
         :param uid: if related to a fit page
@@ -1196 +1196 @@
         for a given interactor.
 
-        :param event: contains type of slicer , paramaters for updating
+        :param event: contains type of slicer , parameters for updating
             the panel and panel_name to find the slicer 's panel concerned.
         """

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

@@ -64 +64 @@
         selection_sizer.Add(self.data_2d_selected, (iy, ix),
                            (1, 1), wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
-        #contruction the sizer contaning button
+        #contruction the sizer containing button
         button_sizer.Add((20, 20), 1, wx.EXPAND | wx.ADJUST_MINSIZE, 0)
         button_sizer.Add(button_cancel, 0,

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

@@ -88 +88 @@
         self.option_button = {}
         self.buttons = []
-        #Check if SAS_OPENCL is already set as enviromental variable
+        #Check if SAS_OPENCL is already set as environment variable
         self.sas_opencl = os.environ.get("SAS_OPENCL", "")
 

src/sas/sasgui/perspectives/fitting/media/fitting.rst

@@ -18 +18 @@
 
    Polarisation/Magnetic Scattering <magnetism/magnetism>
+   
+   Oriented Particles <orientation/orientation>
 
    Information on the SasView Optimisers <optimizer>

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

@@ -976 +976 @@
         param_cbox = self.constraints_list[-1].param_cbox
         param_cbox.Clear()
-        # insert only fittable paramaters
+        # insert only fittable parameters
         for param in param_list:
             param_cbox.Append(str(param), model)

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

@@ -1643 +1643 @@
                         if item_page[2].__class__.__name__ == "ComboBox":
                             if item_page_info[2] in self.model.fun_list:
-                                fun_val = self.model.fun_list[item_page_info[2]]
+                                # to fix: fun_list is not a dictionary, but a tuple
+                                # so the following line (commented) will fail
+                                # fun_val = self.model.fun_list[item_page_info[2]]
+                                # I guess the following should work, but 
+                                # could not test as I don't know when this
+                                # part is used by SasView.
+                                fun_val = self.model.fun_list.index(item_page_info[2])
                                 self.model.setParam(item_page_info[1], fun_val)
                     if item_page[3] is not None:
@@ -1687 +1693 @@
                 selection = value
                 if value in self.model.fun_list:
-                    selection = self.model.fun_list[value]
+                    # to fix: fun_list is not a dictionary, so 
+                    # I commented the following original line 
+                    #selection = self.model.fun_list[value]
+                    # and replaced by this.
+                    # I think this should work, but could not test it.
+                    selection = self.model.fun_list.index(value)
                 item_page[2].SetValue(selection)
                 self.model.setParam(param_name, selection)
@@ -3365 +3376 @@
                     if item[2].__class__.__name__ == "ComboBox":
                         if content[name][1] in self.model.fun_list:
-                            fun_val = self.model.fun_list[content[name][1]]
+                            # to fix: fun_list is not a dictionary, but a tuple
+                            # so the following line (commented) will fail
+                            # fun_val = self.model.fun_list[content[name][1]]
+                            # I guess the following should work, but 
+                            # could not test as I don't know when this
+                            # part is used by SasView.
+                            fun_val = self.model.fun_list.index(content[name][1])
                             self.model.setParam(name, fun_val)
                     try:
@@ -3415 +3432 @@
                         if item[2].__class__.__name__ == "ComboBox":
                             if value[0] in self.model.fun_list:
-                                fun_val = self.model.fun_list[value[0]]
+                                # Fixed: fun_list not a dictionary!
+                                # Arrives here when spherical_sld model is
+                                # selected and number of shells modified.
+                                fun_val = self.model.fun_list.index(value[0])
                                 self.model.setParam(name, fun_val)
                                 # save state