From 66f9c3c86dfec81f9637f0a25a12ce9c063c2b9a 2016-04-13 15:54:04 From: Miguel Valdez Date: 2016-04-13 15:54:04 Subject: [PATCH] Time-window option added to GUI --- diff --git a/schainpy/gui/viewcontroller/basicwindow.py b/schainpy/gui/viewcontroller/basicwindow.py index 39e0205..d5061ca 100644 --- a/schainpy/gui/viewcontroller/basicwindow.py +++ b/schainpy/gui/viewcontroller/basicwindow.py @@ -1573,7 +1573,7 @@ class BasicWindow(QMainWindow, Ui_BasicWindow): trange = str(self.specGgraphTminTmax.text()).strip() magrange = str(self.specGgraphmagnitud.text()).strip() phaserange = str(self.specGgraphPhase.text()).strip() -# timerange = str(self.specGgraphTimeRange.text()).strip() + timerange = str(self.specGgraphTimeRange.text()).strip() figpath = str(self.specGraphPath.text()).strip() figfile = str(self.specGraphPrefix.text()).strip() @@ -1761,6 +1761,13 @@ class BasicWindow(QMainWindow, Ui_BasicWindow): opObj.addParameter(name='xmin', value=value1, format='float') opObj.addParameter(name='xmax', value=value2, format='float') + + if timerange: + try: + timerange = int(timerange) + except: + return 0 + opObj.addParameter(name='timerange', value=timerange, format='int') if hei_range: @@ -2580,6 +2587,7 @@ class BasicWindow(QMainWindow, Ui_BasicWindow): self.specGgraphHeight.setEnabled(height) self.specGgraphDbsrange.setEnabled(db) self.specGgraphTminTmax.setEnabled(timerange) + self.specGgraphTimeRange.setEnabled(timerange) self.specGgraphmagnitud.setEnabled(magnitud) self.specGgraphPhase.setEnabled(phase) diff --git a/schainpy/gui/viewer/windows/ui_spectra.py b/schainpy/gui/viewer/windows/ui_spectra.py index 0cc6858..c1d09ab 100644 --- a/schainpy/gui/viewer/windows/ui_spectra.py +++ b/schainpy/gui/viewer/windows/ui_spectra.py @@ -359,6 +359,13 @@ class Ui_SpectraTab(object): self.specGgraphTminTmax.setObjectName(_fromUtf8("specGgraphTminTmax")) self.gridLayout_9.addWidget(self.specGgraphTminTmax, xi+3, 2, 1, 2) + self.label_48 = QtGui.QLabel(self.tabgraphSpectra) + self.label_48.setObjectName(_fromUtf8("label_48")) + self.gridLayout_9.addWidget(self.label_48, xi+4, 0, 1, 2) + self.specGgraphTimeRange = QtGui.QLineEdit(self.tabgraphSpectra) + self.specGgraphTimeRange.setObjectName(_fromUtf8("specGgraphTimeRange")) + self.gridLayout_9.addWidget(self.specGgraphTimeRange, xi+4, 2, 1, 2) + self.specGraphMagLabel = QtGui.QLabel(self.tabgraphSpectra) self.specGraphMagLabel.setObjectName(_fromUtf8("specGraphMagLabel")) self.gridLayout_9.addWidget(self.specGraphMagLabel, xi, 4, 1, 2) @@ -386,13 +393,6 @@ class Ui_SpectraTab(object): self.specGgraphftpratio = QtGui.QLineEdit(self.tabgraphSpectra) self.specGgraphftpratio.setObjectName(_fromUtf8("specGgraphftpratio")) self.gridLayout_9.addWidget(self.specGgraphftpratio, xi+3, 6, 1, 2) - - self.label_48 = QtGui.QLabel(self.tabgraphSpectra) - self.label_48.setObjectName(_fromUtf8("label_48")) - self.gridLayout_9.addWidget(self.label_48, xi+4, 4, 1, 2) - self.specGgraphTimeRange = QtGui.QLineEdit(self.tabgraphSpectra) - self.specGgraphTimeRange.setObjectName(_fromUtf8("specGgraphTimeRange")) - self.gridLayout_9.addWidget(self.specGgraphTimeRange, xi+4, 6, 1, 2) # spacerItem15 = QtGui.QSpacerItem(28, 15, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) # self.gridLayout_9.addItem(spacerItem15, 27, 6, 1, 2) @@ -469,7 +469,7 @@ class Ui_SpectraTab(object): self.tabWidgetSpectra.setTabText(self.tabWidgetSpectra.indexOf(self.tabopSpectra), _translate("MainWindow", "Operation", None)) self.label_44.setText(_translate("MainWindow", "Coherence Map:", None)) - self.specGraphTminTmaxLabel.setText(_translate("MainWindow", "Time range:", None)) + self.specGraphTminTmaxLabel.setText(_translate("MainWindow", "Time range (hours):", None)) self.label_25.setText(_translate("MainWindow", "Prefix:", None)) self.label_42.setText(_translate("MainWindow", "RTI Plot:", None)) self.label_16.setText(_translate("MainWindow", "Height range:", None)) @@ -487,10 +487,10 @@ class Ui_SpectraTab(object): self.label_47.setText(_translate("MainWindow", "Save:", None)) self.label_19.setText(_translate("MainWindow", "Ftp:", None)) self.label_45.setText(_translate("MainWindow", "Noise:", None)) - self.label_48.setText(_translate("MainWindow", "Time Range:", None)) + self.label_48.setText(_translate("MainWindow", "Time window (seconds):", None)) self.specGraphPhaseLabel.setText(_translate("MainWindow", "Coh. Phase:", None)) - self.label_48.hide() - self.specGgraphTimeRange.hide() +# self.label_48.hide() +# self.specGgraphTimeRange.hide() self.tabWidgetSpectra.setTabText(self.tabWidgetSpectra.indexOf(self.tabgraphSpectra), _translate("MainWindow", "Graphics", None)) self.label_39.setText(_translate("MainWindow", "Type:", None)) diff --git a/schainpy/model/graphics/jroplot_spectra.py b/schainpy/model/graphics/jroplot_spectra.py index f805bee..b7dca88 100644 --- a/schainpy/model/graphics/jroplot_spectra.py +++ b/schainpy/model/graphics/jroplot_spectra.py @@ -552,6 +552,11 @@ class RTIPlot(Figure): update_figfile = False + if dataOut.ltctime >= self.xmax: + self.counter_imagwr = wr_period + self.isConfig = False + update_figfile = True + if not self.isConfig: nplots = len(channelIndexList) @@ -608,11 +613,6 @@ class RTIPlot(Figure): grid='x') self.draw() - - if dataOut.ltctime >= self.xmax: - self.counter_imagwr = wr_period - self.isConfig = False - update_figfile = True self.save(figpath=figpath, figfile=figfile,