Changeset a6fccd7 in sasview for src/sas/sasgui/guiframe


Ignore:
Timestamp:
Dec 21, 2016 8:48:31 AM (7 years ago)
Author:
krzywon
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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
fa487d93
Parents:
9e0aa69a (diff), bb3eb744 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into ticket-795

Location:
src/sas/sasgui/guiframe
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/guiframe/gui_manager.py

    r67b0a99 r505706a  
    19901990                wx.PostEvent(self, 
    19911991                             StatusEvent(status="Completed saving.")) 
    1992             except: 
     1992            except Exception: 
    19931993                msg = "Error occurred while saving: " 
     1994                msg += traceback.format_exc() 
    19941995                msg += "To save, the application panel should have a data set.." 
    19951996                wx.PostEvent(self, StatusEvent(status=msg)) 
     
    20402041                logging.warning(msg) 
    20412042                wx.PostEvent(self, StatusEvent(status=msg, info="error")) 
    2042         except: 
     2043        except Exception: 
    20432044            msg = "Error occurred while saving: " 
     2045            msg += traceback.format_exc() 
    20442046            msg += "To save, at least one application panel " 
    20452047            msg += "should have a data set.." 
  • src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py

    r6ffa0dd rca224b1  
    134134        """ 
    135135        for group_id in self.plot_panels.keys(): 
    136             panel = self.plot_panels[group_id] 
    137             panel.graph.reset() 
    138             self.hide_panel(group_id) 
     136            self.clear_panel_by_id(group_id) 
    139137        self.plot_panels = {} 
    140138 
Note: See TracChangeset for help on using the changeset viewer.