Changes in src/sas/sasgui/perspectives/fitting/fitpage.py [0b6f83c:79e6a33] in sasview

File:

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

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

@@ -289 +289 @@
         self.btFitHelp.SetToolTipString("General fitting help.")
         self.btFitHelp.Bind(wx.EVT_BUTTON, self._onFitHelp)
-
+        
         # Resolution Smearing Help button (for now use same technique as
         # used for dI help to get tiniest possible button that works
@@ -303 +303 @@
         self.btSmearHelp.SetToolTipString("Resolution smearing help.")
         self.btSmearHelp.Bind(wx.EVT_BUTTON, self._onSmearHelp)
-
+        
         # textcntrl for custom resolution
         self.smear_pinhole_percent = ModelTextCtrl(self, wx.ID_ANY,
@@ -564 +564 @@
         sizer.Add(self.draw_button, 0, 0)
         sizer.Add((-1, 5))
-
+        
         sizer.Add(self.tcChi, 0, 0)
         sizer.Add(self.Npts_fit, 0, 0)
@@ -570 +570 @@
         sizer.Add(self.btFit, 0, 0)
         sizer.Add(self.btFitHelp, 0, 0)
-
+        
         boxsizer_range.Add(sizer_chi2)
         boxsizer_range.Add(sizer)
@@ -1156 +1156 @@
                 copy_flag = self.get_copy_params()
                 is_poly_enabled = self.enable_disp.GetValue()
-
-        self._on_select_model_helper()
+        try:
+            self._on_select_model_helper()
+        except Exception as e:
+            evt = StatusEvent(status=e.message, info="error")
+            wx.PostEvent(self._manager.parent, evt)
+            # Set S(Q) to None
+            self.structurebox.SetSelection(0)
+            self._on_select_model()
+            return
         self.set_model_param_sizer(self.model)
         if self.model is None:
@@ -2181 +2188 @@
         self.save_current_state()
 
-        if not self.is_mac:
-            self.Layout()
-            self.Refresh()
         # plot model ( when drawing, do not update chisqr value again)
         self._draw_model(update_chisqr=False, source='fit')
@@ -2778 +2782 @@
             else:
                 return cmp(a.lower(), b.lower())
-
+        
         # keys obtained now from ordered dict, so commenting alphabetical
         # ordering keys.sort(custom_compare)