csip-cfa Displaying differences for changeset

Displaying differences for changeset

display as Allow wrapping

src/java/cfa/guiRegionalFDC_Model.java

@@ -22,7 +22,7 @@

import org.jfree.data.xy.XYSeriesCollection;

/**

-* Last Updated: 7-November-2014

+* Last Updated: 25-March-2015

* @author Tyler Wible

* @since 23-October-2011

@@ -70,13 +70,13 @@

public void setMainFolder(String mainFolder) {

this.mainFolder = mainFolder;

}

- public void setDatabase(String databaseList) {//Break up the inputs per flow duration curve

+ public void setDatabases(String databaseList) {//Break up the inputs per flow duration curve

this.databases = databaseList.split("\t");

}

- public void setStationID(String stationIDlist) {//Break up the inputs per flow duration curve

+ public void setStationIDs(String stationIDlist) {//Break up the inputs per flow duration curve

this.stationIDs = stationIDlist.split("\t");

}

- public void setStationName(String stationNameList) {//Break up the inputs per flow duration curve

+ public void setStationNames(String stationNameList) {//Break up the inputs per flow duration curve

this.stationNames = stationNameList.split("\t");

}

public void setNormalizingMetricName(String normalizingMetricName){

src/java/m/cfa/Baseflow_V1_0.java

@@ -47,7 +47,6 @@

return EXEC_OK;

}

@Override

protected void postProcess() throws Exception {

// files

src/java/m/cfa/RegionalFlowDurationCurve_V1_0.java

 @@ -1,68 +1,52 @@
   package m.cfa;
   import cfa.guiRegionalFDC_Model;
--import csip.AbstractModelService;
--import java.util.Map;
--import java.util.concurrent.Callable;
++import csip.ModelDataService;
   import javax.ws.rs.Path;
   import oms3.annotations.Description;
   import oms3.annotations.Name;
   import oms3.annotations.VersionInfo;
--import org.codehaus.jettison.json.*;
--import csip.utils.JSONUtils;
--import csip.utils.Services;
   import java.io.File;
   @Name("regionalfdc")
   @Description("regionalfdc")
   @VersionInfo("1.0")
   @Path("m/cfa/regionalfdc/1.0")
--public class RegionalFlowDurationCurve_V1_0 extends AbstractModelService {
++public class RegionalFlowDurationCurve_V1_0 extends ModelDataService {
       guiRegionalFDC_Model model = new guiRegionalFDC_Model();
       @Override
--    protected Callable<String> createCallable() throws Exception {
--        return new Callable<String>() {
--            @Override
--            public String call() throws Exception {
--                Map<String, JSONObject> m = getParamMap();
++    protected String process() throws Exception {
++        model.setMainFolder(getWorkspaceDir().toString());
++        model.setDatabases(getStringParam("databases"));
++        model.setStationIDs(getStringParam("station_ids"));
++        model.setStationNames(getStringParam("station_names"));
++        model.setNormalizingMetricName(getStringParam("normalizing_metric_name"));
++        model.setNormalizingMetrics(getStringParam("normalizing_metrics"));
++        model.setFlowDurationCurves(getStringParam("flow_duration_curves"));
++
++        model.run();
++        return EXEC_OK;
++    }
++
++    @Override
++    protected void postProcess() throws Exception {
++        // files
++        putResult(new File(model.getGraph()),
++                model.getRegionalFDC_results(),
++                //Below are the result graph files for use by JHighCharts on eRAMS for duplicating the above graphs
++                model.getRegionalFDCgraphOutput());
--                model.setMainFolder(getWorkspaceDir().toString());
--                model.setDatabase(m.get("databases").getString(VALUE));
--                model.setStationID(m.get("station_ids").getString(VALUE));
--                model.setStationName(m.get("station_names").getString(VALUE));
--                model.setNormalizingMetricName(m.get("normalizing_metric_name").getString(VALUE));
--                model.setNormalizingMetrics(m.get("normalizing_metrics").getString(VALUE));
--                model.setFlowDurationCurves(m.get("flow_duration_curves").getString(VALUE));
--
--                model.run();
--                return EXEC_OK;
--            }
--        };
--    }
--
--    @Override
--    public File[] postprocess() throws Exception {
--        return Services.toFiles(model.getGraph(),
--                                model.getRegionalFDC_results().getName(),
--                                //Below are the result graph files for use by JHighCharts on eRAMS for duplicating the above graphs
--                                model.getRegionalFDCgraphOutput().getName());
--    }
--
--    @Override
--    protected JSONArray createResults() throws Exception {
--        JSONArray result = new JSONArray();
--        result.put(JSONUtils.data("summary_table", model.getSummaryTable()));
--        result.put(JSONUtils.data("regional_flow_duration_curve", model.getRegionalFDC()));
--        result.put(JSONUtils.data("units", model.getUnits()));
--        result.put(JSONUtils.data("graph", model.getGraph()));
--        result.put(JSONUtils.data("result_file", model.getRegionalFDC_results().getName()));
++        // values
++        putResult("summary_table", model.getSummaryTable());
++        putResult("regional_flow_duration_curve", model.getRegionalFDC());
++        putResult("units", model.getUnits());
++        putResult("graph", model.getGraph());
++        putResult("result_file", model.getRegionalFDC_results().getName());
           //Get result files for JSHighCharts
           String graphDataFiles = model.getRegionalFDCgraphOutput().getName();
--        result.put(JSONUtils.data("graph_data_files", graphDataFiles));
--        return result;
++        putResult("graph_data_files", graphDataFiles);
       }
--
   }