Changeset 1c6c1b7 in sasview for fittingview/src/sans/perspectives

Timestamp:

Jan 18, 2013 10:19:03 AM (12 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:

afd45674

Parents:

fad6056

Message:

In report, put the residual plot last

File:

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

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

@@ -2928 +2928 @@
         graphs = []
         canvases = []
+        res_item = None
         # call gui_manager
         gui_manager = self.parent.parent
@@ -2935 +2936 @@
             # try to get all plots belonging to this control panel
             try:
-                if item2.group_id == data_title or \
-                        item2.group_id.count("res" + str(self.graph_id)) or \
-                        item2.group_id.count(str(self.uid)) > 0:
-                    # append to the list
-                    graphs.append(item2.figure)
-                    canvases.append(item2.canvas)
+                g_id = item2.group_id
+                if g_id == data_title or \
+                        str(g_id).count("res" + str(self.graph_id)) or \
+                        str(g_id).count(str(self.uid)) > 0:
+                    if str(g_id).count("res" + str(self.graph_id)) > 0:
+                        res_item = [item2.figure, item2.canvas]
+                    else:
+                        # append to the list
+                        graphs.append(item2.figure)
+                        canvases.append(item2.canvas)  
             except:
                 # Not for control panels
                 pass
+        # Make sure the resduals plot goes to the last
+        if res_item != None:
+            graphs.append(res_item[0])
+            canvases.append(res_item[1])
         # return the list of graphs
         return graphs, canvases