Changeset d6e38661 in sasview for src/sas/qtgui/Perspectives/Fitting

Timestamp:

Apr 5, 2018 8:32:38 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

ded5e77, 01ef3f7

Parents:

bb57068

Message:

Fixed naming of datasets for both theory and file data

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingLogic.py (modified) (1 diff, 1 prop)
• FittingWidget.py (modified) (1 diff)

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

@@ -126 +126 @@
 
         new_plot.group_id = data.group_id
-        new_plot.id = str(tab_id) + " " + data.name
-        new_plot.name = model.name + " [" + data.name + "]"
+        new_plot.id = str(tab_id) + " " + model.id
+
+        if data.filename:
+            new_plot.name = model.name + " [" + data.filename + "]" # data file
+        else:
+            new_plot.name = model.name + " [" + model.id + "]"  # theory
+
         new_plot.title = new_plot.name
         new_plot.xaxis(_xaxis, _xunit)

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

@@ -1957 +1957 @@
             self.updateModelIndex(fitted_data)
         else:
-            name = self.nameForFittedData(self.kernel_module.name)
+            name = self.nameForFittedData(self.kernel_module.id)
             fitted_data.title = name
             fitted_data.name = name