Changeset 505706a in sasview for src/sas/sasgui/guiframe


Ignore:
Timestamp:
Dec 20, 2016 5:59:08 AM (7 years ago)
Author:
Paul Kienzle <pkienzle@…>
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:
b61bd57
Parents:
d3911e3 (diff), 06a4306 (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-811

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

Legend:

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

    rd3911e3 r505706a  
    19501950                    item, _, _ = value 
    19511951                    item.Check(True) 
    1952             self._data_panel.on_remove(None, False) 
    19531952 
    19541953            wx.PostEvent(self, StatusEvent(status="Loading Project file...")) 
     
    19631962                # Reset to a base state 
    19641963                self._on_reset_state() 
     1964                self._data_panel.on_remove(None, False) 
    19651965                # Load the project file 
    19661966                self.load_state(path=path, is_project=True) 
     
    24582458                                                group_id=group_id, 
    24592459                                                action='remove')) 
    2460                 # remove res plot: Todo: improve 
    24612460                wx.CallAfter(self._remove_res_plot, new_plot.id) 
    24622461        self._data_manager.delete_data(data_id=data_id, 
  • src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py

    r1a696bf rb2b36932  
    316316 
    317317        slicerpop.AppendSeparator() 
    318         if len(self.data2D.detector) == 1: 
     318        if len(self.data2D.detector) <= 1: 
    319319            item_list = self.parent.get_current_context_menu(self) 
    320320            if (not item_list == None) and (not len(item_list) == 0) and\ 
Note: See TracChangeset for help on using the changeset viewer.