Changeset bb6b037 in sasview


Ignore:
Timestamp:
Apr 9, 2018 10:57:27 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:
effdd98
Parents:
edd6720
Message:

Handle data removal from the P(r) perspective.

File:
1 edited

Legend:

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

    redd6720 rbb6b037  
    6565        self._calculator = Invertor() 
    6666        # Default to background estimate 
    67         self._calculator.set_est_bck(True) 
     67        self._calculator.est_bck = True 
    6868        # plots of self._data 
    6969        self.pr_plot = None 
     
    150150 
    151151        self.backgroundInput.editingFinished.connect( 
    152             lambda: self.set_background(is_float(self.backgroundInput.text()))) 
     152            lambda: self.set_background(self.backgroundInput.text())) 
    153153        self.minQInput.editingFinished.connect( 
    154154            lambda: self._calculator.set_qmin(is_float(self.minQInput.text()))) 
     
    336336            GuiUtils.updateModelItemWithPlot(self._data, self.data_plot, title) 
    337337        if self.dmaxWindow is not None: 
     338            self.dmaxWindow.nfunc = self.getNFunc() 
    338339            self.dmaxWindow.pr_state = self._calculator 
    339             self.dmaxWindow.nfunc = self.getNFunc() 
    340             self.dmaxWindow.modelChanged() 
    341340        self.mapper.toLast() 
    342341 
     
    488487            self.dmaxWindow.close() 
    489488            self.dmaxWindow = None 
     489        current_data = self._data 
    490490        self.dataList.removeItem(self.dataList.currentIndex()) 
    491         self._data_list.pop(self._data) 
     491        self._data_list.pop(current_data) 
    492492        # Last file removed 
    493493        if len(self._data_list) == 0: 
     494            self._data = None 
    494495            self.pr_plot = None 
    495496            self.data_plot = None 
Note: See TracChangeset for help on using the changeset viewer.