[PATCH 1 of 4] Added new fraction to sq relation
Wald Commits
scm-commit at wald.intevation.org
Wed Sep 17 09:04:37 CEST 2014
# HG changeset patch
# User Raimund Renkert <rrenkert at intevation.de>
# Date 1410937287 -7200
# Node ID e8283197d8891a6111d699c03219c7f27af3a629
# Parent 7e54b27f478011f8df842cec61d967d0f04b18f9
Added new fraction to sq relation.
* New diagram with "Geschiebetransport gesamt(Sohlhöhenrelevant)"
* Added the new fraction to overview diagram.
diff -r 7e54b27f4780 -r e8283197d889 artifacts/doc/conf/artifacts/minfo.xml
--- a/artifacts/doc/conf/artifacts/minfo.xml Tue Sep 16 14:57:55 2014 +0200
+++ b/artifacts/doc/conf/artifacts/minfo.xml Wed Sep 17 09:01:27 2014 +0200
@@ -372,6 +372,16 @@
<facet name="sq_f_outlier_measurement" description="A facet for sq outlier measurement"/>
</facets>
</outputmode>
+ <outputmode name="sq_relation_g" description="output.sq_relation" type="chart">
+ <facets>
+ <facet name="sq_g_measurement" description="A facet for sq measurements"/>
+ <facet name="sq_relation_g.manualpoints" />
+ <facet name="sq_g_outlier" description="A facet fo sq outliers"/>
+ <facet name="sq_g_curve" description="A facet for sq curve"/>
+ <facet name="sq_g_outlier_curve" description="A facet for sq outlier curve"/>
+ <facet name="sq_g_outlier_measurement" description="A facet for sq outlier measurement"/>
+ </facets>
+ </outputmode>
<outputmode name="sq_overview" description="output.sq_overview" type="chart">
<facets>
<facet name="sq_a_measurement_overview" description="A facet for sq measurements"/>
@@ -410,6 +420,12 @@
<facet name="sq_f_curve_overview" description="A facet for sq curve"/>
<facet name="sq_f_outlier_curve_overview" description="A facet for sq outlier curve"/>
<facet name="sq_f_outlier_measurement_overview" description="A facet for sq outlier measurement"/>
+ <facet name="sq_g_measurement_overview" description="A facet for sq measurements"/>
+ <facet name="sq_relation_g.manualpoints" />
+ <facet name="sq_g_outlier_overview" description="A facet fo sq outliers"/>
+ <facet name="sq_g_curve_overview" description="A facet for sq curve"/>
+ <facet name="sq_g_outlier_curve_overview" description="A facet for sq outlier curve"/>
+ <facet name="sq_g_outlier_measurement_overview" description="A facet for sq outlier measurement"/>
</facets>
</outputmode>
<outputmode name="sq_relation_export" description="output.sq_relation_export" type="export">
diff -r 7e54b27f4780 -r e8283197d889 artifacts/doc/conf/artifacts/sqrelation.xml
--- a/artifacts/doc/conf/artifacts/sqrelation.xml Tue Sep 16 14:57:55 2014 +0200
+++ b/artifacts/doc/conf/artifacts/sqrelation.xml Wed Sep 17 09:01:27 2014 +0200
@@ -41,6 +41,12 @@
<facet name="sq_f_curve" description="A facet for sq curve"/>
</facets>
</outputmode>
+ <outputmode name="sq_relation_g" description="output.sq_relation" type="chart">
+ <facets>
+ <facet name="sq_relation_g.manualpoints" />
+ <facet name="sq_g_curve" description="A facet for sq curve"/>
+ </facets>
+ </outputmode>
<outputmode name="sq_overview" description="output.sq_overview" type="overview">
<facets>
<facet name="sq_chart_overview" description="A facet for sq chart overview"/>
diff -r 7e54b27f4780 -r e8283197d889 artifacts/doc/conf/generators/discharge-diagrams.xml
--- a/artifacts/doc/conf/generators/discharge-diagrams.xml Tue Sep 16 14:57:55 2014 +0200
+++ b/artifacts/doc/conf/generators/discharge-diagrams.xml Wed Sep 17 09:01:27 2014 +0200
@@ -37,4 +37,10 @@
<output-generator names="sq_relation_f,sq_relation_f_chartinfo" class="org.dive4elements.river.exports.DiagramGenerator" converter="org.dive4elements.river.exports.DiagramAttributes"><title key="chart.sq_relation_f.title" default=""/>
&sqrelation-defaults;
</output-generator>
+ <output-generator names="sq_relation_g,sq_relation_g_chartinfo" class="org.dive4elements.river.exports.DiagramGenerator" converter="org.dive4elements.river.exports.DiagramAttributes"><title key="chart.sq_relation_f.title" default=""/>
+ &sqrelation-defaults;
+ </output-generator>
+ <output-generator names="sq_overview,sq_overview_chartinfo" class="org.dive4elements.river.exports.DiagramGenerator" converter="org.dive4elements.river.exports.DiagramAttributes"><title key="chart.sq_relation_f.title" default=""/>
+ &sqrelation-defaults;
+ </output-generator>
</discharge-diagrams>
diff -r 7e54b27f4780 -r e8283197d889 artifacts/doc/conf/generators/discharge-diagrams2.xml
--- a/artifacts/doc/conf/generators/discharge-diagrams2.xml Tue Sep 16 14:57:55 2014 +0200
+++ b/artifacts/doc/conf/generators/discharge-diagrams2.xml Wed Sep 17 09:01:27 2014 +0200
@@ -100,6 +100,12 @@
<title key="chart.sq_relation_f.title" default=""/>
&sqrelation-defaults;
</output-generator>
+ <output-generator names="sq_relation_g,sq_relation_g_chartinfo"
+ class="org.dive4elements.river.exports.DischargeGenerator"
+ converter="org.dive4elements.river.exports.DiagramAttributes">
+ <title key="chart.sq_relation_f.title" default=""/>
+ &sqrelation-defaults;
+ </output-generator>
<output-generator names="sq_overview,sq_overview_chartinfo"
class="org.dive4elements.river.exports.DischargeGenerator"
converter="org.dive4elements.river.exports.DiagramAttributes">
diff -r 7e54b27f4780 -r e8283197d889 artifacts/src/main/java/org/dive4elements/river/artifacts/model/FacetTypes.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FacetTypes.java Tue Sep 16 14:57:55 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FacetTypes.java Wed Sep 17 09:01:27 2014 +0200
@@ -65,24 +65,28 @@
|| type.equals(SQ_D_CURVE)
|| type.equals(SQ_E_CURVE)
|| type.equals(SQ_F_CURVE)
+ || type.equals(SQ_G_CURVE)
|| type.equals(SQ_A_OUTLIER_CURVE)
|| type.equals(SQ_B_OUTLIER_CURVE)
|| type.equals(SQ_C_OUTLIER_CURVE)
|| type.equals(SQ_D_OUTLIER_CURVE)
|| type.equals(SQ_E_OUTLIER_CURVE)
|| type.equals(SQ_F_OUTLIER_CURVE)
+ || type.equals(SQ_G_OUTLIER_CURVE)
|| type.equals(SQ_A_CURVE_OV)
|| type.equals(SQ_B_CURVE_OV)
|| type.equals(SQ_C_CURVE_OV)
|| type.equals(SQ_D_CURVE_OV)
|| type.equals(SQ_E_CURVE_OV)
|| type.equals(SQ_F_CURVE_OV)
+ || type.equals(SQ_G_CURVE_OV)
|| type.equals(SQ_A_OUTLIER_CURVE_OV)
|| type.equals(SQ_B_OUTLIER_CURVE_OV)
|| type.equals(SQ_C_OUTLIER_CURVE_OV)
|| type.equals(SQ_D_OUTLIER_CURVE_OV)
|| type.equals(SQ_E_OUTLIER_CURVE_OV)
|| type.equals(SQ_F_OUTLIER_CURVE_OV)
+ || type.equals(SQ_G_OUTLIER_CURVE_OV)
)
{
return true;
@@ -97,24 +101,28 @@
|| type.equals(SQ_D_MEASUREMENT)
|| type.equals(SQ_E_MEASUREMENT)
|| type.equals(SQ_F_MEASUREMENT)
+ || type.equals(SQ_G_MEASUREMENT)
|| type.equals(SQ_A_OUTLIER_MEASUREMENT)
|| type.equals(SQ_B_OUTLIER_MEASUREMENT)
|| type.equals(SQ_C_OUTLIER_MEASUREMENT)
|| type.equals(SQ_D_OUTLIER_MEASUREMENT)
|| type.equals(SQ_E_OUTLIER_MEASUREMENT)
|| type.equals(SQ_F_OUTLIER_MEASUREMENT)
+ || type.equals(SQ_G_OUTLIER_MEASUREMENT)
|| type.equals(SQ_A_MEASUREMENT_OV)
|| type.equals(SQ_B_MEASUREMENT_OV)
|| type.equals(SQ_C_MEASUREMENT_OV)
|| type.equals(SQ_D_MEASUREMENT_OV)
|| type.equals(SQ_E_MEASUREMENT_OV)
|| type.equals(SQ_F_MEASUREMENT_OV)
+ || type.equals(SQ_G_MEASUREMENT_OV)
|| type.equals(SQ_A_OUTLIER_MEASUREMENT_OV)
|| type.equals(SQ_B_OUTLIER_MEASUREMENT_OV)
|| type.equals(SQ_C_OUTLIER_MEASUREMENT_OV)
|| type.equals(SQ_D_OUTLIER_MEASUREMENT_OV)
|| type.equals(SQ_E_OUTLIER_MEASUREMENT_OV)
|| type.equals(SQ_F_OUTLIER_MEASUREMENT_OV)
+ || type.equals(SQ_G_OUTLIER_MEASUREMENT_OV)
)
{
return true;
@@ -129,12 +137,14 @@
|| type.equals(SQ_D_OUTLIER)
|| type.equals(SQ_E_OUTLIER)
|| type.equals(SQ_F_OUTLIER)
+ || type.equals(SQ_G_OUTLIER)
|| type.equals(SQ_A_OUTLIER_OV)
|| type.equals(SQ_B_OUTLIER_OV)
|| type.equals(SQ_C_OUTLIER_OV)
|| type.equals(SQ_D_OUTLIER_OV)
|| type.equals(SQ_E_OUTLIER_OV)
- || type.equals(SQ_F_OUTLIER_OV))
+ || type.equals(SQ_F_OUTLIER_OV)
+ || type.equals(SQ_G_OUTLIER_OV))
{
return true;
}
@@ -372,6 +382,12 @@
String SQ_F_OUTLIER_CURVE = "sq_f_outlier_curve";
String SQ_F_OUTLIER_MEASUREMENT = "sq_f_outlier_measurement";
+ String SQ_G_CURVE = "sq_g_curve";
+ String SQ_G_MEASUREMENT = "sq_g_measurement";
+ String SQ_G_OUTLIER = "sq_g_outlier";
+ String SQ_G_OUTLIER_CURVE = "sq_g_outlier_curve";
+ String SQ_G_OUTLIER_MEASUREMENT = "sq_g_outlier_measurement";
+
String SQ_A_CURVE_OV = "sq_a_curve_overview";
String SQ_A_MEASUREMENT_OV = "sq_a_measurement_overview";
String SQ_A_OUTLIER_OV = "sq_a_outlier_overview";
@@ -408,6 +424,12 @@
String SQ_F_OUTLIER_CURVE_OV = "sq_f_outlier_curve_overview";
String SQ_F_OUTLIER_MEASUREMENT_OV = "sq_f_outlier_measurement_overview";
+ String SQ_G_CURVE_OV = "sq_g_curve_overview";
+ String SQ_G_MEASUREMENT_OV = "sq_g_measurement_overview";
+ String SQ_G_OUTLIER_OV = "sq_g_outlier_overview";
+ String SQ_G_OUTLIER_CURVE_OV = "sq_g_outlier_curve_overview";
+ String SQ_G_OUTLIER_MEASUREMENT_OV = "sq_g_outlier_measurement_overview";
+
String RELATIVE_POINT = "relativepoint";
String FIX_ANALYSIS_EVENTS_DWT = "fix_analysis_events_dwt";
diff -r 7e54b27f4780 -r e8283197d889 artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/Measurements.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/Measurements.java Tue Sep 16 14:57:55 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/Measurements.java Wed Sep 17 09:01:27 2014 +0200
@@ -63,6 +63,13 @@
}
};
+ public static final SExtractor S_BL2_EXTRACTOR = new SExtractor() {
+ @Override
+ public double getS(Measurement measument) {
+ return measument.S_BL_2();
+ }
+ };
+
protected List<Measurement> measuments;
protected List<Measurement> accumulated;
@@ -131,6 +138,10 @@
return extractSQ(accumulated, S_BL_EXTRACTOR);
}
+ public List<SQ> S_BL2() {
+ return extractSQ(accumulated, S_BL2_EXTRACTOR);
+ }
+
public List<SQ> getSQs(int index) {
switch (index) {
case 0: return S_SF();
@@ -139,6 +150,7 @@
case 3: return S_BL_FG();
case 4: return S_BL_CG();
case 5: return S_BL();
+ case 6: return S_BL2();
}
log.error("THIS SHOULD NOT HAPPEN: Tried to access SQ[" + index + "]");
return new ArrayList<SQ>(0);
diff -r 7e54b27f4780 -r e8283197d889 artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQResult.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQResult.java Tue Sep 16 14:57:55 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQResult.java Wed Sep 17 09:01:27 2014 +0200
@@ -14,7 +14,7 @@
public class SQResult implements Serializable {
- public static final int NUMBER_FRACTIONS = 6;
+ public static final int NUMBER_FRACTIONS = 7;
public static final int FRACTION_A = 0;
public static final int FRACTION_B = 1;
@@ -22,6 +22,7 @@
public static final int FRACTION_D = 3;
public static final int FRACTION_E = 4;
public static final int FRACTION_F = 5;
+ public static final int FRACTION_G = 6;
protected double km;
protected SQFractionResult[] fractions;
@@ -48,7 +49,7 @@
}
public static final String [] FRACTION_NAMES = {
- "A", "B", "C", "D", "E", "F"
+ "A", "B", "C", "D", "E", "F", "G"
};
public String getFractionName(int idx) {
diff -r 7e54b27f4780 -r e8283197d889 artifacts/src/main/java/org/dive4elements/river/artifacts/states/SQRelation.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/SQRelation.java Tue Sep 16 14:57:55 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/SQRelation.java Wed Sep 17 09:01:27 2014 +0200
@@ -72,39 +72,44 @@
public static final String [][] FACET_NAMES = {
{ SQ_A_CURVE, SQ_B_CURVE, SQ_C_CURVE,
- SQ_D_CURVE, SQ_E_CURVE, SQ_F_CURVE
+ SQ_D_CURVE, SQ_E_CURVE, SQ_F_CURVE, SQ_G_CURVE
},
{ SQ_A_MEASUREMENT, SQ_B_MEASUREMENT, SQ_C_MEASUREMENT,
- SQ_D_MEASUREMENT, SQ_E_MEASUREMENT, SQ_F_MEASUREMENT
+ SQ_D_MEASUREMENT, SQ_E_MEASUREMENT, SQ_F_MEASUREMENT, SQ_G_MEASUREMENT
},
{ SQ_A_OUTLIER, SQ_B_OUTLIER, SQ_C_OUTLIER,
- SQ_D_OUTLIER, SQ_E_OUTLIER, SQ_F_OUTLIER
+ SQ_D_OUTLIER, SQ_E_OUTLIER, SQ_F_OUTLIER, SQ_G_OUTLIER
},
{ SQ_A_OUTLIER_CURVE, SQ_B_OUTLIER_CURVE, SQ_C_OUTLIER_CURVE,
- SQ_D_OUTLIER_CURVE, SQ_E_OUTLIER_CURVE, SQ_F_OUTLIER_CURVE
+ SQ_D_OUTLIER_CURVE, SQ_E_OUTLIER_CURVE, SQ_F_OUTLIER_CURVE,
+ SQ_G_OUTLIER_CURVE
},
{ SQ_A_OUTLIER_MEASUREMENT, SQ_B_OUTLIER_MEASUREMENT,
SQ_C_OUTLIER_MEASUREMENT, SQ_D_OUTLIER_MEASUREMENT,
- SQ_E_OUTLIER_MEASUREMENT, SQ_F_OUTLIER_MEASUREMENT
+ SQ_E_OUTLIER_MEASUREMENT, SQ_F_OUTLIER_MEASUREMENT,
+ SQ_G_OUTLIER_MEASUREMENT
}
};
public static final String [][] OV_FACET_NAMES = {
{ SQ_A_CURVE_OV, SQ_B_CURVE_OV, SQ_C_CURVE_OV,
- SQ_D_CURVE_OV, SQ_E_CURVE_OV, SQ_F_CURVE_OV
+ SQ_D_CURVE_OV, SQ_E_CURVE_OV, SQ_F_CURVE_OV, SQ_G_CURVE_OV
},
{ SQ_A_MEASUREMENT_OV, SQ_B_MEASUREMENT_OV, SQ_C_MEASUREMENT_OV,
- SQ_D_MEASUREMENT_OV, SQ_E_MEASUREMENT_OV, SQ_F_MEASUREMENT_OV
+ SQ_D_MEASUREMENT_OV, SQ_E_MEASUREMENT_OV, SQ_F_MEASUREMENT_OV,
+ SQ_G_MEASUREMENT_OV
},
{ SQ_A_OUTLIER_OV, SQ_B_OUTLIER_OV, SQ_C_OUTLIER_OV,
- SQ_D_OUTLIER_OV, SQ_E_OUTLIER_OV, SQ_F_OUTLIER_OV
+ SQ_D_OUTLIER_OV, SQ_E_OUTLIER_OV, SQ_F_OUTLIER_OV, SQ_G_OUTLIER_OV
},
{ SQ_A_OUTLIER_CURVE_OV, SQ_B_OUTLIER_CURVE_OV, SQ_C_OUTLIER_CURVE_OV,
- SQ_D_OUTLIER_CURVE_OV, SQ_E_OUTLIER_CURVE_OV, SQ_F_OUTLIER_CURVE_OV
+ SQ_D_OUTLIER_CURVE_OV, SQ_E_OUTLIER_CURVE_OV, SQ_F_OUTLIER_CURVE_OV,
+ SQ_G_OUTLIER_CURVE_OV
},
{ SQ_A_OUTLIER_MEASUREMENT_OV, SQ_B_OUTLIER_MEASUREMENT_OV,
SQ_C_OUTLIER_MEASUREMENT_OV, SQ_D_OUTLIER_MEASUREMENT_OV,
- SQ_E_OUTLIER_MEASUREMENT_OV, SQ_F_OUTLIER_MEASUREMENT_OV
+ SQ_E_OUTLIER_MEASUREMENT_OV, SQ_F_OUTLIER_MEASUREMENT_OV,
+ SQ_G_OUTLIER_MEASUREMENT_OV
}
};
diff -r 7e54b27f4780 -r e8283197d889 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Tue Sep 16 14:57:55 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Wed Sep 17 09:01:27 2014 +0200
@@ -598,6 +598,8 @@
String sq_relation_f();
+ String sq_relation_g();
+
String sq_relation_export();
String sq_relations();
diff -r 7e54b27f4780 -r e8283197d889 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Tue Sep 16 14:57:55 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Wed Sep 17 09:01:27 2014 +0200
@@ -245,6 +245,7 @@
sq_relation_d = D Fein- und Mittelkies
sq_relation_e = E Grobkornanteil (> Mittelkies)
sq_relation_f = F Geschiebetransport Gesamt
+sq_relation_g = G Geschiebetransport Gesamt (Sohlh\u00f6henrelevant)
sq_relation_export = SQ Export
cross_section = Querprofil
cross_sections = Querprofile
diff -r 7e54b27f4780 -r e8283197d889 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties Tue Sep 16 14:57:55 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties Wed Sep 17 09:01:27 2014 +0200
@@ -244,6 +244,7 @@
sq_relation_d = D Fein- und Mittelkies
sq_relation_e = E Grobkornanteil (> Mittelkies)
sq_relation_f = F Geschiebetransport Gesamt
+sq_relation_g = G Geschiebetransport Gesamt (Sohlh\u00f6henrelevant)
sq_relation_export = SQ Export
cross_section = Cross Section
cross_sections = Cross Sections
More information about the Dive4Elements-commits
mailing list