Ignore:
Timestamp:
Oct 30, 2017 7:50:09 AM (7 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:
304d082
Parents:
99ea1b0
Message:

Initial, in-progress version. Not really working atm. SASVIEW-787

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Calculators/DensityPanel.py

    • Property mode changed from 100755 to 100644
    rb0b09b9 r0849aec  
    22import logging 
    33import functools 
    4 from PyQt4 import QtGui, QtCore 
     4from PyQt5 import QtCore 
     5from PyQt5 import QtGui 
     6from PyQt5 import QtWidgets 
    57 
    68from periodictable import formula as Formula 
     
    3941 
    4042 
    41 class DensityPanel(QtGui.QDialog): 
     43class DensityPanel(QtWidgets.QDialog): 
    4244 
    4345    def __init__(self, parent=None): 
     
    6870        self.ui.editMassDensity.textEdited.connect(functools.partial(self.setMode, MODES.DENSITY_TO_VOLUME)) 
    6971 
    70         self.ui.buttonBox.button(QtGui.QDialogButtonBox.Reset).clicked.connect(self.modelReset) 
    71         self.ui.buttonBox.button(QtGui.QDialogButtonBox.Help).clicked.connect(self.displayHelp) 
     72        self.ui.buttonBox.button(QtWidgets.QDialogButtonBox.Reset).clicked.connect(self.modelReset) 
     73        self.ui.buttonBox.button(QtWidgets.QDialogButtonBox.Help).clicked.connect(self.displayHelp) 
    7274 
    7375    def setupModel(self): 
     
    8385 
    8486    def setupMapper(self): 
    85         self.mapper = QtGui.QDataWidgetMapper(self) 
     87        self.mapper = QtWidgets.QDataWidgetMapper(self) 
    8688        self.mapper.setModel(self.model) 
    8789        self.mapper.setOrientation(QtCore.Qt.Vertical) 
     
    9294        self.mapper.addMapping(self.ui.editMassDensity     , MODEL.MASS_DENSITY) 
    9395 
    94         self.mapper.toFirst() 
     96        # FIXME DOESNT WORK WITH QT5 
     97        #self.mapper.toFirst() 
    9598 
    9699    def dataChanged(self, top, bottom): 
Note: See TracChangeset for help on using the changeset viewer.