Changeset 818589a in sasview for sansview/perspectives/fitting

Timestamp:

Apr 18, 2011 4:42:55 PM (14 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:

e58c280

Parents:

0c68c27

Message:

fixed a problem on report not including all plotpanels

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• fitting.py (modified) (3 diffs)

sansview/perspectives/fitting/basepage.py

@@ -2479 +2479 @@
             # try to get all plots belonging to this control panel
              try:
+                 title = ''
                  # check titles (main plot) 
+                 if hasattr(item2,"data2D"):
+                     title = item2.data2D.title
                  # and data_names (model plot[2D], and residuals)
                  if item2.group_id == data_title or \
-                                item2.window_name.count(data_name) or\
+                                title.count(data_name) or \
+                                item2.window_name.count(data_name) or \
                                 item2.window_caption.count(data_name):
                      #panel = gui_manager._mgr.GetPane(item2.window_name)

sansview/perspectives/fitting/fitting.py

@@ -1297 +1297 @@
         new_plot= Data2D(image=image, err_image=err_image)
         new_plot.name = model.name
-        
+        new_plot.title = "Analytical model 2D "
         if data is None:
             self._fill_default_model2D(theory=new_plot, 
@@ -1324 +1324 @@
             new_plot.xmin = data.xmin
             new_plot.xmax = data.xmax
+            title = data.title
+            if len(title) > 1:
+                new_plot.title = "Model2D for " + data.name
         new_plot.is_data = False
         new_plot.name = model.name + " ["+ str(model.__class__.__name__)+ "]"
-        new_plot.title = "Analytical model 2D "
+
         theory_data = deepcopy(new_plot)
         theory_data.name = "Unknown"
@@ -1345 +1348 @@
         current_pg = self.fit_panel.get_page_by_id(page_id)
         title = new_plot.title
+
         wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot,
                                                title=title))