marcel/pylot
3
0
Fork 0
Code Issues 7 Pull Requests 1 Releases Wiki Activity

Data object restructured for convenience; fixed problems in the class logic; restructured imports

Browse Source
This commit is contained in:
Sebastian Wehling-Benatelli
2015-02-16 10:30:35 +01:00
parent 2b8c60a3d4
commit fa6db084b8
3 changed files with 65 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
QtPyLoT.py
View File

@@ -258,23 +258,25 @@ class MainWindow(QMainWindow):
def loadData(self, fname=None):
if fname is None:
try:
self.data = Data(evtdata=self.fname)
self.data = Data(self, evtdata=self.fname)
except AttributeError:
action = self.sender()
if isinstance(action, QAction):
if action.data() is None:
filt = """Supported event formats (*.mat *.qml *.xml *.kor *.evt)"""
filt = "Supported event formats (*.mat *.qml *.xml " \
"*.kor *.evt)"
caption = 'Select event to open'
self.fname = QFileDialog().getOpenFileName(self,
caption=caption,
filter=filt)
fname, = QFileDialog().getOpenFileName(self,
caption=caption,
filter=filt)
self.fname = fname
else:
self.fname = unicode(action.data().toString())
if not self.okToContinue():
return
else:
self.fname = fname
self.data = Data(evtdata=self.fname)
self.data = Data(self, evtdata=self.fname)
def getLastEvent(self):
return self.recentEvents[0]