Changeset ae4c139 in sasview for fittingview/src


Ignore:
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

Location:
fittingview/src/sans/perspectives/fitting
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • fittingview/src/sans/perspectives/fitting/basepage.py

    rea5fa58 rae4c139  
    20162016                    m_list.append(self.model_dict[str_m]) 
    20172017            else: 
    2018                 for (model, enabled) in self.master_category_dict[mod_cat]: 
     2018                cat_dic = self.master_category_dict[mod_cat] 
     2019                for (model, enabled) in cat_dic: 
    20192020                    if enabled: 
    20202021                        m_list.append(self.model_dict[model]) 
    2021                     else: 
    2022                         msg = "This model is diabled by Category Manager."  
    2023                         wx.PostEvent(self.parent.parent, 
    2024                                      StatusEvent(status=msg, info="error")) 
     2022                    #else: 
     2023                    #    msg = "This model is disabled by Category Manager."  
     2024                    #    wx.PostEvent(self.parent.parent, 
     2025                    #                 StatusEvent(status=msg, info="error")) 
    20252026        except: 
    20262027            msg = "%s\n" % (sys.exc_value) 
     
    34573458        sizer_cat_box.SetMinSize((200, 50)) 
    34583459        self.categorybox = wx.ComboBox(self, -1, style=wx.CB_READONLY) 
     3460        self.categorybox.SetToolTip( wx.ToolTip("Select a Category/Type") ) 
    34593461        self._populate_listbox() 
    34603462        wx.EVT_COMBOBOX(self.categorybox, -1, self._show_combox) 
     
    35013503 
    35023504        self.formfactorbox = wx.ComboBox(self, -1, style=wx.CB_READONLY) 
     3505        self.formfactorbox.SetToolTip( wx.ToolTip("Select a Model") ) 
    35033506        if self.model != None: 
    35043507            self.formfactorbox.SetValue(self.model.name) 
  • fittingview/src/sans/perspectives/fitting/fitpage.py

    rea5fa58 rae4c139  
    18891889        reset the state 
    18901890        """ 
    1891         self.reset_page_helper(state) 
    1892  
    1893         self.select_param(event=None) 
    1894         #Save state_fit 
    1895         self.save_current_state_fit() 
     1891        try: 
     1892            self.reset_page_helper(state) 
     1893     
     1894            self.select_param(event=None) 
     1895            #Save state_fit 
     1896            self.save_current_state_fit() 
     1897        except: 
     1898            self._show_combox_helper() 
     1899            msg = "Error: This model state has missing or outdated " 
     1900            msg += "information.\n" 
     1901            msg += "%s"% (sys.exc_value) 
     1902            wx.PostEvent(self.parent.parent, 
     1903                         StatusEvent(status=msg, info="error")) 
    18961904        self._lay_out() 
    18971905        self.Refresh() 
Note: See TracChangeset for help on using the changeset viewer.