Displaying differences for changeset
 
display as  

src/java/cfa/gui15minTimeseries_Model.java

@@ -24,7 +24,7 @@
 import org.jfree.data.time.TimeSeries;
 
 /**
-* Last Updated: 16-December-2014
+* Last Updated: 21-January-2015
 * @author Tyler Wible
 * @since 23-June-2014
 */
@@ -556,6 +556,8 @@
             this.dataSource = "Stream flow data retrieved from the U.S. Geological Survey, National Water Information System: Web Interface. http://waterdata.usgs.gov/nwis, accessed: " + today;
         }else if(database.equalsIgnoreCase("CDWR")){
             this.dataSource = "Stream flow data retrieved from the Colorado Division of Water Resources, CDWR. http://www.dwr.state.co.us accessed: " + today;
+        }else{
+            this.dataSource = "Stream flow data provided by the user. Flow analysis accessed: " + today;
         }
         this.len = String.valueOf(sortedData_combined.length);
         this.units = "cfs";

src/java/cfa/guiBaseflow_Model.java

@@ -27,9 +27,8 @@
 import org.jfree.data.time.Day;
 import org.jfree.data.time.TimeSeries;
 
-
 /**
- * Last Updated: 16-December-2014
+ * Last Updated: 21-January-2015
  * @author Tyler Wible
  * @since 15-June-2012
  */
@@ -670,6 +669,8 @@
             this.dataSource = "Stream flow data retrieved from the U.S. Environmental Protection Agency, STORET. http://www.epa.gov/storet/index.html accessed: " + today;
         }else if(database.equalsIgnoreCase("CDWR")){
             this.dataSource = "Stream flow data retrieved from the Colorado Division of Water Resources, CDWR. http://www.dwr.state.co.us accessed: " + today;
+        }else{
+            this.dataSource = "Stream flow data provided by the user. Flow analysis accessed: " + today;
         }
         this.len = String.valueOf(allFlowData.length);
         this.start = allFlowData[0][0];

src/java/cfa/guiDC_Model.java

@@ -26,7 +26,7 @@
 import org.jfree.data.xy.XYSeriesCollection;
 
 /**
-* Last Updated: 16-January-2015
+* Last Updated: 21-January-2015
 * @author Tyler Wible
 * @since 12-June-2011
 */
@@ -1420,6 +1420,8 @@
             sourceText = "Stream flow data and water quality test data retrieved from the U.S. Environmental Protection Agency, STORET. http://www.epa.gov/storet/index.html accessed: " + today;
         }else if(database.equalsIgnoreCase("CDWR")){
             sourceText = "Stream flow data and water quality test data retrieved from the Colorado Division of Water Resources, CDWR. http://www.dwr.state.co.us accessed: " + today;
+        }else{
+            this.dataSource = "Stream flow data and water quality test data provided by the user. Flow analysis accessed: " + today;
         }
         this.dataSource = sourceText;
         

src/java/cfa/guiDrought_Model.java

@@ -44,7 +44,7 @@
 import org.jfree.ui.TextAnchor;
 
 /**
-* Last Updated: 16-December-2014
+* Last Updated: 21-January-2015
 * @author Tyler Wible
 * @since 10-July-2012
 */
@@ -1305,6 +1305,8 @@
             this.dataSource = "Stream flow data retrieved from the U.S. Environmental Protection Agency, STORET. http://www.epa.gov/storet/index.html accessed: " + today;
         }else if(database.equalsIgnoreCase("CDWR")){
             this.dataSource = "Stream flow data retrieved from the Colorado Division of Water Resources, CDWR. http://www.dwr.state.co.us accessed: " + today;
+        }else{
+            this.dataSource = "Stream flow data provided by the user. Flow analysis accessed: " + today;
         }
         this.len = String.valueOf(sortedData_combined.length);
         this.start = String.valueOf(sortedData_combined[0][0]);

src/java/cfa/guiFlood_Model.java

@@ -11,7 +11,7 @@
 import org.apache.commons.math.ArgumentOutsideDomainException;
 
 /**
-* Last Updated: 15-January-2014
+* Last Updated: 21-January-2015
 * @author Tyler Wible
 * @since 13-June-2012
 */
@@ -205,6 +205,8 @@
                 this.dataSource = "Stream flow data retrieved from the U.S. Environmental Protection Agency, STORET. http://www.epa.gov/storet/index.html accessed: " + today;
             }else if(database.equalsIgnoreCase("CDWR")){
                 this.dataSource = "Stream flow data retrieved from the Colorado Division of Water Resources, CDWR. http://www.dwr.state.co.us accessed: " + today;
+            }else{
+                this.dataSource = "Stream flow data provided by the user. Flow analysis accessed: " + today;
             }
             this.len = String.valueOf(peakFlowData_combined.length);
             this.start = String.valueOf(peakFlowData_combined[0][0]);

src/java/cfa/guiLOADEST_Model.java

@@ -17,7 +17,7 @@
 
 
 /**
-* Last Updated: 16-January-2015
+* Last Updated: 21-January-2015
 * @author Tyler Wible & Tyler Dell
 * @since 27-March-2013
 */
@@ -887,6 +887,8 @@
             this.dataSource = "Stream flow data and water quality test data retrieved from the U.S. Environmental Protection Agency, STORET. http://www.epa.gov/storet/index.html accessed: " + today;
         }else if(database.equalsIgnoreCase("CDWR")){
             this.dataSource = "Stream flow data and water quality test data retrieved from the Colorado Division of Water Resources, CDWR. http://www.dwr.state.co.us accessed: " + today;
+        }else{
+            this.dataSource = "Stream flow data and water quality test data provided by the user. Load-Estimator analysis accessed: " + today;
         }
         this.start = sortedData_combined[0][0];
         this.end = sortedData_combined[sortedData_combined.length - 1][0];

src/java/cfa/guiTimeseries_Model.java

@@ -40,7 +40,7 @@
 import org.jfree.data.xy.XYSeriesCollection;
 
 /**
-* Last Updated: 20-January-2015
+* Last Updated: 21-January-2015
 * @author Tyler Wible
 * @since 24-June-2011
 */
@@ -49,7 +49,7 @@
     String mainFolder = "C:/Projects/TylerWible/CodeDirectories/NetBeans/CSIP/data/CFA/Timeseries";
     String database = "USGS";//"CDWR";//"STORET";//"UserData";//
     String organizationName = "USGS";//"Co. Division of Water Resources";//"Colorado Dept. of Public Health & Environment";//
-    String stationID = "09034250";//"06764880";//"CLAGRECO";//"000028";//
+    String stationID = "06764880";//"CLAGRECO";//"000028";//
     String stationName = "South Platte River at Roscoe, Nebr.";//"Cache La Poudre Near Greeley";//"BIG THOMPSON R NEAR MOUTH";//
     String wqTest = "flow";//"00600 Total nitrogen, water, unfiltered, milligrams per liter -- mg/L";//"00625 Ammonia-nitrogen as N -- mg/L";//
     String beginDate = "";
@@ -2124,6 +2124,8 @@
             this.dataSource = "Stream flow data and water quality test data retrieved from the U.S. Environmental Protection Agency, STORET. http://www.epa.gov/storet/index.html accessed: " + today;
         }else if(database.equalsIgnoreCase("CDWR")){
             this.dataSource = "Stream flow data retrieved from the Colorado Division of Water Resources, CDWR. http://www.dwr.state.co.us accessed: " + today;
+        }else{
+            this.dataSource = "Stream flow data provided by the user. Flow analysis accessed: " + today;
         }
         this.len = String.valueOf(sortedData_combined.length);
         this.units = graphUnits;