src/java/groundwater/guiGroundwater_Model.java
| @@ -22,7 +22,7 @@ |
| import org.jfree.data.time.Year; |
| |
| /** |
| -* Last Updated: 18-August-2015 |
| +* Last Updated: 13-October-2015 |
| * @author Tyler Wible |
| * @since 3-November-2014 |
| */ |
| @@ -51,6 +51,7 @@ |
| String len = "-1"; |
| String start = "?"; |
| String end = "?"; |
| + String units = "?"; |
| String dataSource = "?"; |
| double max = -1; |
| double min = -1; |
| @@ -121,6 +122,9 @@ |
| public String getEnd() { |
| return end; |
| } |
| + public String getUnits(){ |
| + return units; |
| + } |
| public String getDataSource() { |
| return dataSource; |
| } |
| @@ -699,6 +703,7 @@ |
| color = Color.blue; |
| color2 = Color.darkGray; |
| showLine = true; |
| + this.units = "ft"; |
| }else if(wqTest.equalsIgnoreCase("depth")){ |
| //Check if any depth to watertable data exists |
| Object[] returnArray = usgsWell_data.getUSGSwatertableDepthData(stationID, beginDate, endDate); |
| @@ -716,6 +721,7 @@ |
| color = Color.blue; |
| color2 = Color.darkGray; |
| showLine = true; |
| + this.units = "ft"; |
| }else{ |
| //Check if any wq data exists |
| Object[] returnArray = usgsWell_data.getUSGSwellWQdata(stationID, wqTest, beginDate, endDate); |
| @@ -737,6 +743,7 @@ |
| color = Color.magenta; |
| color2 = Color.blue; |
| showLine = false; |
| + this.units = wqUnits; |
| } |
| |
| //Check if merging the datasets is desired, if so get the user data |
src/java/m/groundwater/Groundwater_V1_0.java
| @@ -52,6 +52,7 @@ |
| putResult("len", model.getLen()); |
| putResult("start", model.getStart()); |
| putResult("end", model.getEnd()); |
| + putResult("units", model.getUnits()); |
| putResult("data_source", model.getDataSource()); |
| //Get all data results |
| putResult("max", model.getMax()); |