slightly changed qtpylot to call it from console

This commit is contained in:
Marcel Paffrath 2017-05-24 15:28:52 +02:00
parent 69b2daaab8
commit b3a4470910
2 changed files with 7 additions and 4 deletions

View File

@ -1953,7 +1953,7 @@ class MainWindow(QMainWindow):
self.project.save(filename) self.project.save(filename)
return True return True
def loadProject(self): def loadProject(self, fnm=None):
''' '''
Load an existing project file. Load an existing project file.
''' '''
@ -1969,8 +1969,11 @@ class MainWindow(QMainWindow):
pass pass
elif answer == 4194304: elif answer == 4194304:
return return
if not fnm:
dlg = QFileDialog() dlg = QFileDialog()
fnm = dlg.getOpenFileName(self, 'Open project file...', filter='Pylot project (*.plp)') fnm = dlg.getOpenFileName(self, 'Open project file...', filter='Pylot project (*.plp)')
if not fnm:
return
if fnm[0]: if fnm[0]:
self.project = Project.load(fnm[0]) self.project = Project.load(fnm[0])
self.tabs.setCurrentIndex(0) # implemented to prevent double-loading of waveform data self.tabs.setCurrentIndex(0) # implemented to prevent double-loading of waveform data

View File

@ -1 +1 @@
c954-dirty 69b2-dirty