Changes in / [5156918:7cbbacd] in sasview

Location:

src/sas/sasgui/perspectives/fitting

Files:

• basepage.py (modified) (2 diffs)
• fitpage.py (modified) (2 diffs)
• fitting.py (modified) (4 diffs)

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

@@ -1449 +1449 @@
                 self.state_change = True
                 self._draw_model()
+                # Time delay has been introduced to prevent _handle error
+                # on Windows
+                # This part of code is executed when model is selected and
+                # it's parameters are changed (with respect to previously
+                # selected model). There are two Iq evaluations occuring one
+                # after another and therefore there may be compilation error
+                # if model is calculated for the first time.
+                # This seems to be Windows only issue - haven't tested on Linux
+                # though.The proper solution (other than time delay) requires
+                # more fundemental code refatoring
+                # Wojtek P. Nov 7, 2016
+                if not ON_MAC:
+                    time.sleep(0.1)
                 self.Refresh()
 
@@ -2596 +2609 @@
             Layout is called after fitting.
         """
+        self._sleep4sec()
         self.Layout()
         return
+
+    def _sleep4sec(self):
+        """
+            sleep for 1 sec only applied on Mac
+            Note: This 1sec helps for Mac not to crash on self.
+            Layout after self._draw_model
+        """
+        if ON_MAC:
+            time.sleep(1)
 
     def _find_polyfunc_selection(self, disp_func=None):

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

@@ -1809 +1809 @@
             self.onSmear(None)
 
+    def _mac_sleep(self, sec=0.2):
+        """
+        Give sleep to MAC
+        """
+        if self.is_mac:
+            time.sleep(sec)
+
     def get_view_mode(self):
         """
@@ -2181 +2188 @@
         self.save_current_state()
 
+        if not self.is_mac:
+            self.Layout()
+            self.Refresh()
+        self._mac_sleep(0.1)
         # plot model ( when drawing, do not update chisqr value again)
         self._draw_model(update_chisqr=False, source='fit')

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

@@ -876 +876 @@
                 qmin=qmin, qmax=qmax, weight=weight)
 
+    def _mac_sleep(self, sec=0.2):
+        """
+        Give sleep to MAC
+        """
+        if ON_MAC:
+            time.sleep(sec)
+
     def draw_model(self, model, page_id, data=None, smearer=None,
                    enable1D=True, enable2D=False,
@@ -1023 +1030 @@
                                 manager=self,
                                 improvement_delta=0.1)
+        self._mac_sleep(0.2)
 
         # batch fit
@@ -1262 +1270 @@
         :param elapsed: time spent at the fitting level
         """
+        self._mac_sleep(0.2)
         uid = page_id[0]
         if uid in self.fit_thread_list.keys():
@@ -1511 +1520 @@
             page_id = []
         ## fit more than 1 model at the same time
+        self._mac_sleep(0.2)
         try:
             index = 0