Ignore:
Timestamp:
Nov 15, 2017 4:52:27 AM (6 years ago)
Author:
Piotr Rozyczko <rozyczko@…>
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:
c7ebb37
Parents:
fa81e94
Message:

Initial implementation of Adam Washington's Corfunc perspective.
Converted to py3/Qt5.

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

Legend:

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

    rfa81e94 rd4881f6a  
    3030logger = logging.getLogger(__name__) 
    3131 
    32 def enum(*sequential, **named): 
    33     enums = dict(list(zip(sequential, list(range(len(sequential))))), **named) 
    34     return type('Enum', (), enums) 
     32from sas.qtgui.Utilities.GuiUtils import enum 
    3533 
    3634W = enum( 'NPTS',           #0 
  • src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

    rfa81e94 rd4881f6a  
    3131# TODO: Easy way to scroll through results - no tabs in window(?) - 'spreadsheet' 
    3232# TODO: Method to export results in some meaningful way 
    33 class InversionWindow(QtWidgets.QTabWidget, Ui_PrInversion): 
     33#class InversionWindow(QtWidgets.QTabWidget, Ui_PrInversion): 
     34class InversionWindow(QtWidgets.QDialog, Ui_PrInversion): 
    3435    """ 
    3536    The main window for the P(r) Inversion perspective. 
     
    117118            # reset the closability flag 
    118119            self.setClosable(value=False) 
     120            # Tell the MdiArea to close the container 
     121            self.parentWidget().close() 
    119122            event.accept() 
    120123        else: 
     
    253256    def setupWindow(self): 
    254257        """Initialize base window state on init""" 
    255         self.setTabPosition(0) 
     258        #self.setTabPosition(0) 
    256259        self.enableButtons() 
    257260        self.estimateBgd.setChecked(True) 
     
    380383        for data in data_item: 
    381384            # Create initial internal mappings 
    382             self._data_list[data] = self._calculator.clone() 
     385            # TODO: in PyQt5 QStandardItem no longer can be used as dict key 
     386            # Possibly the easiest solution is to subclass QStandardItem 
     387            # and reimplement __hash__() method so it can be hashed. 
     388            self._data_list[data] = self._calculator.clone() #<- this crashes 
    383389            self._data_set = GuiUtils.dataFromItem(data) 
    384390            self.data_plot_list[data] = self.data_plot 
  • src/sas/qtgui/Perspectives/Inversion/InversionUtils.py

    rfa81e94 rd4881f6a  
    1 def enum(*sequential, **named): 
    2     enums = dict(list(zip(sequential, list(range(len(sequential))))), **named) 
    3     return type('Enum', (), enums) 
     1from sas.qtgui.Utilities.GuiUtils import enum 
    42 
    53WIDGETS = enum( 'W_FILENAME',               #0 
Note: See TracChangeset for help on using the changeset viewer.