Changeset 986da97 in sasview for fittingview/src/sans

Timestamp:

Jun 28, 2012 2:53:08 PM (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:

83b81b8

Parents:

9c30b8c

Message:

Popup dialog on status event with error

Location:

fittingview/src/sans/perspectives/fitting

Files:

• console.py (modified) (1 diff)
• fit_thread.py (modified) (1 diff)
• fitting.py (modified) (4 diffs)

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

@@ -102 +102 @@
         wx.PostEvent(self.parent, StatusEvent(status=message,
                                    info="error", type="stop"))
+    def stop(self, msg):
+        """
+        Post event msg and stop
+        """
+        if self.isbetter:
+            #self.result.print_summary()
+            self.update_fit()
+
+        message = str(msg) + " \n %s \n" % self.result.__str__()
+        wx.PostEvent(self.parent, StatusEvent(status=message,
+                                   info="info", type="stop"))
+        
     def finalize(self):
         """

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

@@ -100 +100 @@
             
             if self.handler is not None:
-                self.handler.error(msg=msg)
+                self.handler.stop(msg=msg)
         except:
             if self.handler is not None:

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

@@ -1033 +1033 @@
                     current_page_id = page_id
                     value.clear_model_param()
+            except KeyboardInterrupt:
+                flag = True
+                msg = "Fitting terminated"
+                wx.PostEvent(self.parent, StatusEvent(status=msg, info="info",
+                                                      type="stop"))
+                return flag
             except:
                 flag = False
@@ -1474 +1480 @@
                                          batch_inputs=batch_inputs)
         
-        wx.PostEvent(self.parent, StatusEvent(status=msg, error="error",
+        wx.PostEvent(self.parent, StatusEvent(status=msg, error="info",
                                               type="stop"))
         # Remove parameters that are not shown
@@ -1600 +1606 @@
                         index += 1
                         wx.CallAfter(cpage._on_fit_complete)
+                    except KeyboardInterrupt:
+                        msg = "Singular point: Fitting Stoped."
+                        wx.PostEvent(self.parent, StatusEvent(status=msg,
+                                                              info="info",
+                                                              type="stop"))
                     except:
                         msg = "Singular point: Fitting Error occurred."
@@ -1607 +1618 @@
                     
         except:
-            msg = "Fit completed but Following"
+            msg = "Fit completed 33but Following"
             msg += " error occurred:%s" % sys.exc_value
             wx.PostEvent(self.parent, StatusEvent(status=msg, info="error",