Changeset ae4c139 in sasview

Timestamp:

Sep 20, 2012 2:03:11 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:

c35e6901

Parents:

1f73bd2

Message:

fixed a little bit of error msg

Files:

• fittingview/src/sans/perspectives/fitting/basepage.py (modified) (3 diffs)
• fittingview/src/sans/perspectives/fitting/fitpage.py (modified) (1 diff)
• sansmodels/src/sans/models/MultiplicationModel.py (modified) (1 diff)

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

@@ -2016 +2016 @@
                     m_list.append(self.model_dict[str_m])
             else:
-                for (model, enabled) in self.master_category_dict[mod_cat]:
+                cat_dic = self.master_category_dict[mod_cat]
+                for (model, enabled) in cat_dic:
                     if enabled:
                         m_list.append(self.model_dict[model])
-                    else:
-                        msg = "This model is diabled by Category Manager." 
-                        wx.PostEvent(self.parent.parent,
-                                     StatusEvent(status=msg, info="error"))
+                    #else:
+                    #    msg = "This model is disabled by Category Manager." 
+                    #    wx.PostEvent(self.parent.parent,
+                    #                 StatusEvent(status=msg, info="error"))
         except:
             msg = "%s\n" % (sys.exc_value)
@@ -3457 +3458 @@
         sizer_cat_box.SetMinSize((200, 50))
         self.categorybox = wx.ComboBox(self, -1, style=wx.CB_READONLY)
+        self.categorybox.SetToolTip( wx.ToolTip("Select a Category/Type") )
         self._populate_listbox()
         wx.EVT_COMBOBOX(self.categorybox, -1, self._show_combox)
@@ -3501 +3503 @@
 
         self.formfactorbox = wx.ComboBox(self, -1, style=wx.CB_READONLY)
+        self.formfactorbox.SetToolTip( wx.ToolTip("Select a Model") )
         if self.model != None:
             self.formfactorbox.SetValue(self.model.name)

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

@@ -1889 +1889 @@
         reset the state
         """
-        self.reset_page_helper(state)
-
-        self.select_param(event=None)
-        #Save state_fit
-        self.save_current_state_fit()
+        try:
+            self.reset_page_helper(state)
+    
+            self.select_param(event=None)
+            #Save state_fit
+            self.save_current_state_fit()
+        except:
+            self._show_combox_helper()
+            msg = "Error: This model state has missing or outdated "
+            msg += "information.\n"
+            msg += "%s"% (sys.exc_value)
+            wx.PostEvent(self.parent.parent,
+                         StatusEvent(status=msg, info="error"))
         self._lay_out()
         self.Refresh()

sansmodels/src/sans/models/MultiplicationModel.py

@@ -219 +219 @@
             # Look for standard parameter
             for item in self.params.keys():
-                if item.lower()==name.lower():
+                if item.lower() == name.lower():
                     self.params[item] = value
                     return