Changeset 8ac8717 in sasview for src/sas/qtgui/Perspectives/Fitting

Timestamp:

Oct 4, 2018 7:46:49 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

658795d

Parents:

37b34a3

Message:

Patch for the new style of magnetic parameter display. Ticket 1189

File:

• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (1 diff)

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -3006 +3006 @@
         Wrapper for model update with a subset of magnetic parameters
         """
-        if param.name[param.name.index(':')+1:] in self.shell_names:
-            # check if two-digit shell number
+        try:
+            basename, _ = param.name.rsplit('_', 1)
+        except ValueError:
+            basename = param.name
+        if basename in self.shell_names:
             try:
-                shell_index = int(param.name[-2:])
+                shell_index = int(basename[-2:])
             except ValueError:
-                shell_index = int(param.name[-1:])
+                shell_index = int(basename[-1:])
 
             if shell_index > self.current_shell_displayed: