Changeset 7d47789 in sasview for sansguiframe/src/sans

Timestamp:

Oct 13, 2011 12:32:57 PM (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:

665fd06

Parents:

cf0eb8e

Message:

fixed improper view results when one of them is returned not fitted

File:

• sansguiframe/src/sans/guiframe/data_processor.py (modified) (3 diffs)

sansguiframe/src/sans/guiframe/data_processor.py

@@ -754 +754 @@
                             wx.PostEvent(self.parent.parent, 
                                  StatusEvent(status=msg, info="error")) 
-                            return
+                            continue
                         
                         if issubclass(new_plot.__class__, Data1D):
@@ -773 +773 @@
                                                  StatusEvent(status=msg,
                                                               info="error")) 
-                                    return  
+                                    continue  
                         wx.PostEvent(self.parent.parent, 
                                      NewPlotEvent(action="clear",
@@ -884 +884 @@
         self.y_axis_unit = wx.TextCtrl(self, -1)
         self.view_button = wx.Button(self, -1, "View Results")
-        view_tip = "Highlight data sets or Chi2 column first."
+        view_tip = "Highlight the data set or the Chi2 column first."
         self.view_button.SetToolTipString(view_tip)
         wx.EVT_BUTTON(self, self.view_button.GetId(), self.on_view)
         self.plot_button = wx.Button(self, -1, "Plot")
-        plot_tip = "Highlight column for axis and click the Add button first."
+        plot_tip = "Highlight a column for each axis and \n"
+        plot_tip += "click the Add buttons first."
         self.plot_button.SetToolTipString(plot_tip)
         self.button_sizer.AddMany( [ (500, 30),