From 9e7f20a9fb260e9c88403f5cc5ab85b8e2ab0cf1 Mon Sep 17 00:00:00 2001 From: Sebastian Wehling-Benatelli Date: Mon, 8 Dec 2014 11:38:24 +0100 Subject: [PATCH] create a working MainWindow --- QtPyLoT.py | 11 +++++++---- pylot/RELEASE-VERSION | 2 +- pylot/core/util/layouts.py | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/QtPyLoT.py b/QtPyLoT.py index 70bd2c9b..1caf4cd8 100755 --- a/QtPyLoT.py +++ b/QtPyLoT.py @@ -133,7 +133,6 @@ class MainWindow(QMainWindow): self.fileMenu.addAction(action) self.fileMenu.addSeparator() self.fileMenu.addAction(self.fileMenuActions[-1]) - def loadData(self, fname=None): if fname is None: @@ -179,9 +178,7 @@ class MainWindow(QMainWindow): statsButtons = layoutStationButtons(self.getData(), self.getComponent()) _layout.addLayout(statsButtons) _layout.addWidget(self.DataPlot) - self.setLayout(_layout) - self.setCentralWidget(_widget) - + openIcon = self.style().standardIcon(QStyle.SP_DirOpenIcon) quitIcon = self.style().standardIcon(QStyle.SP_MediaStop) saveIcon = self.style().standardIcon(QStyle.SP_DriveHDIcon) @@ -235,6 +232,12 @@ class MainWindow(QMainWindow): status.addPermanentWidget(self.eventLabel) status.showMessage("Ready", 500) + statsButtons = layoutStationButtons(self.getData(), self.getComponent()) + _layout.addLayout(statsButtons) + _layout.addWidget(self.DataPlot) + _widget.setLayout(_layout) + self.setCentralWidget(_widget) + def okToContinue(self): if self.dirty: return self.saveData() diff --git a/pylot/RELEASE-VERSION b/pylot/RELEASE-VERSION index 0b303821..c5affb8d 100644 --- a/pylot/RELEASE-VERSION +++ b/pylot/RELEASE-VERSION @@ -1 +1 @@ -9603-dirty +ef8b-dirty diff --git a/pylot/core/util/layouts.py b/pylot/core/util/layouts.py index 632c2473..c9011a66 100644 --- a/pylot/core/util/layouts.py +++ b/pylot/core/util/layouts.py @@ -21,7 +21,7 @@ def layoutStationButtons(data, comp): stationButtons.append(QPushButton('%s'.format(stat))) except: for n in range(5): - stationButtons.append(QPushButton('ST%02d'.format(n))) + stationButtons.append(QPushButton('ST{0:02d}'.format(n+1))) for button in stationButtons: layout.addWidget(button) return layout \ No newline at end of file