Commit for #33 item-5. Can't fulfill #4 since there is no good way to…

… spatially tie each entry to the spatial data for each HUC.
DOI-BOR · Aug 15, 2019 · a270a58 · a270a58
1 parent bb03ee9
commit a270a58
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 29 deletions.
diff --git a/Resources/GUI/PyForecast_GUI.py b/Resources/GUI/PyForecast_GUI.py
@@ -1125,44 +1125,43 @@ def setupUI(self):
         self.otherDataLayout.addWidget(self.stationLabel, 0, 0, 1, 4)
 
         # NRCC dataset layout
-        self.nrccLabel = QtWidgets.QLabel('NRCC')
-        self.nrccLabel.setMinimumWidth(100)
-        self.nrccLabel.setMaximumWidth(100)
-        self.nrccInfoButton = QtWidgets.QLabel()
-        self.nrccInfoButton.setPixmap(QtGui.QPixmap(os.path.abspath("Resources/Fonts_Icons_Images/infoHover.png")).scaled(30,30, QtCore.Qt.KeepAspectRatio))
-        self.nrccInfoButton.setScaledContents(True)
-        self.nrccInfoButton.setToolTip('<html><head/><body><p>NRCC gridded precipitation and temperature data, averaged by watershed.</p></body></html>')
-        self.nrccInput = QtWidgets.QLineEdit()
-        self.nrccInput.setPlaceholderText("Enter HUC8:")
+        #self.nrccLabel = QtWidgets.QLabel('NRCC')
+        #self.nrccLabel.setMinimumWidth(100)
+        #self.nrccLabel.setMaximumWidth(100)
+        #self.nrccInfoButton = QtWidgets.QLabel()
+        #self.nrccInfoButton.setPixmap(QtGui.QPixmap(os.path.abspath("Resources/Fonts_Icons_Images/infoHover.png")).scaled(30,30, QtCore.Qt.KeepAspectRatio))
+        #self.nrccInfoButton.setScaledContents(True)
+        #self.nrccInfoButton.setToolTip('<html><head/><body><p>NRCC gridded precipitation and temperature data, averaged by watershed.</p></body></html>')
+        #self.nrccInput = QtWidgets.QLineEdit()
+        #self.nrccInput.setPlaceholderText("Enter HUC8:")
         self.nrccButton = QtWidgets.QPushButton('Add')
-        self.otherDataLayout.addWidget(self.nrccLabel, 1, 0, 1, 1)
-        self.otherDataLayout.addWidget(self.nrccInfoButton, 1, 1, 1, 1)
-        self.otherDataLayout.addWidget(self.nrccInput, 1, 2, 1, 1)
-        self.otherDataLayout.addWidget(self.nrccButton, 1, 3, 1, 1)
+        #self.otherDataLayout.addWidget(self.nrccLabel, 1, 0, 1, 1)
+        #self.otherDataLayout.addWidget(self.nrccInfoButton, 1, 1, 1, 1)
+        #self.otherDataLayout.addWidget(self.nrccInput, 1, 2, 1, 1)
+        #self.otherDataLayout.addWidget(self.nrccButton, 1, 3, 1, 1)
 
         # Prism dataset layout
-        self.prismLabel = QtWidgets.QLabel('PRISM')
-        self.prismLabel.setMinimumWidth(100)
-        self.prismLabel.setMaximumWidth(100)
-        self.prismInfoButton = QtWidgets.QLabel()
-        self.prismInfoButton.setPixmap(QtGui.QPixmap(os.path.abspath("Resources/Fonts_Icons_Images/infoHover.png")).scaled(30,30, QtCore.Qt.KeepAspectRatio))
-        self.prismInfoButton.setScaledContents(True)
-        self.prismInfoButton.setToolTip('<html><head/><body><p>PRISM gridded precipitation and temperature data, averaged by watershed.</p></body></html>')
-        self.prismInput = QtWidgets.QLineEdit()
-        self.prismInput.setPlaceholderText("Enter HUC8:")
+        #self.prismLabel = QtWidgets.QLabel('PRISM')
+        #self.prismLabel.setMinimumWidth(100)
+        #self.prismLabel.setMaximumWidth(100)
+        #self.prismInfoButton = QtWidgets.QLabel()
+        #self.prismInfoButton.setPixmap(QtGui.QPixmap(os.path.abspath("Resources/Fonts_Icons_Images/infoHover.png")).scaled(30,30, QtCore.Qt.KeepAspectRatio))
+        #self.prismInfoButton.setScaledContents(True)
+        #self.prismInfoButton.setToolTip('<html><head/><body><p>PRISM gridded precipitation and temperature data, averaged by watershed.</p></body></html>')
+        #self.prismInput = QtWidgets.QLineEdit()
+        #self.prismInput.setPlaceholderText("Enter HUC8:")
         self.prismButton = QtWidgets.QPushButton('Add')
-        self.otherDataLayout.addWidget(self.prismLabel, 2, 0, 1, 1)
-        self.otherDataLayout.addWidget(self.prismInfoButton, 2, 1, 1, 1)
-        self.otherDataLayout.addWidget(self.prismInput, 2, 2, 1, 1)
-        self.otherDataLayout.addWidget(self.prismButton, 2, 3, 1, 1)
+        #self.otherDataLayout.addWidget(self.prismLabel, 2, 0, 1, 1)
+        #self.otherDataLayout.addWidget(self.prismInfoButton, 2, 1, 1, 1)
+        #self.otherDataLayout.addWidget(self.prismInput, 2, 2, 1, 1)
+        #self.otherDataLayout.addWidget(self.prismButton, 2, 3, 1, 1)
 
         # PDSI dataset 
         self.pdsiLabel = QtWidgets.QLabel("PDSI")
         self.pdsiLabel.setMinimumWidth(100)
         self.pdsiLabel.setMaximumWidth(100)
         self.pdsiInfoButton = QtWidgets.QLabel()
         self.pdsiInfoButton.setPixmap(QtGui.QPixmap(os.path.abspath("Resources/Fonts_Icons_Images/infoHover.png")).scaled(30,30, QtCore.Qt.KeepAspectRatio))
-        self.pdsiInfoButton.setScaledContents(True)
         self.pdsiInfoButton.setToolTip('<html><head/><body><p>Palmer Drought Severity Index by Climate Division</p></body></html>')
         self.pdsiInput = CustomQComboBox(self.formScroll)
         self.pdsiInput.addItems(list(CLIMATE_DIVISIONS.divisions.keys()))

diff --git a/Resources/tempFiles/pyforecast.cfg b/Resources/tempFiles/pyforecast.cfg
@@ -1,5 +1,5 @@
 [DEFAULT]
-programtime = 2019-08-14
-savefilename = C:/Users/jrocha/Documents/Python/PyForecast/test.fcst.bkup
+programtime = 2019-08-15
+savefilename = 
 allsignificantoverride = False