Changes in src/sas/sasgui/perspectives/fitting/fitting.py [1a5d5f2:8f02f7f] in sasview

File:

• src/sas/sasgui/perspectives/fitting/fitting.py (modified) (5 diffs)

src/sas/sasgui/perspectives/fitting/fitting.py

@@ -45 +45 @@
 from sas.sasgui.guiframe.gui_manager import MDIFrame
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
+from sas.sasgui.perspectives.fitting.gpu_options import GpuOptions
 
 from . import models
@@ -192 +193 @@
         self.bumps_options_menu = self.menu1.FindItemById(self.id_bumps_options)
         self.bumps_options_menu.Enable(True)
+
+        self.id_gpu_options_panel = wx.NewId()
+        self.menu1.Append(self.id_gpu_options_panel, "OpenCL Options", "Choose OpenCL driver or turn it off")
+        wx.EVT_MENU(owner, self.id_gpu_options_panel, self.on_gpu_options)
 
         self.id_result_panel = wx.NewId()
@@ -801 +806 @@
         self.result_frame.Show()
         self.result_frame.Raise()
+
+    def on_gpu_options(self, event=None):
+        """
+        Make the Fit Results panel visible.
+        """
+        dialog = GpuOptions(None, wx.ID_ANY, "")
+        dialog.Show()
 
     def stop_fit(self, uid):
@@ -1521 +1533 @@
             for uid in page_id:
                 res = result[index]
-                fit_msg = res.mesg
                 if res.fitness is None or \
                     not numpy.isfinite(res.fitness) or \
                     numpy.any(res.pvec == None) or \
                     not numpy.all(numpy.isfinite(res.pvec)):
-                    fit_msg += "\nFitting did not converge!!!"
+                    msg = "Fitting did not converge!!!"
+                    evt = StatusEvent(status=msg, info="warning", type="stop")
+                    wx.PostEvent(self.parent, evt)
                     wx.CallAfter(self._update_fit_button, page_id)
                 else:
@@ -1549 +1562 @@
                         wx.CallAfter(cpage._on_fit_complete)
                     except KeyboardInterrupt:
-                        fit_msg += "\nSingular point: Fitting stopped."
+                        msg = "Singular point: Fitting Stoped."
+                        evt = StatusEvent(status=msg, info="info", type="stop")
+                        wx.PostEvent(self.parent, evt)
                     except:
-                        fit_msg += "\nSingular point: Fitting error occurred."
-                if fit_msg:
-                   evt = StatusEvent(status=fit_msg, info="warning", type="stop")
-                   wx.PostEvent(self.parent, evt)
+                        msg = "Singular point: Fitting Error occurred."
+                        evt = StatusEvent(status=msg, info="error", type="stop")
+                        wx.PostEvent(self.parent, evt)
 
         except: