diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java @ 3091:179e38aa678d

Some fixing charts are generated now flys-artifacts/trunk@4690 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Christian Lins <christian.lins@intevation.de>
date Mon, 18 Jun 2012 13:29:15 +0000
parents 960307cf2adc
children cd309f8597f6
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java	Mon Jun 18 12:29:29 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java	Mon Jun 18 13:29:15 2012 +0000
@@ -14,6 +14,8 @@
 import de.intevation.flys.artifacts.model.FacetTypes;
 import de.intevation.flys.artifacts.model.Parameters;
 
+import de.intevation.flys.artifacts.model.fixings.FixFacetUtils;
+
 import de.intevation.flys.artifacts.states.DefaultState.ComputeType;
 
 import org.apache.log4j.Logger;
@@ -90,8 +92,7 @@
             de.intevation.flys.artifacts.math.Function mf =
                 ff.instantiate(coeffs);
 
-            double maxQ = getMaxQ(params, currentKm);
-
+            double maxQ = FixFacetUtils.getMaxQ(params, currentKm);
             logger.debug("getData: maxQ = " + maxQ);
 
             FixFunction fix = new FixFunction(
@@ -108,16 +109,6 @@
         }
     }
 
-
-    public static double getMaxQ(Parameters params, double km) {
-        double [] maxQ = params.interpolate("km", km, new String[] { "max_q" });
-        if (maxQ == null) {
-            return 1000;
-        }
-        double mQ = Math.min(10000, Math.abs(maxQ[0]));
-        return mQ + 0.05*mQ;
-    }
-
     /**
      * Create a deep copy of this Facet.
      * @return a deep copy.

http://dive4elements.wald.intevation.org