ASCEE/pyqtgraph
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #715 from campagnola/file-dialog-fix

Browse Source 
File dialog fix
This commit is contained in:
Luke Campagnola 2018-06-25 09:39:47 -07:00 committed by GitHub
commit 3d3d0a2459
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
examples/relativity/relativity.py
View File

@ -159,17 +159,21 @@ class RelativityGUI(QtGui.QWidget):
self.setAnimation(self.params['Animate']) self.setAnimation(self.params['Animate'])
def save(self): def save(self):
fn = str(pg.QtGui.QFileDialog.getSaveFileName(self, "Save State..", "untitled.cfg", "Config Files (*.cfg)")) filename = pg.QtGui.QFileDialog.getSaveFileName(self, "Save State..", "untitled.cfg", "Config Files (*.cfg)")
if fn == '': if isinstance(filename, tuple):
filename = filename[0] # Qt4/5 API difference
if filename == '':
return return
state = self.params.saveState() state = self.params.saveState()
pg.configfile.writeConfigFile(state, fn) pg.configfile.writeConfigFile(state, str(filename))
def load(self): def load(self):
fn = str(pg.QtGui.QFileDialog.getOpenFileName(self, "Save State..", "", "Config Files (*.cfg)")) filename = pg.QtGui.QFileDialog.getOpenFileName(self, "Save State..", "", "Config Files (*.cfg)")
if fn == '': if isinstance(filename, tuple):
filename = filename[0] # Qt4/5 API difference
if filename == '':
return return
state = pg.configfile.readConfigFile(fn) state = pg.configfile.readConfigFile(str(filename))
self.loadState(state) self.loadState(state)
def loadPreset(self, param, preset): def loadPreset(self, param, preset):

4
pyqtgraph/imageview/ImageView.py
View File

@ -790,9 +790,11 @@ class ImageView(QtGui.QWidget):
def exportClicked(self): def exportClicked(self):
fileName = QtGui.QFileDialog.getSaveFileName() fileName = QtGui.QFileDialog.getSaveFileName()
if isinstance(fileName, tuple):
fileName = fileName[0] # Qt4/5 API difference
if fileName == '': if fileName == '':
return return
self.export(fileName) self.export(str(fileName))
def buildMenu(self): def buildMenu(self):
self.menu = QtGui.QMenu() self.menu = QtGui.QMenu()

4
pyqtgraph/widgets/TableWidget.py
View File

@ -351,9 +351,11 @@ class TableWidget(QtGui.QTableWidget):
def save(self, data): def save(self, data):
fileName = QtGui.QFileDialog.getSaveFileName(self, "Save As..", "", "Tab-separated values (*.tsv)") fileName = QtGui.QFileDialog.getSaveFileName(self, "Save As..", "", "Tab-separated values (*.tsv)")
if isinstance(fileName, tuple):
fileName = fileName[0] # Qt4/5 API difference
if fileName == '': if fileName == '':
return return
open(fileName, 'w').write(data) open(str(fileName), 'w').write(data)
def contextMenuEvent(self, ev): def contextMenuEvent(self, ev):
self.contextMenu.popup(ev.globalPos()) self.contextMenu.popup(ev.globalPos())