# HG changeset patch # User Tom Gottfried # Date 1427386296 -3600 # Node ID b30068e92757caa82c889a9101d87c6719e52818 # Parent 5210e1dd303ec6629aa84bc65359baac46ac36f6 SQ relation CSV export: order info lines according to columns plus whitespace cosmetics. diff -r 5210e1dd303e -r b30068e92757 artifacts/src/main/java/org/dive4elements/river/exports/sq/SQRelationExporter.java --- a/artifacts/src/main/java/org/dive4elements/river/exports/sq/SQRelationExporter.java Thu Mar 26 12:11:49 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/sq/SQRelationExporter.java Thu Mar 26 17:11:36 2015 +0100 @@ -220,6 +220,12 @@ log.debug("writeCSVData"); writeCSVInfo(writer, new String[] { + msg(INFO_PARAM_A), + msg(INFO_PARAM_B), + msg(INFO_PARAM_C), + msg(INFO_PARAM_D), + msg(INFO_PARAM_E), + msg(INFO_PARAM_F), msg(INFO_COEFF_A), msg(INFO_COEFF_B), msg(INFO_QMAX), @@ -229,12 +235,6 @@ msg(INFO_NOUTL), msg(INFO_CFERGUSON), msg(INFO_CDUAN), - msg(INFO_PARAM_A), - msg(INFO_PARAM_B), - msg(INFO_PARAM_C), - msg(INFO_PARAM_D), - msg(INFO_PARAM_E), - msg(INFO_PARAM_F), msg(INFO_S_KG), msg(INFO_Q), msg(INFO_DATE) diff -r 5210e1dd303e -r b30068e92757 artifacts/src/main/resources/messages_de.properties --- a/artifacts/src/main/resources/messages_de.properties Thu Mar 26 12:11:49 2015 +0100 +++ b/artifacts/src/main/resources/messages_de.properties Thu Mar 26 17:11:36 2015 +0100 @@ -455,8 +455,8 @@ export.sqrelation.csv.info.cferguson = CFERGUSON: Bias Korrektur nach Ferguson 1986 export.sqrelation.csv.info.cduan = CDUAN: Bias Korrektur nach Duan 1983 export.sqrelation.csv.info.param.a = Parameter A: Sedimenttransport von Feinkornanteil (< 0.063 mm) -export.sqrelation.csv.info.param.b = Parameter B: Sedimenttransport von Sand (Suspensionstransort)(0.063-2 mm) -export.sqrelation.csv.info.param.c = Parameter C: Sedimenttransport von Sand (Geschiebetransport) (0.063-2 mm) +export.sqrelation.csv.info.param.b = Parameter B: Sedimenttransport von Sand (Suspensionstransort) (0.063-2 mm) +export.sqrelation.csv.info.param.c = Parameter C: Sedimenttransport von Sand (Geschiebetransport) (0.063-2 mm) export.sqrelation.csv.info.param.d = Parameter D: Sedimenttransport von Fein- und Mittelkies (2-16 mm) export.sqrelation.csv.info.param.e = Parameter E: Sedimenttransport von Grobkornanteil (> Mittelkies)(16-125 mm) export.sqrelation.csv.info.param.f = Parameter F: Sedimenttransport von Geschiebtransportgesamt (0.063-125 mm) diff -r 5210e1dd303e -r b30068e92757 artifacts/src/main/resources/messages_de_DE.properties --- a/artifacts/src/main/resources/messages_de_DE.properties Thu Mar 26 12:11:49 2015 +0100 +++ b/artifacts/src/main/resources/messages_de_DE.properties Thu Mar 26 17:11:36 2015 +0100 @@ -451,8 +451,8 @@ export.sqrelation.csv.info.cferguson = CFERGUSON: Bias Korrektur nach Ferguson 1986 export.sqrelation.csv.info.cduan = CDUAN: Bias Korrektur nach Duan 1983 export.sqrelation.csv.info.param.a = Parameter A: Sedimenttransport von Feinkornanteil (< 0.063 mm) -export.sqrelation.csv.info.param.b = Parameter B: Sedimenttransport von Sand (Suspensionstransort)(0.063-2 mm) -export.sqrelation.csv.info.param.c = Parameter C: Sedimenttransport von Sand (Geschiebetransport) (0.063-2 mm) +export.sqrelation.csv.info.param.b = Parameter B: Sedimenttransport von Sand (Suspensionstransort) (0.063-2 mm) +export.sqrelation.csv.info.param.c = Parameter C: Sedimenttransport von Sand (Geschiebetransport) (0.063-2 mm) export.sqrelation.csv.info.param.d = Parameter D: Sedimenttransport von Fein- und Mittelkies (2-16 mm) export.sqrelation.csv.info.param.e = Parameter E: Sedimenttransport von Grobkornanteil (> Mittelkies)(16-125 mm) export.sqrelation.csv.info.param.f = Parameter F: Sedimenttransport von Geschiebtransportgesamt (0.063-125 mm)