Changeset 7f5196e in sasview


Ignore:
Timestamp:
Oct 31, 2017 3:13:10 PM (7 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:
18d5af02
Parents:
4cac8a47
Message:

Basic link between dmax window and inversion.

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

Legend:

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

    r570a2f73 r7f5196e  
    350350        Open the Explorer window to see correlations between params and results 
    351351        """ 
    352         # TODO: Look at PR from AW - Is there anything else I need to do? 
    353         pass 
     352        # TODO: Link Invertor() and DmaxWindow so window updates when recalculated 
     353        from dmax import DmaxWindow 
     354        self.dmaxWindow = DmaxWindow(self._calculator, self.getNFunc(), self) 
     355        self.dmaxWindow.show() 
    354356 
    355357    ###################################################################### 
     
    391393        self.enableButtons() 
    392394 
     395    def getNFunc(self): 
     396        """Get the n_func value from the GUI object""" 
     397        return int(UI.TabbedInversionUI._fromUtf8(self.noOfTermsInput.text())) 
     398 
    393399    def setCurrentData(self, data_ref): 
    394400        """Get the current data and display as necessary""" 
     
    429435            self.calc_thread.stop() 
    430436        pr = self._calculator.clone() 
    431         nfunc = int(UI.TabbedInversionUI._fromUtf8( 
    432             self.noOfTermsInput.text())) 
     437        nfunc = self.getNFunc() 
    433438        self.calc_thread = CalcPr(pr, nfunc, 
    434439                                  error_func=self._threadError, 
     
    452457        pr.slit_height = 0.0 
    453458        pr.slit_width = 0.0 
    454         nfunc = int(UI.TabbedInversionUI._fromUtf8( 
    455             self.noOfTermsInput.text())) 
     459        nfunc = self.getNFunc() 
    456460        self.estimation_thread = EstimateNT(pr, nfunc, 
    457461                                            error_func=self._threadError, 
     
    474478            self.estimation_thread.stop() 
    475479        pr = self._calculator.clone() 
    476         nfunc = int(UI.TabbedInversionUI._fromUtf8( 
    477             self.noOfTermsInput.text())) 
     480        nfunc = self.getNFunc() 
    478481        self.estimation_thread = EstimatePr(pr, nfunc, 
    479482                                            error_func=self._threadError, 
Note: See TracChangeset for help on using the changeset viewer.