Displaying differences for changeset
 
display as  

src/java/cfa/guiDC_Model.java

@@ -297,7 +297,7 @@
         double[][] xyRanks = doubleArray.weibullPlottingPosition(sortedData_combined);
 
         //Determine summary table from xyRanks for duration curve
-        calculatePercentileSummmary(xyRanks, "Flow", "cfs");
+        calculatePercentileSummmary(xyRanks, "Flow (cfs)");
         
         //Graph the complete flow duration curve for the time period
         XYSeries FDC_xy = new XYSeries("FDC");
@@ -618,7 +618,7 @@
             loadRanks[i][0] = xyRanks[i][0];
             loadRanks[i][1] = xyRanks[i][1] * conversion * wqTarget;
         }
-        calculatePercentileSummmary(loadRanks, "Load", endUnits);
+        calculatePercentileSummmary(loadRanks, "Load (" + endUnits +")");
 
         //Break scattered WQ points data into the 5 flow sub classifications 0-10, 10-40, 40-60, 60-90, 90-100
         //which are High flows, Moist conditions, Mid-range flows, Dry conditions, and low flows respectively Assimilative
@@ -1068,7 +1068,7 @@
         Object[] returnArray = {paragraphTitle, totalCount};
         return returnArray;
     }
-    private void calculatePercentileSummmary(double[][] xyRanks, String title, String units){
+    private void calculatePercentileSummmary(double[][] xyRanks, String title){
         DoubleMath doubleMath = new DoubleMath();
         DoubleArray doubleArray = new DoubleArray();
 
@@ -1083,11 +1083,10 @@
         yFinal = doubleMath.roundColumn(yFinal, 100);
 
         //Create summary table in a single string
-        this.summaryTable = "Exceedence Percentile\t" + title;     //row 1
-        summaryTable = summaryTable + "\n(%)\t" + units;  //row 2
+        this.summaryTable = "Exceedence Percentile (%)\t" + title;     //row 1
 
         for(int i=0; i<frqDisp.length; i++){
-            summaryTable = summaryTable + "\n" + frqDispString[i] + "\t" + String.valueOf(yFinal[i]);
+            this.summaryTable = this.summaryTable + "\n" + frqDispString[i] + "\t" + String.valueOf(yFinal[i]);
         }
     }
     /**