Ignore:
Timestamp:
Nov 9, 2017 8:43:55 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:
d6b8a1d
Parents:
7969b9c
git-author:
Piotr Rozyczko <rozyczko@…> (11/03/17 10:58:39)
git-committer:
Piotr Rozyczko <rozyczko@…> (11/09/17 08:43:55)
Message:

More Qt5 related fixes.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/sas/qtgui/Calculators/ResolutionCalculatorPanel.py

    r4992ff2 rfbfc488  
    317317        if self.cbCustomSpectrum.currentText() == 'Add New': 
    318318            datafile = QtWidgets.QFileDialog.getOpenFileName( 
    319                 self, "Choose a spectral distribution file", "", 
    320                 "All files (*.*)", 
    321                 QtWidgets.QFileDialog.DontUseNativeDialog) 
     319                self, "Choose a spectral distribution file","", 
     320                "All files (*.*)", None, 
     321                QtWidgets.QFileDialog.DontUseNativeDialog)[0] 
    322322 
    323323            if datafile is None or str(datafile) == '': 
    … …  
    568568        : return: image (numpy array) 
    569569        """ 
    570         # This fails in py3 with 
    571         # [Failure instance: Traceback: <class 'TypeError'>: 'map' object is not subscriptable 
    572         # INVESTIGATE 
    573         image = map(func, qx, qy, 
     570        image = list(map(func, qx, qy, 
    574571                    qx_min, qx_max, 
    575                     qy_min, qy_max)[0] 
     572                    qy_min, qy_max))[0] 
     573 
    576574        return image 
    577575 
    … …  
    751749        self.plotter.plot() 
    752750        self.plotter.show() 
     751        self.plotter.update() 
    753752 
    754753    def drawLines(self): 
Note: See TracChangeset for help on using the changeset viewer.