Changeset ba4e3ba in sasview


Ignore:
Timestamp:
Mar 27, 2018 11:18:04 AM (4 years ago)
Author:
krzywon
Branches:
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
Children:
b685c7b
Parents:
8289ae3
Message:

P(r) fixes.

Location:
src/sas/qtgui/Perspectives/Inversion
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Perspectives/Inversion/InversionLogic.py

    rd744767 rba4e3ba  
    3737        """ data setter """ 
    3838        self._data = value 
    39         self.data_is_loaded = True 
     39        self.data_is_loaded = (self._data is not None) 
    4040 
    4141    def isLoadedData(self): 
  • src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

    r304e42f rba4e3ba  
    1515 
    1616# pr inversion calculation elements 
    17 from sas.sascalc.dataloader.data_info import Data1D 
    1817from sas.sascalc.pr.invertor import Invertor 
    1918 
     
    2928BACKGROUND_INPUT = 0.0 
    3029MAX_DIST = 140.0 
    31 DICT_KEYS = ["Calculator", "PrPlot", "DataPlot", "DMaxWindow", 
    32              "Logic", "NFuncEst"] 
    33  
    34  
    35 # TODO: Remove not working 
     30DICT_KEYS = ["Calculator", "PrPlot", "DataPlot", "DMaxWindow", "NFuncEst"] 
     31 
     32 
    3633# TODO: Explore window not working 
    3734# TODO: Update help with batch capabilities 
     
    309306        self.updateDataList(ref_item) 
    310307        self.setCurrentData(ref_item) 
    311         self.updateGuiValues() 
    312308 
    313309    ###################################################################### 
     
    416412            DICT_KEYS[2]: self.data_plot, 
    417413            DICT_KEYS[3]: self.dmaxWindow, 
    418             DICT_KEYS[4]: self.logic, 
    419             DICT_KEYS[5]: self.nTermsSuggested 
     414            DICT_KEYS[4]: self.nTermsSuggested 
    420415        } 
    421416 
     
    444439        self.data_plot = self._data_list[data_ref].get(DICT_KEYS[2]) 
    445440        self.dmaxWindow = self._data_list[data_ref].get(DICT_KEYS[3]) 
    446         self.logic = self._data_list[data_ref].get(DICT_KEYS[4]) 
    447         self.nTermsSuggested = self._data_list[data_ref].get(DICT_KEYS[5]) 
     441        self.nTermsSuggested = self._data_list[data_ref].get(DICT_KEYS[4]) 
     442        self.logic.set_data = self._data_set 
    448443        self.updateGuiValues() 
    449444 
     
    506501            self._data_set = None 
    507502            self._calculator = Invertor() 
    508             self.logic = InversionLogic() 
     503            self.logic.data = None 
    509504            self.enableButtons() 
    510         self.dataList.setCurrentIndex(0) 
    511         self.updateGuiValues() 
     505        else: 
     506            self.dataList.setCurrentIndex(0) 
     507            self.updateGuiValues() 
    512508 
    513509    ###################################################################### 
     
    600596        """ 
    601597        alpha, message, elapsed = output_tuple 
    602         self.updateGuiValues() 
    603598        if message: 
    604599            logging.info(message) 
Note: See TracChangeset for help on using the changeset viewer.