Changeset 18b7ecb9 in sasview


Ignore:
Timestamp:
Oct 7, 2016 4:26:18 PM (5 years ago)
Author:
Piotr Rozyczko <rozyczko@…>
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:
ed9f872, 1f648cf8
Parents:
48b8f6d
git-author:
Piotr Rozyczko <rozyczko@…> (10/07/16 16:24:39)
git-committer:
Piotr Rozyczko <rozyczko@…> (10/07/16 16:26:18)
Message:

Save Analysis improvements. Fixed #629

Location:
src/sas/sasgui
Files:
3 edited

Legend:

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

    rd85c194 r18b7ecb9  
    317317        """ 
    318318        return self._drag_flag 
    319      
     319 
     320    def _set_analysis(self, flag): 
     321        """ 
     322        Set the Analysis Save state flag and informs the manager 
     323        so it refreshes the menu/whole panel 
     324        """ 
     325        self._set_save_flag(flag) 
     326        if self._manager is not None: 
     327            wx.PostEvent(self._manager.parent, PanelOnFocusEvent(panel=self)) 
     328 
    320329    def _set_reset_flag(self, flag=True): 
    321330        """ 
  • src/sas/sasgui/perspectives/invariant/invariant_panel.py

    r654e8e0 r18b7ecb9  
    9595        self.is_state_data = False 
    9696        self.is_power_out = False 
     97        self._set_analysis(False) 
    9798 
    9899        #container of invariant value 
     
    170171            self._reset_state_list() 
    171172            self._set_bookmark_flag(True) 
     173            self._set_analysis(True) 
    172174        return True 
    173175 
     
    281283            self.new_state = False 
    282284            self.is_state_data = False 
     285            self._set_analysis(True) 
    283286 
    284287    def clear_panel(self): 
     
    911914        self.button_calculate.SetFocus() 
    912915        #self.SetupScrolling() 
     916        self._set_analysis(False) 
    913917 
    914918    def _set_state(self, event): 
  • src/sas/sasgui/perspectives/pr/inversion_panel.py

    r5a58656 r18b7ecb9  
    4343        #Set window's font size 
    4444        self.SetWindowVariant(variant=FONT_VARIANT) 
     45        self._set_analysis(False) 
    4546 
    4647        self.plots = plots 
     
    396397            self.bck = state.bck 
    397398 
     399        # We have the data available for serialization 
     400        self._set_analysis(True) 
     401 
    398402        # Perform inversion 
    399403        self._on_invert(None) 
     
    401405    def set_manager(self, manager): 
    402406        self._manager = manager 
     407        if manager is not None: 
     408            self._set_analysis(False) 
    403409 
    404410    def _do_layout(self): 
     
    752758        self.nterms_estimate_ctl.Enable(False) 
    753759        self.nterms_estimate_ctl.SetLabel("") 
     760        self._set_analysis(False) 
     761 
    754762        self._on_pars_changed() 
    755763 
     
    936944                self._on_pars_changed(None) 
    937945                self._on_invert(None) 
     946                self._set_analysis(True) 
    938947            except: 
    939948                msg = "InversionControl._change_file: %s" % sys.exc_value 
Note: See TracChangeset for help on using the changeset viewer.