Changeset 71e5c11 in sasview for fittingview/src/sans

Timestamp:

Oct 14, 2011 10:20:26 AM (13 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

62ffd8d

Parents:

ab8b880

Message:

theory title depending on data

File:

• fittingview/src/sans/perspectives/fitting/fitting.py (modified) (2 diffs)

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -1482 +1482 @@
             #the same id
             theory_data = self.page_finder[page_id].get_theory_data(fid=data.id)
-            new_plot.name = model.name + " ["+ str(data.name)+"]"
+            
+            if data.is_data:
+                data_name = str(data.name)
+            else:
+                data_name = str(model.__class__.__name__)
+            
+            new_plot.name = model.name + " ["+ data_name +"]"
             new_plot.xaxis(_xaxis, _xunit)
             new_plot.yaxis(_yaxis, _yunit)
@@ -1563 +1569 @@
         new_plot.xmax = data.xmax
         title = data.title
+        
+        new_plot.is_data = False
+        if data.is_data:
+            data_name = str(data.name)
+        else:
+            data_name = str(model.__class__.__name__)
+
         if len(title) > 1:
-            new_plot.title = "Model2D for " + data.name
-        new_plot.is_data = False
+            new_plot.title = "Model2D for " + data_name
         new_plot.name = model.name + " [" + \
-                                    str(data.name) + "-2D]"
+                                    data_name + "-2D]"
         theory_data = deepcopy(new_plot)
         theory_data.name = "Unknown"