# HG changeset patch # User Tom Gottfried # Date 1372446503 -7200 # Node ID 1a7f5d09b9d8c0b6c2f158a9b32e7a2790a3dffc # Parent ef3b02034f6a86bc4e0fcb7419f7f547d36fe0d4 Longitudinal sections: partly renamed outs and configured recommendations at once diff -r ef3b02034f6a -r 1a7f5d09b9d8 artifacts/doc/conf/artifacts/minfo.xml --- a/artifacts/doc/conf/artifacts/minfo.xml Fri Jun 28 21:05:52 2013 +0200 +++ b/artifacts/doc/conf/artifacts/minfo.xml Fri Jun 28 21:08:23 2013 +0200 @@ -142,7 +142,7 @@ - + @@ -172,7 +172,7 @@ - + @@ -205,7 +205,7 @@ - + @@ -219,7 +219,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -499,7 +499,7 @@ - + diff -r ef3b02034f6a -r 1a7f5d09b9d8 artifacts/doc/conf/artifacts/winfo.xml --- a/artifacts/doc/conf/artifacts/winfo.xml Fri Jun 28 21:05:52 2013 +0200 +++ b/artifacts/doc/conf/artifacts/winfo.xml Fri Jun 28 21:08:23 2013 +0200 @@ -259,7 +259,7 @@ - + diff -r ef3b02034f6a -r 1a7f5d09b9d8 artifacts/doc/conf/conf.xml --- a/artifacts/doc/conf/conf.xml Fri Jun 28 21:05:52 2013 +0200 +++ b/artifacts/doc/conf/conf.xml Fri Jun 28 21:08:23 2013 +0200 @@ -306,7 +306,7 @@ org.dive4elements.river.exports.DurationCurveExporter org.dive4elements.river.exports.ComputedDischargeCurveExporter org.dive4elements.river.exports.DischargeLongitudinalSectionExporter - org.dive4elements.river.exports.WDifferencesCurveGenerator + org.dive4elements.river.exports.WDifferencesCurveGenerator org.dive4elements.river.exports.WDifferencesCurveInfoGenerator org.dive4elements.river.exports.WDifferencesExporter org.dive4elements.river.exports.MapGenerator @@ -321,20 +321,20 @@ org.dive4elements.river.exports.HistoricalDischargeWQCurveGenerator org.dive4elements.river.exports.HistoricalDischargeWQCurveInfoGenerator org.dive4elements.river.exports.HistoricalDischargeCurveExporter - org.dive4elements.river.exports.FlowVelocityGenerator + org.dive4elements.river.exports.FlowVelocityGenerator org.dive4elements.river.exports.FlowVelocityInfoGenerator org.dive4elements.river.exports.FlowVelocityExporter - org.dive4elements.river.exports.MiddleBedHeightGenerator + org.dive4elements.river.exports.MiddleBedHeightGenerator org.dive4elements.river.exports.MiddleBedHeightInfoGenerator org.dive4elements.river.exports.MiddleBedHeightExporter org.dive4elements.river.exports.minfo.BedQualityGenerator org.dive4elements.river.exports.minfo.BedQualityInfoGenerator org.dive4elements.river.exports.minfo.BedQualityExporter - org.dive4elements.river.exports.minfo.BedDifferenceYearGenerator + org.dive4elements.river.exports.minfo.BedDifferenceYearGenerator org.dive4elements.river.exports.minfo.BedDiffYearInfoGenerator - org.dive4elements.river.exports.minfo.BedDifferenceEpochGenerator + org.dive4elements.river.exports.minfo.BedDifferenceEpochGenerator org.dive4elements.river.exports.minfo.BedDiffEpochInfoGenerator - org.dive4elements.river.exports.minfo.BedDiffHeightYearGenerator + org.dive4elements.river.exports.minfo.BedDiffHeightYearGenerator org.dive4elements.river.exports.minfo.BedDiffHeightYearInfoGenerator org.dive4elements.river.exports.minfo.BedDifferenceExporter org.dive4elements.river.exports.sq.SQRelationGeneratorA @@ -362,7 +362,7 @@ org.dive4elements.river.exports.WaterlevelExporter org.dive4elements.river.exports.fixings.FixWQCurveGenerator org.dive4elements.river.exports.fixings.FixWQCurveInfoGenerator - org.dive4elements.river.exports.minfo.SedimentLoadLSGenerator + org.dive4elements.river.exports.minfo.SedimentLoadLSGenerator org.dive4elements.river.exports.minfo.SedimentLoadLSInfoGenerator org.dive4elements.river.exports.ReportGenerator diff -r ef3b02034f6a -r 1a7f5d09b9d8 artifacts/doc/conf/meta-data.xml --- a/artifacts/doc/conf/meta-data.xml Fri Jun 28 21:05:52 2013 +0200 +++ b/artifacts/doc/conf/meta-data.xml Fri Jun 28 21:08:23 2013 +0200 @@ -45,10 +45,7 @@ - - - - + @@ -108,9 +105,6 @@ - - - @@ -133,7 +127,7 @@ - + @@ -172,18 +166,18 @@ - + - + - + @@ -191,7 +185,7 @@ - + @@ -200,7 +194,7 @@ - + @@ -209,7 +203,7 @@ - + @@ -316,7 +310,7 @@ - + @@ -356,14 +350,14 @@ - + - + @@ -373,20 +367,20 @@ - + - + - + @@ -414,7 +408,7 @@ factory="winfo" target_out="{$out}" artifact-id="{$aid}" ids="{$aid}" - out="w_differences"/> + out="w_differences_longitudinal_section"/> @@ -828,7 +822,7 @@ - - + @@ -855,7 +849,7 @@ - + @@ -867,7 +861,7 @@ - + @@ -878,7 +872,7 @@ - diff -r ef3b02034f6a -r 1a7f5d09b9d8 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 Fri Jun 28 21:05:52 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Fri Jun 28 21:08:23 2013 +0200 @@ -404,7 +404,7 @@ String year(); - String sedimentload_ls(); + String sedimentload_longitudinal_section(); // Gauges @@ -486,6 +486,8 @@ String w_differences(); + String w_differences_longitudinal_section(); + String historical_discharge(); String historical_discharge_wq(); @@ -562,11 +564,11 @@ String discharge(); - String flow_velocity(); + String flow_velocity_longitudinal_section(); String flow_velocity_export(); - String bedheight_middle(); + String bedheight_middle_longitudinal_section(); String bedheight_middle_export(); @@ -598,11 +600,11 @@ String soundings_width(); - String bed_difference_year(); + String bed_difference_year_longitudinal_section(); - String bed_difference_epoch(); + String bed_difference_epoch_longitudinal_section(); - String bed_difference_height_year(); + String bed_difference_height_year_longitudinal_section(); String bedheight_difference_export(); diff -r ef3b02034f6a -r 1a7f5d09b9d8 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties --- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Fri Jun 28 21:05:52 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Fri Jun 28 21:08:23 2013 +0200 @@ -87,7 +87,7 @@ end_year = End period = Period year = Year -sedimentload_ls = Sediment Load +sedimentload_longitudinal_section = Sediment Load welcome = Welcome to Flusshydrologische Software welcome_open_or_create = Please open a project from the project list or create a # Header images @@ -224,9 +224,9 @@ floodmap = Floodmap historical_discharge = Time-Chart historical_discharge_wq = W/Q-Chart -flow_velocity = Flow Velocity +flow_velocity_longitudinal_section = Flow Velocity flow_velocity_export = Flow Velocity Export -bedheight_middle = Middle Bed Height +bedheight_middle_longitudinal_section = Middle Bed Height bedheight_middle_export = Middle Bed Height Export bed_longitudinal_section = Bed Quality bed_longitudinal_section_export = Bed Quality Export @@ -240,6 +240,7 @@ cross_section = Cross Section cross_sections = Cross Sections w_differences = Differences +w_differences_longitudinal_section = Differences w_differences_export = Differences Export reference_curve_export = Reference Curve Export historical_discharge_export = Historical Discharge Curve Export @@ -255,9 +256,9 @@ bed_diameter = Bed Diameter soundings = Soundings soundings_width = Soundings Width -bed_difference_year = Bedheight Differences -bed_difference_epoch = Epoch Bedheight Differences -bed_difference_height_year = Bedheight Differences per year +bed_difference_year_longitudinal_section = Bedheight Differences +bed_difference_epoch_longitudinal_section = Epoch Bedheight Differences +bed_difference_height_year_longitudinal_section = Bedheight Differences per year bedheight_difference_export = Bedheight Differences Export exportATTooltip = Export as AT file diff -r ef3b02034f6a -r 1a7f5d09b9d8 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 Fri Jun 28 21:05:52 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Fri Jun 28 21:08:23 2013 +0200 @@ -87,7 +87,7 @@ end_year = Ende period = Zeitraum year = Jahr -sedimentload_ls = Sediment Fracht +sedimentload_longitudinal_section = Sediment Fracht welcome = Willkommen bei der Flusshydrologischen Software welcome_open_or_create = Bitte \u00f6ffnen Sie ein bestehendes Projekt aus der Projektliste oder erstellen Sie ein @@ -224,9 +224,9 @@ floodmap = \u00dcberschwemmungsfl\u00e4che historical_discharge = Zeit-Diagramm historical_discharge_wq = W/Q-Diagramm -flow_velocity = Flie\u00dfgeschwindigkeiten +flow_velocity_longitudinal_section = Flie\u00dfgeschwindigkeiten flow_velocity_export = Flie\u00dfgeschwindigkeiten Export -bedheight_middle = Mittlere Sohlh\u00f6he +bedheight_middle_longitudinal_section = Mittlere Sohlh\u00f6he bedheight_middle_export = Mittlere Sohlh\u00f6he Export bed_longitudinal_section = Sohlbeschaffenheit bed_longitudinal_section_export = Sohlbeschaffenheit Export @@ -240,6 +240,7 @@ cross_section = Querprofil cross_sections = Querprofile w_differences = Differenzen +w_differences_longitudinal_section = Differenzen w_differences_export = Differenzen Export reference_curve_export = Bezugslinien Export historical_discharge_export = Historische Abflusskurven Export @@ -255,9 +256,9 @@ bed_diameter = Sohldurchmesser soundings = Peilungen soundings_width = Gepeilte Breite -bed_difference_year = Sohlh\u00f6hendifferenz -bed_difference_epoch = Sohlh\u00f6hendifferenz (Epoche) -bed_difference_height_year = Sohlh\u00f6hendifferenz pro Jahr +bed_difference_year_longitudinal_section = Sohlh\u00f6hendifferenz +bed_difference_epoch_longitudinal_section = Sohlh\u00f6hendifferenz (Epoche) +bed_difference_height_year_longitudinal_section = Sohlh\u00f6hendifferenz pro Jahr bedheight_difference_export = Sohlh\u00f6hendifferenz Export waterlevel_export = Wasserstand/Wasserspiegellagen Export diff -r ef3b02034f6a -r 1a7f5d09b9d8 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 Fri Jun 28 21:05:52 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties Fri Jun 28 21:08:23 2013 +0200 @@ -87,7 +87,7 @@ end_year = end period = Period year = Year -sedimentload_ls = Sediment Load +sedimentload_longitudinal_section = Sediment Load welcome = Welcome to Flusshydrologische Software welcome_open_or_create = Please open a project from the project list or create a @@ -222,9 +222,9 @@ floodmap = Floodmap historical_discharge = Time Chart historical_discharge_wq = W/Q Chart -flow_velocity = Flow Velocity +flow_velocity_longitudinal_section = Flow Velocity flow_velocity_export = Flow Velocity Export -bedheight_middle = Middle Bed Height +bedheight_middle_longitudinal_section = Middle Bed Height bedheight_middle_export = Middle Bed Height Export bed_longitudinal_section = Bed Quality bed_longitudinal_section_export = Bed Quality Export @@ -238,6 +238,7 @@ cross_section = Cross Section cross_sections = Cross Sections w_differences = Differences +w_differences_longitudinal_section = Differences w_differences_export = Differences Export reference_curve_export = Reference Curve Export historical_discharge_export = Historical Discharge Curve Export @@ -253,9 +254,9 @@ bed_diameter = Bed Diameter soundings = Soundings soundings_width = Soundings Width -bed_difference_year = Bedheight Differences -bed_difference_epoch = Epoch Bedheight Differences -bed_difference_height_year = Bedheight Difference per year +bed_difference_year_longitudinal_section = Bedheight Differences +bed_difference_epoch_longitudinal_section = Epoch Bedheight Differences +bed_difference_height_year_longitudinal_section = Bedheight Difference per year bedheight_difference_export = Bedheight Differences Export exportATTooltip = Export as AT file