diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionState.java @ 9150:23945061daec

gigantic refactoring: exporter, result, results to support multiple jaspers -> collisions
author gernotbelger
date Thu, 14 Jun 2018 16:56:31 +0200
parents 2ed3824a3d53
children f9bb5d0a6ff3
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionState.java	Thu Jun 14 15:12:25 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionState.java	Thu Jun 14 16:56:31 2018 +0200
@@ -14,8 +14,11 @@
 import org.dive4elements.artifacts.CallContext;
 import org.dive4elements.river.artifacts.ChartArtifact;
 import org.dive4elements.river.artifacts.D4EArtifact;
+import org.dive4elements.river.artifacts.common.AbstractCalculationExportableResult;
 import org.dive4elements.river.artifacts.model.CalculationResult;
+import org.dive4elements.river.artifacts.model.DataFacet;
 import org.dive4elements.river.artifacts.model.EmptyFacet;
+import org.dive4elements.river.artifacts.model.FacetTypes;
 import org.dive4elements.river.artifacts.sinfo.SINFOArtifact;
 import org.dive4elements.river.artifacts.states.DefaultState;
 
@@ -67,13 +70,14 @@
         if (facets == null)
             return res;
         //
-        // final FlowDepthCalculationResults results = (FlowDepthCalculationResults) res.getData();
+        final CollisionCalculationResults results = (CollisionCalculationResults) res.getData();
         //
         // /* add themes for chart, for each result */
-        // final List<FlowDepthCalculationResult> resultList = results.getResults();
+        // final List<CollisionCalcOverviewResult> resultList = results.getResults();
         // for (int index = 0; index < resultList.size(); index++) {
         //
-        // final FlowDepthCalculationResult result = resultList.get(index);
+        final AbstractCalculationExportableResult<CollisionCalculationResults> result = results.getResults().get(0);
+
         //
         // /* filtered (zoom dependent mean) flow depth */
         // facets.add(FlowDepthProcessor.createFlowDepthFilteredFacet(context, hash, this.id, result, index));
@@ -88,13 +92,13 @@
         // }
         // }
 
-        // if (!resultList.isEmpty()) {
-        // final Facet csv = new DataFacet(FacetTypes.CSV, "CSV data", ComputeType.ADVANCE, hash, this.id);
-        // final Facet pdf = new DataFacet(FacetTypes.PDF, "PDF data", ComputeType.ADVANCE, hash, this.id);
-        //
-        // facets.add(csv);
-        // facets.add(pdf);
-        // }
+        if (!result.isEmpty()) {
+            final Facet csv = new DataFacet(FacetTypes.CSV, "CSV data", ComputeType.ADVANCE, hash, this.id);
+            final Facet pdf = new DataFacet(FacetTypes.PDF, "PDF data", ComputeType.ADVANCE, hash, this.id);
+
+            facets.add(csv);
+            facets.add(pdf);
+        }
         //
         // final Calculation report = res.getReport();
         //

http://dive4elements.wald.intevation.org