Apply naming conventions to reports, residual plots, and plotted fits.

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

@@ -147,7 +147,7 @@ def _create1DPlot(self, tab_id, x, y, model, data, component=None):
         new_plot.id = str(tab_id) + " " + ("[" + component + "] " if component else "") + model.id
 
         # use data.filename for data, use model.id for theory
-        id_str = data.filename if data.filename else model.id
+        id_str = data.name if data.name else model.id
         new_plot.name = model.name + ((" " + component) if component else "") + " [" + id_str + "]"
 
         new_plot.title = new_plot.name

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

@@ -599,7 +599,7 @@ def plotResiduals(reference_data, current_data, weights):
         return None
 
     theory_name = str(current_data.name.split()[0])
-    res_name = reference_data.filename if reference_data.filename else reference_data.name
+    res_name = reference_data.name if reference_data.name else reference_data.filename
     residuals.name = "Residuals for " + str(theory_name) + "[" + res_name + "]"
     residuals.title = residuals.name
     residuals.ytransform = 'y'

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

@@ -100,7 +100,7 @@ def reportHeader(self):
 
     def buildPlotsForReport(self, images):
         """ Convert Matplotlib figure 'fig' into a <img> tag for HTML use using base64 encoding. """
-        html = FEET_1 % self.data.filename
+        html = FEET_1 % self.data.name
 
         for fig in images:
             canvas = FigureCanvas(fig)