schain-jc Commit - r816:66f9c3c86dfe

Time-window option added to GUI

Miguel Valdez -

r816:66f9c3c86dfe

parent child

Context file:

r816:66f9c3c86dfe

Collapse all files

schainpy/gui/viewcontroller/basicwindow.py +9 -1

                     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()
                             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:
                     self.specGgraphHeight.setEnabled(height)
                     self.specGgraphDbsrange.setEnabled(db)
                     self.specGgraphTminTmax.setEnabled(timerange)
+                    self.specGgraphTimeRange.setEnabled(timerange)
                     self.specGgraphmagnitud.setEnabled(magnitud)
                     self.specGgraphPhase.setEnabled(phase)

schainpy/gui/viewer/windows/ui_spectra.py +11 -11

                     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)
                     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)
                     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))
                     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.label_48.hide()
-                    self.specGgraphTimeRange.hide()
+            #         self.specGgraphTimeRange.hide()
                     self.tabWidgetSpectra.setTabText(self.tabWidgetSpectra.indexOf(self.tabgraphSpectra), _translate("MainWindow", "Graphics", None))
                     self.label_39.setText(_translate("MainWindow", "Type:", None))

schainpy/model/graphics/jroplot_spectra.py +5 -5

                     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)
                                     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,

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages