Changeset 6b50296 in sasview for src/sas/qtgui/Perspectives

Timestamp:

Sep 4, 2018 8:18:49 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

e3df84e

Parents:

f53bc04

Message:

Added freeze action for inner main model datasets. SASVIEW-1002

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingUtilities.py (modified) (1 diff)
• FittingWidget.py (modified) (1 diff)

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

@@ -430 +430 @@
 
     theory_name = str(current_data.name.split()[0])
-    residuals.name = "Residuals for " + str(theory_name) + "[" + \
-                    str(reference_data.filename) + "]"
+    res_name = reference_data.filename if reference_data.filename else reference_data.name
+    residuals.name = "Residuals for " + str(theory_name) + "[" + res_name + "]"
     residuals.title = residuals.name
     residuals.ytransform = 'y'

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

@@ -392 +392 @@
         # Tag along functionality
         self.label.setText("Data loaded from: ")
-        self.lblFilename.setText(self.logic.data.filename)
+        if self.logic.data.filename:
+            self.lblFilename.setText(self.logic.data.filename)
+        else:
+            self.lblFilename.setText(self.logic.data.name)
         self.updateQRange()
         # Switch off Data2D control