christian@4183: 2012-10-17 Felix Wolfsteller christian@4183: christian@4183: * flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java: christian@4183: Let FIX_SECTOR_AVERAGE_DWT*-Facets enter inactively. christian@4183: christian@4183: 2012-10-17 Felix Wolfsteller christian@4183: christian@4183: Fix loading former derivative curves in fixation analysis artifacts christian@4183: DC. christian@4183: christian@4183: * flys-artifacts/doc/conf/meta-data.xml: Fix typo. christian@4183: christian@4183: 2012-10-17 Björn Ricks christian@4183: christian@4183: * doc/conf/artifacts/gaugedischargecurve.xml, christian@4183: src/main/java/de/intevation/flys/artifacts/GaugeDischargeCurveArtifact.java, christian@4183: src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties: christian@4183: Add data for the gauge name to the GaugeDischargeCurveArtifact. christian@4183: christian@4183: 2012-10-17 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/DoubleUtil.java(explode): christian@4183: Return empty double array if we are up to create a negative christian@4183: result array. This should fix some problems in christian@4183: "Fixierungsanalyse/Auslagerung von Wasserspiegellagen". christian@4183: christian@4183: 2012-10-16 Björn Ricks christian@4183: christian@4183: * doc/conf/default-themes.xml, christian@4183: doc/conf/themes.xml: christian@4183: Add theme for gauge discharge curve artifact. christian@4183: christian@4183: 2012-10-16 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/GaugeDischargeCurveArtifact.java: christian@4183: Set uiprovider on the state. christian@4183: christian@4183: 2012-10-16 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/AbstractStaticStateArtifact.java: christian@4183: Use StaticState class instead of State in member staticstate. christian@4183: Override describe method to return also a uiprovider. christian@4183: christian@4183: 2012-10-16 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java: christian@4183: Change visibility of createOutputModes to protected. christian@4183: christian@4183: 2012-10-16 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: Avoid NullPointerException if help text is null. christian@4183: christian@4183: 2012-10-16 Ingo Weinzierl christian@4183: christian@4183: flys/issue930 christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/Access.java: Added new christian@4183: method to retrieve long[] values separated with a ';'. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/HistoricalDischargeAccess.java: christian@4183: New. Access class to retrieve information for historical discharge christian@4183: curves. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java: christian@4183: Add the evaluation timerange provided by HistoricalDischargeAccess to christian@4183: the subtitle of those charts. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties: Added start and end date to christian@4183: subtitle of historical discharge curve charts. christian@4183: christian@4183: 2012-10-16 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/BedHeightAccess.java, christian@4183: src/main/java/de/intevation/flys/exports/MiddleBedHeightGenerator.java: christian@4183: Workaround for double facets in "Mittlere SohlhÃhe" (#961). christian@4183: christian@4183: 2012-10-16 Felix Wolfsteller christian@4183: christian@4183: Fix issue946. christian@4183: christian@4183: * flys-artifacts/doc/conf/meta-data.xml: Load wkms with different christian@4183: parameter for fix wq curves. christian@4183: christian@4183: * flys-artifacts/doc/conf/artifacts/fixanalysis.xml: christian@4183: Add new facet to compat list. christian@4183: christian@4183: * flys-artifacts/doc/conf/default-themes.xml, christian@4183: flys-artifacts/doc/conf/second-themes.xml, christian@4183: flys-artifacts/doc/conf/themes.xml: christian@4183: Added new theme/mapping. christian@4183: christian@4183: * flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Register new facet type. christian@4183: christian@4183: * flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Handle "new" Facet. christian@4183: christian@4183: 2012-10-16 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/MiddleBedHeightGenerator.java, christian@4183: src/main/resources/messages_de.properties, christian@4183: src/main/resources/messages_de_DE.properties: christian@4183: Fix typo christian@4183: christian@4183: 2012-10-16 Ingo Weinzierl christian@4183: christian@4183: flys/issue930 christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java: christian@4183: Add unit [cm] to the facet description if calculation mode is W. christian@4183: christian@4183: 2012-10-15 Ingo Weinzierl christian@4183: christian@4183: flys/issue904 christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: christian@4183: Defined two constants for converting discharge table values into [cm]. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: christian@4183: Use the new constants for value conversion for master discharge table christian@4183: and historical discharge tables. christian@4183: christian@4183: 2012-10-15 Ingo Weinzierl christian@4183: christian@4183: flys/issue548 christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: christian@4183: Use SCALE=1 for fetching values of a discharge table. In future, all christian@4183: discharge tables should be stored in [cm] in database. Currently, christian@4183: historical discharge tables are in [cm], so no transformation is christian@4183: necessary. christian@4183: christian@4183: 2012-10-13 Felix Wolfsteller christian@4183: christian@4183: Improve on issue945/6 christian@4183: christian@4183: * flys-artifacts/doc/conf/meta-data.xml: Add nodes for W/Q-only christian@4183: mainvalues. christian@4183: christian@4183: * flys-artifacts/src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: christian@4183: Create only W/Q values if corresponding data given. christian@4183: christian@4183: 2012-10-13 Felix Wolfsteller christian@4183: christian@4183: Improve on issue945/1 christian@4183: christian@4183: * flys-artifacts/doc/conf/meta-data.xml: Recommend main values christian@4183: in computed discharge curves. christian@4183: christian@4183: 2012-10-12 Felix Wolfsteller christian@4183: christian@4183: Improve on issue943/4 christian@4183: christian@4183: * flys-artifacts/doc/conf/meta-data.xml: Do not show double christian@4183: annotation entry in LS DC. christian@4183: christian@4183: 2012-10-12 Felix Wolfsteller christian@4183: christian@4183: Improve on issue943/4 christian@4183: christian@4183: * flys-artifacts/doc/conf/meta-data.xml: Show an "all" node in DC christian@4183: for annotations per type. christian@4183: christian@4183: 2012-10-12 Felix Wolfsteller christian@4183: christian@4183: Fix issue943/3 christian@4183: christian@4183: * flys-artifacts/doc/conf/meta-data.xml: Add Floodprotections to christian@4183: LS non-recommendations. christian@4183: christian@4183: 2012-10-12 Felix Wolfsteller christian@4183: christian@4183: * flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Help future developers. christian@4183: christian@4183: 2012-10-12 Felix Wolfsteller christian@4183: christian@4183: * flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/RiverAccess.java: christian@4183: Improve code drastically. christian@4183: christian@4183: 2012-10-12 Felix Wolfsteller christian@4183: christian@4183: * flys-artifacts/doc/conf/artifacts/winfo.xml: Include new state and christian@4183: transition for extreme value q input per segment. christian@4183: christian@4183: 2012-10-12 Felix Wolfsteller christian@4183: christian@4183: * flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/extreme/ExtremeQInput.java: christian@4183: New, initial Input state for Q input per segment in extreme analysis christian@4183: path. christian@4183: christian@4183: 2012-10-12 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/DischargeInfoService.java: christian@4183: Insert the date as time millis for each discharge curve. christian@4183: christian@4183: 2012-10-09 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/Measurements.java: christian@4183: Added debug output to detect where data got lost. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: christian@4183: Fixed problem with losing meassurement points. There are still bugs left. christian@4183: christian@4183: 2012-10-08 Felix Wolfsteller christian@4183: christian@4183: * flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/extreme/ExtremeCalculation.java, christian@4183: flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/OutliersInput.java: christian@4183: Documentation. christian@4183: christian@4183: 2012-10-08 Felix Wolfsteller christian@4183: christian@4183: * flys-artifacts/doc/conf/artifacts/winfo.xm: Introduce another christian@4183: dummyish state for extreme value analysis. christian@4183: christian@4183: * flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/extreme/PercentInput.java: christian@4183: New State to get percentage as input. christian@4183: christian@4183: 2012-10-08 Felix Wolfsteller christian@4183: christian@4183: * flys-artifacts/doc/conf/artifacts/winfo.xm: Introduce dummyish states for christian@4183: extreme value analysis. christian@4183: christian@4183: * flys-artifacts/src/main/resources/messages.properties, christian@4183: flys-artifacts/src/main/resources/messages_de.properties, christian@4183: flys-artifacts/src/main/resources/messages_de_DE.properties, christian@4183: flys-artifacts/src/main/resources/messages_en.properties: christian@4183: i18n. christian@4183: christian@4183: 2012-10-08 Felix Wolfsteller christian@4183: christian@4183: * flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java, christian@4183: flys-artifacts/src/main/java/de/intevation/flys/utils/FLYSUtils.java: christian@4183: Validate partial strings. christian@4183: christian@4183: 2012-10-08 Felix Wolfsteller christian@4183: christian@4183: * flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/ExtremeAccess.java, christian@4183: flys-artifacts/src/main/java/de/intevation/flys/artifacts/charts/TimeseriesStepChart.java, christian@4183: flys-artifacts/src/main/java/de/intevation/flys/utils/DoubleUtil.java: christian@4183: Doc. christian@4183: christian@4183: 2012-10-05 Felix Wolfsteller christian@4183: christian@4183: * flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java, christian@4183: flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, christian@4183: flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/extreme/ExtremeCompute.java, christian@4183: flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FunctionSelect.java, christian@4183: flys-artifacts/src/main/java/de/intevation/flys/artifacts/transitions/ValueCompareTransition.java: christian@4183: Cosmetics, docs. christian@4183: christian@4183: 2012-10-06 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java, christian@4183: src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WQKmsFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedHeightFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/services/BedKMChartService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/services/BedloadKMChartService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/OutputState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/EventSelect.java, christian@4183: src/main/java/de/intevation/flys/exports/BooleanAttribute.java, christian@4183: src/main/java/de/intevation/flys/exports/ChoiceStringAttribute.java, christian@4183: src/main/java/de/intevation/flys/exports/DoubleAttribute.java, christian@4183: src/main/java/de/intevation/flys/exports/IntegerAttribute.java, christian@4183: src/main/java/de/intevation/flys/exports/StringAttribute.java, christian@4183: src/main/java/de/intevation/flys/exports/VisibleAttribute.java: christian@4183: More dead code removal. Minor code clean ups. christian@4183: christian@4183: 2012-10-06 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/map/WSPLGENCalculation.java, christian@4183: src/main/java/de/intevation/flys/collections/CollectionAttribute.java, christian@4183: src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: christian@4183: Cleaned up iterating over maps. Removed some dead code. christian@4183: christian@4183: 2012-10-06 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/ChartArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/MapArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/EnterMultipleLocationsState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/ReferenceGaugeState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/ScenarioSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/FixationSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/FunctionSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/PreprocessingSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/minfo/DifferenceSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/minfo/YearEpochSelect.java, christian@4183: src/main/java/de/intevation/flys/exports/OutputHelper.java, christian@4183: src/main/java/de/intevation/flys/themes/DefaultTheme.java: christian@4183: Removed dead code. christian@4183: christian@4183: 2012-10-06 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java, christian@4183: src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java, christian@4183: src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: christian@4183: Removed dead code. christian@4183: christian@4183: 2012-10-06 Sascha L. Teichmann christian@4183: christian@4183: * main/java/de/intevation/flys/exports/LegendProcessor.java: christian@4183: Removed superfluous import. christian@4183: christian@4183: * main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, christian@4183: main/java/de/intevation/flys/exports/CrossSectionGenerator.java, christian@4183: main/java/de/intevation/flys/exports/FlowVelocityGenerator.java, christian@4183: main/java/de/intevation/flys/exports/MiddleBedHeightGenerator.java, christian@4183: main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java, christian@4183: main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, christian@4183: main/java/de/intevation/flys/exports/sq/SQRelationGenerator.java, christian@4183: main/java/de/intevation/flys/utils/MapfileGenerator.java: christian@4183: Removed dead code. christian@4183: christian@4183: 2012-10-06 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LegendProcessor.java: christian@4183: Avoid redundant hashing. Removed dead code. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: christian@4183: Fix for ArrayIndexOutOfBoundsException (#818). christian@4183: christian@4183: 2012-10-05 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Add chart legend entries for interpolated series (#838). christian@4183: christian@4183: 2012-10-05 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Fix typo. christian@4183: christian@4183: 2012-10-05 Felix Wolfsteller christian@4183: christian@4183: Register new calculation mode "extreme". christian@4183: christian@4183: * flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties: christian@4183: i18n. christian@4183: christian@4183: 2012-10-05 Felix Wolfsteller christian@4183: christian@4183: * flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/ExtremeAccess.java, christian@4183: flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/extreme/ExtremeCalculation.java: christian@4183: Documentation. christian@4183: christian@4183: 2012-10-04 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQRelationCalculation.java: christian@4183: Removed dead code. christian@4183: christian@4183: 2012-10-04 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Prefer to use static method on Class (vs. on object). christian@4183: christian@4183: 2012-10-04 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/StaticState.java: christian@4183: Allow to set an uiprovider for a static state. christian@4183: christian@4183: 2012-10-04 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/GaugeDischargeCurveArtifact.java: christian@4183: Set translated data descriptions. christian@4183: christian@4183: 2012-10-04 Björn Ricks christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties: christian@4183: Add messages for displaying the river name and gauge reference. christian@4183: christian@4183: 2012-10-04 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/GaugeDischargeCurveArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/GaugeDischargeCurveFacet.java: christian@4183: Add description from message template for facet and set correct facet christian@4183: name. christian@4183: christian@4183: 2012-10-04 Felix Wolfsteller christian@4183: christian@4183: Fix issue889/2 . christian@4183: christian@4183: * flys-artifacts/src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: christian@4183: Do not AIOOB on wsts with one (or zero) value only. christian@4183: christian@4183: 2012-10-04 Björn Ricks christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties: christian@4183: Add template for the gauge discharge curver description christian@4183: christian@4183: 2012-10-04 Björn Ricks christian@4183: christian@4183: * doc/conf/artifacts/gaugedischargecurve.xml: christian@4183: Fix typo and change type to chart. christian@4183: christian@4183: 2012-10-04 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java: christian@4183: Add warning if no compatible facet is found. christian@4183: christian@4183: 2012-10-04 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Avoid NullPointerException if not attribute outs are present. christian@4183: christian@4183: 2012-10-04 Felix Wolfsteller christian@4183: christian@4183: Fix issue417. christian@4183: christian@4183: * flys-artifacts/doc/conf/default-themes, christian@4183: flys-artifacts/doc/conf/second-themes, christian@4183: flys-artifacts/doc/conf/virtual-themes: christian@4183: Remove not needed theme props from main-value-annotations. christian@4183: christian@4183: 2012-10-04 Christian Lins christian@4183: christian@4183: * flys-artifacts/src/main/java/de/intevation/flys/exports/LegendProcessor.java, christian@4183: flys-artifacts/src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Cosmetics, comments. christian@4183: christian@4183: * flys-artifacts/src/main/resources/messages.properties, christian@4183: flys-artifacts/src/main/resources/messages_de.properties, christian@4183: flys-artifacts/src/main/resources/messages_de_DE.properties, christian@4183: flys-artifacts/src/main/resources/messages_en.properties: christian@4183: Add message for 'state.chart.km' (#899). christian@4183: Add message for 'state.chart.km' (#899). christian@4183: 2012-10-02 Felix Wolfsteller christian@4183: christian@4183: * flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/AnnotationRiverState.java: christian@4183: If type of annotation was chosen, give facet name of type. christian@4183: christian@4183: 2012-10-02 Felix Wolfsteller christian@4183: christian@4183: * flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java christian@4183: (setup): Deal with ids from datacage-doc, expose a data-item with the christian@4183: annotationtypename. christian@4183: christian@4183: * flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java christian@4183: (getData): filter annotations given by typename, if available. christian@4183: christian@4183: 2012-10-02 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Show "per-type" annotations in christian@4183: longitudinal-sections DC. christian@4183: christian@4183: 2012-10-01 Felix Wolfsteller christian@4183: christian@4183: * flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, christian@4183: flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java, christian@4183: flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/LocationProvider.java: christian@4183: Added TODOs for issue880. christian@4183: christian@4183: 2012-10-01 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: christian@4183: Totals are now fetched with separate SQL statement. Fixed join to christian@4183: GEWAESSER table. christian@4183: christian@4183: 2012-10-01 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: christian@4183: Wrote fractions SQL more compact. Fixed AIOOBE. christian@4183: christian@4183: 2012-10-01 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java: christian@4183: Fixed typo. christian@4183: christian@4183: * flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: christian@4183: Removed unused field from SQL query. christian@4183: christian@4183: 2012-10-01 Sascha L. Teichmann christian@4183: christian@4183: Finally calculate the S(Q) fractions. TODO: Split SQL into two queries. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java: christian@4183: Make the fractions accessible. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: christian@4183: Calculate the fraction. christian@4183: * flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/Measurements.java: christian@4183: Store new measurements for fractions in separate list. christian@4183: christian@4183: 2012-10-01 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java: christian@4183: Make it compilable again. christian@4183: christian@4183: 2012-10-01 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/sq/Measurements.java: christian@4183: Generate a second list of accumulated meassurements, christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java: christian@4183: Do not calculate the adjusted and sieve array for all measurements. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/Sieve.java: christian@4183: Added diameter comparator. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SieveArray.java: christian@4183: Copy the data if total load is zero. christian@4183: christian@4183: christian@4183: 2012-10-01 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/StaticState.java: christian@4183: Add simple default constuctor. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: christian@4183: Add a facet type for GaugeDischargeCurveArtifact christian@4183: christian@4183: * doc/conf/artifacts/gaugedischargecurve.xml, christian@4183: flys-artifacts/doc/conf/conf.xml: christian@4183: Add a config for GaugeDischargeCurveArtifact christian@4183: christian@4183: 2012-09-30 Sascha L. Teichmann christian@4183: christian@4183: * flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/Sieve.java: christian@4183: Model a sieve with diameter and load which simplifies the logic a lot. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SieveArray.java: christian@4183: New. A standard sieve array with 12 sieves. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java: christian@4183: Removed the string lookup crap and move the code to classes. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: christian@4183: Directy generate sieves now not the symbolic string lookup stuff. christian@4183: christian@4183: 2012-09-30 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/GaugeDischargeCurveArtifact.java: christian@4183: Removed dead code. christian@4183: christian@4183: 2012-09-30 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: christian@4183: Fixing Delta W/t chart: reference period area can now switched to invisible (#877). christian@4183: christian@4183: 2012-09-30 Christian Lins christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties: christian@4183: Correct i18n for fixation outlier widget (state.fixation.preprocess) (#873). christian@4183: christian@4183: 2012-09-30 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/GaugeDischargeCurveArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/GaugeDischargeCurveFacet.java: christian@4183: Removed heavy weight backend data (gauge) from facet. christian@4183: The relevant data is already available in the artifact. christian@4183: christian@4183: !!! Facets should be only used to retrieve data with the help of christian@4183: !!! the artifact. If the artifact already stores the data or christian@4183: !!! is able to fetch it for the facet don't replicated it in christian@4183: !!! the members of the facet. christian@4183: christian@4183: 2012-09-30 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/GaugeDischargeCurveArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/GaugeDischargeCurveFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-09-29 Christian Lins christian@4183: christian@4183: * doc/conf/themes.xml, christian@4183: src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Manual Points working in Fixing Delta W/t chart (#462). christian@4183: christian@4183: 2012-09-29 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java: christian@4183: More code for calculating S fractions. Totally broken and incomplete! christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: christian@4183: Fetch more data from data base (sieve diameters). christian@4183: christian@4183: 2012-09-29 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java: christian@4183: Also add the artifact name to the artifact description. christian@4183: christian@4183: 2012-09-29 Björn Ricks christian@4183: christian@4183: * doc/conf/conf.xml, christian@4183: src/main/java/de/intevation/flys/artifacts/GaugeDischargeCurveArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/AbstractStaticStateArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/GaugeDischargeCurveFacet.java: christian@4183: Implement new Artifacts and State for displaying discharge curves at a christian@4183: gauge. christian@4183: christian@4183: 2012-09-29 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/StaticState.java: christian@4183: Make addOuput public. Allow StaticArtifacts to add static outputs to the christian@4183: state. christian@4183: christian@4183: 2012-09-29 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Add protected method addFacets to allow child classes to add facets christian@4183: without accessing the member variable. christian@4183: christian@4183: 2012-09-28 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/meta-data.xml: Added 'info' column to the dem section of the christian@4183: datacage. christian@4183: christian@4183: 2012-09-28 Felix Wolfsteller christian@4183: christian@4183: Work on issue724 (i18n in minfo). christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: i18n strings. christian@4183: christian@4183: 2012-09-27 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/SoundingsSelect.java: christian@4183: Whitespace-cosmetics. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/FlowVelocityAccess.java: christian@4183: Doc. christian@4183: christian@4183: 2012-09-27 Felix Wolfsteller christian@4183: christian@4183: Work on issue724 (i18n in minfo). christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: i18n strings. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/MiddleBedHeightGenerator.java: christian@4183: Fix typo. christian@4183: christian@4183: 2012-09-27 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: christian@4183: Removed invalid entries of the SQL projection. christian@4183: christian@4183: 2012-09-27 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java, christian@4183: Added more data fields from SedDB to calculate the fraction parts. christian@4183: christian@4183: src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java: christian@4183: Have now previous and next Measurement attached. christian@4183: christian@4183: 2012-09-27 Felix Wolfsteller christian@4183: christian@4183: Fix part of issue871 (selected flow-veloc- parameter shown wrong). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DischargeState.java: christian@4183: Fix conditional. christian@4183: christian@4183: 2012-09-27 Felix Wolfsteller christian@4183: christian@4183: Fix issue863 (gaps in middle height bed data). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightCalculation.java: christian@4183: Handle missing data. christian@4183: christian@4183: 2012-09-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java: Set christian@4183: missing 'originalExtent' attribute of the WSPLGEN layer. christian@4183: christian@4183: 2012-09-27 Felix Wolfsteller christian@4183: christian@4183: Towards fix issue863 (gaps in middle height bed data). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightData.java christian@4183: (addAll): Do not expose single add*-Methods, instead always add a full christian@4183: set of data. christian@4183: Added new isEmpty-data and query it before exporting data as christian@4183: double[][] to e.g. ChartGenerator. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightCalculation.java: christian@4183: Do not use single add()*-Methods, instead call new addAll method. christian@4183: Find out whether a gap-value is present. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/MiddleBedHeightGenerator.java: christian@4183: Prevent skipping of NaNs (gaps). christian@4183: christian@4183: 2012-09-27 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/map/WMSLayerFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSFloodplainArtifact.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: 2012-09-27 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/Measurements.java christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java: christian@4183: Add more symbols. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: christian@4183: Adjust symbols. christian@4183: christian@4183: 2012-09-26 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Change createOutputModes method to be private. It is not used in a child christian@4183: class. christian@4183: christian@4183: 2012-09-26 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java: christian@4183: Mark FLYSArtifact data member as private and add setter method. christian@4183: christian@4183: 2012-09-26 Christian Lins christian@4183: christian@4183: * doc/conf/second-themes.xml, christian@4183: doc/conf/default-themes.xml: christian@4183: Enable line labels for Delta W/t sector average lines (#896). christian@4183: christian@4183: 2012-09-26 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/mapserver/db_layer.vm: Set initial projection of the database christian@4183: to "epsg:31467". christian@4183: christian@4183: * doc/conf/mapserver/mapfile.vm: Set initial projection of the database to christian@4183: "epsg:31467". Set the max extent to the extent of the river Saar. christian@4183: christian@4183: TODO: Set the max extent to the extent of germany! christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSQPSArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSKmArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSHydrBoundaryArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSFixpointsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSFloodmapsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSHwsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSCatchmentArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSHydrBoundaryPolyArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSBuildingsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSGaugeLocationArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/MapArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSLineArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSFloodplainArtifact.java: christian@4183: Added a parameter "reproject" to the getExtent() method. If reproject is christian@4183: set, the method should return the extent of the layer in the projection christian@4183: that is specified for the relevant river in the configuration. christian@4183: Otherwise, this method should return the extent in the projection that christian@4183: is used by the database. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/map/WMSLayerFacet.java: christian@4183: Added new attributes and methods for the original extent of a layer. The christian@4183: original extent is used in the XML document that is generated by christian@4183: toXML(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/MapGenerator.java: Use the christian@4183: getOriginalExtent() method of WMSLayerFacet to determine the max extent christian@4183: for the map (maps should be in the river projection specified in the christian@4183: configuration). christian@4183: christian@4183: 2012-09-26 Christian Lins christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml, christian@4183: doc/conf/artifacts/manualpoints.xml, christian@4183: doc/conf/themes.xml, christian@4183: src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java, christian@4183: src/main/java/de/intevation/flys/artifacts/FixationArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/ManualPointsSingleState.java: christian@4183: Rename fix_derivate facet to enable manual points in the derived curve chart. christian@4183: christian@4183: 2012-09-25 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/manualpoints.xml: Re-enable manualpoints christian@4183: compatibility. christian@4183: christian@4183: 2012-09-24 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/DeltaWtExporter.java: christian@4183: Fix for #825 ? christian@4183: christian@4183: 2012-09-24 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedloadOverview.java: christian@4183: Fixed SQL statement. Exclude data where km is null. christian@4183: christian@4183: 2012-09-24 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java: christian@4183: Fixing analysis longitudinal section chart has now initially christian@4183: deactivated A1/B facets. W/Q and W(t) has activated facets. (#874) christian@4183: christian@4183: 2012-09-24 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/GaugeOverviewInfoService.java: christian@4183: Remove info-url from gauge and river in the response and add official christian@4183: number to the river. christian@4183: christian@4183: 2012-09-23 Christian Lins christian@4183: christian@4183: * doc/conf/default-themes.xml, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: W(Q) chart: q sectors are now black and labeled by default (#875). christian@4183: christian@4183: 2012-09-23 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/GaugeInfoService.java: christian@4183: Cosmetics. christian@4183: christian@4183: 2012-09-23 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: 2012-09-23 Christian Lins christian@4183: christian@4183: * doc/conf/second-themes.xml, christian@4183: doc/conf/default-themes.xml, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: christian@4183: Themes and i18n of Delta W/t's A1/B facets (#876). christian@4183: christian@4183: 2012-09-23 Christian Lins christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml, christian@4183: doc/conf/themes.xml, christian@4183: doc/conf/second-themes.xml, christian@4183: doc/conf/default-themes.xml, christian@4183: src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: christian@4183: Add reference period facet to delta W/t chart (#877). christian@4183: christian@4183: 2012-09-22 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixLongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Longitudinal section chart does now respect the bounds of the drawn christian@4183: areas, so that no clipping occurs (#878). christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: i18n corrections. christian@4183: christian@4183: 2012-09-22 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixDerivedCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixATWriter.java: christian@4183: Cosmetics, doc. christian@4183: christian@4183: 2012-09-22 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Prevent ArrayIndexOutOfBounds. christian@4183: christian@4183: 2012-09-22 Felix Wolfsteller christian@4183: christian@4183: Document issue880 (extrapolation of wkms). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: christian@4183: Do not extrapolate, mention further issues with the code. christian@4183: christian@4183: 2012-09-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedDiffYearResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/minfo/DifferencesState.java, christian@4183: src/main/java/de/intevation/flys/exports/minfo/BedDifferenceEpochGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/minfo/BedDifferenceYearGenerator.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: 2012-09-21 Raimund Renkert christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n strings for bedheight difference charts. christian@4183: christian@4183: 2012-09-21 Raimund Renkert christian@4183: christian@4183: * doc/conf/themes.xml, christian@4183: doc/conf/second-themes.xml, christian@4183: doc/conf/default-themes.xml: christian@4183: Added themes for bedheight difference charts. christian@4183: christian@4183: 2012-09-21 Raimund Renkert christian@4183: christian@4183: * doc/conf/meta-data.xml: christian@4183: Add river annotations to bedheight difference charts. christian@4183: christian@4183: 2012-09-21 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/minfo/BedDiffHeightYearInfoGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/minfo/BedDiffHeightYearGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/minfo/BedDiffEpochInfoGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/minfo/BedDiffYearInfoGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/minfo/BedDifferenceEpochGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/minfo/BedDifferenceYearGenerator.java: christian@4183: New. Chart generators for bedheight diff calculation charts. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/minfo/DifferencesState.java: christian@4183: Add facets to generate outputs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/BedDifferencesAccess.java: christian@4183: Extract calculation relevant data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedDifferencesResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedDiffYearResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedDiffEpochResult.java: christian@4183: Updated result set data fields. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedDiffCalculation.java: christian@4183: Updated the bedheight difference calculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added new facet types. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedDiffEpochFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedDiffYearFacet.java: christian@4183: New facets for bedheight differences. christian@4183: christian@4183: * doc/conf/conf.xml: christian@4183: Added ouput generators. christian@4183: christian@4183: * doc/conf/artifacts/minfo.xml: christian@4183: Added facets to outputmodes. christian@4183: christian@4183: 2012-09-21 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedHeight.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedHeightSingle.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedHeightEpoch.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedHeightFactory.java: christian@4183: Updated data fields to fit the needs of bedheight difference calculation. christian@4183: christian@4183: 2012-09-21 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/GaugeOverviewInfoService.java: christian@4183: Return also the gauge official number in a service response. christian@4183: christian@4183: 2012-09-21 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/GaugeOverviewInfoService.java: christian@4183: Use Gauge and River fetchInfoURL instead of getInfoURL until the URLs are christian@4183: fetched from the db. christian@4183: christian@4183: 2012-09-21 Felix Wolfsteller christian@4183: christian@4183: Fix issue887 (HYKs in New Chart). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/HYKArtifact.java: christian@4183: Lower the Casting requirement to FLYSArtifact instead of christian@4183: WINFOArtifact. christian@4183: christian@4183: 2012-09-21 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/GaugeOverviewInfoService.java: christian@4183: Return also the gauge and river info-url in a service response. christian@4183: christian@4183: 2012-09-20 Felix Wolfsteller christian@4183: christian@4183: Fix issue886 (do not show waterline if out of range). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Do not extrapolate waterlines. christian@4183: christian@4183: 2012-09-21 Felix Wolfsteller christian@4183: christian@4183: Better Partial issue880 (diverse DC). christian@4183: christian@4183: * doc/conf/meta-data.xml: Remove double entry for annotations in christian@4183: longitudinal section case but keep recommending it. christian@4183: christian@4183: 2012-09-20 Felix Wolfsteller christian@4183: christian@4183: Partial issue880 (diverse DC). christian@4183: christian@4183: * doc/conf/meta-data.xml: Remove double entry for annotations in christian@4183: longitudinal section case. christian@4183: christian@4183: 2012-09-20 Christian Lins christian@4183: christian@4183: * doc/conf/second-themes.xml, christian@4183: doc/conf/default-themes.xml, christian@4183: src/main/java/de/intevation/flys/utils/ThemeUtil.java, christian@4183: src/main/java/de/intevation/flys/jfree/StyledAreaSeriesCollection.java, christian@4183: src/main/java/de/intevation/flys/jfree/StyledDomainMarker.java: christian@4183: Theme area transparency fixed for longitudinal section chart (#879). christian@4183: christian@4183: 2012-09-20 Felix Wolfsteller christian@4183: christian@4183: Improvements for manual points in fixation diags. christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: Add LS-manual points. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Add missing ChartTypes. christian@4183: christian@4183: 2012-09-20 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedDiffCalculation.java: christian@4183: New. Calcuation for bed height differences. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedDifferencesResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedDiffEpochResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedDiffYearResult.java: christian@4183: New. Bed height calculation results. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/BedDifferencesAccess.java: christian@4183: New. Access object to get bed height difference parameters from artifact. christian@4183: christian@4183: 2012-09-20 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedHeightFactory.java: christian@4183: Create separate objects for bed height epochs and single bed heights. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedHeight.java: christian@4183: Added morph. width. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedHeightEpoch.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedHeightSingle.java: christian@4183: New. Separate classes for bed height epochs and single bed heights. christian@4183: christian@4183: 2012-09-20 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/minfo/BedQualityExporter.java: christian@4183: Add dates to csv header. christian@4183: christian@4183: 2012-09-20 Raimund Renkert christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n string for bed quality CSV export. christian@4183: christian@4183: 2012-09-20 Christian Lins christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml, christian@4183: doc/conf/artifacts/manualpoints.xml, christian@4183: src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java, christian@4183: src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/ManualPointsSingleState.java: christian@4183: Work on manual points in fix analysis charts (not yet working). christian@4183: christian@4183: 2012-09-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/minfo/BedQualityExporter.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-09-19 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/minfo/BedQualityExporter.java: christian@4183: New. CSV exporter for bed quality calculation result. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedloadDiameterResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedDiameterResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedParametersResult.java: christian@4183: Added getter with km as parameter. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/minfo/BedQualityState.java: christian@4183: Added facet for csv export. christian@4183: christian@4183: * doc/conf/artifacts/minfo.xml: christian@4183: Added output mode. christian@4183: christian@4183: * doc/conf/conf.xml: christian@4183: Added export generator. christian@4183: christian@4183: 2012-09-19 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/GaugeOverviewInfoService.java: christian@4183: Return also the station in a service response. christian@4183: christian@4183: 2012-09-18 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FunctionSelect.java: christian@4183: Cosmetics. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java: christian@4183: A and B facets of fix analysis are now deactivated by default (#717). christian@4183: christian@4183: 2012-09-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/extreme/ExtremeCalculation.java: christian@4183: Extract parameters needed for calculation from access. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/DoubleUtil.java(isValid): christian@4183: Added method to check if 2d double array is valid. christian@4183: christian@4183: 2012-09-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Use generics aware Collections.emptyList(). christian@4183: christian@4183: 2012-09-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/SoundingsSelect.java, christian@4183: src/main/java/de/intevation/flys/exports/minfo/BedQualityGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/OutputHelper.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/themes/ThemeFactory.java, christian@4183: src/main/java/de/intevation/flys/themes/ThemeMapping.java, christian@4183: src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: christian@4183: The usual whitespace and import cleanups. christian@4183: christian@4183: 2012-09-18 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/QualityMeasurementFactory.java: christian@4183: Avoid loading empty data sets. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityCalculation.java: christian@4183: Load bedload data sets... christian@4183: christian@4183: 2012-09-18 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/minfo/CharDiameter.java: christian@4183: Removed incorrect characteristic diameter. christian@4183: christian@4183: 2012-09-18 Christian Lins christian@4183: christian@4183: * doc/conf/default-themes.xml: christian@4183: Update point themes of fixing W/Q chart to show point descriptions christian@4183: per default (#685). christian@4183: christian@4183: 2012-09-18 Felix Wolfsteller christian@4183: christian@4183: i18n for area label (fix issue487). christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java: christian@4183: Get internationalized label and numberformat, pass it to renderer, christian@4183: where its used. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Area label translations. christian@4183: christian@4183: 2012-09-18 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/CollectionDescriptionHelper.java, christian@4183: src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Add robustness checks to prevent NPEs (#859). christian@4183: christian@4183: 2012-09-18 Felix Wolfsteller christian@4183: christian@4183: Brought showarea-theme setting back (fix issue865). christian@4183: christian@4183: * doc/conf/default-themes.xml, doc/conf/second-themes.xml: christian@4183: Define showarea theme prop where its needed. christian@4183: christian@4183: 2012-09-17 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityResult.java: christian@4183: Added setter for date range. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityCalculation.java christian@4183: Set correct date range for result. christian@4183: christian@4183: 2012-09-17 Raimund Renkert christian@4183: christian@4183: Refactor MINFO bed quality resultsets and facets. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedLoadBedQualityResult.java, christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedBedQualityResult.java: christian@4183: Removed. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityResult.java: christian@4183: Container wrapping the single calculation results. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedDiameterResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedloadDiameterResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityDiameterResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedParametersResult.java: christian@4183: New. Results containing calculated average diameter, porosity and density. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedPorosityFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedloadDiameterFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedDiameterFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedDensityFacet.java: christian@4183: Facets now return the concrete datatype using the facet index. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/minfo/BedQualityState.java: christian@4183: Create a facet for each resultset. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/minfo/BedQualityGenerator.java: christian@4183: Use the classes containing the results. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityCalculation.java: christian@4183: Use new classes for results and calculate porosity and density once christian@4183: each period. christian@4183: christian@4183: 2012-09-17 Ingo Weinzierl christian@4183: christian@4183: Tagged RELEASE 2.9.1 christian@4183: christian@4183: 2012-09-17 Ingo Weinzierl christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added still missing christian@4183: translations for state. christian@4183: christian@4183: 2012-09-17 Ingo Weinzierl christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added missing translations christian@4183: for state to select soundings. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/SoundingsSelect.java: christian@4183: Added more debug output to find out how many single and epochs where christian@4183: found. christian@4183: christian@4183: 2012-09-17 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/second-themes.xml, christian@4183: doc/conf/default-themes.xml: Defined initial colors. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/OutputHelper.java, christian@4183: src/main/java/de/intevation/flys/themes/ThemeFactory.java, christian@4183: src/main/java/de/intevation/flys/themes/ThemeMapping.java: Added more christian@4183: debug output to understand why theme mappings don't match to facets. christian@4183: christian@4183: 2012-09-17 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/BedQualityAccess.java: christian@4183: Extract characteristic diameter only if the user selected a diameter. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityCalculation.java: christian@4183: Calculate for selected diameter only. christian@4183: christian@4183: 2012-09-16 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedloadOverview.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/SQOverview.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/ParametersExporter.java: christian@4183: Fixed wrong assigned loggers. christian@4183: christian@4183: 2012-09-16 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java: christian@4183: Please _DO NOT_ use FLYSUtils in new code based on Access*! christian@4183: Now the river name is fetch via access.getRiver(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/RiverAccess.java: christian@4183: New. Almost all calculations need accessing the river name. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/SQRelationAccess.java, christian@4183: src/main/java/de/intevation/flys/artifacts/access/BedQualityAccess.java, christian@4183: src/main/java/de/intevation/flys/artifacts/access/FixAccess.java, christian@4183: src/main/java/de/intevation/flys/artifacts/access/FlowVelocityAccess.java, christian@4183: src/main/java/de/intevation/flys/artifacts/access/ExtremeAccess.java: christian@4183: Now extend RiverAccess. christian@4183: christian@4183: 2012-09-16 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/ExtremeAccess.java: christian@4183: Implemented the access methods needed for christian@4183: "Auslagerung extremer Wasserspiegellagen". christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Segment.java: christian@4183: Move segment parsing to DoubleUtil to be usable with more data types. christian@4183: The wire protocol should be the same for: christian@4183: - "WINFO: W fuer ungleichwertige Abfluesse", christian@4183: - "WINFO: Auslagerung extremer Wasserspiegellagen" christian@4183: - "Fixierungsanalyse: Auslagerung von Wasserspiegellagen" christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/DoubleUtil.java: christian@4183: Now contains the the code to parse segments. Found segments christian@4183: are propagated back with a callback. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/RangeWithValues.java: christian@4183: Added toString() method. christian@4183: christian@4183: 2012-09-16 Sascha L. Teichmann christian@4183: christian@4183: More infrastructure stuff for the "Auslagerung extremer Wasserspiegellagen". christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/extreme/ExtremeCalculation.java: christian@4183: New. Stub for "Auslagerung extremer Wasserspiegellagen" calculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/extreme/ExtremeResult.java: christian@4183: New. Stub for the cacheable results of the calculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/extreme/ExtremeCompute.java: christian@4183: New. Stub compute state for the calculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/ExtremeAccess.java: christian@4183: New. Sub access to the artifact to extract the relevant data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixRealizingCompute.java: christian@4183: A little code reordering to keep related stuff together more closely. christian@4183: christian@4183: 2012-09-16 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/BedHeightsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/AreaFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/MINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/QSectorArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/FixationArtifact.java: christian@4183: Removed some superfluous implementations of FacetTypes. christian@4183: TODO: FacetTypes should be broken into smaller pieces. christian@4183: ATM a lof of class implement it and share a lot of unnecessary christian@4183: stuff. christian@4183: christian@4183: 2012-09-15 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java, christian@4183: src/main/java/de/intevation/flys/artifacts/geom/VectorUtils.java: christian@4183: Deleted. Some nice code from the early days of the cross sections christian@4183: but its unused nowadays. christian@4183: christian@4183: 2012-09-15 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedBedQualityResult.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/JFreeUtil.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedDiameterFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedloadDiameterFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedLoadBedQualityResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedDensityFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedPorosityFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/minfo/BedQualityState.java, christian@4183: src/main/java/de/intevation/flys/exports/minfo/BedQualityInfoGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/minfo/BedQualityGenerator.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: 2012-09-15 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/resources/Resources.java, christian@4183: src/main/java/de/intevation/flys/utils/Formatter.java, christian@4183: src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: i18n messages are now formatted with correct (client) locale, not christian@4183: server VM locale (#852).. christian@4183: christian@4183: 2012-09-15 Christian Lins christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml, christian@4183: doc/conf/artifacts/manualpoints.xml, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixLongitudinalSectionGenerator.java: christian@4183: Try to add support for ManualPoints in fixing charts (not working yet). christian@4183: christian@4183: 2012-09-14 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/QualityMeasurementFactory.java: christian@4183: Fixed SQL-statement. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/QualityMeasurements.java: christian@4183: Added getter for all kms. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityCalculation.java: christian@4183: Implemented the bed quality calculation. There are still some fixes to do, christian@4183: e.g. extract a single result object for porosity and density. christian@4183: christian@4183: 2012-09-14 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/BedQualityAccess.java: christian@4183: Getter for characteristic diameter. christian@4183: christian@4183: 2012-09-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/minfo/BedQualityState.java: christian@4183: Create i18n facet descriptions. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: New i18n strings for facets christian@4183: in bed quality calculation. christian@4183: christian@4183: 2012-09-14 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/minfo.xml: Splitted facets for diameter of bed into christian@4183: two facets: diameter for sublayer and toplayer. christian@4183: christian@4183: * doc/conf/themes.xml, christian@4183: doc/conf/second-themes.xml, christian@4183: doc/conf/default-themes.xml: Splitted themes for diameter of bed into christian@4183: two themes. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Splitted facets for diameter of bed into two facets. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityResult.java: christian@4183: New method to retrieve the diameter data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedBedQualityResult.java: christian@4183: New methods to retrieve the porosity, density and diameter data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/minfo/BedQualityState.java: christian@4183: Create two facets for bed diameter instead of a single one. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/minfo/BedQualityGenerator.java: christian@4183: Insert data supported by facets into chart. christian@4183: christian@4183: 2012-09-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/JFreeUtil.java: Added function to christian@4183: generate a randomized line. christian@4183: christian@4183: 2012-09-14 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/themes.xml: Defined new mappings for the six bed quality christian@4183: facets. christian@4183: christian@4183: * doc/conf/second-themes.xml, christian@4183: doc/conf/default-themes.xml: Added themes for new mappings in christian@4183: themes.xml. The themes in second-themes are the same as in christian@4183: default-themss. christian@4183: christian@4183: 2012-09-14 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedBedQualityResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedLoadBedQualityResult.java: christian@4183: Updated bed quality result objects. christian@4183: christian@4183: 2012-09-14 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/minfo.xml: Splitted porosity and density facets into christian@4183: two facets: a toplayer and a sublayer facet for each. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added christian@4183: the new facets for toplayer and sublayer for porosity and density. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/minfo/BedQualityState.java: christian@4183: Create Facets based on the calculation results. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/minfo/BedQualityGenerator.java: christian@4183: Use concrete result types in doXXXOut(). christian@4183: christian@4183: 2012-09-13 Christian Lins christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml, christian@4183: doc/conf/themes.xml, christian@4183: src/main/java/de/intevation/flys/artifacts/ManualPointsArtifact.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixDerivedCurveGenerator.java: christian@4183: Work on ManualPoints integration in fix analysis charts (wip). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/minfo/BedQualityState.java: christian@4183: Fix missing import. christian@4183: christian@4183: 2012-09-13 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/BedQualityAccess.java: christian@4183: Added getter for calculation parameters. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/BedQualityCalculation.java: christian@4183: Removed. Moved to package de.intevation.flys.artifacts.model.minfo. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedLoadBedQualityResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedBedQualityResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityCalculation.java: christian@4183: New. Calculation results and some more calculation stub. christian@4183: christian@4183: 2012-09-13 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/minfo.xml, christian@4183: src/main/java/de/intevation/flys/artifacts/access/FlowVelocityAccess.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DischargeState.java, christian@4183: src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Renamed MINFO parameter christian@4183: 'main.channel' -> 'main_channel' and 'total.channel' -> 'total_channel'. christian@4183: christian@4183: 2012-09-13 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/QualityMeasurementFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/QualityMeasurement.java: christian@4183: Added depth parameter to bed quality data. christian@4183: christian@4183: 2012-09-13 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/conf.xml: Registered new OutGenerators BedQualityGenerator and christian@4183: BedQualityInfoGenerator. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedPorosityFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedDiameterFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedloadDiameterFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedDensityFacet.java: christian@4183: New Facets for serving data for bed quality exports/charts. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/minfo/BedQualityState.java: christian@4183: Add some dummy Facets to force chart creation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/minfo/BedQualityInfoGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/minfo/BedQualityGenerator.java: christian@4183: New OutGenerators for bed quality charts. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: New I18N strings for bed christian@4183: quality charts. christian@4183: christian@4183: 2012-09-13 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/QualityMeasurementFactory.java: christian@4183: The factory can load bedload and bed data from seddb now. christian@4183: christian@4183: 2012-09-13 Raimund Renkert christian@4183: christian@4183: Objects and factory for minfo bedquality calculation data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/QualityMeasurementFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/QualityMeasurements.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/QualityMeasurement.java: christian@4183: New. Data objects and factory for minfo bed quality calculation. christian@4183: christian@4183: 2012-09-13 Felix Wolfsteller christian@4183: christian@4183: Added missing images for datacage config manual doc. christian@4183: christian@4183: * doc/datacage-config-manual/figures/bsh_logo.png, christian@4183: doc/datacage-config-manual/figures/intevation-logo.eps, christian@4183: doc/datacage-config-manual/figures/intevation-logo.pdf: christian@4183: Logos for DC conf doc. christian@4183: christian@4183: 2012-09-13 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/GaugeOverviewInfoService.java: christian@4183: Add also min and max q values to the river info. christian@4183: christian@4183: 2012-09-12 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/BedloadKMChartService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/services/BedKMChartService.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: 2012-09-12 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/BedloadKMChartService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/services/BedKMChartService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedOverview.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedloadOverview.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedOverviewFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedloadOverviewFactory.java: christian@4183: New. Services, data structures and factories for overview charts in minfo christian@4183: bed quality calculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/minfo/BedQualityPeriodsSelect.java: christian@4183: New. State for period input in minfo bed quality that displays the overview christian@4183: charts. christian@4183: christian@4183: * doc/conf/artifacts/minfo.xml: christian@4183: Added states and transitions for minfo bed quality calculation. christian@4183: christian@4183: * doc/conf/conf.xml: christian@4183: Added services. christian@4183: christian@4183: 2012-09-12 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/BedQualityCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java, christian@4183: src/main/java/de/intevation/flys/artifacts/access/BedQualityAccess.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/minfo/BedQualityState.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: 2012-09-12 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/minfo.xml: Defined facets for bed quality chart. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/BedQualityCalculation.java: christian@4183: Calculation stub for bed quality. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/BedQualityAccess.java: christian@4183: Access stub for bed quality data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added christian@4183: facets defined in minfo.xml. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/minfo/BedQualityState.java: christian@4183: Override computeAdvance; no calculation and facet creation takes place christian@4183: yet. christian@4183: christian@4183: 2012-09-11 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/GaugeOverviewInfoService.java: christian@4183: Made AEo and datum attributes NPE proof. christian@4183: christian@4183: 2012-09-11 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/GaugeOverviewInfoService.java: christian@4183: Use getGaugeValue method also for aeo and datum. Also add some javadoc for christian@4183: the getGaugeValue method. christian@4183: christian@4183: 2012-09-11 Christian Lins christian@4183: christian@4183: * doc/conf/second-themes.xml, christian@4183: doc/conf/default-themes.xml, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: christian@4183: Fix for line text annotations in Delta W(t) charts (#837). christian@4183: christian@4183: 2012-09-10 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/GaugeTimerangeState.java: christian@4183: Add additional check to prevent NPE (fix for #844) christian@4183: christian@4183: 2012-09-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/RangeWithValues.java: christian@4183: Extends Range now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: christian@4183: Adjusted to use slightly different method names of Range. christian@4183: christian@4183: 2012-09-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Range.java: christian@4183: Added disjoint method. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java: christian@4183: Find a list of segments intersecting a given range. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Generate a list of ranges needed for the input of Qs christian@4183: in the "Auslagerung extremer Wasserspiegellagen.". christian@4183: christian@4183: 2012-09-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/extreme/Curve.java: christian@4183: Added type safety. christian@4183: christian@4183: 2012-09-10 Sascha L. Teichmann christian@4183: christian@4183: * pom.xml: Java 1.5 -> 1.6 christian@4183: christian@4183: 2012-09-10 Christian Lins christian@4183: christian@4183: * doc/conf/second-themes.xml, christian@4183: doc/conf/default-themes.xml: christian@4183: Remove unnecessary attributes for fixation derived curve (#836). christian@4183: christian@4183: 2012-09-10 Björn Ricks christian@4183: christian@4183: * doc/conf/conf.xml, christian@4183: src/main/java/de/intevation/flys/artifacts/services/GaugeOverviewInfoService.java: christian@4183: Add new artifact service for the gauge overview christian@4183: christian@4183: 2012-09-09 Christian Lins christian@4183: christian@4183: * doc/conf/second-themes.xml, christian@4183: doc/conf/default-themes.xml, christian@4183: doc/conf/virtual-themes.xml, christian@4183: src/main/java/de/intevation/flys/utils/ThemeUtil.java, christian@4183: src/main/java/de/intevation/flys/jfree/StyledDomainMarker.java: christian@4183: Theme transparency attribute support (part of #840). christian@4183: christian@4183: 2012-09-09 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/extreme/Curve.java: christian@4183: Store Ws and Qs in double arrays instead of WQ objects (as christian@4183: they are return from WstValueTable.interpolateTabular()). christian@4183: This simplifies the code and should be more memory effective. christian@4183: christian@4183: 2012-09-09 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/Linear.java: christian@4183: Added a vectorwise weighting. christian@4183: christian@4183: src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Added methods to interpolate tabulated values only. christian@4183: Need in "Auslagerung extremer Wasserspiegellagen". christian@4183: christian@4183: 2012-09-09 Christian Lins christian@4183: christian@4183: * doc/conf/second-themes.xml, christian@4183: doc/conf/default-themes.xml, christian@4183: doc/conf/virtual-themes.xml: christian@4183: Updating themes for issue #840 (wip). christian@4183: christian@4183: 2012-09-09 Christian Lins christian@4183: christian@4183: * doc/conf/second-themes.xml: christian@4183: Modify every theme to differ from default theme (#835). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java: christian@4183: Use gauge.getMainValues() instead of gauge.fetchMainValues() which fixes christian@4183: a compiling issue on my setup. christian@4183: christian@4183: 2012-09-08 Sascha L. Teichmann christian@4183: christian@4183: Some models for representing results for the upcoming christian@4183: "Auslagerung extremer Wasserspiegellagen". Work im progress. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/NaNFunction.java: christian@4183: New. Function always return NaNs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/UnivariateRealFunctionFunction.java: christian@4183: New. Adapter to bridge between our Functions and UnivariateRealFunctions christian@4183: of Apache Common Math. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/extreme/Curve.java: christian@4183: New. Part of the result model of "Auslagerung extremer Wasserspiegellagen". christian@4183: Its a function for a given km that uses a spline interpolation christian@4183: for the tabulated Q range (which is effectively the same as the christian@4183: calculated discharge curve for this km) and an extrapolated christian@4183: function beyond the tabulated values. christian@4183: christian@4183: 2012-09-08 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java, christian@4183: src/main/java/de/intevation/flys/themes/DefaultTheme.java: christian@4183: More iterator code simplification. christian@4183: christian@4183: 2012-09-08 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/themes/DefaultThemeField.java: christian@4183: Simplified code. christian@4183: christian@4183: 2012-09-08 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java: christian@4183: Simplified code. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisResult.java: christian@4183: Improved robustness and performance. christian@4183: Only expose date events as Collections not TreeSets. christian@4183: christian@4183: 2012-09-08 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/QW.java: christian@4183: New. a pure model for discharge and waterlevel. No extras. christian@4183: christian@4183: Makes reuse in upcoming "Auslagerung extremer Wasserspiegellagen" christian@4183: a lot easier. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/QW.java: christian@4183: Removed. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/QWI.java: christian@4183: Re-inserted here. Extends the new QW and adds all the extra bells christian@4183: and whistles needed in the fixings analysis. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/services/QWSeriesCollection.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/Fitting.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixRealizingResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/QWD.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixOutlierFacet.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Adjusted QW to QWI. christian@4183: christian@4183: 2012-09-08 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MainValuesFactory.java; christian@4183: Removed because code is found in backend already. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java: christian@4183: Simplified. Please _DO_NOT_ use NullPointerExceptions for regular flow control! christian@4183: This hides unintended errors. christian@4183: christian@4183: 2012-09-08 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: christian@4183: Removed code duplication. christian@4183: christian@4183: 2012-09-08 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: 2012-09-08 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/minfo/CharDiameter.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-09-08 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/DatacageBackendListener.java, christian@4183: src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, christian@4183: src/main/java/de/intevation/flys/artifacts/ChartArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, christian@4183: src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixATExport.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/TypeSection.java, christian@4183: src/main/java/de/intevation/flys/jfree/DoubleBounds.java, christian@4183: src/main/java/de/intevation/flys/jfree/Bounds.java: christian@4183: Cosmetics, docs. christian@4183: christian@4183: 2012-09-07 Raimund Renkert christian@4183: christian@4183: * doc/conf/artifacts/minfo.xml: christian@4183: Add data fields for characteristic bed and bedload diameter. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/minfo/CharDiameter.java: christian@4183: Use parametermatrix as UI provider and set the correct data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/SoundingsSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/MultiStringArrayState.java: christian@4183: Updated method parameter. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n strings. christian@4183: christian@4183: 2012-09-07 Raimund Renkert christian@4183: christian@4183: Issue 791. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/EnterMultipleLocationsState.java: christian@4183: Add start km to data to compare reference and target km in next state. christian@4183: christian@4183: 2012-09-07 Ingo Weinzierl christian@4183: christian@4183: Tagged RELEASE 2.9 christian@4183: christian@4183: 2012-09-07 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/MainValuesFactory.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-09-07 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MainValuesFactory.java: christian@4183: Removed the deprecated method. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Call the new Gauge model method fetchDurationCurveData(). christian@4183: christian@4183: 2012-09-06 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MainValuesFactory.java: christian@4183: Mark getDurationCurveData as deprecated. The instance method of Gauge with christian@4183: the same name should be used instead. christian@4183: christian@4183: 2012-09-06 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/DeltaWtExporter.java: christian@4183: Revert accidentally committed experiment. christian@4183: christian@4183: 2012-09-06 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/DeltaWtExporter.java: christian@4183: Comments, changed order of columns as requested in issue825. christian@4183: christian@4183: 2012-09-05 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixATWriter.java: christian@4183: Only goto down to Q = 0.0001 to circumvent some numerial issues christian@4183: with steep functions around zero. christian@4183: christian@4183: 2012-09-05 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixATWriter.java: christian@4183: Increase Q max about 5% (as it should be). christian@4183: christian@4183: 2012-09-04 Sascha L. Teichmann christian@4183: christian@4183: Fix for issue687 christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixATWriter.java: christian@4183: Rewrote AT export to fix it. christian@4183: christian@4183: 2012-09-03 Felix Wolfsteller christian@4183: christian@4183: Fix for issue820. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Changed label for middle height/depth. christian@4183: christian@4183: 2012-09-03 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: christian@4183: Default horizontal and vertical placement of logo to "center" and christian@4183: "top" instead of "none." christian@4183: christian@4183: 2012-09-03 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Improved comment regarding image placement. christian@4183: christian@4183: 2012-09-03 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Fixed URLs for logos. christian@4183: christian@4183: 2012-09-02 Felix Wolfsteller christian@4183: christian@4183: Fix issue744 (wrong ranges for w/q input). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: christian@4183: Do not add items for gauges that do not intersect with given range. christian@4183: christian@4183: 2012-09-01 Felix Wolfsteller christian@4183: christian@4183: Fix issue829 (wrong fixation names). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java: christian@4183: Fix check, column indices start with 0. christian@4183: christian@4183: 2012-09-01 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo/BedHeight.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedHeightFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java, christian@4183: src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChoiceStringAttribute.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: 2012-08-31 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Fix cast. christian@4183: christian@4183: 2012-08-31 Raimund Renkert christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n strings for minfo bed quality parameters. christian@4183: christian@4183: 2012-08-31 Björn Ricks christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/ModuleService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/Module.java, christian@4183: src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java, christian@4183: src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java, christian@4183: src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties, christian@4183: doc/conf/conf.xml: christian@4183: Add a module service. It's now possible to configure the modules which are christian@4183: available for a client. With the selected attribute it is possible to give christian@4183: a hint for the client which module should be pre selected by default. christian@4183: christian@4183: 2012-08-31 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/minfo/BedQualityState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/minfo/CharDiameter.java: christian@4183: New. States for minfo bed quality calculation. christian@4183: christian@4183: * doc/conf/artifacts/minfo.xml: christian@4183: Added states and transitions for minfo bed quality calculation. christian@4183: christian@4183: 2012-08-31 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: christian@4183: Refactored state to use FLYSArtifact instead of WINFOArtifact. christian@4183: christian@4183: 2012-08-31 Felix Wolfsteller christian@4183: christian@4183: Fix issue817 (double datacage entries). christian@4183: christian@4183: * doc/conf/meta-data.xml: removed double entries. christian@4183: christian@4183: 2012-08-30 Felix Wolfsteller christian@4183: christian@4183: issue729, default line labels for waterlines in cross sections. christian@4183: christian@4183: * doc/conf/default-themes.xml: Default line label and level label christian@4183: to true for lines in crossections.. christian@4183: christian@4183: 2012-08-30 Felix Wolfsteller christian@4183: christian@4183: issue814, line labels do not follow zoom. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java: christian@4183: Move line label into visible area if otherwise outside. christian@4183: christian@4183: 2012-08-30 Felix Wolfsteller christian@4183: christian@4183: issue695, show waterlevel as line label. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java: christian@4183: Fix path to showlevel style property. christian@4183: christian@4183: 2012-08-30 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Mention how/where to change predefined logos in comment. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Mention how/where to change predefined logos in comment, christian@4183: Use resource for images. christian@4183: christian@4183: * src/main/resources/images/bfg_logo.gif, christian@4183: src/main/resources/images/intevation.png: christian@4183: Added sample logos of intevation and bfg. christian@4183: christian@4183: 2012-08-29 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Copy and slightly modified XYChartGenerators logo mechanism. christian@4183: christian@4183: 2012-08-29 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: (getLeftX, getRightX): New and overridden to deal with inverted axis christian@4183: for logo placement in longitudinalsection charts. christian@4183: christian@4183: 2012-08-29 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Use RectangleAnchor to set anchor of logo. christian@4183: christian@4183: 2012-08-29 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Add Logo settings to CrossSection ChartSettings. christian@4183: christian@4183: 2012-08-29 Felix Wolfsteller christian@4183: christian@4183: Split logo-placement property in two, one for horizontal, one for christian@4183: vertical placement. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartSettings.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartSection.java: christian@4183: Accessors for split property. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java christian@4183: (logoHPlace,logoVPlace,logoPlace): Use split properties for vertical christian@4183: and horizontal placement of logo. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Use split properties, respect in placement. christian@4183: christian@4183: 2012-08-28 Felix Wolfsteller christian@4183: christian@4183: Sloppy logo placement property implementation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartSettings.java: christian@4183: Parse and set logo placement property value. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartSection.java: christian@4183: Accessors for Logo placement property. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java christian@4183: (logoPlace): New, get logo placement property value. christian@4183: (showLogo): Default to "none". christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Sloppy interpretation of the logo placement property. christian@4183: christian@4183: 2012-08-28 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: (addLogo): New, add an image annotation to plot, very stubby, christian@4183: use hard-coded paths for now. christian@4183: christian@4183: 2012-08-28 Felix Wolfsteller christian@4183: christian@4183: Preparations for logo-inclusion in charts. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChoiceStringAttribute.java: christian@4183: New string attribute type to trigger different UI (selectboxes) christian@4183: in client. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TypeSection.java christian@4183: (setChoiceStringValue): Create new ChoiceStringAttribute. christian@4183: christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartSection.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartSettings.java: christian@4183: Accessors to show logo-property. christian@4183: christian@4183: 2012-08-28 Raimund Renkert christian@4183: christian@4183: MINFO: Implemented UI and facet/artifact stack for bed height differences. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/minfo, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedHeight.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedHeightFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/minfo/BedHeightFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/StaticBedHeightCacheKey.java: christian@4183: New. Facet and data object incl. factory for bed heights. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/minfo, christian@4183: src/main/java/de/intevation/flys/artifacts/states/minfo/YearEpochSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/minfo/DifferenceSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/minfo/DifferencesState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/BedHeightsArtifact.java: christian@4183: New. States for difference calculation mode and new artifact for difference christian@4183: selection. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/BedHeightAccess.java: christian@4183: Added getter for time (year or epoch). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added new facet type. christian@4183: christian@4183: * doc/conf/meta-data.xml: christian@4183: Datacage config for minfo bed heights. christian@4183: christian@4183: * doc/conf/artifacts/minfo.xml: christian@4183: Added transitions and states for minfo difference calculation. christian@4183: christian@4183: * doc/conf/conf.xml: christian@4183: Added artifact factory. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n strings. christian@4183: christian@4183: 2012-08-27 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartSettings.java: christian@4183: (setDisplayGird, setDisplayGrid): Fixed typos. christian@4183: christian@4183: 2012-08-23 Raimund Renkert christian@4183: christian@4183: FixA: Changed sector average form point to line in delta W(t) chart. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: christian@4183: Add data points for sector average and changed time unit for analysis period christian@4183: from month to day. christian@4183: christian@4183: * doc/conf/default-themes.xml: christian@4183: Changed theme for sector average to color line. christian@4183: christian@4183: 2012-08-23 Raimund Renkert christian@4183: christian@4183: Issue 716. FixA: Spilt reference and analysis period themes into one theme for each event. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java: christian@4183: Create a facet for each event and use new facet for sector average in christian@4183: longitudinal section chart. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixReferenceEventsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalAnalysisFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalReferenceFacet.java: christian@4183: The facets now return data for a single event. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalAvSectorFacet.java: christian@4183: New. This facet returns an analysis period containing the calculated christian@4183: average. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisResult.java: christian@4183: Added methods to get the dates for all reference and analysis period events. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Fixed range combining. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixLongitudinalSectionGenerator.java: christian@4183: Adjusted generators to use the data returned by the facets. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n strings. christian@4183: christian@4183: 2012-08-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java: christian@4183: Using trove to map int->int instead of bloated generics. christian@4183: christian@4183: 2012-08-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Prevent another NPE. Removed dead code. christian@4183: christian@4183: 2012-08-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java: christian@4183: Each analysis period has its own index scheme now. christian@4183: christian@4183: 2012-08-22 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Fix for NullPointerException. christian@4183: christian@4183: 2012-08-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java: christian@4183: Made indices of analysis periods QWs zero based. christian@4183: christian@4183: 2012-08-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/QW.java: christian@4183: Store index, too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/QWD.java: christian@4183: Adjusted to keep constructors in sync. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java: christian@4183: Set QD index to the values of the column cache columns. christian@4183: christian@4183: 2012-08-22 Sascha L. Teichmann christian@4183: christian@4183: Use the column cache to establish a consistent index scheme. christian@4183: TODO: Store the index values in the created QWDs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: doFitting() fetches the columns from column cache, too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java: christian@4183: Reuse same column cache from fitting to have the same index scheme. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixRealizingCalculation.java: christian@4183: Adjusted to use the column cache. christian@4183: christian@4183: 2012-08-22 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/HYKFacet.java, christian@4183: src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Fix NullPointerExceptions in cross section diagrams that occurred when christian@4183: no HYKs are available for the selected kms. christian@4183: christian@4183: * src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Typo, see issue #806 christian@4183: christian@4183: 2012-08-20 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixATExport.java: christian@4183: Removed superfluous import. s/Double.valueOf/Double.parseDouble/. christian@4183: christian@4183: 2012-08-17 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixATExport.java: christian@4183: Removed debug outputs. christian@4183: christian@4183: 2012-08-17 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixATExport.java: christian@4183: New. Exporter for FixAnaylsis AT files. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java: christian@4183: Add facet for AT export. christian@4183: christian@4183: * doc/conf/conf.xml: christian@4183: Added out generator for fix AT export. christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: christian@4183: Added outputmode for AT export. christian@4183: christian@4183: 2012-08-16 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: Add more facets to christian@4183: compat list, removed doubled wq output. christian@4183: christian@4183: 2012-08-16 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: christian@4183: Shorten overlong lines. Simplified code. christian@4183: christian@4183: 2012-08-16 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: christian@4183: Interpolate and reduce WQKms if currentKm found in context. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Handle WQKms in WQOuts. christian@4183: christian@4183: 2012-08-16 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: Add longitudinal section christian@4183: facet type to compatibility list of W/Q diags. christian@4183: christian@4183: 2012-08-16 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FunctionSelect.java: christian@4183: Added getter for ui provider. christian@4183: christian@4183: 2012-08-16 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: BasicStroke constructor takes an float as first argument christian@4183: so there is no need to blow up an 'int' to an Integer christian@4183: which is auto-unboxed to int which is implicitly cast to float. christian@4183: christian@4183: 2012-08-15 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Do not hard-recommend gauge-dis. for fixwq. christian@4183: christian@4183: 2012-08-15 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/GaugeDischargeArtifact.java: christian@4183: Fail more gracefully. christian@4183: christian@4183: 2012-08-14 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: More former calculations in fixA (dwt) DC. christian@4183: christian@4183: 2012-08-14 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: More former calculations in fixA DC. christian@4183: christian@4183: 2012-08-13 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: Add discharge curve facet to christian@4183: compat. list. christian@4183: christian@4183: * doc/conf/meta-data.xml: Show discharge curves for FixA WQ DC. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Handle discharge curve data. christian@4183: christian@4183: 2012-08-13 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: Add more facets to compat. list. christian@4183: christian@4183: * doc/conf/meta-data.xml: Show more additional data in FixA w/q-diag. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Handle new, annotation-type facets. christian@4183: christian@4183: 2012-08-13 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: Added wqkms facets to comp. list. christian@4183: christian@4183: * doc/conf/meta-data.xml: Add wq-basedata and other stubs to fixA dc. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java christian@4183: (getWQAtKm): Adjusted behaviour such that passed km can be christian@4183: respected. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Handle WQFacets. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQFacet.java: christian@4183: Pass contexts current_km if available. christian@4183: christian@4183: 2012-08-13 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: Added deltawt-out. christian@4183: christian@4183: 2012-08-13 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Show former calculations in FixA WQ-DC. christian@4183: christian@4183: 2012-08-13 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Show more former calculations in DeltaWTs christian@4183: and fix query (and/or/() precedences). christian@4183: christian@4183: 2012-08-13 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Show more former calculations in fixA LS. christian@4183: christian@4183: 2012-08-13 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/conf.xml: Renamed qsector(s) factory. christian@4183: christian@4183: 2012-08-13 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Load annotations for fixA long.sections. christian@4183: Add stubs for "old calculations"-dc-conf for various FixA outs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixLongitudinalSectionGenerator.java: christian@4183: Handle annotation outs. christian@4183: christian@4183: 2012-08-13 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/themes.xml, doc/conf/default-themes.xml: christian@4183: Added theme fields for qsectors label. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Add markers for the qsectors. christian@4183: christian@4183: 2012-08-10 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/themes.xml, doc/conf/default-themes.xml: christian@4183: Fix some typos, correct defaults and add mapping for qsector-theme. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java: christian@4183: Cosmetics. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Add accidentally omitted change, stub for style-handling. christian@4183: christian@4183: 2012-08-10 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/QSectorFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/QSectorSingleState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/QSectorArtifact.java: christian@4183: Wording and i18n of qsectors. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Add Markers to plot for qsectors. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: i18n for qsectors. christian@4183: christian@4183: 2012-08-10 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/QSectorSingleState.java: christian@4183: New, accidentally omitted single state of a qsector-artifact. christian@4183: christian@4183: 2012-08-10 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: Add qsectors-facet to christian@4183: compatibility list. christian@4183: christian@4183: * doc/conf/conf.xml: Register qsector artifact and its factory. christian@4183: christian@4183: * doc/conf/meta-data.xml: Recommend qsectors in fix w/q settings. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Add qsector facet type. christian@4183: christian@4183: 2012-08-10 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/qsector.xml: christian@4183: Trivial state model for qsector artifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/QSectorFacet.java: christian@4183: Rather trivial facet to get QSectors from QSectorArtifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/QSectorArtifact.java: christian@4183: New QSectorArtifact. christian@4183: christian@4183: 2012-08-09 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java: christian@4183: Cosmetics. christian@4183: christian@4183: 2012-08-09 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/Fitting.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/sq/Outlier.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-08-08 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Set info attribute (will evaluate as tooltip christian@4183: in GUI. christian@4183: christian@4183: 2012-08-07 Felix Wolfsteller christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Reflect fact that there can be only one reference station. christian@4183: christian@4183: 2012-08-07 Felix Wolfsteller christian@4183: christian@4183: Fix issue798. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: christian@4183: Set Tick Units dependant on cm/m scale on X axis. christian@4183: christian@4183: 2012-08-01 Sascha L. Teichmann christian@4183: christian@4183: Fix for flys/issue748 christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/Fitting.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/sq/Outlier.java: christian@4183: Only remove one data point per outlier removal iteration. christian@4183: christian@4183: 2012-07-31 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/Outlier.java: christian@4183: Only evict only one(!) data point as outlier. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/Fitting.java: christian@4183: Recalculate the function when one point is removed. christian@4183: christian@4183: 2012-07-31 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/Outlier.java: christian@4183: Corrected the formulas of Grubbs' test for outliers. christian@4183: TODO: Remove only one(!) data point. Currently it removes christian@4183: more than on point without recalculating the fitting curve. christian@4183: This leads to too much removed points. christian@4183: christian@4183: 2012-07-30 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/SQRelation.java: christian@4183: Setup better initial activity for the facets of the S/Q results. christian@4183: christian@4183: 2012-07-30 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: christian@4183: Use getCurrentKmFromRequest().doubleValue() in i18n formatting. christian@4183: christian@4183: 2012-07-29 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: christian@4183: getCurrentKmFromRequest returns Double(!) not double. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java: christian@4183: Use Double.parseDouble() instead od Double.valueOf(). christian@4183: christian@4183: 2012-07-29 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/SQRelation.java: christian@4183: Initially activate/deactivate facets. christian@4183: christian@4183: 2012-07-29 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java, christian@4183: src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: christian@4183: Refactored to use the new Chain-of-responsibility pattern in facet christian@4183: activation. christian@4183: christian@4183: 2012-07-29 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/GaugeInfoService.java: christian@4183: Made expensive XMLUtils.toString() debug output conditional. christian@4183: christian@4183: 2012-07-29 Sascha L. Teichmann christian@4183: christian@4183: Use the new infrastructure to figure out if a facet should christian@4183: be initially active or not. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java: christian@4183: Uses the FacetActivity.Registry to look up the initial acitiviy. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Do not use sub classing any more. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/ManualPointsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/GaugeDischargeArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/StaticWQKmsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/HYKArtifact.java: christian@4183: Register to FacetActivity.Registry now. TODO: Make it configurable. christian@4183: christian@4183: 2012-07-28 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/themes/ThemeFactory.java, christian@4183: src/main/java/de/intevation/flys/collections/CollectionAttribute.java, christian@4183: src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java, christian@4183: src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/ChartArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/MapArtifact.java: christian@4183: s/container.size() == 0/container.isEmpty()/ christian@4183: christian@4183: 2012-07-28 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Lowered logging output level from info to debug. christian@4183: Made some more debug outputs conditional. christian@4183: christian@4183: 2012-07-28 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Some code simplifications. christian@4183: christian@4183: 2012-07-27 Sascha L. Teichmann christian@4183: christian@4183: Extented the result data model of the S/Q calculation to christian@4183: store the curve coefficients for each iteration step christian@4183: of the outlier elimination. The starting data set of S/Qs christian@4183: is stored as well. christian@4183: christian@4183: TODOs: christian@4183: - Create the new facets as inactive. christian@4183: - Repair the facet to style mapping. christian@4183: christian@4183: * doc/conf/themes.xml: Added mappings for new facets. christian@4183: christian@4183: * doc/conf/artifacts/minfo.xml: Configured the new facets. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/sq/SQRelationExporter.java: christian@4183: Adjusted to new data model. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/SQRelation.java: christian@4183: Generate facets for outlier curves and measurements. Simplified code. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: New facet types for outlier curves and meassurements. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Parameters.java: christian@4183: New set() method to set an array of values by their names. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Segment.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQOutlierFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/sq/SQCurveFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/sq/SQMeasurementFacet.java: christian@4183: Adjusted to new data model. Curves are drawn over the whole length of the christian@4183: starting S/Q dataset. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQOutlierCurveFacet.java: christian@4183: New. Facet for the curves of the outlier test iterations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQOutlierMeasurementFacet.java christian@4183: New. Facet for the meassurement data remainind after outlier test iteration. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQRelationCalculation.java: christian@4183: Now creates the new data model. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/Fitting.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/sq/Outlier.java: christian@4183: Refactorted to have more control over the data structures to be generated. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQFractionResult.java: christian@4183: The new data model to represnt a fraction result. Each outlier test iteration christian@4183: results in a different iteration object. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n strings for new facets. christian@4183: christian@4183: 2012-07-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/QWDDateRange.java: christian@4183: Added method getQWD() to retrieve the QWD property. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Avoid class cast exceptions; a QWDDateRange object is returned by WQ christian@4183: sector average Facet - not a QWD object. Use new getter method to christian@4183: retrieve the required data object. christian@4183: christian@4183: 2012-07-27 Ingo Weinzierl christian@4183: christian@4183: Tagged module as '2.8.1'. christian@4183: christian@4183: 2012-07-26 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/QWDDateRange.java: christian@4183: New class. QWD and a DateRange. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java: christian@4183: Produce QWDDateRanges in state, consume in generator. christian@4183: christian@4183: 2012-07-26 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: Registered new Output christian@4183: 'fix_vollmer_wq_curve'. christian@4183: christian@4183: * doc/conf/conf.xml: Registered new FixWQCurveGenerator for christian@4183: 'fix_vollmer_wq_curve'. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added new names for Facets christian@4183: used in 'fix_vollmer_wq_curve' Output. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixReferenceEventsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixOutlierFacet.java: christian@4183: Make use of FitResult (parent of FixAnalysisResult) which is enough for christian@4183: these Facets instead of casting the calculation result to christian@4183: FixAnalysisResult. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/FixAnalysisAccess.java: christian@4183: Fixed potential NullpointerException. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixRealizingCompute.java: christian@4183: Create new Facets for WQ curve, fix events and outliers. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Add subtitles only if the required data (date period and referenence christian@4183: period) are existing. Otherwise do not add a subtitle. christian@4183: christian@4183: 2012-07-26 Felix Wolfsteller christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Adjusted i18n strings (vollmer). christian@4183: christian@4183: 2012-07-26 Christian Lins christian@4183: christian@4183: * doc/conf/virtual-themes.xml, christian@4183: src/main/java/de/intevation/flys/utils/ThemeUtil.java, christian@4183: src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/themes/ThemeAccess.java, christian@4183: src/main/java/de/intevation/flys/themes/TextStyle.java, christian@4183: src/main/java/de/intevation/flys/themes/LineStyle.java, christian@4183: src/main/java/de/intevation/flys/themes/ThemeFactory.java, christian@4183: src/main/java/de/intevation/flys/themes/PointStyle.java, christian@4183: src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java, christian@4183: src/main/java/de/intevation/flys/jfree/XYStyle.java, christian@4183: src/main/java/de/intevation/flys/jfree/StyledDomainMarker.java: christian@4183: Line labels and point labels share same styles and code. christian@4183: Point labels can have a background color. christian@4183: christian@4183: 2012-07-26 Felix Wolfsteller christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Adjusted i18n strings (vollmer). christian@4183: christian@4183: 2012-07-26 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: Registered new Output christian@4183: 'fix_waterlevel_export' for FixRealizingCompute State. christian@4183: christian@4183: * doc/conf/conf.xml: Registered new WaterlevelExport Generator for christian@4183: 'fix_waterlevel_export'. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixRealizingCompute.java: christian@4183: Create proper CSV, WST and PDF Facets with hash and State id. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Made christian@4183: WaterlevelExporter support FixRealizingResult objects. christian@4183: christian@4183: 2012-07-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixWaterlevelFacet.java: christian@4183: Removed instanceof hack to fetch the WQKms of the fix realizations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixWaterlevelFacet.java: christian@4183: New. Subclass of WaterlevelFacet. Used to fetch the WQKms the fix realization way. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixRealizingCompute.java: christian@4183: Create the subclassed waterlevel facets. christian@4183: christian@4183: 2012-07-25 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixRealizingCompute.java: christian@4183: Create proper facets for Ws and Qs. christian@4183: christian@4183: 2012-07-25 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixRealizingCompute.java: christian@4183: Also add Q-Facet. christian@4183: christian@4183: 2012-07-25 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixRealizingCompute.java: christian@4183: Add WaterlevelFacet. christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: christian@4183: Add output and facet compability. christian@4183: christian@4183: 2012-07-25 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/FixRealizingAccess.java: christian@4183: Fix data names in FixRealizingAccess. christian@4183: christian@4183: 2012-07-25 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: christian@4183: Handle slightly different access to Fixation-WQKms. christian@4183: christian@4183: 2012-07-25 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: christian@4183: Handle slightly different access to Fixation-WQKms. christian@4183: christian@4183: 2012-07-25 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixationSelect.java: christian@4183: Fix (last?) vol(l)mer naming issue. christian@4183: christian@4183: 2012-07-24 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/StateFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/ManualPointsSingleState.java christian@4183: src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java christian@4183: src/main/java/de/intevation/flys/themes/ThemeMapping.java: christian@4183: s/.equals("")/.length() == 0/ christian@4183: christian@4183: 2012-07-24 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WQTimerange.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/SoundingsSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, christian@4183: src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Removed some superfluous casts. christian@4183: christian@4183: 2012-07-23 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: Removed some inner whitespace. christian@4183: christian@4183: 2012-07-23 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixResult.java: christian@4183: New base class for fixing analysis results. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixRealizingResult.java: christian@4183: Inherits from FixResult. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixRealizingCalculation.java: christian@4183: Calculation returns FixRealizingResult. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: christian@4183: Remove superfluous import. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: christian@4183: Cosmetics. christian@4183: christian@4183: 2012-07-23 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Broke over long line. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Segment.java: christian@4183: Added some getters. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixRealizingCalculation.java: christian@4183: Calculated the Q -> Ws. TODO: Produce result. christian@4183: christian@4183: 2012-07-23 Felix Wolfsteller christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Adjusted i18n strings (vollmer). christian@4183: christian@4183: 2012-07-23 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/LocationSelect.java: christian@4183: Set ld_mode so that FLYSUtils can use it. christian@4183: christian@4183: 2012-07-23 Felix Wolfsteller christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Adjusted i18n strings (vollmer). christian@4183: christian@4183: 2012-07-23 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: christian@4183: Handle FixationArtifacts with as much care as WINFOArtifacts, christian@4183: by using refactore FLYSUtils. christian@4183: christian@4183: 2012-07-23 Felix Wolfsteller christian@4183: christian@4183: Towards per-Gauge-input of W/Q values for FixationArtifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/utils/FLYSUtils.java: christian@4183: (getGauges): Refactored, moved from WINFOArtifact to FLYSUtils. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java: christian@4183: Handle unlucky differences in names of data for christian@4183: WINFOArtifact/FixationArtifact. christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: christian@4183: (Re-)use WQAdapted State for fix.analysis. christian@4183: christian@4183: 2012-07-23 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/HYKFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/RelativePointFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/QSelect.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/jfree/StyledAreaSeriesCollection.java, christian@4183: src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Cosmetics, docs. christian@4183: christian@4183: 2012-07-23 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Segment.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: christian@4183: Moved code to convert W to Q at gauge to segments to be reusable. christian@4183: christian@4183: 2012-07-23 Christian Lins christian@4183: christian@4183: * doc/conf/themes.xml, christian@4183: doc/conf/second-themes.xml, christian@4183: doc/conf/default-themes.xml: christian@4183: Remove line style attributes from FixingReferenceEvents theme. christian@4183: christian@4183: 2012-07-23 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation4.java christian@4183: src/main/java/de/intevation/flys/artifacts/model/Segment.java: christian@4183: Moved reference point comparator to segment class be be reusable christian@4183: in FixA 'ausgelagerte Wasserspiegellagen'. christian@4183: christian@4183: 2012-07-23 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: christian@4183: Simplify annotation code. christian@4183: christian@4183: 2012-07-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: Made abstract. Sub classes have to overwrite innerCalculate() christian@4183: calculate() now figures out the fixings overview and the function christian@4183: to fit and passes it to innerCalculate() christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixRealizingCalculation.java: christian@4183: Overrides innerCalculate() now. christian@4183: christian@4183: 2012-07-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Prevent NPE in getOutputForState(). Why does this happen? christian@4183: christian@4183: 2012-07-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: Made curve fitting over the given calculation range reusable. Removed dead code. christian@4183: christian@4183: 2012-07-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java: christian@4183: Moved more common code into base class. christian@4183: christian@4183: 2012-07-21 Sascha L. Teichmann christian@4183: christian@4183: * contrib/fixoverview2html.xsl: Clip the displayed from/to ranges christian@4183: of the gauges to the max extent of the events. christian@4183: christian@4183: 2012-07-21 Sascha L. Teichmann christian@4183: christian@4183: * contrib/fixoverview2html.xsl: Embed german and english translations christian@4183: into the stylesheet. This should be better done by importing christian@4183: an external resource depending on the choosen locale! christian@4183: christian@4183: 2012-07-21 Sascha L. Teichmann christian@4183: christian@4183: * contrib/fixoverview2html.xsl: Introduced i18n to transformation. christian@4183: christian@4183: 2012-07-20 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: christian@4183: Wrong epsilon was taken so sector aggregation was not working christian@4183: leading to too large result documents and wrong range display christian@4183: on client side. christian@4183: christian@4183: 2012-07-20 Sascha L. Teichmann christian@4183: christian@4183: * contrib/fixoverview2html.xsl: Render the names of the gauges into christian@4183: the header line. Full name and spread is displayed as a tooltip. christian@4183: christian@4183: 2012-07-20 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/minfo.xml: Use SQPeriodSelect state for the input of christian@4183: a time range. The difference to PeriodSelect is the UI provider desired christian@4183: by this state. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/sq/SQPeriodSelect.java: christian@4183: New subclass of PeriodSelect; this state wants to be rendered in a christian@4183: 'sq.period.select' UI provider. christian@4183: christian@4183: 2012-07-20 Sascha L. Teichmann christian@4183: christian@4183: * contrib/fixoverview2html.xsl: To help developing the christian@4183: HTML overview stylsheet more quickly bring back in sync with christian@4183: version of the flys-client. christian@4183: christian@4183: 2012-07-20 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/minfo.xml: Changed the parameters for SQ relation christian@4183: period selection; only a single period is allowed now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/PeriodSelect.java: New christian@4183: class that allows the selection of a time period. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/SQRelationAccess.java: christian@4183: Reduced support of time periods to a single period. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQRelationCalculation.java: christian@4183: Adapted the usage of SQRelationAccess which method signature has christian@4183: changed; it returns a single DateRange instance only. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Modified the keys of the christian@4183: state for SQ relation time period input. christian@4183: christian@4183: 2012-07-20 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/sq/SQOverviewGenerator.java: christian@4183: Disabled legends in this overview. christian@4183: christian@4183: 2012-07-20 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/sq/SQOverviewGenerator.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-07-20 Sascha L. Teichmann christian@4183: christian@4183: * src/main/resources/messages_de.properties, christian@4183: src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties: christian@4183: Fixed anomalies. christian@4183: christian@4183: 2012-07-20 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReportGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/AbstractExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/ATExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/sq/SQOverviewGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/MapGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/OutGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: christian@4183: Added a setCollection() method that allows the caller of OutGenerators christian@4183: to set a reference to a FLYSArtifactCollection. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Use setCollection() to set the reference to the current christian@4183: FLYSArtifactCollection before using OutGenerators. christian@4183: christian@4183: * doc/conf/conf.xml: Registered the SQOverviewGenerator. christian@4183: christian@4183: 2012-07-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: christian@4183: Add a list of gauges which intersect the range of the selected columns: christian@4183: christian@4183: christian@4183: christian@4183: ... christian@4183: christian@4183: christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/GaugeRange.java: christian@4183: Store the name of the gauge, too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/GaugeFinderFactory.java: christian@4183: Load the names of the gauges from database, too. christian@4183: christian@4183: 2012-07-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java: christian@4183: Some minor refactoring. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixRealizingCalculation.java: christian@4183: Call super constructor to retrieve the common data from the artifact. christian@4183: christian@4183: 2012-07-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: New. Common base class for Fix*Calculations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java: christian@4183: Moved common stuff to base class FixCalculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixRealizingCalculation.java: christian@4183: Inherit from FixCalculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/FixRealizingAccess.java: christian@4183: Extract parameters that are only relevant for the christian@4183: 'Ausgelagerte Wasserspiegellagen' calculation. christian@4183: christian@4183: isQ(): Must we convert the given values from W to Q first? christian@4183: Used data field: 'fix_isq' christian@4183: getSegments(): Segments same semantics as WINFO's christian@4183: 'W fuer ungleichwertige Abfluesse.' christian@4183: Used data field: 'fix_segments' christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Segment.java, christian@4183: src/main/java/de/intevation/flys/artifacts/access/FixAccess.java: christian@4183: Cosmetics. christian@4183: christian@4183: 2012-07-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/FixAccess.java: christian@4183: New. Common base class for the Fix*Access. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/FixAnalysisAccess.java, christian@4183: src/main/java/de/intevation/flys/artifacts/access/FixRealizingAccess.java: christian@4183: Now inherit from FixAccess. christian@4183: christian@4183: 2012-07-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/ParametersExporter.java: christian@4183: Prevent NPE. christian@4183: christian@4183: 2012-07-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixFacetUtils.java: christian@4183: Use constant to lookup column instead of dynamically allocated array. christian@4183: christian@4183: 2012-07-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixResult.java: christian@4183: Removed. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisResult.java: christian@4183: Re-added here. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalDeviationFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalAnalysisFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixDerivateFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalReferenceFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisPeriodsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixDeviationFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixOutlierFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixReferenceEventsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/ParametersExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/DeltaWtExporter.java: christian@4183: Adjusted. christian@4183: christian@4183: 2012-07-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixRealizingCalculation.java: christian@4183: New. Stub for 'Ausgelagerte Wasserspiegellagen' calculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/FixRealizingAccess.java: christian@4183: New. Stub for accessing the artifact to extract the relevant parameters christian@4183: for the 'ausgelagerte Wasserspiegellagen' calculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixRealizingCompute.java: christian@4183: Call the calculation if the state is reached. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: 2012-07-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixationVolmerCompute.java: christian@4183: Deleted. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixRealizingCompute.java: christian@4183: Re-added here. christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: Adjusted. BTW: Vollmer is spelled with two 'l's. christian@4183: christian@4183: 2012-07-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java: christian@4183: Removed. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java: christian@4183: Re-added. christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: Adjusted. christian@4183: christian@4183: 2012-07-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: Deleted christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java: christian@4183: Re-added. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/FixAnalysisAccess.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java: christian@4183: Adjusted class name usage. christian@4183: christian@4183: 2012-07-19 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java, christian@4183: src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: native2ascii with properties files. christian@4183: Show analysis periods as subtitle in W/Q chart. christian@4183: christian@4183: 2012-07-19 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, christian@4183: src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Add subtitle to Fix W/Q chart. christian@4183: Move addSubtitle() code from generators up to ChartGenerate which saves christian@4183: a lot of duplicate code. christian@4183: christian@4183: 2012-07-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/FixationArtifactAccess.java: christian@4183: Deleted. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/FixAnalysisAccess.java: christian@4183: Re-added. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalDeviationFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalAnalysisFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixDerivateFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalReferenceFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisPeriodsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixDeviationFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixOutlierFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixReferenceEventsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Adjusted class name usage. christian@4183: christian@4183: 2012-07-19 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: Sourced code to set default values of a parameter to an own method. christian@4183: Subclasses should override this method. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/OutliersInput.java: christian@4183: Set default value for outliers to "3". christian@4183: christian@4183: 2012-07-19 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixDerivedCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixLongitudinalSectionGenerator.java, christian@4183: src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Add kilometer info to chart titles. christian@4183: christian@4183: 2012-07-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSQPSArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSKmArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSHwsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSCatchmentArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/StaticWQKmsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSFloodplainArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSLineArtifact.java, christian@4183: src/main/java/de/intevation/flys/utils/ThemeUtil.java, christian@4183: src/main/java/de/intevation/flys/utils/FLYSUtils.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartSettings.java, christian@4183: src/main/java/de/intevation/flys/jfree/XYStyle.java: christian@4183: Use Integer.parseInt() instead of Integer.valueOf() + Autounboxing. christian@4183: christian@4183: 2012-07-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: christian@4183: Replaced "string -> object -> native -> object" by simple "string -> object". christian@4183: Removed stupid duplicate XPathing. christian@4183: christian@4183: 2012-07-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/QWSeriesCollection.java: christian@4183: Use only blue as point color. christian@4183: christian@4183: 2012-07-18 Sascha L. Teichmann christian@4183: christian@4183: Adjusted Delta W(t) CSV exporter to customers wishes. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/DeltaWtExporter.java: christian@4183: Reordered columns, removed description, added W and formatted date christian@4183: via i18n. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/Formatter.java: christian@4183: Added method to get a formatter based on pattern and locale. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Adjusted i18n strings. christian@4183: christian@4183: 2012-07-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: christian@4183: Classify each discharge range by the gauges which intersect it. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Range.java: christian@4183: Added convinience constructor. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/GaugeFinder.java: christian@4183: Added method to return all gauges. christian@4183: christian@4183: 2012-07-18 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Use bandwidth parameter for width of band, adjusted name to be christian@4183: displayed in legend. christian@4183: christian@4183: 2012-07-18 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/default-themes.xml, christian@4183: src/main/java/de/intevation/flys/utils/ThemeUtil.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Change bandwidth type to double (still bugged, round integers still christian@4183: work, though). christian@4183: christian@4183: 2012-07-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/DeltaWtExporter.java: christian@4183: Added column for time range. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties christian@4183: src/main/resources/messages_en.properties christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n strings. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/resources/Resources.java: christian@4183: Fixed stupid formatting bug. christian@4183: christian@4183: 2012-07-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/DeltaWtExporter.java: christian@4183: Added discharge column. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added missing strings. christian@4183: christian@4183: 2012-07-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: 2012-07-17 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java, christian@4183: src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java, christian@4183: src/main/java/de/intevation/flys/jfree/StyledAreaSeriesCollection.java, christian@4183: src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java, christian@4183: src/main/java/de/intevation/flys/collections/CollectionAttribute.java: christian@4183: Cosmetics, doc. christian@4183: christian@4183: 2012-07-17 Felix Wolfsteller christian@4183: christian@4183: Partial implementation of issue720 (bandwith for curves), in christian@4183: longitudinal section ws only, no styling, integer-based. christian@4183: christian@4183: * doc/conf/default-themes.xml: Add bandwidth to fields of longitudinal christian@4183: section facets. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Add bandwidth christian@4183: theme parsing. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: If bandwidth is set, add an area data series with datapoints christian@4183: above/under the actual data points. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java: christian@4183: Helper for adding points with offset. christian@4183: christian@4183: 2012-07-17 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java: christian@4183: Use Q_BPEGEL as symbolic name for Q christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: christian@4183: Out commented the LEFT JOINs which produce a lot of empty and christian@4183: redundant data. Bring them back in when we treat subsamples right. christian@4183: christian@4183: 2012-07-16 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Parameters.java: christian@4183: Added getValue() method. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQRelationCalculation.java: christian@4183: Store location of calculation in result, too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQFractionResult.java: christian@4183: Added method getTotalCount() to return the number of used S/Q pairs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQResult.java: christian@4183: Store location of result, too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/sq/SQRelationExporter.java: christian@4183: Write parameters as export result. christian@4183: christian@4183: 2012-07-16 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: christian@4183: Bit of doc. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: christian@4183: TODO for automatic official lines added. christian@4183: christian@4183: 2012-07-16 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQRelationCalculation.java: christian@4183: Out commented debug output which caused OOM errors. christian@4183: christian@4183: 2012-07-16 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/SQOverview.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: christian@4183: Q is not taken from MESSUNG.Q but from MESSUNG.Q_BPEGEL christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java: christian@4183: Fixed indentation. More macros. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQRelationCalculation.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: 2012-07-16 Ingo Weinzierl christian@4183: christian@4183: * Tagged module as '2.8'. christian@4183: christian@4183: 2012-07-15 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StyledXYSeries.java, christian@4183: src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java, christian@4183: src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java, christian@4183: src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/GaugeDischargeArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/SQRelation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/OutliersInput.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/PeriodsSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WQKmsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/FixingsFilterBuilder.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/RelativePointFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WQKmsFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/LocationProvider.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WKmsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WQFacet.java: christian@4183: Removed same package imports. christian@4183: christian@4183: 2012-07-15 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Lowered log level. christian@4183: christian@4183: 2012-07-13 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Allow manual loading of official lines in christian@4183: longitudinal_discharge diagrams. christian@4183: christian@4183: 2012-07-13 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: christian@4183: Prevent nasty NPE (hidden by autobox). christian@4183: christian@4183: 2012-07-13 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/sq/SQRelationGenerator.java: christian@4183: Suppress data points with values <= 0 because they kill JFreeChart's christian@4183: log/log diagrams. christian@4183: christian@4183: 2012-07-13 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: christian@4183: Fixed more SQL syntax errors. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQRelationCalculation.java: christian@4183: Generate more than one SQResult (To my big suprise it's possible). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQFractionResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/sq/SQCurveFacet.java. christian@4183: src/main/java/de/intevation/flys/exports/sq/SQRelationGenerator.java: christian@4183: Made more NPE bullet proof. christian@4183: christian@4183: 2012-07-13 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: christian@4183: Fixed problem with string operation precedence. christian@4183: christian@4183: 2012-07-13 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: very basic official lines matching the current christian@4183: artifact (for this it is wrongly placed in previous calc.-part, for christian@4183: now. christian@4183: christian@4183: 2012-07-13 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: christian@4183: Create shapefile directory instead of shapefile 'file'. christian@4183: christian@4183: 2012-07-13 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQRelationCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/sq/SQFractionResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSFixpointsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSCatchmentArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSBuildingsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSFloodplainArtifact.java: christian@4183: Removed translation whitespace. christian@4183: christian@4183: 2012-07-13 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQRelationCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/sq/SQFractionResult.java: christian@4183: Finally! SQResult is build and should be ready for display. :-) christian@4183: christian@4183: 2012-07-13 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/MapfileGenerator.java, christian@4183: src/main/java/de/intevation/flys/utils/GeometryUtils.java: christian@4183: Fix and workaround NullPointerExceptions. christian@4183: christian@4183: 2012-07-13 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/WSPLGENCallable.java, christian@4183: src/main/java/de/intevation/flys/wsplgen/FacetCreator.java, christian@4183: src/main/java/de/intevation/flys/wsplgen/JobObserver.java, christian@4183: src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java, christian@4183: src/main/java/de/intevation/flys/wsplgen/Scheduler.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/MapArtifact.java, christian@4183: src/main/java/de/intevation/flys/utils/MapfileGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/MapGenerator.java: christian@4183: Organized and added missing imports. christian@4183: christian@4183: 2012-07-13 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Added new christian@4183: functions to reproject an Envelope from one CoordinateReferenceSystem to christian@4183: antoher. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSQPSArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSKmArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSHydrBoundaryArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSFixpointsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSFloodmapsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSHwsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSCatchmentArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSHydrBoundaryPolyArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSBuildingsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSGaugeLocationArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSLineArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSFloodplainArtifact.java: christian@4183: The getExtent() method will now return the extent of the layer in the christian@4183: coordinate reference system that is configured for the specific river. christian@4183: christian@4183: 2012-07-13 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WMSDBLayerFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WSPLGENLayerFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WSPLGENCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WSPLGENReportFacet.java: christian@4183: Moved to subpackage map. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/map/WSPLGENLayerFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/map/WMSLayerFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/map/WSPLGENJob.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/map/WMSDBLayerFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/map/WSPLGENCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/map/WSPLGENReportFacet.java: christian@4183: Moved from upper package. christian@4183: christian@4183: 2012-07-13 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQOverviewFacet.java, christian@4183: src/main/java/de/intevation/flys/exports/OutputHelper.java, christian@4183: src/main/java/de/intevation/flys/exports/sq/SQOverviewGenerator.java: christian@4183: Added missing vim lines. christian@4183: christian@4183: 2012-07-13 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQOverviewFacet.java, christian@4183: src/main/java/de/intevation/flys/exports/OutputHelper.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: 2012-07-13 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQOverviewFacet.java, christian@4183: src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-07-13 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQRelationCalculation.java: christian@4183: Only use first period of the time periods given by the UI. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQResult.java: christian@4183: Added some more index checking. christian@4183: christian@4183: 2012-07-13 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQOverviewFacet.java: christian@4183: New. Facet for chart overview in sq relation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/sq/SQOverviewGenerator.java: christian@4183: New. Generator for chart overview. This generator is not used jet. christian@4183: Currently we generate the overview on client side by putting all charts in a christian@4183: simple grid, cause the charts rendered by this generator are empty. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added new Facet type. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/SQRelation.java: christian@4183: Add facets for overview. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: christian@4183: Avoid a NPE in legend entry aggregation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Moved log output to avoid NPE. christian@4183: christian@4183: * doc/conf/artifacts/minfo.xml: christian@4183: Added new output for chart overview. christian@4183: christian@4183: 2012-07-13 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Refactored. Moved some functionality to FLYSContext and OutputHelper. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: christian@4183: Added 'getOutGenerator' to get a concrete generator. Moved from christian@4183: FLYSArtifactCollection. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/OutputHelper.java: christian@4183: New. Provides the 'doOut' functionality for FYLSArtifactCollection. christian@4183: christian@4183: 2012-07-13 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/Measurements.java: christian@4183: Handle the error case of accessing wrong indexed SQ relation christian@4183: more smoothly. christian@4183: christian@4183: 2012-07-13 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java: christian@4183: Added access to the data of GSIEBSATZ and SSIEBUNG. christian@4183: christian@4183: 2012-07-12 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: christian@4183: Added the left joins to the GSIEBSATZ and SSIEBUNG tables. christian@4183: christian@4183: 2012-07-12 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: christian@4183: Do not store null values from database. christian@4183: christian@4183: 2012-07-12 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/Measurements.java: christian@4183: New. Container for measurements. Helps to extract the S/Q fractions. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQRelationCalculation.java: christian@4183: Now uses the measurements container. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java: christian@4183: Added convenience methods to extract the different fractions. christian@4183: DONE: Q, S_SS, S_SF christian@4183: TODO: S_BL_S, S_BL_FG, S_BL_CG, S_BL christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/SQOverview.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: christian@4183: Relax existence of SIEBSATZID. christian@4183: We have to use a left join during data extraction anyway. christian@4183: We force the existence of Q because we cannot do the fitting if christian@4183: we don't have them. christian@4183: christian@4183: 2012-07-12 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java: christian@4183: New. Access to the data from the SedDB. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: christian@4183: Load measurements from SedDB. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/SQOverview.java: christian@4183: Force NOT NULL for discharge values, too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/SQOverviewFactory.java: christian@4183: Indentation fix. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQRelationCalculation.java: christian@4183: Iterate over all given periods. christian@4183: christian@4183: 2012-07-12 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/SQKMChartService.java: christian@4183: Fixed wrong logger class. christian@4183: christian@4183: 2012-07-12 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/SQOverview.java: christian@4183: Filter out the meassures which don't have a related 'Siebsatz'. christian@4183: christian@4183: * doc/conf/cache.xml: Added forgotten cache for sq-overview. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/SQOverviewFactory.java: christian@4183: Added vim line. christian@4183: christian@4183: 2012-07-12 Christian Lins christian@4183: christian@4183: * doc/conf/default-themes.xml, christian@4183: doc/conf/virtual-themes.xml, christian@4183: src/main/java/de/intevation/flys/utils/ThemeUtil.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/themes/ThemeAccess.java: christian@4183: Add showpointlabel style attribute. Refactor some styles to make use of christian@4183: general attributes in the virtual themes. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/GeometryUtils.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixLongitudinalSectionGenerator.java: christian@4183: Suppress or fix some warnings. christian@4183: christian@4183: 2012-07-12 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/conf.xml: Fix class name. christian@4183: christian@4183: 2012-07-11 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/ManualPointsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DefaultState.java, christian@4183: src/main/java/de/intevation/flys/utils/FLYSUtils.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartExportHelper.java, christian@4183: src/main/java/de/intevation/flys/exports/WstWriter.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java, christian@4183: src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: christian@4183: Various cosmetic doc fixes. christian@4183: christian@4183: 2012-07-11 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Make official lines available in dc for christian@4183: manual loading in longitudinal sections. christian@4183: christian@4183: 2012-07-11 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/Sieve.java: christian@4183: Simulates a sieve to separate the differen fractions from each other. christian@4183: christian@4183: 2012-07-11 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DateRange.java, christian@4183: src/main/java/de/intevation/flys/artifacts/access/FixationArtifactAccess.java, christian@4183: src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: 2012-07-11 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DateRange.java, christian@4183: src/main/java/de/intevation/flys/artifacts/access/FixationArtifactAccess.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java, christian@4183: src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Delta W(t) chart subtitle now with real values and correct i18n. christian@4183: christian@4183: christian@4183: 2012-07-11 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java: christian@4183: Re-add HYK rendering code again to CrossSectionGenerator (fix for #712). christian@4183: christian@4183: 2012-07-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/SQKMChartService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/SQOverview.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-07-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/SQOverview.java: christian@4183: Made km separating of dates epsilon tolerant and avoid empty date lists. christian@4183: christian@4183: 2012-07-10 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/SQKMChartService.java: christian@4183: New. Service that generates an overview chart for measuring points. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/SQOverview.java: christian@4183: New. Instance of measuring points overview data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/SQOverviewFactory.java: christian@4183: New. Foctory for overview data objects. christian@4183: christian@4183: * doc/conf/conf.xml: christian@4183: Added new service to config. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n strings. christian@4183: christian@4183: 2012-07-10 Felix Wolfsteller christian@4183: christian@4183: Fix for issue694. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: christian@4183: Also resolve edge cases (last/first cross section km). christian@4183: christian@4183: 2012-07-10 Felix Wolfsteller christian@4183: christian@4183: Partial fix for issue694 (Heightmarks snap to nearest cross section christian@4183: line). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WaterLineArtifact.java: christian@4183: Extended signature of getWaterLines to allow behaviour of only christian@4183: delivering data if it snaps to the km (is closest). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/ManualPointsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Documentation, updated signature of getWaterLines(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: christian@4183: Remember if Heightmarks are displayed, if so deliver data christian@4183: only if cross-section is closest (snap). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: christian@4183: Make next and previous km of cross-sections available as data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: christian@4183: Provide next and previous cross-section km via blackboard, adjusted christian@4183: call to getWaterLines. christian@4183: christian@4183: 2012-07-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: 2012-07-10 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/AbstractExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartExportHelper.java, christian@4183: src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/MiddleBedHeightGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/OutGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/FlowVelocityGenerator.java: christian@4183: Fix various documentation issues. christian@4183: christian@4183: 2012-07-10 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQKms.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/CrossSectionFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/transitions/DefaultTransition.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/WDifferencesExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartHelper.java, christian@4183: src/main/java/de/intevation/flys/exports/MiddleBedHeightGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java, christian@4183: src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: christian@4183: Fix various issues in the hard-to-find documentation. christian@4183: christian@4183: 2012-07-09 Felix Wolfsteller christian@4183: christian@4183: * pom.xml: Configure javadoc mojo to include doc for protected/private. christian@4183: christian@4183: 2012-07-09 Sascha L. Teichmann christian@4183: christian@4183: * contrib/themes2html.xsl: Create a list of direct sub themes christian@4183: of a theme. christian@4183: christian@4183: 2012-07-08 Felix Wolfsteller christian@4183: christian@4183: * doc/datacage-config-manual/Makefile: New, added Makefile. christian@4183: christian@4183: 2012-07-08 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation2.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, christian@4183: src/main/java/de/intevation/flys/jfree/HasLabel.java: christian@4183: Cosmetics, docs. christian@4183: christian@4183: 2012-07-08 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java: christian@4183: Fixed XPath typo. christian@4183: christian@4183: 2012-07-08 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Removed dynamic XPaths to pervent potential XPath injections. christian@4183: christian@4183: 2012-07-08 Sascha L. Teichmann christian@4183: christian@4183: * contrib/themes2html.xsl: New. Transformation to get a better christian@4183: overview of themes.xml. Usage: christian@4183: christian@4183: $ xsltproc --path doc/conf \ christian@4183: contrib/themes2html.xsl \ christian@4183: doc/conf/themes.xml \ christian@4183: > themes.xhtml christian@4183: christian@4183: Use browser to view the resulting file. christian@4183: christian@4183: 2012-07-08 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/second-themes.xml: Name the second themegroup 'second' christian@4183: instead of 'default' to avoid clashes with the real 'default' christian@4183: themegroup. christian@4183: christian@4183: 2012-07-08 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/default-themes.xml, christian@4183: doc/conf/virtual-themes.xml, christian@4183: doc/conf/themes.xml, christian@4183: doc/conf/second-themes.xml: christian@4183: Added xml processing instruction. christian@4183: christian@4183: 2012-07-08 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/fitting/InvLog.java, christian@4183: src/main/java/de/intevation/flys/artifacts/access/Access.java, christian@4183: src/main/java/de/intevation/flys/artifacts/access/BedHeightAccess.java, christian@4183: src/main/java/de/intevation/flys/artifacts/access/FlowVelocityAccess.java, christian@4183: src/main/java/de/intevation/flys/exports/sq/SQRelationGeneratorA.java, christian@4183: src/main/java/de/intevation/flys/exports/sq/SQRelationGeneratorB.java, christian@4183: src/main/java/de/intevation/flys/exports/sq/SQRelationGeneratorC.java, christian@4183: src/main/java/de/intevation/flys/exports/sq/SQRelationGeneratorD.java, christian@4183: src/main/java/de/intevation/flys/exports/sq/SQRelationGeneratorE.java, christian@4183: src/main/java/de/intevation/flys/exports/sq/SQRelationGeneratorF.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartArea.java, christian@4183: src/main/java/de/intevation/flys/jfree/StyledValueMarker.java, christian@4183: src/main/java/de/intevation/flys/jfree/StyledDomainMarker.java: christian@4183: Added vim lines. christian@4183: christian@4183: 2012-07-08 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/access/BedHeightAccess.java, christian@4183: src/main/java/de/intevation/flys/artifacts/access/FlowVelocityAccess.java: christian@4183: Replaced tabs with four spaces each. christian@4183: christian@4183: 2012-07-07 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartArea.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-07-07 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StyledDomainMarker.java, christian@4183: src/main/java/de/intevation/flys/jfree/StyledValueMarker.java, christian@4183: src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java, christian@4183: src/main/java/de/intevation/flys/utils/ThemeUtil.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: 2012-07-06 Christian Lins christian@4183: christian@4183: * doc/conf/*-themes.xml, christian@4183: src/main/java/de/intevation/flys/utils/ThemeUtil.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/jfree/StyledValueMarker.java, christian@4183: src/main/java/de/intevation/flys/jfree/StyledDomainMarker.java, christian@4183: src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Add styles for W(t) domain markers. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java: christian@4183: Remove false @override. christian@4183: christian@4183: 2012-07-06 Christian Lins christian@4183: christian@4183: * doc/conf/themes.xml, christian@4183: doc/conf/second-themes.xml, christian@4183: doc/conf/default-themes.xml: christian@4183: Add missing themes for fixation charts. christian@4183: christian@4183: 2012-07-06 Felix Wolfsteller christian@4183: christian@4183: Fix issue705 (names for mainvalues in export). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: christian@4183: Documentation and use NamedMainValues irrespective of WQ-type ( christian@4183: single vs range). christian@4183: christian@4183: 2012-07-06 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: christian@4183: W(t) chart label rotation now working (see #684) christian@4183: christian@4183: 2012-07-06 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: christian@4183: Removed solved TODO. christian@4183: christian@4183: 2012-07-06 Felix Wolfsteller christian@4183: christian@4183: Fix issue710 (crashing diagrams with only one point). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Expand the range/bounds where its added. christian@4183: christian@4183: 2012-07-06 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java christian@4183: (expandPointRange): Fix weird code with help of new ChartHelper christian@4183: method. christian@4183: christian@4183: 2012-07-06 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartHelper.java christian@4183: (expandBounds): New, expand bounds by given percentage. christian@4183: christian@4183: 2012-07-06 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/Distance.java: christian@4183: New distance helper module. christian@4183: christian@4183: 2012-07-06 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Remove debugging code. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: christian@4183: Remove HYK references and code. christian@4183: christian@4183: 2012-07-05 Felix Wolfsteller christian@4183: christian@4183: * doc/datacage-config-manual/datacage-config-manual.tex: christian@4183: Changed inclusions to include new content file. christian@4183: christian@4183: * doc/datacage-config-manual/content.tex: Content from doc/datacage.txt, christian@4183: xml formatted. christian@4183: christian@4183: 2012-07-05 Felix Wolfsteller christian@4183: christian@4183: * doc/datacage-config-manual/datacage-config-manual.tex, christian@4183: doc/datacage-config-manual/README, christian@4183: doc/datacage-config-manual/title.tex: christian@4183: Added stub of tex-version of datacage config documentation. christian@4183: christian@4183: 2012-07-05 Christian Lins christian@4183: christian@4183: * doc/*-themes.xml: christian@4183: Add textorientation field. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartArea.java: christian@4183: Move annotation related code to base class ChartGenerator. christian@4183: christian@4183: 2012-07-04 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java: christian@4183: Prevent casting exception. christian@4183: christian@4183: 2012-07-04 Felix Wolfsteller christian@4183: christian@4183: issue487 (wrong area calculation). christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: christian@4183: Fix area calculation. christian@4183: christian@4183: 2012-07-04 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/themes.xml: Moved theme groups to own XML files to improve the christian@4183: structure. christian@4183: christian@4183: * doc/conf/second-themes.xml, christian@4183: doc/conf/default-themes.xml, christian@4183: doc/conf/virtual-themes.xml: New XML files for themes / theme groups; each christian@4183: theme group in one single file. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: christian@4183: Improved logging; print number of theme groups and themes in it as INFO. christian@4183: christian@4183: 2012-07-03 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: christian@4183: Only show labels if enabled in theme. Commented (failed) trials to get the christian@4183: text rotation right. christian@4183: christian@4183: 2012-07-03 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: christian@4183: Fix certain AIOOBs that were caused by the fact that QWDs can end up in two christian@4183: different series. christian@4183: christian@4183: 2012-07-03 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Implemented mergeRanges to combine y bounds in timeseries charts. christian@4183: christian@4183: 2012-07-03 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveInfoGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtInfoGenerator.java: christian@4183: New. Added chart info generator for WQ and delta W(t) chart. christian@4183: christian@4183: * doc/conf/conf.xml: christian@4183: Added info generators to config. christian@4183: christian@4183: 2012-07-03 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: christian@4183: Very basic, unstyled, always-on labels of points in DeltaWt-Diagrams. christian@4183: christian@4183: 2012-07-03 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Replaced Arrays.asList(new String[] { "a", "b" }).contains("a") code. christian@4183: christian@4183: 2012-07-03 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/themes.xml, christian@4183: src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/access/BedHeightAccess.java, christian@4183: src/main/java/de/intevation/flys/artifacts/access/FlowVelocityAccess.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/FlowVelocityState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/MiddleBedHeight.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: 2012-07-03 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/themes.xml: Added missing themes for middle bed height curves. christian@4183: christian@4183: 2012-07-03 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/BedHeightAccess.java, christian@4183: src/main/java/de/intevation/flys/artifacts/access/FlowVelocityAccess.java: christian@4183: New Access objects to access relevant information of Artifacts specific christian@4183: to bed heights and flow velocity calculations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/access/FixationArtifactAccess.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/FlowVelocityState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/MiddleBedHeight.java: christian@4183: Use *Access objects to get required information from Artifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MINFOArtifact.java: Moved christian@4183: methods to access specific information for calculations to *Access christian@4183: objects. christian@4183: christian@4183: 2012-07-03 Felix Wolfsteller christian@4183: christian@4183: Fix issue695 (labeling of waterlines). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java christian@4183: (doCrossSectionWaterLineOut): Handle labels more individually. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/XYStyle.java christian@4183: (applyShowLineLabel): Tell renderer that there is something to do in case christian@4183: any label is switched on. christian@4183: christian@4183: 2012-07-03 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java, christian@4183: src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/DifferenceCurveFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/ManualPointsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/geom/VectorUtils.java, christian@4183: src/main/java/de/intevation/flys/artifacts/geom/Lines.java, christian@4183: src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WaterLineArtifact.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/sq/SQRelationExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/themes/ThemeAccess.java, christian@4183: src/main/java/de/intevation/flys/jfree/StyledAreaSeriesCollection.java: christian@4183: Fixed various bugs (package declarations, moved classes to correct christian@4183: places). christian@4183: christian@4183: 2012-07-03 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/themes.xml: Removed line properties from fixation point themes christian@4183: and added missing point properties. christian@4183: christian@4183: 2012-07-02 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ManualPointsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/ManualPointsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: christian@4183: Cosmetics. christian@4183: christian@4183: 2012-07-02 Felix Wolfsteller christian@4183: christian@4183: issue654. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LegendProcessor.java: christian@4183: Do not include type in hash for legend item. christian@4183: christian@4183: 2012-07-02 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/ParametersExporter.java: christian@4183: Generate CSV for facet 'fix_parameters'. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/AbstractExporter.java: christian@4183: Be more eloquent on which kind of facet the exporter does not christian@4183: like. christian@4183: christian@4183: 2012-07-02 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/SQRelation.java: christian@4183: Made it more symmetrical to FixationCompute. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQRelationCalculation.java: christian@4183: Removed fake result stuff. Fetch parameters from SQRelationAccess. christian@4183: christian@4183: 2012-07-01 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixChartGenerator.java: christian@4183: Remove some evidence that the authors of this software christian@4183: do not know Java at all. christian@4183: christian@4183: 2012-07-01 Sascha L. Teichmann christian@4183: christian@4183: Part of flys/issue687 christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ATWriter.java: christian@4183: New. Samples fitting function to AT files. christian@4183: christian@4183: !!! Untested and expected to be slightly broken. !!! christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixATWriter.java: christian@4183: Made some formatting things public to be reusable. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n strings for AT headers. christian@4183: christian@4183: 2012-07-01 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/artifact-db.xml, christian@4183: doc/conf/cache.xml, christian@4183: doc/conf/meta-data.xml: Removed trailing whitespace. christian@4183: christian@4183: 2012-07-01 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java: christian@4183: Removed embedded class IdGenerator. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/IdGenerator.java: christian@4183: New. Re-added the id generator as top level class. christian@4183: christian@4183: 2012-06-30 Sascha L. Teichmann christian@4183: christian@4183: Added parameter exporter for fixings analysis. christian@4183: Part of flys/issue689 christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/ParametersExporter.java: christian@4183: New. Exports the contents of the parameters of the fix analysis. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Parameters.java: christian@4183: Added visitor interface to visit all rows of the parameters. christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: Added new facet for christian@4183: parameter export. christian@4183: christian@4183: * doc/conf/conf.xml: Register the new parameter exporter. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added facet type. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java: christian@4183: Fixed indentation. christian@4183: Removed some programming oddities. christian@4183: Create facet for parameter export. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/DeltaWtExporter.java: christian@4183: Removed code which is already contained in the base class. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/AbstractExporter.java: christian@4183: Cleaned up code. christian@4183: christian@4183: 2012-06-30 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DeltaWtExporter.java: christian@4183: Deleted christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/DeltaWtExporter.java: christian@4183: Re-added here christian@4183: christian@4183: * doc/conf/conf.xml: Adjusted package name of DeltaWtExporter. christian@4183: christian@4183: 2012-06-29 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixDerivedCurveInfoGenerator.java: christian@4183: New. Added chart info companion for FixDerivedCurveGenerator. christian@4183: christian@4183: * doc/conf/conf.xml: Added to configuration. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixDerivateFacet.java: christian@4183: Code clean up. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixFunction.java: christian@4183: Simplified. Not Serializable any more because its only a transient object. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixDerivedCurveGenerator.java: christian@4183: Clean up. Simplified. Removed dependency from Function2DAdapter because christian@4183: we are doing our own sampling. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixLongitudinalSectionInfoGenerator.java: christian@4183: Removed empty last line. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Small cosmetics. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixLongitudinalSectionGenerator.java: christian@4183: Do not notify listeners when add data series. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/Function2DAdapter.java: christian@4183: Removed. Obsolete. christian@4183: christian@4183: 2012-06-29 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Removed superfluous import. christian@4183: christian@4183: 2012-06-29 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixLongitudinalSectionInfoGenerator.java: christian@4183: New. Added chart info companion for FixLongitudinalSectionGenerator. christian@4183: christian@4183: * doc/conf/conf.xml: Added to configuration. christian@4183: christian@4183: 2012-06-29 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Unfinished work on generalizing annotations in ChartGenerators. christian@4183: christian@4183: 2012-06-28 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/FixationArtifactAccess.java: christian@4183: Fixed parameter name. christian@4183: christian@4183: * src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Fixed typo. christian@4183: christian@4183: 2012-06-28 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/SQRelationAccess.java: christian@4183: Finished the access to the S/Q relation stuff. christian@4183: christian@4183: * doc/conf/artifacts/minfo.xml: christian@4183: State "state.minfo.sq.periods" returns the value as string christian@4183: symmetrical to state "state.fix.analysisperiods". christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/DateRange.java: christian@4183: Deleted. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DateRange.java: christian@4183: Re-added here because its of use not only in the fix analysis christian@4183: but also in the S/Q relation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisPeriodsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/AnalysisPeriod.java, christian@4183: src/main/java/de/intevation/flys/artifacts/access/FixationArtifactAccess.java, christian@4183: src/main/java/de/intevation/flys/artifacts/access/Access.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: christian@4183: Adjusted the imports for the moved DateRange. christian@4183: christian@4183: 2012-06-28 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/SQRelationAccess.java: christian@4183: New. Artifact access for the S/Q relation. TODO: Add more parameters. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/Access.java: christian@4183: Remove trailing whitespace. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/FixationArtifactAccess.java: christian@4183: Added more debug output. christian@4183: christian@4183: 2012-06-28 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/Access.java: New. christian@4183: Base class for *Access of FLYSArtifacts. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/FixationArtifactAccess.java: christian@4183: Extends Access now. christian@4183: christian@4183: 2012-06-28 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/access/FixationArtifactAccess.java: christian@4183: Removed dead code. christian@4183: christian@4183: 2012-06-28 Christian Lins christian@4183: christian@4183: * doc/conf/themes.xml, christian@4183: src/main/java/de/intevation/flys/utils/ThemeUtil.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/themes/ThemeAccess.java: christian@4183: Set text orientation to horizontal for points in Fixation W/Q curve. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java: christian@4183: Fix overlapping indices of facets. christian@4183: christian@4183: 2012-06-28 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixResult.java: christian@4183: Added method to figure out which discharge sectors of the christian@4183: the analysis periods really contains data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java: christian@4183: Only emit analysis period / discharge sectors which really contain data. christian@4183: christian@4183: 2012-06-28 Sascha L. Teichmann christian@4183: christian@4183: Moved FixationArtifactAccess into own package access because there are christian@4183: more *Access to come e.g. SQRelationAccess. christian@4183: christian@4183: TODO: Refactor the code for WINFO to use this *Access pattern. This christian@4183: results in much cleaner, better scaling and better understandable code. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FixationArtifactAccess.java: Deleted. christian@4183: * src/main/java/de/intevation/flys/artifacts/access/FixationArtifactAccess.java: New. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalDeviationFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalAnalysisFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixDerivateFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalReferenceFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisPeriodsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixDeviationFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixOutlierFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixReferenceEventsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/access, christian@4183: src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java: christian@4183: Adjusted imports. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/Fitting.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-06-27 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/Fitting.java: christian@4183: If fitting fails for tolerance of 1e-10 increase it incremental christian@4183: by factor of 10 to 1e-3 and only bail out if it fails on this level. christian@4183: christian@4183: 2012-06-27 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/fitting/Exp.java: christian@4183: Fixed da/dQ but the fitting still does not work for the function. :-/ christian@4183: christian@4183: 2012-06-27 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Show only dates as point labels. christian@4183: christian@4183: 2012-06-27 Christian Lins christian@4183: christian@4183: * doc/conf/conf.xml: christian@4183: Fix typo in generator class for fix_longitudinal_section_curve christian@4183: christian@4183: 2012-06-27 Felix Wolfsteller christian@4183: christian@4183: Create and handle new manual line facets. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: christian@4183: Added new constructor to play nice with upcoming facet-type. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/ManualPointsArtifact.java: christian@4183: Added functionality to serve as WaterLineFacet (calculate water christian@4183: line against cross section profile). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ManualPointsSingleState.java: christian@4183: Extended to generate cross section water line facets, too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Handle new Facet Type. christian@4183: christian@4183: 2012-06-27 Felix Wolfsteller christian@4183: christian@4183: FacetType for upcoming cross_section.manualline facet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added Facet Type and IS-helper dor upcoming facet. christian@4183: christian@4183: 2012-06-27 Felix Wolfsteller christian@4183: christian@4183: Configure Themes and compatibility of upcoming christian@4183: cross_section.manualline facet. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml, christian@4183: doc/conf/artifacts/manualpoint.xml: christian@4183: Add upcoming facet to compatibility lists. christian@4183: christian@4183: * doc/conf/themes.xml: Register theme for upcoming facet. christian@4183: christian@4183: 2012-06-27 Christian Lins christian@4183: christian@4183: * doc/conf/conf.xml: christian@4183: Add output generator for 'fix_derived_curve' christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Add some ugly formatted point labels. christian@4183: christian@4183: 2012-06-27 Sascha L. Teichmann christian@4183: christian@4183: Moved describe() and the generating of output into FLYSArtifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: This the base class so it should contain common code! christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/FixationArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/ChartArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/MINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/MapArtifact.java: christian@4183: Moved common code into base class. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-06-27 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Use JFreeUtil.sampleFunction2D() to sample a StyledXYSeries. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixDerivateFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixDeviationFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixOutlierFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java: christian@4183: Add ctor with addtional custom facet index parameter. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java: christian@4183: Introduce IdGenerator to generate unique facets IDs within an output, christian@4183: so themes can now be applied properly to points and lines. christian@4183: christian@4183: 2012-06-27 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeParser.java: christian@4183: Removed some expensive XPath usage. Some quick profiling christian@4183: showed that up to 7% of our code (excluding Hibernate, H2, Restlet, etc.) christian@4183: were spend in these XPaths. A lot of time christian@4183: christian@4183: !!! Please, please, dear fellow programmers do not use XPath for fetching christian@4183: !!! trivial things that are easily accessible via DOM, too! christian@4183: christian@4183: 2012-06-26 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/Outlier.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/sq/Fitting.java: christian@4183: Refactored to better fit the data types of SQResult. christian@4183: christian@4183: 2012-06-26 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LegendProcessor.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: 2012-06-26 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQ.java: christian@4183: Added method to validate point. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/Outlier.java: christian@4183: Added method to callback to re-initialize the function to fit. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/Fitting.java: christian@4183: New. Shell for fitting of one SQ fraction. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Removed superfluous import. christian@4183: christian@4183: 2012-06-26 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/Outlier.java: christian@4183: New. Specialized outlier test for the S/Q relation. christian@4183: Outliers are accepted in multiples of the standard deviation. christian@4183: christian@4183: 2012-06-26 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java: christian@4183: Only generate outlier facet when we done the prepocessing. christian@4183: christian@4183: 2012-06-26 Felix Wolfsteller christian@4183: christian@4183: Enable legend aggregation in time series charts. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Call super.aggregateLegendEntries. christian@4183: christian@4183: 2012-06-26 Felix Wolfsteller christian@4183: christian@4183: Legend Item Aggregation refactoring. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java christian@4183: (aggregateLegendEntries): Moved up from XYChartGenerator to ChartGenerator. christian@4183: christian@4183: 2012-06-26 Felix Wolfsteller christian@4183: christian@4183: Legend Item Aggregation refactoring. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LegendProcessor.java: christian@4183: New (extracted from XYChartGenerator). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Extracted legend item aggregation to LegendProcessor. christian@4183: christian@4183: 2012-06-26 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: 2012-06-26 Felix Wolfsteller christian@4183: christian@4183: Minor polish for LegendItem-Aggregation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183:  Define and use static SPACE Shape. christian@4183: christian@4183: 2012-06-26 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/fitting/InvLogLinear.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/InvQuad.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/InvPow.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/InvSQPow.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/InvLogLinear.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/Quad.java: christian@4183: Completed inverse stubs. christian@4183: christian@4183: 2012-06-26 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/fitting/FunctionFactory.java: christian@4183: Register the singletons instead of new objects. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/fitting/Pow.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/InvQuad.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/SQPow.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/LogLinear.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/InvPow.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/InvSQPow.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/InvLogLinear.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/Quad.java: christian@4183: Link the functions to there inverses via getInverse(). christian@4183: christian@4183: 2012-06-26 Sascha L. Teichmann christian@4183: christian@4183: Implemenation of the inverses of the fitting functions. Needed christian@4183: for the AT export of the calculated curves. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/fitting/Function.java: christian@4183: Added abstract method getInverse() to get the inverse of the christian@4183: function. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/fitting/Pow.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/SQPow.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/Linear.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/LogLinear.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/Log.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/Quad.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/Exp.java: christian@4183: Implements the getInverse() method. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/fitting/InvLog.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/InvLogLinear.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/InvQuad.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/InvPow.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/InvExp.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/InvSQPow.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/InvLinear.java: christian@4183: Implements the inverses of the function above. Some are still christian@4183: stubs. christian@4183: christian@4183: 2012-06-25 Felix Wolfsteller christian@4183: christian@4183: Fix issue663 ("step" curves for Q). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java christian@4183: (addStepPointsKmQ): New, add "step" points for series. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Use new StyledSeriesBuilder function. christian@4183: christian@4183: 2012-06-25 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Fix LegendAggregation; prevent single aggregated legend item to christian@4183: overflow by splitting it into many, but iconless legenditems. christian@4183: christian@4183: 2012-06-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java: christian@4183: Fixed typo in I18N key. christian@4183: christian@4183: 2012-06-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java: christian@4183: Finished I18N. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/QWSeriesCollection.java: christian@4183: Accept callback to label legend items. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/ShapeRenderer.java: Added interface christian@4183: LabelGenerator to create labels for entries. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added strings. christian@4183: christian@4183: 2012-06-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalReferenceFacet.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: 2012-06-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalDeviationFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalAnalysisFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalReferenceFacet.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixLongitudinalSectionGenerator.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-06-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java: christian@4183: Uses I18N now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/QWSeriesCollection.java: christian@4183: Added convenience constructor for creating date formatters with strings. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/resources/Resources.java: christian@4183: Added variadic method format(). christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added strings. christian@4183: christian@4183: 2012-06-25 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixLongitudinalSectionGenerator.java: christian@4183: New. Generator for longitudinal sections in fix analysis. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalDeviationFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalAnalysisFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalReferenceFacet.java: christian@4183: New. Facets for longitudinal sections chart in fix analysis. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added new facet types. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java: christian@4183: Add facets for new chart. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: christian@4183: Fixed NPE. christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: christian@4183: Added facets to config. christian@4183: christian@4183: * doc/conf/themes.xml: christian@4183: Added new themes. christian@4183: christian@4183: * doc/conf/conf.xml: christian@4183: Added new chart generator. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n strings. christian@4183: christian@4183: 2012-06-25 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Look for the attribut "outline" to render shape outlines in charts. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: christian@4183: Add the "outline" attribute. christian@4183: christian@4183: 2012-06-25 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: christian@4183: Do not add entries ending with " " to legend. christian@4183: christian@4183: 2012-06-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java: christian@4183: Prevent that the plot becomes to small if only one point is drawn. christian@4183: christian@4183: 2012-06-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: Added debug output about the concrete coeffs found by the fitting. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/fitting/Log.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/LogLinear.java: christian@4183: Re-checked the partial deviations to the coeffs. Write the formulas christian@4183: more human readable. christian@4183: christian@4183: 2012-06-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/ShapeRenderer.java: If a label collides christian@4183: with a other labels try to draw it on the other side of the point. christian@4183: This results in more labeled points which is useful because you cannot zoom christian@4183: in for details in the fixings km chart. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/QWSeriesCollection.java: christian@4183: Paint measured points blue and interpolated green. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java: christian@4183: Set background color to white. christian@4183: christian@4183: 2012-06-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: Interpolated and measured values where switched. christian@4183: christian@4183: 2012-06-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java: christian@4183: Label the points in diagram and show if they are interpolated or not. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/QWSeriesCollection.java: christian@4183: New. Extended XYSeriesCollection to cope with QWs christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/Formatter.java: Added formatters christian@4183: to be fetched only over CallMeta. CallContext are not present in services. christian@4183: christian@4183: * src/main/java/de/intevation/flys/java2d/ShapeUtils.java: New. Some code christian@4183: to handle Shapes. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/ShapeRenderer.java: New. Shape christian@4183: renderer. This is a simplified version of the shape renderer christian@4183: from fixings analysis in desktop FLYS. christian@4183: christian@4183: 2012-06-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: Re-added accidentially removed code. christian@4183: christian@4183: 2012-06-24 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/jfree/StyledXYSeries.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: 2012-06-24 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: Removed TODOs about I18N christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added strings for fixing analysis. christian@4183: christian@4183: 2012-06-23 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/KMIndex.java: christian@4183: OpenJDK javac 1.6.0_24 seems to be more picky about christian@4183: correct usage of generics. christian@4183: christian@4183: 2012-06-23 Sascha L. Teichmann christian@4183: christian@4183: * contrib/add-i18n-numbers.py: New. Script to prefix christian@4183: the values of property files with a small number to christian@4183: make the keys identifiable even through the UI. christian@4183: christian@4183: Apply in the same manner as contrib/check-i18n-properties.py christian@4183: christian@4183: 2012-06-23 Sascha L. Teichmann christian@4183: christian@4183: * src/main/resources/messages_de.properties, christian@4183: src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties: christian@4183: Repaired inconsistencies. christian@4183: christian@4183: 2012-06-24 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/themes/ThemeFactory.java, christian@4183: src/main/java/de/intevation/flys/jfree/XYStyle.java: christian@4183: Add debug logs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/jfree/StyledXYSeries.java: christian@4183: Draw the W/Q function as StyledXYSeries. christian@4183: christian@4183: 2012-06-23 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Re-enable legend entry aggregation, take the threshold from christian@4183: settings. christian@4183: christian@4183: 2012-06-23 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartSettings.java: christian@4183: Parse and set legend aggregation value. christian@4183: christian@4183: 2012-06-23 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/GaugeFinderFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: 2012-06-23 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java: christian@4183: Added bug output when creating Q sector markers. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/GaugeRange.java: christian@4183: Added toString() method. christian@4183: christian@4183: 2012-06-22 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: christian@4183: Set the aggregation threshold value. christian@4183: christian@4183: 2012-06-22 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java, christian@4183: src/main/java/de/intevation/flys/collections/OutputParser.java: christian@4183: Cosmetics, doc. christian@4183: christian@4183: 2012-06-22 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WstWriter.java: christian@4183: Cosmetics. christian@4183: christian@4183: 2012-06-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java: christian@4183: Draw domain markers for borders of Q sectors. There is some kind of glitch christian@4183: in in the Q sector classifaction code or the db data is strange. christian@4183: christian@4183: Because of the common code basis this affects the fixings calculations, too. :-( christian@4183: christian@4183: 2012-06-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: Calculate the standard deviation of the Q sector delta Ws, too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/AnalysisPeriod.java: christian@4183: Store the standard deviation of the Q sector delta Ws, too. christian@4183: Indexed 0..3; NaN means the std dev for this sector is not existing. christian@4183: christian@4183: 2012-06-21 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/GaugeRange.java: christian@4183: added method getSectorBorder(int). With this method you can figure christian@4183: the three discharge sector borders. Returns NaN if border is christian@4183: not there. Usage: christian@4183: christian@4183: GaugeFinderFactory ggf = GaugeFinderFactory.getInstance(); christian@4183: GaugeFinder gf = ggf.getGaugeFinder("Elbe"); christian@4183: if (gf == null) { /* FAIL */ } christian@4183: GaugeRange gr = gf.find(km); // km is the km where you are. christian@4183: if (gr == null) { /* FAIL */ } christian@4183: christian@4183: double m0 = gr.getSectorBorder(0); // Draw as marker if not NaN christian@4183: double m1 = gr.getSectorBorder(1); // Draw as marker if not NaN christian@4183: double m2 = gr.getSectorBorder(2); // Draw as marker if not NaN christian@4183: christian@4183: Labels should be: christian@4183: '(MNQ+MQ)/2' for m0 christian@4183: '(MQ+MHQ)/2' for m1 christian@4183: 'HQ5' for m2 christian@4183: christian@4183: 2012-06-21 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/GaugeFinderFactory.java: christian@4183: New. Cache access to per river gauge finders. This very useful christian@4183: if you want to draw the discharge sectors of river at a given christian@4183: km into a diagram. christian@4183: christian@4183: * doc/conf/cache.xml: Added cache 'gauge-finders'. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/GaugeFinder.java: christian@4183: Added find(double km) method to find GaugeRange by km. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: christian@4183: Uses the instance of the GaugeFinderFactory to access the christian@4183: gauge ranges. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java: christian@4183: Simplified code. christian@4183: christian@4183: 2012-06-21 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/GaugeFinder.java: christian@4183: New. Moved out of FixingsOverview. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: christian@4183: Moved GaugeFinder into top level class. christian@4183: christian@4183: 2012-06-21 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/GaugeRange.java: christian@4183: New. Moved out of FixingsOverview. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: christian@4183: Moved GaugeRange into top level class. christian@4183: christian@4183: 2012-06-21 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Prevent some NPEs. christian@4183: !!! This is not a fix for the real problem !!! christian@4183: christian@4183: 2012-06-21 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixDeviationFacet.java, christian@4183: src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-06-21 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Range.java: christian@4183: New. Moved out of FixingsOverview. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: christian@4183: Moved Range into top level class. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/FixingsFilterBuilder.java, christian@4183: src/main/java/de/intevation/flys/artifacts/services/FixingsOverviewService.java: christian@4183: Adjusted imports. christian@4183: christian@4183: 2012-06-21 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: Fixed problem with select the wrong meta data (date, descriptions, etc.) christian@4183: for a data column. christian@4183: christian@4183: 2012-06-21 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsFilterBuilder.java: christian@4183: Fixed stupid i/j switch bug. christian@4183: christian@4183: 2012-06-21 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java: christian@4183: Updated i18n. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n string for delta W(t) chart. christian@4183: christian@4183: 2012-06-21 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Added attribution for single series styling. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: christian@4183: Skip legend items for interpolated point series. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: christian@4183: Split analysis and reference points into two chart series. Added attribute christian@4183: for interpolated points for different styling. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/Style.java: christian@4183: Added getter for renderer. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/XYStyle.java: christian@4183: Implemented getter for renderer. christian@4183: christian@4183: 2012-06-21 Christian Lins christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java: christian@4183: Split fix_sector_average_wq in four facet types, one for each class (_0, _1, ..) christian@4183: christian@4183: * doc/conf/themes.xml: christian@4183: Update themes for WQ curve christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Fix for small issue with sector average points christian@4183: christian@4183: 2012-06-21 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Adapt doAverageSectorOut() to reflect changes in Facet. christian@4183: christian@4183: 2012-06-20 Raimund Renkert christian@4183: christian@4183: Added delta W(t) chart in fix analysis. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added facet types for deta W(t) chart. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java: christian@4183: Changed facet index to determine the sector index and the analysis period christian@4183: index. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java: christian@4183: Calculate a facet index including the sector index and the analysis period christian@4183: index. christian@4183: Added new facet for delta W(t) chart. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixDeviationFacet.java: christian@4183: New. Facet to display the standard deviation in delta W(t) chart. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: christian@4183: New. Generator for the delta W(t) chart. christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: christian@4183: Updated facets in outputmodes. christian@4183: christian@4183: * doc/conf/conf.xml: christian@4183: Added output generator to config. christian@4183: christian@4183: 2012-06-20 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: New methods to add domain and value axis markers to the plot. christian@4183: christian@4183: 2012-06-20 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DeltaWtExporter.java: christian@4183: Added reference events to CSV export. christian@4183: christian@4183: 2012-06-20 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixReferenceEventsFacet.java: christian@4183: Changed data type from QW[] to QWD[] to have delta Ws in reference events. christian@4183: christian@4183: 2012-06-20 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/Fitting.java: christian@4183: Moved function instantiation to alway have a valid function instance. christian@4183: christian@4183: 2012-06-20 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Parameters.java: christian@4183: Fixed binary search. christian@4183: christian@4183: 2012-06-20 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Parameters.java: christian@4183: Bring binarySearch with epsilon more to source of binarySearch of Collections. christian@4183: Still not working properly. Why? christian@4183: christian@4183: 2012-06-20 Felix Wolfsteller christian@4183: christian@4183: Avoid problems with corrected Ws in cross-sections; hacky solution, christian@4183: issue680. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java christian@4183: (waterLineC): New, get corrected W. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java: christian@4183: Create C-facet with other index. christian@4183: christian@4183: 2012-06-20 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Cosmetics, doc. christian@4183: christian@4183: 2012-06-20 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: christian@4183: Cosmetics, doc. christian@4183: christian@4183: 2012-06-20 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: Now respects the selected events and reference period correctly. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FixationArtifactAccess.java: christian@4183: referenceStart and referenceEnd are now melted into referencePeriod. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: christian@4183: Add a new filter IdsFilter which is more efficent to check than a christian@4183: OrFilter with a list of IdFilters inside. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsFilterBuilder.java: christian@4183: Expose the new IdsFilter to the XML representation in form of christian@4183: christian@4183: christian@4183: 2012-06-20 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/sq/SQRelationGenerator.java: christian@4183: Fixed broken naming of chart curves. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Renamed facets for SQ christian@4183: relation chart curves. christian@4183: christian@4183: 2012-06-20 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/SQRelation.java: christian@4183: Create a compound index value for SQOutlierFacets. This index is based christian@4183: on the index of the result object (to get the correct data) and the christian@4183: iteration of the outliers. This compound index is used to make christian@4183: SQOutlierFacets unique to FLYSCollection's DESCRIBE document. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQOutlierFacet.java: christian@4183: Parse the index of the result object and the iteration number from index christian@4183: property. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/sq/SQRelationGenerator.java: christian@4183: Added some more debug output. christian@4183: christian@4183: 2012-06-20 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQRelationCalculation.java: christian@4183: Create only SQ objects with values > 0. Otherwise JFreeChart will break christian@4183: during chart creation (values for logarithmic axes have to be > 0). christian@4183: christian@4183: 2012-06-20 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/themes.xml: Adjusted the color of SQ Facets (lines and points) christian@4183: as shown in examples. christian@4183: christian@4183: 2012-06-20 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/SQRelation.java: christian@4183: Create new Facets with proper i18n label. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added i18n strings for facet christian@4183: names. christian@4183: christian@4183: 2012-06-20 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/sq/SQRelationGeneratorA.java, christian@4183: src/main/java/de/intevation/flys/exports/sq/SQRelationGeneratorB.java, christian@4183: src/main/java/de/intevation/flys/exports/sq/SQRelationGeneratorC.java, christian@4183: src/main/java/de/intevation/flys/exports/sq/SQRelationGeneratorD.java, christian@4183: src/main/java/de/intevation/flys/exports/sq/SQRelationGeneratorE.java, christian@4183: src/main/java/de/intevation/flys/exports/sq/SQRelationGeneratorF.java: christian@4183: New concrete chart generators. Each fraction of the SQ relation christian@4183: calculation has its own generator now. This is because they all have christian@4183: different chart titles and labels. christian@4183: christian@4183: * doc/conf/conf.xml: Let SQ relation charts use more concrete generators. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/sq/SQRelationGenerator.java: christian@4183: Implemented getDefaultXAxisLabel() getDefaultYAxisLabel(). christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added i18n strings for chart christian@4183: titles and axes labels. christian@4183: christian@4183: 2012-06-19 Felix Wolfsteller christian@4183: christian@4183: Fix issue681 (wrong vertical lines in duration curve q-mainvalues on christian@4183: second y-axis). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Fix vertical line if on second y-axis. christian@4183: christian@4183: 2012-06-19 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java: christian@4183: Restrict q-filter facet to the differences case. christian@4183: christian@4183: 2012-06-19 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/waterlevel.xml: Add Q-facets to compatibility list. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java: christian@4183: Add Q-facets to filter facet list. christian@4183: christian@4183: 2012-06-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/QW.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixDerivedCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Removed trailing whitespace. christian@4183: christian@4183: 2012-06-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/JFreeUtil.java: Directly christian@4183: sample "our" Function objects instead of JFreeChart Function2Ds. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/sq/SQRelationGenerator.java: christian@4183: Removed JFreeChart Function2D wrapper and directly use our Function christian@4183: objects. christian@4183: christian@4183: 2012-06-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixDerivedCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-06-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/Fitting.java: christian@4183: Calculate the standard deviation of the delta Ws of the referencen points, too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: Store the standard deviation of delta Ws of reference points into christian@4183: a parameters column "std-dev". christian@4183: christian@4183: 2012-06-19 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/JFreeUtil.java: New function to christian@4183: sample a Function2D. This method is used, because JFreeChart's christian@4183: DataUtilities.sampleFunction2D() returns an instance of XYSeries but we christian@4183: need StyledXYSeries. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Parameters.java: Added a christian@4183: method to retrieve parameter values for a list of parameter names. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQRelationCalculation.java: christian@4183: Create a fake Parameters object for the SQ curve. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQFractionResult.java: christian@4183: Added getMinQ() and getMaxQ() to determine the Q range. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQFunction.java: New christian@4183: model class that stores a Function and a min and max Q value. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQCurveFacet.java: christian@4183: Return a SQFunction instance based on the parameters and Q range of the christian@4183: SQFractionResult. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/sq/SQRelationGenerator.java: Use christian@4183: JFreeUtil's new function sampleFunction2D to create a StyledXYSeries for christian@4183: the SQ curve. christian@4183: christian@4183: 2012-06-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: Store into QWs if they are interpolated. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/QW.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/QWD.java: christian@4183: Stores boolean if the values are interpolated. christian@4183: christian@4183: 2012-06-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/fitting/SQPow.java: christian@4183: Name derivative S'(Q). christian@4183: christian@4183: 2012-06-19 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Add Q-Facets to compatibility list of dis-c. christian@4183: christian@4183: 2012-06-19 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/themes.xml: Added theme mappings for sq relation fractions b - f. christian@4183: christian@4183: 2012-06-19 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQResult.java: Renamed christian@4183: the former SQResult to SQFractionResult. This class is now used to store a christian@4183: set of SQFractionResults for each SQ calculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQFractionResult.java: christian@4183: Former SQResult. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQRelationCalculation.java: christian@4183: Create new fake SQFractionResults for fraction A, B and C (used for christian@4183: testing). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQOutlierFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/sq/SQCurveFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/sq/SQMeasurementFacet.java: christian@4183: Added the 'fractionIdx' property to get to know which fraction should be christian@4183: represented. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/SQRelation.java: Create christian@4183: Facets for each SQResult and SQFractionResult. christian@4183: christian@4183: 2012-06-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/fitting/SQPow.java: christian@4183: New. S(Q) = a*Q^b christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/fitting/FunctionFactory.java: christian@4183: Registered new function. christian@4183: christian@4183: 2012-06-19 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQMeasurementFacet.java: christian@4183: Implemented getData(). It returns the SQ[] of christian@4183: SQResult.getMeasurements(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/SQRelation.java: Create christian@4183: proper facet for sq measurements and corrected constructor call of christian@4183: SQOutlierFacet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/sq/SQRelationGenerator.java: christian@4183: Generalized doSQMeasurementsOut() and doSQOutliersOut() to one single christian@4183: method doSQOut() which is able to handle SQ[] data. christian@4183: christian@4183: 2012-06-19 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Changed the christian@4183: default behavior: line labels are not visible if no config option is set! christian@4183: christian@4183: 2012-06-19 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/conf.xml: Load config of rest server and floodmap over christian@4183: external entities, too. christian@4183: christian@4183: * doc/conf/floodmap.xml, doc/conf/rest-server.xml: New. christian@4183: External config. christian@4183: christian@4183: 2012-06-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/Fitting.java: christian@4183: The reference points are now wrapped in QWDs. This enables the christian@4183: plotting of Delta W(t) data for the reference points. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/QWD.java: christian@4183: Added convenience constructor. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixReferenceEventsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: Adjusted. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixFacetUtils.java: christian@4183: Cosmetics. christian@4183: christian@4183: 2012-06-18 Christian Lins christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: christian@4183: Remove fix_analysis_periods_wq from fix_wq_curve facet. christian@4183: christian@4183: * doc/conf/themes.xml: christian@4183: Add fixing themes for other theme groups. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java: christian@4183: Debug output added. christian@4183: christian@4183: 2012-06-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixFacetUtils.java: christian@4183: Added vim line, made class public. christian@4183: christian@4183: 2012-06-18 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/conf.xml: Using external system entities to configure databases. christian@4183: !!! christian@4183: !!! FROM NOW ON YOU CAN YOUR conf.xml FROM TRUNK. christian@4183: !!! Adjust the database credentials via the *-db.xml files christian@4183: !!! which are included. christian@4183: !!! christian@4183: christian@4183: * doc/conf/artifact-db.xml: New. Configuration for the artifact database. christian@4183: * doc/conf/seddb-db.xml: New. Configuration for the SedDB christian@4183: * doc/conf/backend-db.xml: New. Configuration for the FLYS3 database. christian@4183: * doc/conf/datacage-db.xml: Configuration for the datacage datacage. christian@4183: christian@4183: 2012-06-18 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/AnalysisPeriod.java: christian@4183: Fixed constructor. christian@4183: christian@4183: 2012-06-18 Christian Lins christian@4183: christian@4183: * doc/conf/themes.xml: christian@4183: Add themes for fixing facets. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixDerivateFacet.java: christian@4183: Use FixFacetUtils.getMaxQ() to retrieve max Q. christian@4183: Interpolate km values instead of strict binary search. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixFacetUtils.java: christian@4183: Added, contains static getMaxQ() method. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixDerivedCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Some issues fixed. christian@4183: christian@4183: 2012-06-18 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/themes.xml: Fixed broken color strings. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Added new functions christian@4183: that return colors for points. christian@4183: christian@4183: * src/main/java/de/intevation/flys/themes/ThemeAccess.java: Added new christian@4183: function that returns the color for points. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/XYStyle.java: Added new method to christian@4183: apply the color of points (independent of the specified line color). christian@4183: christian@4183: 2012-06-18 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/themes.xml: Added themes for SQ relation charts christian@4183: ('sq_a_measurement', sq_a_outlier' and 'sq_a_curve'). christian@4183: christian@4183: 2012-06-18 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixChartGenerator.java: christian@4183: New. Abstract chart generator for fix analysis. This generator adds the christian@4183: current km to the context. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixDerivedCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Generators now extend the FixCahrtGenerator. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixDerivateFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisPeriodsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixReferenceEventsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixOutlierFacet.java: christian@4183: Get the current km from context. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: christian@4183: Removed getter for current km. christian@4183: christian@4183: 2012-06-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/map/PrintMap.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/SoundingsSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/SQRelation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DischargeState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java, christian@4183: src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/collections/CollectionDescriptionHelper.java: christian@4183: Removed repeated x.size() calls from for loops. christian@4183: christian@4183: 2012-06-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixDerivateFacet.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-06-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WKmsJRDataSource.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WWQQJRDataSource.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WQTJRDataSource.java: christian@4183: Added missing 'else's in if/else ladders. christian@4183: christian@4183: 2012-06-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FileUploadService.java: christian@4183: Fixed string comparision for identity. christian@4183: christian@4183: 2012-06-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/**/*.java: Added missing vim lines. christian@4183: christian@4183: 2012-06-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Parameters.java: christian@4183: Removed tabs. Set log level from INFO to DEBUG because this case christian@4183: is much too common. christian@4183: christian@4183: 2012-06-17 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Parameters.java: christian@4183: Comments added. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java: christian@4183: Logging output added. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixDerivateFacet.java: christian@4183: Max Q is now determined by parameter.interpolate(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixDerivedCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Use getCurrentKmFromRequest() in output generation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Typo in method description. christian@4183: christian@4183: 2012-06-15 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixDerivateFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisPeriodsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixReferenceEventsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixOutlierFacet.java: christian@4183: The getData() method now takes a km parameter to get the data at a specific christian@4183: km. christian@4183: christian@4183: 2012-06-15 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQ.java: New model to christian@4183: store values for S/Q. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQResult.java: New christian@4183: model class that should be used to store calculation results of SQ christian@4183: relation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQRelationCalculation.java: christian@4183: Create a fake SQResult. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQOutlierFacet.java: christian@4183: Set missing required properties, so that this facet will be able to christian@4183: re-calculate results again if the results are not in cache. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/SQRelation.java: christian@4183: Create correct number of facets for parameter A for outliers Facet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/sq/SQRelationGenerator.java: christian@4183: Create a JFreeChart XYSeries from SQResult's outliers Facet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Added a christian@4183: method to create X axes. The SQRelationGenerator overrides this method, christian@4183: because it requires a logarithmic axis. christian@4183: christian@4183: 2012-06-15 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: christian@4183: Added getter for current km. christian@4183: christian@4183: 2012-06-15 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added christian@4183: new functions to determine if a Facet is a SQ curve, measurement or christian@4183: outlier independend of their parameter. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/sq/SQRelationInfoGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/sq/SQRelationGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/sq/SQRelationExporter.java: christian@4183: Stubs for chart and export generators. christian@4183: christian@4183: * doc/conf/conf.xml: Registered new output-generators for SQ relation christian@4183: charts and exports. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added i18n strings for CSV christian@4183: export of SQ relations. christian@4183: christian@4183: 2012-06-15 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/**/*.java: Removed trailing whitespace. christian@4183: christian@4183: 2012-06-14 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/conf.xml: Added out commented block for SedDB configuration. christian@4183: christian@4183: 2012-06-14 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java: christian@4183: Some code cleanup. christian@4183: christian@4183: 2012-06-14 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/Fitting.java: christian@4183: Added more debug output. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java: christian@4183: Interpolate the coeffs for the function to be drawn. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Made code more robust for none existing data. christian@4183: christian@4183: 2012-06-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added christian@4183: new Facets for MINFO SQ relation calculation. christian@4183: christian@4183: * doc/conf/artifacts/minfo.xml: Added output for chart and data export for christian@4183: sq relation calculation. Registered new facets. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/sq/SQRelationCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/sq/SQOutlierFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/sq/SQCurveFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/sq/SQMeasurementFacet.java: christian@4183: Stubs for calculation and Facets used for SQ relation calculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/SQRelation.java: christian@4183: Override computeAdvance() and implemented a stub for calculation and christian@4183: Facet creation. christian@4183: christian@4183: 2012-06-11 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java: christian@4183: Changed filter string to 'Messstelle'. christian@4183: christian@4183: 2012-06-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Fetch only cross section tracks that have a name 'qps' set for WSPLGEN christian@4183: calculation. christian@4183: christian@4183: 2012-06-11 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java: christian@4183: Use binary search again. christian@4183: christian@4183: 2012-06-11 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixDerivedCurveGenerator.java: christian@4183: Removed superfluous import. christian@4183: christian@4183: 2012-06-13 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixDerivateFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java: christian@4183: Workaround for IndexOutOfBoundsException. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixDerivedCurveGenerator.java: christian@4183: Output generator for fixing derived curve. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java: christian@4183: Use binary search with epsilon again. christian@4183: christian@4183: 2012-06-13 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java: christian@4183: Added more debug/warn log statements. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/Fitting.java: Do christian@4183: not add empty objects into the calculation result. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Take care on empty QWD objects. christian@4183: christian@4183: 2012-06-11 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/Fitting.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/AnalysisPeriod.java: christian@4183: Max Q is store in column "max_q" in Parameters now. So function can be plotted christian@4183: bewtween calculated kms, too. christian@4183: For function sampling use something like this.: christian@4183: christian@4183: double [] maxQ = parameters.interpolate("km", 42.3", new String [] { "max_q" }); christian@4183: double maxSampleQ = 10000d; christian@4183: christian@4183: if (maxQ != null) { christian@4183: maxSampleQ = Math.min(2000d, Math.abs(maxQ[0])); christian@4183: maxSampleQ += 0.05*maxSampleQ; christian@4183: } christian@4183: christian@4183: 2012-06-13 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Add missing imports and correct coding issues. christian@4183: christian@4183: 2012-06-12 Christian Lins christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java: christian@4183: Use KMIndex.search() (with epsilon) instead of KMIndex.binarySearch(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Move marker generation to XYChartGenerator. christian@4183: christian@4183: 2012-06-12 Christian Lins christian@4183: christian@4183: * doc/conf/conf.xml: christian@4183: Add fix_wq_curve output generator. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisPeriodsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixOutlierFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixReferenceEventsFacet.java: christian@4183: Add additional null-checks to prevent NullPointerExceptions when accessing empty christian@4183: facets. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java: christian@4183: getMaxQ() now returns constant '1000' until it is properly fixed. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Code for generating charts more or less complete but untested due to bugs in facets. christian@4183: christian@4183: 2012-06-11 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Parameters.java: christian@4183: Added method double [] interpolate(keyName, key, columnNames). christian@4183: This construct is better suited for the extraction of christian@4183: coefficients for building functions. In pseudo code: christian@4183: christian@4183: fitting.Function function = christian@4183: FunctionFactory.getInstance().getFunction("log"); christian@4183: christian@4183: double km = 42.35; christian@4183: christian@4183: double [] coeffs = parameters.interpolate( christian@4183: "km", km, function.getParamterNames()); christian@4183: christian@4183: math.Function f = function.instantiate(coeffs); christian@4183: christian@4183: 2012-06-11 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/GaugeDischargeState.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-06-11 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Parameters.java: christian@4183: Added interpolate methods that return an array of linear interpolated christian@4183: values for a given key. Say you have a column named "km" you can call christian@4183: 'values = parameters.interpolate("km", 12)' to fetch a set christian@4183: of proportional interpolated parameters even if there are only christian@4183: "km": 10 and "km": 15 in the data structure. Returns null if out of bounds. christian@4183: christian@4183: 2012-06-11 Raimund Renkert christian@4183: christian@4183: * doc/conf/artifacts/minfo.xml: christian@4183: Added states and transitions for S-Q-relation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/PeriodsSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/OutliersInput.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/SQRelation.java: christian@4183: New. States for multiple periods input, outliers input and final christian@4183: S-Q-relation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java: christian@4183: Added name filter for locations. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n strings for states. christian@4183: christian@4183: 2012-06-11 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: christian@4183: Fixed broken logger class. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Parameters.java: christian@4183: Re-establish old indentation. christian@4183: christian@4183: 2012-06-07 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: (doWOut): Interpolate values from WKms. christian@4183: christian@4183: 2012-06-07 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/GaugeDischargeState.java: christian@4183: Enable caching. christian@4183: christian@4183: 2012-06-07 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Simplified choice of gauges for discharge c. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/GaugeDischargeArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/GaugeDischargeState.java: christian@4183: Create better name for facets, minor refactoring, polishing. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n strings. christian@4183: christian@4183: 2012-06-07 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java, christian@4183: src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java: christian@4183: Cosmetics, docs christian@4183: christian@4183: 2012-06-07 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/PreprocessingSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java: christian@4183: Use i18n strings. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n strings. christian@4183: christian@4183: 2012-06-07 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java: christian@4183: Changed facet description. christian@4183: christian@4183: 2012-06-06 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/GaugeDischargeFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java, christian@4183: src/main/java/de/intevation/flys/utils/FLYSUtils.java: christian@4183: Cosmetics, doc. christian@4183: christian@4183: 2012-06-06 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/GaugeDischargeArtifact.java: christian@4183: Fix issues, import river, documentation, more debug. christian@4183: christian@4183: 2012-06-06 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/GaugeDischargeFacet.java: christian@4183: Hard-code state id, instruct computation to result in facets. christian@4183: christian@4183: 2012-06-06 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: christian@4183: Doc. christian@4183: christian@4183: 2012-06-06 Raimund Renkert christian@4183: christian@4183: Added facet for derivate curve and fixed facet names. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixDerivateFacet.java: christian@4183: New. Facet for derivate curve. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisPeriodsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixOutlierFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixReferenceEventsFacet.java: christian@4183: Added name for facet to constructor. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java: christian@4183: Add one facet for each output using a different name. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added facet names. christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: christian@4183: Changed facet names. christian@4183: christian@4183: 2012-06-06 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/MiddleBedHeightExporter.java: christian@4183: Trivial doc. christian@4183: christian@4183: 2012-06-06 Felix Wolfsteller christian@4183: christian@4183: * doc/datacage.txt: More documentation of datacage conf. christian@4183: christian@4183: 2012-06-06 Raimund Renkert christian@4183: christian@4183: Added new facet for analysis periods and updated facet names. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisPeriodsFacet.java: christian@4183: New. Facet for analysis periods. Returns the date ranges for the analysis christian@4183: periods. christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml, christian@4183: src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added new facet and updated facet names. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixReferenceEventsFacet.java: christian@4183: Updated facet names. christian@4183: christian@4183: 2012-06-06 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java: christian@4183: Minor doc. christian@4183: christian@4183: 2012-06-06 Felix Wolfsteller christian@4183: christian@4183: * doc/datacage.txt: More documentation of datacage conf. christian@4183: christian@4183: 2012-06-06 Raimund Renkert christian@4183: christian@4183: Implemented facets and splitted up the event facet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixEventsFacet.java: christian@4183: Removed. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixReferenceEventsFacet.java: christian@4183: New. Facets for events. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixOutlierFacet.java: christian@4183: Implemented getData(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java: christian@4183: Add new event facets. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java: christian@4183: Fixed return value. christian@4183: christian@4183: 2012-06-06 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/Function2DAdapter.java: christian@4183: New. Adapter class to brigde de.intevation.flys.artifacts.math.Function christian@4183: to org.jfree.data.function.Function2D. christian@4183: christian@4183: Function2D objects can be used by org.jfree.data.general.DatasetUtilities christian@4183: to sample functions into XYDatasets. christian@4183: See DatasetUtilities.sampleFunction2D() christian@4183: christian@4183: 2012-06-06 Felix Wolfsteller christian@4183: christian@4183: * doc/datacage.txt: New file that will contain datacage configuration christian@4183: documentation. christian@4183: christian@4183: 2012-06-06 Raimund Renkert christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: christian@4183: Fixed outputmodes. christian@4183: christian@4183: 2012-06-06 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/Fitting.java: christian@4183: Local variable shadowed instance variable. christian@4183: christian@4183: 2012-06-06 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: Fixed index problem with name of chi^2. christian@4183: christian@4183: 2012-06-06 Raimund Renkert christian@4183: christian@4183: Added facets for fix analysis. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixOutlierFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixEventsFacet.java: christian@4183: New. Facets for W/Q-Chart in fix analysis. FixAvSectorFacet is implemented, christian@4183: the others are just stubs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java: christian@4183: Add facets to artifact after calculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FixationArtifactAccess.java: christian@4183: Added method to get the current km for charts. The km is used for christian@4183: synchronous navigation in fix analysis charts. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added new facet types. christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: christian@4183: Added facets to config. christian@4183: christian@4183: 2012-06-05 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Parameters.java: christian@4183: Added some binary search methods. TODO: Sort by column. christian@4183: christian@4183: 2012-06-05 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DeltaWtExporter.java: christian@4183: Use new data structures for export. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/KMIndex.java: christian@4183: Implements java.lang.Iterable now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/DeltaWT.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/DeltaWTsKM.java: christian@4183: Removed. Obsolete. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java: christian@4183: Removed superfluous import. christian@4183: christian@4183: 2012-06-05 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FixationArtifactAccess.java: christian@4183: Prevent duplicates in analysis periods. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/DateRange.java: christian@4183: Added equals. christian@4183: christian@4183: 2012-06-05 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/EpsilonComparator.java: christian@4183: Removed. Obsolete now. christian@4183: christian@4183: 2012-06-05 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/JFreeUtil.java: christian@4183: Improved collision detection. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java: christian@4183: Avoid collisions of line labels, documentation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java: christian@4183: Use JFreeUtil. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/CollisionFreeLineLabelEntity.java: christian@4183: New, ChartEntity class for Line labels. christian@4183: christian@4183: 2012-06-05 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/Fitting.java: christian@4183: Store the QWs that are actually used in the fitting as referenced. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: Store the referenced QWs for each km. TODO: Use same index structure. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixResult.java: christian@4183: Store the referenced QWs, too. christian@4183: christian@4183: 2012-06-05 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixResults.java: christian@4183: Removed. Obsolete. christian@4183: christian@4183: 2012-06-05 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/AnalysisPeriodsKM.java: christian@4183: Removed. Not needed any longer. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: Store the AnalysisPeriod per km into FixResult. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixResult.java: christian@4183: Uses KMIndex instead of DeltaWTsKM now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DeltaWtExporter.java: christian@4183: Commented out old code. christian@4183: TODO: Rewrite exporter to use AnalysisPeriods. christian@4183: christian@4183: 2012-06-05 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java: Override christian@4183: endOfLife() to remove files and directories produced for WMS output. christian@4183: christian@4183: 2012-06-05 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/JFreeUtil.java: christian@4183: New jfreechart-related utility class. christian@4183: christian@4183: 2012-06-05 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/Formatter.java: christian@4183: (getMeterFormat): New. christian@4183: Doc. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: i18n and formatting for line labels. christian@4183: christian@4183: 2012-06-05 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java: christian@4183: Added better doc and TODO. christian@4183: christian@4183: 2012-06-05 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixResult.java: christian@4183: Now uses the KMIndex for outliers. christian@4183: TODO: Use KMIndex for DeltaWTs, too. christian@4183: christian@4183: 2012-06-05 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/KMIndex.java: New. christian@4183: Serializable index structure to find objects by there km. christian@4183: TODO: Use in fixings analysis. christian@4183: christian@4183: 2012-06-05 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/EpsilonComparator.java: christian@4183: Fixed sign problem in comparison. christian@4183: christian@4183: 2012-06-04 Sascha L. Teichmann christian@4183: christian@4183: Implemented outlier checks in fixings analysis. Expected to be christian@4183: still broken, but the code is in the right place now and has the christian@4183: right structure. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/Outlier.java: christian@4183: Fixed endless loop. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Parameters.java: christian@4183: Added further set methods for indexed access. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/Fitting.java: christian@4183: New. Out factored fitting code from FixCalculation. Checks for outliers, too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: Moved fitting code out to separate class. Streamlined code a bit. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixResult.java: christian@4183: Store the outliers from fitting in separate data structure, too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/QW.java: New. christian@4183: Base class for delta W/t data. Used as storage for outliers. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/QWD.java: christian@4183: Is a sub class of QW now. christian@4183: christian@4183: 2012-06-04 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: Store Chi^2 of fitting into result, too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Parameters.java: christian@4183: Added indexed set method. christian@4183: christian@4183: 2012-05-31 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/fitting/Function.java: christian@4183: Added inner class Derivative representing the first derivative of the christian@4183: function. Can be instantiated with a given set of parameters. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/fitting/Log.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/Pow.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/Linear.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/Quad.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/Exp.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/fitting/LogLinear.java: christian@4183: Added the derivatives of all fitting functions. christian@4183: christian@4183: 2012-05-30 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: Calculate the Delta W/ts + christian@4183: the average Delta W/ts per Q sector per analysis period. christian@4183: !!! Very complicated stuff !!! christian@4183: TODO: christian@4183: - Store results into the new data structures AnalysisPeriod and christian@4183: AnalysisPeriods. christian@4183: - Remove the old DeltaWTsKM and DeltaWT. christian@4183: - Adjust the facets and the export. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/QWD.java: christian@4183: Added convinience constructor. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: christian@4183: Added sector filter. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsFilterBuilder.java: christian@4183: Expose the new sector filter to the fixing overview service. Syntax: christian@4183: christian@4183: christian@4183: 2012-05-30 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/DateAverager.java: christian@4183: New. Averages a list of dates preventing overflows. christian@4183: christian@4183: 2012-05-30 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: christian@4183: Added a km filter to find columns which touches a given km. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsFilterBuilder.java: christian@4183: Expose the new km filter to the fixing overview service. Syntax: christian@4183: christian@4183: christian@4183: 2012-05-30 Sascha L. Teichmann christian@4183: christian@4183: Better persistence model for delta w/t calculations. Supports christian@4183: storage of Q sector averages, too. TODO: Use the new model. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/QWD.java: christian@4183: New. Will be used as a replacement for DeltaWT. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/AnalysisPeriod.java: christian@4183: New. Will be used as a replacement for DeltaWTsKM.KM. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/AnalysisPeriodsKM.java: christian@4183: New. List Will be used as a replacement for DeltaWTsKM. christian@4183: christian@4183: 2012-05-30 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/FixationArtifactAccess.java: christian@4183: Use DateRange objects now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/DateRange.java: New. christian@4183: Model for date ranges. To be used in re-factored persistance model. christian@4183: christian@4183: 2012-05-30 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: christian@4183: Added method to find the Q sector of fixing column for a given km. christian@4183: Useful to classify fixing events at certain kms. christian@4183: christian@4183: 2012-05-30 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FixationArtifactAccess.java: christian@4183: Fixed access to analysis periods. christian@4183: christian@4183: 2012-05-30 Raimund Renkert christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: christian@4183: Changed data fields to a single string data field. The data contains a christian@4183: string of semi-colon separated 'long' value pairs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FixationArtifactAccess.java: christian@4183: Process the new data. christian@4183: christian@4183: 2012-05-29 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/RelativePointFacet.java: christian@4183: trivial doc. christian@4183: christian@4183: * src/main/java/de/intevation/flys/themes/ThemeAccess.java: christian@4183: Removed disturbing comment. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java christian@4183: (SimpleAxis): Add ommitted Y_AXIS2 to enum. christian@4183: christian@4183: 2012-05-29 Felix Wolfsteller christian@4183: christian@4183: solve issue417: duration curve annotations as line to curve. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java christian@4183: (createStickyLineAnnotation): New. christian@4183: Resolved todos, use the line style. christian@4183: christian@4183: 2012-05-29 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Doc, TODOs added. christian@4183: christian@4183: 2012-05-29 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Consider theme setting before drawing line to curve. christian@4183: christian@4183: 2012-05-29 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/themes.xml: Donate own theme for mainvalues. christian@4183: christian@4183: 2012-05-28 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: Fit from Q to W not from W to Q! christian@4183: Delta w/t's are now in cm. christian@4183: Slimmed down fitting error report. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DeltaWtExporter.java: christian@4183: Changed default column header of delta W to cm. christian@4183: christian@4183: 2012-05-28 Sascha L. Teichmann christian@4183: christian@4183: Made Delta W/t calculation work. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java: christian@4183: Added toString() method. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsColumn.java: christian@4183: Fixed problem accessing Ws. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Parameters.java: christian@4183: Fixed silly 'name.equals(name)' bug. This mainly prevented delta W/t christian@4183: computation from working. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/DeltaWTsKM.java: christian@4183: More deug code. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: More debug code. Simplified access to data a bit. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/AbstractExporter.java: christian@4183: Allow CSV exporter to throw IOExceptions. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DeltaWtExporter.java: christian@4183: More debug output. Flush CSV after writing. christian@4183: christian@4183: 2012-05-28 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: Units of step is in meter and not km. Added more debug output. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java: christian@4183: Stupidly forgot to add facet to return the delta w/t as CSV. christian@4183: christian@4183: 2012-05-27 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java: christian@4183: There was a cast to WINFOArtifact where a cast to FLYSArtifact christian@4183: is sufficient. This prevented generating error reports that christian@4183: does not inherit from WINFOArtifact like FixationArtifact. christian@4183: christian@4183: 2012-05-27 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml, christian@4183: doc/conf/conf.xml: Added CSV and error report generator/facets. christian@4183: christian@4183: 2012-05-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFactory.java: christian@4183: CrossSectionFactory.isNewest() will return true if the CrossSection is christian@4183: the only CrossSection found in the database. No IndexOutOfBounds is christian@4183: thrown. christian@4183: christian@4183: 2012-05-27 Ingo Weinzierl christian@4183: christian@4183: * Tagged module as '2.7'. christian@4183: christian@4183: 2012-05-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Don't break chart creation if no hyks are existing. christian@4183: christian@4183: 2012-05-26 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/DeltaWTsKM.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/fixings/FixResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/ExternalWMSArtifact.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-05-26 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/DeltaWTsKM.java: christian@4183: Added getters to access the inner data structures. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/Formatter.java: Added formatting christian@4183: support for delta w/t exports of fix analysis. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DeltaWtExporter.java: christian@4183: New. CSV exporter for delta w/ts of fix analysis. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: christian@4183: Reordered imports. christian@4183: christian@4183: 2012-05-26 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FitResult.java: christian@4183: Removed. Obsolete. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixResult.java: christian@4183: New. Stores the result of the fixing analysis. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: Return the right structure (FixResult) from the calculation. christian@4183: christian@4183: 2012-05-26 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Parameters.java: christian@4183: Fixed stupid index bug. christian@4183: christian@4183: 2012-05-26 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java: christian@4183: Call the computing. christian@4183: christian@4183: 2012-05-25 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/conf.xml: Use the correct Artifacts for wms fixpoints and christian@4183: floodmaps (they were interchanged). christian@4183: christian@4183: 2012-05-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixResults.java: christian@4183: New. Stores all results of a fixing analysis. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/DeltaWTsKM.java: christian@4183: New. Km indexed container for Delta W/t diagrams. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: Create FixResults and DeltaWTsKM now to store the results. christian@4183: christian@4183: 2012-05-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeParser.java: christian@4183: Replaced another silly "@attribute" XPATH with direct getAttribute() christian@4183: call. christian@4183: christian@4183: 2012-05-25 Felix Wolfsteller christian@4183: christian@4183: Draw line of mainvalues to duration curve hit point to ground. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Also work for q-value case on second y-axis, refactored. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java: christian@4183: Doc and fix.Doc and fix. christian@4183: christian@4183: 2012-05-25 Felix Wolfsteller christian@4183: christian@4183: Also draw lines to curve from q-mainvalues in dur. curve christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java: christian@4183: In analogy to the W-case, calculate where line from main value hits christian@4183: a wqday-curve from DurationCurve. christian@4183: christian@4183: 2012-05-25 Felix Wolfsteller christian@4183: christian@4183: Draw line of w-mainvalue to duration curve hit point to ground. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: If StickyAxisAnnotation has a hit point set, also add line annotation christian@4183: from the crossing point to the x-axis. christian@4183: christian@4183: 2012-05-25 Felix Wolfsteller christian@4183: christian@4183: Draw line of w-mainvalue to duration curve, baby version. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: christian@4183: Added field "hitPoint", when a line to a point should be drawn christian@4183: - leveraging this annotation into the second dimension. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java: christian@4183: Calculate where mainvalue hits a duration curve. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: If StickyAxisAnnotation has a hit point set, add line annotation christian@4183: to hit (the duration) curve. christian@4183: christian@4183: 2012-05-25 Raimund Renkert christian@4183: christian@4183: * doc/conf/themes.xml: christian@4183: Added a warning to not use virtual themes for facets. christian@4183: christian@4183: 2012-05-25 Raimund Renkert christian@4183: christian@4183: * doc/conf/themes.xml: christian@4183: Added concrete themes for maps. christian@4183: christian@4183: 2012-05-25 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Moved parameter of addAnnotations out, renamed to addVisibleAnnotation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Adjusted. christian@4183: christian@4183: 2012-05-25 Raimund Renkert christian@4183: christian@4183: * doc/conf/themes.xml: christian@4183: Added concrete themes for areas. christian@4183: christian@4183: 2012-05-24 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Load mainvalues in reference curves. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Add mainvalues to compatibility list christian@4183: of reference curves; fix typo. christian@4183: christian@4183: 2012-05-24 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: christian@4183: Render mainvalues as annotations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Render static wkms data. christian@4183: christian@4183: 2012-05-24 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Cosmetic. christian@4183: christian@4183: 2012-05-24 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java, christian@4183: src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: christian@4183: (flipStickyAxis): Allow easy change of sticky axes. christian@4183: christian@4183: 2012-05-24 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java christian@4183: (getWaterlevelData): Exception for discharge case. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java christian@4183: (getLocations): Exception for discharge case. christian@4183: christian@4183: 2012-05-24 Raimund Renkert christian@4183: christian@4183: Issue 667. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: christian@4183: Added data to jfreechart data source. christian@4183: christian@4183: 2012-05-24 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/services/ThemeListingService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/HYKArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/AreaArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/GaugeDischargeArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/StaticWQKmsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java, christian@4183: src/main/java/de/intevation/flys/themes/ThemeGroup.java: Removed christian@4183: needless imports. christian@4183: christian@4183: 2012-05-24 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Reproject christian@4183: geometries into the coordinate reference system defined in the christian@4183: configuration. christian@4183: christian@4183: 2012-05-24 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Include other "thematic" heights for christian@4183: reference curve relative points dc conf. christian@4183: christian@4183: 2012-05-24 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: christian@4183: Cosmetics. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/RelativePointFacet.java: christian@4183: Added TODO. christian@4183: christian@4183: 2012-05-24 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/relativepoint.xml, christian@4183: doc/conf/conf.xml: Remove relativepoint artifact remainders, so far christian@4183: all cases are covered by facet. christian@4183: christian@4183: 2012-05-24 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java: christian@4183: Handle reference curve case, slightly refactored. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: christian@4183: Handle points in doOut. christian@4183: christian@4183: 2012-05-24 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java: christian@4183: Expose data via blackboard. christian@4183: christian@4183: 2012-05-24 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Serve fixations christian@4183: with relative points for reference curves. christian@4183: christian@4183: 2012-05-24 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java christian@4183: (getReferenceStartKm, getReferenceEndKms): Made public. christian@4183: christian@4183: 2012-05-24 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Add relative point to compatibility christian@4183: list of reference curve out. christian@4183: christian@4183: 2012-05-23 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Remove second facet from christian@4183: StaticWKmsArtifact from compatibility list of duration curves. christian@4183: christian@4183: * doc/conf/themes.xml: Add basic theme for relativepoint. christian@4183: christian@4183: 2012-05-23 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Serve floodprotections and heightmarks christian@4183: with relative points for duration curves. christian@4183: christian@4183: 2012-05-23 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: christian@4183: Handle relative points in doOut. christian@4183: christian@4183: 2012-05-23 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Serve fixations with relative points christian@4183: for duration curves. christian@4183: christian@4183: 2012-05-23 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/ExternalWMSArtifact.java: christian@4183: Use superclass static field and method. christian@4183: christian@4183: 2012-05-23 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/RelativePointFacet.java: christian@4183: Handle duration curve case. Do a linear interpolation of the day. christian@4183: christian@4183: 2012-05-23 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DurationCurveFacet.java: christian@4183: Be a DataProvider, provide the duration curve and its km. christian@4183: christian@4183: 2012-05-23 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: christian@4183: (getWAtKmLin): Linear interpolating version of getWAtKm. christian@4183: christian@4183: 2012-05-23 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/RelativePointFacet.java: christian@4183: Add (dummy-) implementation of a relative point facet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: christian@4183: Use superclass infrastructure. Spawn RelativePointFacet. christian@4183: christian@4183: * doc/conf/winfo.xml: Add relativepoint facet to compatibility list christian@4183: of duration curve out. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Add RELATIVE_POINT Facet Type. christian@4183: christian@4183: 2012-05-23 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/fitting/Function.java: christian@4183: Allow instantiation of a function with concrete parameters. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Parameters.java: christian@4183: Enable indexed access to parameter names. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FitResult.java: christian@4183: New. Bundles the results of the fitting. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/DeltaWT.java: christian@4183: New. Stores results of Delta W/t calcs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: christian@4183: Calculate Delta W/t s, too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: christian@4183: Make component filters ('and', 'or') more easy to construct. christian@4183: christian@4183: 2012-05-23 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java, christian@4183: src/main/java/de/intevation/flys/themes/ThemeFactory.java: christian@4183: Improved startup performance. christian@4183: christian@4183: 2012-05-23 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java christian@4183: (getDatacageIDValue): New, extracted from various duplicates. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/HYKArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/AreaArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/GaugeDischargeArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/StaticWQKmsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java: christian@4183: Use getDatacageIDValue() from superclass or static context. christian@4183: christian@4183: 2012-05-23 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java: christian@4183: Define XPath to access "id" value of element coming from datacage-document. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/HYKArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/AreaArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/GaugeDischargeArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/StaticWQKmsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java: christian@4183: Use xpath defined in superclass. christian@4183: christian@4183: 2012-05-23 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/BlackboardDataFacet.java: christian@4183: Whitespace-Cosmetics. christian@4183: christian@4183: 2012-05-23 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/relativepoint.xml: New artifact-state-config for upcoming christian@4183: artifact. christian@4183: christian@4183: * doc/conf/conf.xml: Register artifact factory and artifact for christian@4183: upcoming artifact. christian@4183: christian@4183: 2012-05-23 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/themes/ThemeGroup.java: christian@4183: New. A theme group takes a set of themes configured in the themes.xml. christian@4183: christian@4183: * src/main/java/de/intevation/flys/themes/ThemeFactory.java: christian@4183: Read the theme groups configured in the themes.xml. christian@4183: Improved reading the xml file. Thanks to Sascha for the patch. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Get a theme using the new parameter themegroup. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: christian@4183: Create theme groups while configuring themes. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/ThemeListingService.java: christian@4183: New. This service returns a list with all configured theme groups, each christian@4183: containing exactly one theme filtered by name. christian@4183: The theme name has to be provided as parameter. christian@4183: christian@4183: * doc/conf/conf.xml: christian@4183: Added new service to config. christian@4183: christian@4183: * doc/conf/themes.xml: christian@4183: Introduced theme groups and added new group. christian@4183: christian@4183: 2012-05-23 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Repair CS-DC-Conf, allow loading christian@4183: waterlevels, add fixations and heightmarks. christian@4183: christian@4183: 2012-05-23 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Cosmetics. christian@4183: christian@4183: 2012-05-22 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Allow loading of fixations in cross-sections. christian@4183: christian@4183: 2012-05-22 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/GaugeDischargeState.java: christian@4183: More debugging of discharge curve issue. christian@4183: christian@4183: 2012-05-22 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/GaugeDischargeArtifact.java christian@4183: (getDischargeCurveData): Moved to more specific class. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/GaugeDischargeFacet.java: christian@4183: Cosmetics, be louder in miscondition. christian@4183: christian@4183: 2012-05-22 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Allow loading of fixations and thmatic christian@4183: heights in longitudinal sections, make discharge-curve-misbehavior christian@4183: testable with trunk. christian@4183: christian@4183: 2012-05-22 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Render discharge outs (was own out once). christian@4183: christian@4183: 2012-05-22 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Allow cross-section stuff in christian@4183: dischargelongitudinal state. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java: christian@4183: Add CrossSectionWaterLineFacets, will trigger the cross section output. christian@4183: christian@4183: 2012-05-22 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FixationArtifact.java: christian@4183: Added vim line. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: christian@4183: Removed empty line. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Removed invalid/not helpful comments. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java christian@4183: (outputExists): Doc. christian@4183: christian@4183: 2012-05-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/ReferencePeriod.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/AnalysisPeriods.java: christian@4183: Adjusted ui providers to make parameter names unique in client. christian@4183: christian@4183: 2012-05-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Fixed short evaluation problem. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FixationArtifactAccess.java: christian@4183: Added more debuf output. christian@4183: christian@4183: 2012-05-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FixationArtifactAccess.java: christian@4183: New. Access the state data of fixings artifacts. christian@4183: christian@4183: 2012-05-22 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: Make "start" and "end" parameters christian@4183: unique in fixings artifact states. christian@4183: christian@4183: 2012-05-21 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/winfo.xml: Extend compatibility lists. christian@4183: christian@4183: * doc/conf/conf.xml: Add gaugedischarge factory and artifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/GaugeDischargeFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/GaugeDischargeArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/GaugeDischargeState.java: christian@4183: New, State, Facet and Artifact to access discharge curves of gauges. christian@4183: christian@4183: * doc/conf/gaugedischarge.xml: New trivial state model for gaugedis. christian@4183: christian@4183: 2012-05-21 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Allow loading of prev. reference curves. christian@4183: christian@4183: 2012-05-21 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: (yet unused) sceleton for ref-curve dc conf. christian@4183: christian@4183: 2012-05-21 Raimund Renkert christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n strings for fix analysis. christian@4183: christian@4183: 2012-05-21 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/EventSelect.java: christian@4183: Implemented static data for state. christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: christian@4183: Changed transition in 'volmer' states. christian@4183: christian@4183: christian@4183: 2012-05-21 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java: christian@4183: Include km in names of duration curve facets. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Adjusted i18n for christian@4183: duration curve facet names (now include km). christian@4183: christian@4183: 2012-05-21 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Allow loading of previous duration curves and christian@4183: fixations in duration curves. christian@4183: christian@4183: 2012-05-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/SoundingsSelect.java: christian@4183: Take the current km range into account in getOptions(). christian@4183: christian@4183: 2012-05-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java, christian@4183: doc/conf/artifacts/minfo.xml: Adapted facets for middle bed height. We christian@4183: now distinguish between epochs and singles. christian@4183: christian@4183: * doc/conf/conf.xml: Registered new output generator for middle bed height. christian@4183: christian@4183: * doc/conf/themes.xml: Added new themes for middle bed height epoch and christian@4183: single curves. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightCalculation.java: christian@4183: Take the km range into account. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/MiddleBedHeight.java: christian@4183: Create facets for single and epochs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/MiddleBedHeightInfoGenerator.java, christian@4183: * src/main/java/de/intevation/flys/exports/MiddleBedHeightGenerator.java: christian@4183: Chart and info generator for middle bed height charts. christian@4183: christian@4183: 2012-05-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightData.java: christian@4183: Added new methods that create names for singles and epochs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/Formatter.java: Added number christian@4183: formatters used to export middle bed heights values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/MiddleBedHeightExporter.java: christian@4183: New exporter for middle bed heights values. christian@4183: christian@4183: * doc/conf/conf.xml: Registered new output generator for middle bed height christian@4183: exports. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: New i18n strings for middle christian@4183: bed height facets and csv export. christian@4183: christian@4183: 2012-05-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightData.java: christian@4183: New model class for storing data for middle bed height exports (chart, christian@4183: data exports). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightCalculation.java: christian@4183: New Calculation that generates new MiddleBedHeightData. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightFacet.java: christian@4183: New Facet which is used for middle bed height charts. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added christian@4183: new facet type for middle bed height curves. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/MiddleBedHeight.java: christian@4183: Calculate middle bed height data using MiddleBedHeightCalculation and christian@4183: create new facets for charts and csv export. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MINFOArtifact.java: Added new christian@4183: methods that return the IDs of selected single bed heights and epoch bed christian@4183: heights. christian@4183: christian@4183: 2012-05-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/SoundingsSelect.java: christian@4183: Implemented getOptions() and getLabelFor(). christian@4183: christian@4183: 2012-05-16 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Stabilized legend item aggregation. christian@4183: christian@4183: 2012-05-16 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Extensive - although mostly trivial - doc adds. christian@4183: christian@4183: 2012-05-16 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/minfo.xml: Added states and transitions for MINFO christian@4183: middle bed height calculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/MultiStringArrayState.java: christian@4183: New. Nearly a copy of MultiIntArrayState but uses String values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/SoundingsSelect.java: christian@4183: New subclass of MultiStringArrayState. It will be used for bed heights christian@4183: selection. We need to do handle the values as string, because singles christian@4183: and epochs are mixed, so the DB ID is not enough as parameter value. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/MiddleBedHeight.java: christian@4183: New. This state will trigger the calculation for middle bed height in christian@4183: MINFO module. christian@4183: christian@4183: 2012-05-16 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/MultiIntArrayState.java: christian@4183: Do not add a element to the dynamic DESCRIBE but add the christian@4183: directly to which allows using default mechanism christian@4183: in FLYS client. christian@4183: christian@4183: 2012-05-15 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: christian@4183: Replaced event name by its description, which combines the christian@4183: description of the fixing (= WST file description) and the name christian@4183: of the column. christian@4183: christian@4183: * contrib/fixoverview2html.xsl: Adjusted. christian@4183: christian@4183: 2012-05-16 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/minfo.xml: Added a chart output and relevant facets to christian@4183: flow velocity state. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added christian@4183: new facet types for mainchannel, totalchannel and tau of flow velocity christian@4183: calculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FlowVelocityFacet.java: christian@4183: New Facet that returns FlowVelocityData in getData(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FlowVelocityData.java: christian@4183: Added new methods that return xy points for mainchannel, totalchannel and christian@4183: tau. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FlowVelocityState.java: christian@4183: Create new mainchannel, totalchannel and tau Facets for each christian@4183: FlowVelocityData instance retrieved by FlowVelocityCalculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Commented christian@4183: legend aggregation out. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/FlowVelocityInfoGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/FlowVelocityGenerator.java: New christian@4183: chart generator for flow velocity data and its info generator. christian@4183: christian@4183: * doc/conf/conf.xml: Registered the chart and chart info generator for flow christian@4183: velocity data. christian@4183: christian@4183: * doc/conf/themes.xml: Added new themes for mainchannel, totalchannel and christian@4183: tau of flow velocity calculation. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added i18n strings for flow christian@4183: velocity facets. christian@4183: christian@4183: 2012-05-16 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/MultiIntArrayState.java: christian@4183: Add a 'label' attribute to each element in the static DESCRIBE. christian@4183: In addition to that, the element created in this class can have christian@4183: multiple elements which consist of a 'value' and a 'label' christian@4183: attribute. This 'label' attribute is taken from getLabelFor() which is christian@4183: abstract and needs to be implemented by subclasses. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DischargeState.java: christian@4183: Implemented the abstract method getLabelFor(). christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_de.properties: New i18n strings for MINFO christian@4183: parameter names. christian@4183: christian@4183: 2012-05-16 Ingo Weinzierl christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: New i18n strings for MINFO christian@4183: states. christian@4183: christian@4183: 2012-05-16 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/FlowVelocityExporter.java: christian@4183: Append the name of a location for the km row which is provided by christian@4183: FLYSUtils.getLocationDescription(km); christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added i18n strings for flow christian@4183: velocity CSV export headers. christian@4183: christian@4183: 2012-05-16 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/minfo.xml: Added new state and csv export for MINFO flow christian@4183: velocity calculation. christian@4183: christian@4183: * doc/conf/conf.xml: Registered a new CSV exporter for flow velocity christian@4183: values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java: christian@4183: New calculation for MINFO flow velocity. Actually, this is no christian@4183: calculation but a bundling of data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FlowVelocityData.java: christian@4183: New model class that is used to store flow velocity relevant data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FlowVelocityState.java: christian@4183: New state that triggers the FlowVelocityCalculation and creates new christian@4183: facets. Currently, only a CSV Facet is created. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MINFOArtifact.java: Added christian@4183: methods to retrieve the IDs of main channels and total channels for the christian@4183: flow velocity calculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/Formatter.java: New formatters christian@4183: that are used in CSV exporter for flow velocity. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/FlowVelocityExporter.java: New christian@4183: concrete subclasses of AbstractExporter that currently implements the christian@4183: path to export FlowVelocityData as CSV. christian@4183: christian@4183: 2012-05-16 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/HYKArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java: christian@4183: Removed getDataAsDouble() which is now implemented in FLYSArtifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Implemented getDataAsDouble(). This method will return a Double based on christian@4183: a given parameter name. christian@4183: christian@4183: 2012-05-15 Raimund Renkert christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: christian@4183: Changed data type for state 'eventselect'. christian@4183: christian@4183: 2012-05-15 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSQPSArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSKmArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSHydrBoundaryArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSFixpointsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSFloodmapsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/FixationArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSHwsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSCatchmentArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/QSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/FixationSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/ReferencePeriod.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/FixationVolmerCompute.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/PreprocessingSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/FixationPeriod.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/FunctionSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/GaugeRange.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/LocationSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/AnalysisPeriods.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSHydrBoundaryPolyArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSBuildingsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSGaugeLocationArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSLineArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSFloodplainArtifact.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-05-15 Raimund Renkert christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: christian@4183: Adjusted state data fields. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/ReferencePeriod.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/PreprocessingSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/FunctionSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/AnalysisPeriods.java: christian@4183: Implemented states. christian@4183: christian@4183: 2012-05-15 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/fitting/Function.java: christian@4183: Fixed constructor. Descriptions are now available. christian@4183: christian@4183: 2012-05-15 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/minfo.xml: Added new transistions and states for christian@4183: MINFO flow velocity calculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/MultiIntArrayState.java: christian@4183: New abstract states that might be used to append a list of available christian@4183: integer values to the DESCRIBE document. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DischargeState.java: christian@4183: Concrete subclass of MultiIntArrayState which implements the abstract christian@4183: method getOptions(). christian@4183: christian@4183: 2012-05-14 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Parameters.java: christian@4183: New. Model for storing fitting results in cache. christian@4183: christian@4183: 2012-05-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java: christian@4183: Removed the computeFeed() method that created Facets for discharge christian@4183: curves to make this state ready to use in MINFO calculations. christian@4183: christian@4183: 2012-05-14 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/minfo.xml: New Artifact configuration for module christian@4183: MINFO. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MINFOArtifact.java: New christian@4183: Artifact for module INFO. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/CalculationSelectMinfo.java: christian@4183: New. The state is used for choosing the calculation in module MINFO. christian@4183: christian@4183: * doc/conf/conf.xml: Registered the MINFO Artifact. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: New strings for states and christian@4183: calculations. christian@4183: christian@4183: 2012-05-13 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: christian@4183: Removed unused code. christian@4183: christian@4183: 2012-05-13 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: christian@4183: Doc. christian@4183: christian@4183: 2012-05-13 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Allow duration_curve.q loading via datacage. christian@4183: christian@4183: 2012-05-11 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Allow hyk loading also when in non- christian@4183: recommendation mode. christian@4183: christian@4183: 2012-05-11 Felix Wolfsteller christian@4183: christian@4183: Improved middle height calculations for waterlevels. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/geom/Lines.java christian@4183: (area): Improved or even corrected area calculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Corrected middle height calculated, have a very verbose label for christian@4183: the time being. christian@4183: christian@4183: 2012-05-11 Felix Wolfsteller christian@4183: christian@4183: Somewhat improve area calculation during line computation. christian@4183: Still faulty. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/geom/Lines.java christian@4183: (fillWater): Piecewise calculate area in more cases. christian@4183: christian@4183: 2012-05-11 Felix Wolfsteller christian@4183: christian@4183: Tackle water-through-mountain issue that exists since r4099. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java christian@4183: (addPoints): Add parameter that decides whether or not to skip NaNs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Set new parameter to StyledSeriesBuilder.addPoints calls. christian@4183: For waterlines it is important that NaNs stay included! christian@4183: christian@4183: 2012-05-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSGaugeLocationArtifact.java: christian@4183: New Artifact for storing geometries for gauges. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added christian@4183: a new facet type for WMSGaugeLocationArtifact 'floodmap.gaugelocation'. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml, christian@4183: doc/conf/artifacts/map.xml: Added 'floodmap.gaugelocation' facet to the christian@4183: list of valid facets for map and floodmap output. christian@4183: christian@4183: * doc/conf/conf.xml: Added a factory for creating christian@4183: WMSGaugeLocationArtifacts. christian@4183: christian@4183: * doc/conf/themes.xml: Added a theme for 'floodmap.gaugelocation' facets. christian@4183: christian@4183: * doc/conf/meta-data.xml: Added a datacage section for gauge locations to christian@4183: the floodmap and map section. christian@4183: christian@4183: 2012-05-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added christian@4183: new facet types 'floodmap.hydr_boundaries' and christian@4183: 'floodmap.hydr_boundaries_poly' christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml, christian@4183: doc/conf/artifacts/map.xml: Registered 'floodmap.hydr_boundaries' and christian@4183: 'floodmap.hydr_boundaries_poly' for floodmap and map output types. christian@4183: christian@4183: * doc/conf/conf.xml: christian@4183: christian@4183: * doc/conf/themes.xml: Added themes for 'floodmap.hydr_boundaries' and christian@4183: 'floodmap.hydr_boundaries_poly'. christian@4183: christian@4183: * doc/conf/meta-data.xml: Improved datacage configuration specific to christian@4183: floodmaps and maps. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSHydrBoundaryArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSHydrBoundaryPolyArtifact.java: christian@4183: New artifacts to save information about hydrological boundaries. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSQPSArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSKmArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSFixpointsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSFloodmapsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSHwsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSCatchmentArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSBuildingsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSLineArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSFloodplainArtifact.java: christian@4183: Moved the methods getRiverId() and getTitle() into WMSDBArtifact. christian@4183: christian@4183: 2012-05-10 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/mapserver/wsplgen_layer.vm, christian@4183: doc/conf/mapserver/shapefile_layer.vm: Added a 'PROJECTION' section. christian@4183: christian@4183: 2012-05-10 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/geom/Lines.java: christian@4183: Minor refactoring, doc. christian@4183: christian@4183: 2012-05-10 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/mapserver/layer.vm: Added a 'PROJECTION' section. christian@4183: christian@4183: 2012-05-10 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/geom/Lines.java: christian@4183: Minimal doc, TODO. christian@4183: christian@4183: 2012-05-10 Felix Wolfsteller christian@4183: christian@4183: Fix issue620: synchron navigation at impossible kms. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java christian@4183: (searchCrossSectionLine): Do not return a CrossSectionLine if there christian@4183: is none found within 1km. christian@4183: christian@4183: 2012-05-10 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: christian@4183: Minimal cosmetics. christian@4183: christian@4183: 2012-05-10 Felix Wolfsteller christian@4183: christian@4183: Preparations for fix issue620: Synchron navigation on non-existing km. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java christian@4183: (getData): Return empty lines if no cross section found. christian@4183: christian@4183: 2012-05-09 Felix Wolfsteller christian@4183: christian@4183: Display mittlere hoehe (which is not yet calculated). christian@4183: christian@4183: * doc/conf/themes.xml: Added theme prop to display middlere hoehe or not. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java: christian@4183: (parseShowMiddleHeight): New, parse the new theme prop. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/geom/Lines.java: christian@4183: (fillWater, ListWithArea): Return new type wich also contains area. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Respect new theme prop and adjust label if set. christian@4183: christian@4183: 2012-05-09 Felix Wolfsteller christian@4183: christian@4183: Beginning of calculation of Mittlere Hoehe: area calculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: christian@4183: Adjusted to LineData constructor. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/geom/Lines.java christian@4183: (area): New, calculate area of a polygon. christian@4183: Added todos where area calculation code paths are missing. christian@4183: christian@4183: 2012-05-08 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/meta-data.xml: Moved the hws layers out to an own node. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSCatchmentArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java: Moved the christian@4183: 'name' property from WMSCatchmentArtifact to WMSDBArtifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSHwsArtifact.java: Create christian@4183: more specific filter and extent that takes the 'name' into account. christian@4183: christian@4183: 2012-05-08 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/meta-data.xml: Moved the catchments out to an own node. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSCatchmentArtifact.java: christian@4183: Parse the name of required catchments fetch name specific catchments christian@4183: only. christian@4183: christian@4183: 2012-05-08 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/map.xml: Added the 'floodmap.floodmaps' facet to the christian@4183: list of valid facets of the 'map' output. christian@4183: christian@4183: * doc/conf/themes.xml: Renamed the 'Line' theme used for floodmaps to christian@4183: 'FloodmapLines'. christian@4183: christian@4183: 2012-05-08 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/mapserver/db_layer.vm: Added a PROJECTION section which is christian@4183: filled by the LayerInfo object. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java: Added christian@4183: a 'srid' property. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Set the christian@4183: 'srid' property of all LayerInfo objects. christian@4183: christian@4183: 2012-05-07 Raimund Renkert christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: christian@4183: Changed state data and added new state. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation/QSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/FixationSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/EventSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/FixationPeriod.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/GaugeRange.java: christian@4183: Modified states and added new state for concrete event selection. christian@4183: christian@4183: 2012-05-04 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/themes: Add text-bg properties to Area style. christian@4183: christian@4183: * src/main/java/de/intevation/flys/themes/ThemeAccess.java christian@4183: (TextStyle.apply): Apply text bg theme-properties to renderer. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StyledAreaSeriesCollection.java: christian@4183: Cosmetics. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: christian@4183: Added field to store labels background color, calculate arithmetic christian@4183: middles of polygons, to put label there (improves situation slightly). christian@4183: christian@4183: 2012-05-03 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java christian@4183: (parseShowArea): parse show area field of theme. christian@4183: christian@4183: * src/main/java/de/intevation/flys/themes/ThemeAccess.java christian@4183: (TextStyle.apply): Be applicable to StableXYDifferenceRenderers. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StyledAreaSeriesCollection.java: christian@4183: Apply setting from theme to renderer. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: christian@4183: Simplified area calculation (always calculate). Added getters and christian@4183: setters for text for label style, respect most of that. christian@4183: christian@4183: 2012-05-03 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/themes: Let Area style not inherit from colorlines (as labels christian@4183: work slightly different. Enable showarea property. Comment dupe Lines. christian@4183: christian@4183: 2012-05-03 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java christian@4183: (doArea): Add Lines.LineData datatype to areable data types. christian@4183: christian@4183: 2012-05-03 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/themes.xml: Add two new options for waterlevel label in cs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java: christian@4183: Parse new theme properties. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Adjust label according to chosen properties. christian@4183: christian@4183: 2012-05-03 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java christian@4183: (parseShowLineLabelBG): parse show line label bg field of theme. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java: christian@4183: Respect show line label bg setting of theme. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/XYStyle.java: christian@4183: Apply setting from theme to renderer. christian@4183: christian@4183: 2012-05-03 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added a 'helpText' field to each state. christian@4183: The 'helpText' field represents in this case a message in the i18n christian@4183: resources which should be a link to a online help page. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: Append the 'helpText' to the DESCRIBE document. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added links to help text in christian@4183: the FLYS wiki. christian@4183: christian@4183: 2012-05-03 Felix Wolfsteller christian@4183: christian@4183: Use the colors specified in theme document for linelabel. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java: christian@4183: New methods to find colors specified for linelabels. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java: christian@4183: Store and use background and foreground color for linelabels. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/XYStyle.java: christian@4183: Communicate colors of linelabels to renderer. christian@4183: christian@4183: 2012-05-02 Felix Wolfsteller christian@4183: christian@4183: Actually use the font specified in theme document for linelabel. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java: christian@4183: Fixed paths for linelabel-related fields in theme doc. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java: christian@4183: Set font for linelabel. christian@4183: christian@4183: 2012-05-02 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/themes.xml: No default background show for linelabels. christian@4183: christian@4183: 2012-05-02 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelInfoState.java: christian@4183: Cosmetic, added annotation. christian@4183: christian@4183: 2012-05-02 Felix Wolfsteller christian@4183: christian@4183: Parse font for linelabels, do not use it yet. christian@4183: christian@4183: * doc/conf/themes.xml: Add more theme properties related to linelabels. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java christian@4183: (parseTextSize, parseLineLabelSize): New and slightly refactored. christian@4183: (parseLineLabelFont): New. christian@4183: (parseTextStyle, parseLineLabelStyle): New and slightly refactored. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java christian@4183: (setLineLabelFont, getLineLabelFont): New, accessors to christian@4183: linelabelfont field. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/XYStyle.java christian@4183: (applyLineLabelFont): New. christian@4183: christian@4183: 2012-05-02 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: christian@4183: Make it compile again after signature change in backend. christian@4183: christian@4183: 2012-04-27 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Doc. christian@4183: christian@4183: 2012-04-27 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/geom/Lines.java: christian@4183: Added local class LineData and return it to also include christian@4183: Length of lines. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WaterLineArtifact.java: christian@4183: Changed signature of interfaces getWaterLines. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: christian@4183: (getWaterLines): adjusted signature. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: christian@4183: Adjusted to return type of Lines.createWaterLines. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Include length in label (stub). christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/HasLabel.java: christian@4183: New interface. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StyledXYSeries.java: christian@4183: Implement new HasLabel interface. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java: christian@4183: Take into account that StyledXYSeries are HasLabel. christian@4183: christian@4183: 2012-04-26 Raimund Renkert christian@4183: christian@4183: Initial transition configuration and artifact/state stubs for fixation christian@4183: analysis. christian@4183: christian@4183: * doc/conf/artifacts/fixanalysis.xml: christian@4183: New. Initial transition configuration. christian@4183: christian@4183: * doc/conf/conf.xml: christian@4183: Added artifact and factory entry to config. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FixationArtifact.java: christian@4183: New. Stub with initial implementation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/fixation, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/QSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/ReferencePeriod.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/FixationSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/FixationVolmerCompute.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/PreprocessingSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/FixationPeriod.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/FunctionSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/GaugeRange.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/LocationSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/AnalysisPeriods.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java: christian@4183: New. Stubs for fixation states. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n strings. christian@4183: christian@4183: 2012-04-26 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/geom/Lines.java: christian@4183: Add method to calculate length of water lines. christian@4183: christian@4183: 2012-04-26 Felix Wolfsteller christian@4183: christian@4183: Most of issue454: Label waterlevels. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java christian@4183: (drawSecondaryPass): Use correct label for lines. christian@4183: christian@4183: 2012-04-26 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java christian@4183: (showSeriesMinimunX, showLineLabel): Renamed field. christian@4183: (isShowLineLabel, setShowLineLabel): Added getters and setters for christian@4183: showLineLabel field. christian@4183: (drawSecondaryPass): Respect showLineLabel field, draw static text christian@4183: as placeholder for real label (stub). christian@4183: christian@4183: * doc/conf/themes.xml: Define theme prop 'showlinelabel' for Lines. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Parse theme christian@4183: theme prop. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/XYStyle.java: Apply showline christian@4183: theme prop. christian@4183: christian@4183: 2012-04-26 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java: christian@4183: Cosmetics, doc. christian@4183: christian@4183: 2012-04-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/Outlier.java: christian@4183: Gah! Checked in out dated version. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FileUploadService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/ScenarioSelect.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-04-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/Outlier.java: christian@4183: New. Simple Grubb's outlier test. Needs testing. ;-) christian@4183: christian@4183: 2012-04-25 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java christian@4183: (isMinimumX): Implemented minimum finding for x in analogy to the ones for christian@4183: y values. Stub to label dataset curves in plot. christian@4183: christian@4183: 2012-04-25 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java: christian@4183: Cosmetics, added doc, TODO and an OPTIMIZE. christian@4183: christian@4183: 2012-04-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FileUploadService.java: christian@4183: Make it cross platform. christian@4183: christian@4183: 2012-04-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FileUploadService.java: christian@4183: Make it compilable. christian@4183: christian@4183: 2012-04-18 Raimund Renkert christian@4183: christian@4183: Issue 657. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FileUploadService.java: christian@4183: New. Service to upload a file as base64 string embedded in xml structure. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Extract shape files from zip archive and move them to artifact directory. christian@4183: Add the user shapefile as parameter for wsplgen calculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ScenarioSelect.java: christian@4183: Remove the artifact directory on step back. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/MapfileGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/MapGenerator.java: christian@4183: Create layer to display the uploaded shapefile. christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java: christian@4183: Create a facet to output the user defined layer. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added type for user shape file. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: christian@4183: Resized array for '-lin' parameter. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: christian@4183: Added facet to diplay user defined shapefile. christian@4183: christian@4183: * doc/conf/conf.xml: christian@4183: Added file upload service. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n string. christian@4183: christian@4183: 2012-04-18 Raimund Renkert christian@4183: christian@4183: Issue 560. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WSPLGENLayerFacet.java: christian@4183: New. Facet for WSPLGEN layers. christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java: christian@4183: Create a new WSPLGEN facet when creating uesk layers. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/MapfileGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/MapGenerator.java: christian@4183: Use WSPLGENLayerFacet to create uesk layer. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: christian@4183: Switch back to false as return value in isQueryable(). christian@4183: christian@4183: 2012-04-18 Raimund Renkert christian@4183: christian@4183: Issue 560. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: christian@4183: Generate WSPLGEN-Layer with its own template and set the layertitle to christian@4183: an i18n string. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/MapGenerator.java: christian@4183: Call createUeskLayer with a CallContext. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: christian@4183: Set queryable to true. christian@4183: christian@4183: * doc/conf/mapserver/wsplgen_layer.vm: christian@4183: New. Template for WSPLGEN-Layer. christian@4183: christian@4183: 2012-04-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-04-18 Raimund Renkert christian@4183: christian@4183: * doc/conf/themes.xml: christian@4183: Added mapping for manual points in historical discharge chart. christian@4183: christian@4183: 2012-04-18 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Fixed duplicated legend entry for manual points. christian@4183: christian@4183: 2012-04-18 Raimund Renkert christian@4183: christian@4183: Issue 494. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Create manual points with text annotations in time charts. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java: christian@4183: Add manual points to the chart. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added historical discharge to chart types. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml, christian@4183: doc/conf/artifacts/manualpoints.xml: christian@4183: Added manual points facet to output modes. christian@4183: christian@4183: 2012-04-17 Sascha L. Teichmann christian@4183: christian@4183: * contrib/fixoverview2html.xsl: Render optional check boxes. christian@4183: Use different font. TODO: Move to client, christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: christian@4183: Ignore hours and seconds. christian@4183: christian@4183: 2012-04-13 Raimund Renkert christian@4183: christian@4183: Issue 528, 637 christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WWQQJRDataSource.java: christian@4183: Added fields for new columns. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: christian@4183: Added columns for 'W at gauge' and fixed column header. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added filenames for new pdf export templates. christian@4183: christian@4183: 2012-04-13 Raimund Renkert christian@4183: christian@4183: * doc/conf/jasper/reference_gauge_end.jasper, christian@4183: doc/conf/jasper/reference_gauge.jasper, christian@4183: doc/conf/jasper/reference_gauge_start_end.jasper: christian@4183: Small fixes in pdf templates. christian@4183: christian@4183: 2012-04-12 Raimund Renkert christian@4183: christian@4183: Issue 528, 637. christian@4183: christian@4183: * doc/conf/jasper/reference_gauge.jasper, christian@4183: doc/conf/jasper/reference_en_gauge.jasper: christian@4183: Modified templates. christian@4183: christian@4183: * doc/conf/jasper/reference_gauge_end.jasper, christian@4183: doc/conf/jasper/reference_gauge_start_end.jasper, christian@4183: doc/conf/jasper/reference_en_gauge_end.jasper, christian@4183: doc/conf/jasper/reference_en_gauge_start_end.jasper: christian@4183: New. Templates for reference curve pdf export. christian@4183: christian@4183: 2012-04-12 Raimund Renkert christian@4183: christian@4183: Issue 528, 637. christian@4183: christian@4183: * doc/conf/jasper/reference.jasper, christian@4183: doc/conf/jasper/reference_en.jasper: christian@4183: Fixed column header. christian@4183: christian@4183: * doc/conf/jasper/reference_gauge.jasper, christian@4183: doc/conf/jasper/reference_en_gauge.jasper: christian@4183: New. christian@4183: christian@4183: 2012-04-11 Sascha L. Teichmann christian@4183: christian@4183: * contrib/check-i18n-properties.py: Checked in unsaved version. :-/ christian@4183: christian@4183: 2012-04-11 Raimund Renkert christian@4183: christian@4183: Issue 656. christian@4183: christian@4183: * src/main/resources/messages_en.properties: christian@4183: Added missing i18n strings. christian@4183: christian@4183: 2012-04-11 Sascha L. Teichmann christian@4183: christian@4183: * contrib/check-i18n-properties.py: New. Script to check inconsistencies christian@4183: of i18n properties files: Detects duplicates and keys not defined in other christian@4183: properties files. Usage: christian@4183: christian@4183: $ find -name messages\*.properties | \ christian@4183: xargs contrib/check-i18n-properties.py christian@4183: christian@4183: 2012-04-11 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Generate error message when more than one Q is found for given christian@4183: Q in "W auf freier Strecke". christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation.java: christian@4183: Added feature to adopt problems from other reports. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n for the error message. christian@4183: christian@4183: 2012-04-11 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: christian@4183: Use factor to calculate steps in range input mode. christian@4183: christian@4183: 2012-04-06 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/cache.xml: Increased number of fixings columns a bit. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsColumnFactory.java: christian@4183: Corrected misspelled cache name. Added bebug output. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsOverviewFactory.java: christian@4183: Added debug output. christian@4183: christian@4183: 2012-04-05 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java: christian@4183: Small fixes: The service works as expected but there seems christian@4183: to be a caching issue. christian@4183: christian@4183: 2012-04-05 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java: christian@4183: Generate chart and deliver the image as the response of the service. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsColumnFactory.java: christian@4183: Return null when looking for a fixing data column that does not exist. christian@4183: christian@4183: 2012-04-05 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsColumnFactory.java: christian@4183: Load ws and qs from database. Cache the fixings columns. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsColumn.java: christian@4183: Removed column id and added q values. christian@4183: christian@4183: * doc/conf/cache.xml: Added cache for the columns of the fixings. christian@4183: christian@4183: 2012-04-05 Raimund Renkert christian@4183: christian@4183: Fix for 'W free' validation and theme names. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: christian@4183: Append the current Q values to theme name if the previous theme has christian@4183: the same name. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: christian@4183: Use the start km to get min/max W values in distance mode and use the christian@4183: first km to get min/max W values if in location mode. christian@4183: christian@4183: 2012-04-05 Raimund Renkert christian@4183: christian@4183: Issue 499. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: christian@4183: Added validation for 'W free' using WstValueTable min/max values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Added getter for WstValueTable. christian@4183: christian@4183: 2012-04-05 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/themes.xml: Defined a theme for WSPLGEN layers. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MapserverStyle.java: christian@4183: Made style creation more robust against nullpointers and added an christian@4183: Expression class. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Added a static christian@4183: method createWSPLGENStyle() and some helpers to create a WSPLGEN style. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/MapGenerator.java, christian@4183: src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Methods christian@4183: for creating the WSPLGEN layer now take a style document. christian@4183: christian@4183: 2012-04-04 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java: christian@4183: Extract parameters from input xml and fetch fixings filters and overview christian@4183: to find the columns to be viewed. christian@4183: TODO: Generate chart. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsColumn.java: Added christian@4183: boolean result to indicate if value comes from table or is interpolated. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsColumnFactory.java: christian@4183: New. Factory to fetch fixings column data from cache or database. Stub by now. christian@4183: christian@4183: 2012-04-04 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java: christian@4183: New. Service to generate a chart of fixings for given river and km applied christian@4183: some filters. christian@4183: christian@4183: Usage: christian@4183: $ curl http://localhost:8181/service/fixings-km-chart \ christian@4183: -d @fix-overview.xml > chart.png christian@4183: christian@4183: The input XML is nearly the same as for the overview service. christian@4183: Besides the river, filters and range it accepts elements christian@4183: for passing the river km, christian@4183: for the extent of the output chart, christian@4183: for type of result. Currently ignored. christian@4183: christian@4183: ATM only a static fixed sized PNG image is delivered. christian@4183: christian@4183: * doc/conf/conf.xml: Added service to list of services. christian@4183: christian@4183: 2012-04-04 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: christian@4183: Made bullet proof for null filters and ranges. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsFilterBuilder.java: christian@4183: Fixed bug which leeds to always generating a null range filter. christian@4183: christian@4183: 2012-04-04 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: christian@4183: Squashed performance bug introduced in rev4070, which slowed down christian@4183: CSV export about 245 times! christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java: christian@4183: Added debug output about savings when joining neighbored nodes. christian@4183: christian@4183: 2012-04-03 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FixingsOverviewService.java: christian@4183: Removed the code for filter building. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsFilterBuilder.java: christian@4183: New. Now contains the code for filter building. This useful because other christian@4183: services like the "Fixierungs-Rohdaten am KM" service need this filtering, too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: christian@4183: Refactored the code to obtain a filtered list of fixings columns without christian@4183: the XML serialization, too. The "Fixierungs-Rohdaten am KM" service christian@4183: does not need the overview data but the ids of the fixing columns to be christian@4183: displayed. christian@4183: christian@4183: 2012-04-03 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/CacheInvalidationService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/services/FLYSService.java: christian@4183: Derive from XMLService now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Removed superfluous import. christian@4183: christian@4183: 2012-03-30 Ingo Weinzierl christian@4183: christian@4183: flys/issue460 (W-Differenzen: Frühere Berechnungen aus den Datenkorb werden doppelt geladen) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Removed christian@4183: code to find out all Outputs of this Artifacts. A method getOutputs() christian@4183: had been implemented some time ago that does exactly this work. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Heavy christian@4183: bugfix! Adding the current state id to the list of previous state ids christian@4183: for temporary usage was no good idea! Now, the list of previous state christian@4183: ids only modifified in advance(). This solves the problem of having christian@4183: duplicated Outputs in the Artifact's DESCRIBE document. christian@4183: christian@4183: 2012-03-29 Ingo Weinzierl christian@4183: christian@4183: flys/issue366 (W-INFO / Abflusskurve, Diagramm: Umbenennen von Themen und Anzeige im Diagramm) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: christian@4183: Use description from ArtifactAndFacet objects for JFreeChart Series christian@4183: creation. christian@4183: christian@4183: 2012-03-28 Ingo Weinzierl christian@4183: christian@4183: flys/issue362 (W-Info / Abflusskurve, Diagramm) christian@4183: christian@4183: * doc/conf/themes.xml: Adjusted text color of w and q main values for christian@4183: computed discharge curves. christian@4183: christian@4183: 2012-03-23 Sascha L. Teichmann christian@4183: christian@4183: flys/issue639: Bezugsliniendiagramm,Achsen-Intervall-Skalierung vereinheitlichen christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: christian@4183: Render only axis ticks in meters. christian@4183: christian@4183: 2012-03-22 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/themes.xml: Let hyks have a text orientation in themes. christian@4183: christian@4183: 2012-03-22 Felix Wolfsteller christian@4183: christian@4183: Fix flys/issue491, if area fill between curve and axis, draw not only christian@4183: to zero. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java christian@4183: (doArea): Add an artificial dataset to set lower bounds for area. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java christian@4183: (addPoints): New convenience method to be used in future. christian@4183: (createGroundAtInfinity, createCeilingAtInfinity): Create artificial christian@4183: datasets for better areas. christian@4183: christian@4183: 2012-03-20 Raimund Renkert christian@4183: christian@4183: Issue 506. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Create the date from long values instead of the year. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java: christian@4183: Added method to transform a String into an array of long values. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: christian@4183: changed data type from intrange to longrange. christian@4183: christian@4183: 2012-03-20 Ingo Weinzierl christian@4183: christian@4183: flys/issue544 (Historische ATs: Eingabeunterstützung W/Q) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/GaugeInfoService.java: christian@4183: New service that returns information for gauges based on a specified christian@4183: river. christian@4183: christian@4183: * doc/conf/conf.xml: Registered the GaugeInfoService. christian@4183: christian@4183: 2012-03-20 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/DischargeInfoService.java: christian@4183: Skip DischargeTables that have no time interval set or that are marked christian@4183: as master DischargeTable. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: Skip christian@4183: DischargeTables that have no time interval set. christian@4183: christian@4183: 2012-03-20 Ingo Weinzierl christian@4183: christian@4183: flys/issue146 (In WINFO Diagramm Abflusskurve raus, wenn nicht gewünscht) christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Do not create outputs for discharge curves christian@4183: at gauge any longer. christian@4183: christian@4183: 2012-03-20 Ingo Weinzierl christian@4183: christian@4183: flys/issue252 (W-INFO: Wasserspiegellagenberechnung / Mitführung der Jährlichkeiten in der Diagramm-/Ergbnisausgabe) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Added christian@4183: the numeric value of a selected named main value to the WST column name. christian@4183: christian@4183: 2012-03-16 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/mapserver/db_layer.vm: Set the FILTER expression into double christian@4183: quotes (") instead of single quotes (') which allows single quotes in christian@4183: expressions. christian@4183: christian@4183: * doc/conf/meta-data.xml: Moved the floodmaps from kilometrage to its christian@4183: parent folder. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSFloodmapsArtifact.java: christian@4183: Fixed broken filter expression and set geometry type (MapServer does not christian@4183: know a 'MULTIPOLYGON'). christian@4183: christian@4183: 2012-03-16 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Remove unnecessary outputs from attributes instead of copying outs to christian@4183: new attribute element. christian@4183: christian@4183: 2012-03-16 Ingo Weinzierl christian@4183: christian@4183: * Tagged module as 'pre2.7-2012-03-16'. christian@4183: christian@4183: 2012-03-16 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: christian@4183: Removed useless imports. christian@4183: christian@4183: 2012-03-16 Ingo Weinzierl christian@4183: christian@4183: flys/issue523 (W-INFO / Bezugslinienverfahren / Linieneinstellungen / Min+Max anzeigen) christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java: christian@4183: Improved the look of the minimum and maximum shape of a series. They are christian@4183: now rectangles with a darker fill color as the line color is. christian@4183: christian@4183: 2012-03-15 Ingo Weinzierl christian@4183: christian@4183: flys/issue522 (W-INFO / Bezugslinienverfahren / Schriftgröße der Achsenbeschriftung) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Label and christian@4183: tick label fonts for axes will now always be the same. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: christian@4183: Removed the createYAxis() method which is already implemented in an christian@4183: upper class. There, the method also takes the ChartSettings into account. christian@4183: christian@4183: 2012-03-15 Raimund Renkert christian@4183: christian@4183: Issue 547. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveExporter.java: christian@4183: Use date format with MEDIUM style. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/Formatter.java: christian@4183: Added date format with MEDIUM style. christian@4183: christian@4183: 2012-03-15 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartHelper.java: Added a new christian@4183: method that returns the Bounds for a given XYDataset. Based on the christian@4183: concrete type of the XYDataset, the call is dispatched to a more specific christian@4183: method. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Removed the whole "range" stuff and some methods that are implemented in christian@4183: upper classes. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Removed the christian@4183: setXRange() and setYRange() methods. In our own code, we will use Bounds christian@4183: instead of JFreeChart's Range instances to save range/bounds information. christian@4183: This is necessary to save information which is not not from type double christian@4183: (which is the case in Timeseries charts). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Replaced christian@4183: usage of Range with Bounds in the whole class. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: christian@4183: Adapted the method signature of zoom() and zoomX(). christian@4183: christian@4183: 2012-03-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Copied the adjustAxes() method from XYChartGenerator which enables axes christian@4183: label font sizes. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java: christian@4183: Removed unnecessary axes creation method which is implemented in upper christian@4183: classes. christian@4183: christian@4183: 2012-03-14 Raimund Renkert christian@4183: christian@4183: Issue 640. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Remove all unnecessary output settings from attributes. christian@4183: christian@4183: 2012-03-09 Felix Wolfsteller christian@4183: christian@4183: Partial for flys/issue358, rough stub for legenditem aggregation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Added rough stub for legend aggregation. christian@4183: christian@4183: 2012-03-08 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/themes.xml: Fixed broken XML syntax. christian@4183: christian@4183: 2012-03-08 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/meta-data.xml: Modified the datacage structure of 'floodmaps'. christian@4183: christian@4183: 2012-03-08 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSFloodmapsArtifact.java: New. christian@4183: This Artifacts allows loading 'floodmaps'. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added a christian@4183: new Facet type "floodmap.floodmaps" which are created by christian@4183: WMSFloodmapsArtifact. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Registered the "floodmap.floodmaps" facet christian@4183: for "floodmap" output. christian@4183: christian@4183: * doc/conf/conf.xml: Registered the new WMSFloodmapsArtifact. christian@4183: christian@4183: * doc/conf/themes.xml: Added a theme for the "floodmap.floodmaps" facet. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added i18n string for christian@4183: "floodmap.floodmaps" title. christian@4183: christian@4183: 2012-03-08 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/meta-data.xml: Improved datacage configuration to serve christian@4183: floodmaps. christian@4183: christian@4183: 2012-03-05 Ingo Weinzierl christian@4183: christian@4183: flys/issue566 (ÜSK: Formalien in der Parametrisierung) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodplainChoice.java: christian@4183: Override getLabelFor() method to return better I18N strings for selected christian@4183: floodplain option. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added options christian@4183: for floodplain (active/inactive) and adapted a german I18N string. christian@4183: christian@4183: 2012-03-05 Felix Wolfsteller christian@4183: christian@4183: Fix flys/issue 528 for csv. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: christian@4183: Fixed column order, reworked todos. christian@4183: christian@4183: 2012-03-05 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: christian@4183: Fixed column order. christian@4183: christian@4183: 2012-03-05 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: christian@4183: Stub to export the "W (cm)" column conditionally on Gauge presence. christian@4183: christian@4183: 2012-03-05 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StepCSVWriter.java: christian@4183: New utility to handle csv rows of more "dynamical" length. christian@4183: christian@4183: 2012-03-05 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StepCSVWriter.java: christian@4183: New utility to handle csv rows of more "dynamical" length. christian@4183: christian@4183: 2012-03-01 Felix Wolfsteller christian@4183: christian@4183: Fix flys/issue501 (manual points have two legend entries). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Respect wish to not have a legend entry. christian@4183: christian@4183: 2012-03-01 Felix Wolfsteller christian@4183: christian@4183: Fix flys/issue636 (cross-section: name of waterlevel facets). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: christian@4183: Corrected name for waterlevel facets. christian@4183: christian@4183: 2012-03-01 Felix Wolfsteller christian@4183: christian@4183: Partial fix flys/issue615 (datacage: events for fixations). christian@4183: christian@4183: * doc/conf/meta-data.xml: Adjusted to make loading single events christian@4183: possible. christian@4183: christian@4183: 2012-03-01 Felix Wolfsteller christian@4183: christian@4183: Partial Dontcrash on flys/issue647 (NaNs from WstValueTable interpolation). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java: christian@4183: Do not add data pairs where a NaN is present. christian@4183: christian@4183: 2012-03-01 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Cosmetics, doc. christian@4183: christian@4183: 2012-02-27 Sascha L. Teichmann christian@4183: christian@4183: Added functions to be used for fitting in christian@4183: the "Fixierungsanalyse" and "Extremwertermittlung". christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/fitting/Function.java: New. christian@4183: Abstract base class for functions to fit. Provides the name of the function, christian@4183: a short description, the names of the parameters and an initial parameter guess christian@4183: for the fit processe. Sub classes have to overwite the function evaluation and christian@4183: the partial derivative of the function in respect to the parameters. christian@4183: christian@4183: TODO: Add a meachnism for the inverse function (needed for AT export) and christian@4183: the first derivative (needed for the respective diagram). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/fitting/FunctionFactory.java: christian@4183: New. Factory to fetch a function by its name. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/fitting/Exp.java: New. christian@4183: exp: W(Q) = m * a^Q + b christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/fitting/Quad.java: New. christian@4183: quad: W(Q) = n*Q^2 + m*Q + b christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/fitting/Linear.java: New. christian@4183: linear: W(Q) = m*Q + b christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/fitting/LogLinear.java: New. christian@4183: log-linear: W(Q) = a*ln(m*Q + b) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/fitting/Log.java: New christian@4183: log: W(Q) = m*ln(Q + b) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/fitting/Pow.java: New. christian@4183: pow: W(Q) = a*Q^c + d christian@4183: christian@4183: !!! This power function is new in the pool of functions to be fit. !!! christian@4183: See my mail "Manuelle Punkte in der Fixierungsanalyse" 2011-10-27 for details. christian@4183: The function exp-new found in the old FLYS function pool is omitted christian@4183: because it is worthless and was maybe never used. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/fitting/App.java: New. christian@4183: Small test driver to check if the fitting is working. The points to christian@4183: fit are read from stdin the function to fit is determined by the christian@4183: system property 'function'. Example usage: christian@4183: christian@4183: $ mvn -e \ christian@4183: -Dfunction=linear \ christian@4183: -Dexec.mainClass=de.intevation.flys.artifacts.math.fitting.App exec:java < christian@4183: christian@4183: * src/main/resources/messages_de.properties: christian@4183: Added ommitted translations. christian@4183: christian@4183: 2012-02-27 Felix Wolfsteller christian@4183: christian@4183: fix flys/issue638. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java christian@4183: (doArea): Ract to WKms as upper/lower area data again. christian@4183: christian@4183: 2012-02-27 Felix Wolfsteller christian@4183: christian@4183: Partial fix flys/issue637. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java, christian@4183: src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Modified translations. christian@4183: christian@4183: 2012-02-21 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: christian@4183: - Calculate the extent of the river by the extents of the fixings. christian@4183: Reason: The river Elbe has only has fixings up to km 351. The other half christian@4183: of the river is empty which results in a sparse looking overview. christian@4183: - Add the name of the river as name attribute to resulting element. christian@4183: christian@4183: * contrib/fixoverview2html.xsl: New. Demo XSL transformation to turn christian@4183: the output of the overview service directly into HTML. Used in the christian@4183: client a variant of this script could be used for producing the content christian@4183: of the assistance widget. Usage: christian@4183: christian@4183: $ curl http://localhost:8181/service/fixings-overview \ christian@4183: -d @fix-overview.xml | \ christian@4183: xsltproc contrib/fixoverview2html.xsl - \ christian@4183: > fixings-overview.html christian@4183: christian@4183: 2012-02-20 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FixingsOverviewService.java: christian@4183: Made the filter mechanisms available via the incoming XML document. christian@4183: christian@4183: 1 - range: Simply add a element next to the christian@4183: element. Optional. Defaults to full extent. christian@4183: christian@4183: 2 - filters: Add a element next to the element. christian@4183: Optional. Defaults to accepting all. christian@4183: The element can contain the following elements: christian@4183: christian@4183: : Creates an IdFilter. christian@4183: : Creates a DateFilter. christian@4183: : Creates a DateRangeFilter. christian@4183: : Create a SectorRangeFilter. christian@4183: ...: Creates a NotFilter. The nested element is negated. christian@4183: ...: Create an AndFilter: The nested elements are 'and'ed. christian@4183: ...: Create an OrFilter: The nested elements are 'or'ed. christian@4183: christian@4183: These filters need testing! christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: christian@4183: Made date format a public constant. christian@4183: christian@4183: 2012-02-20 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: christian@4183: Added a filter mechanism for generating output. christian@4183: christian@4183: There are two kinds of filters: christian@4183: christian@4183: 1 - A range. Defaults to [-Double.MAX_VALUE, Double.MAX_VALUE] christian@4183: The resulting sectors are cut to this range. Sectors outside christian@4183: this range are omitted. christian@4183: christian@4183: 2 - column filters: Given a fixing column they can decide to keep christian@4183: or not to keep it. Following filters exist: christian@4183: christian@4183: - IdFilter: Keep column if column id matches. christian@4183: - DateFilter: Keep column if column date matches. christian@4183: - DateRangeFilter: Keep column if column date is in range. christian@4183: - SectorRangeFilter: Keep colum if one of its q sectors is in given range. christian@4183: - NotFilter: Negates another nested filter. christian@4183: - AndFilter: Keep column if all nested filters accept column. christian@4183: - OrFilter: Keep column if at least one of the nested filters accepts it. christian@4183: christian@4183: 2012-02-20 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: christian@4183: Refactored to build the Q sectors once at construction time and not christian@4183: every time output is generated. christian@4183: This will ease the job of applying filters to the Overview. christian@4183: christian@4183: 2012-02-19 Sascha L. Teichmann christian@4183: christian@4183: Service to generate the data needed to build the "Fixerungen pro Fluss Uebersicht" christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FixingsOverviewService.java: christian@4183: New. A service that serves an XML overview version of the fixings of a given river. christian@4183: christian@4183: The input documents look like this: christian@4183: christian@4183: christian@4183: christian@4183: christian@4183: christian@4183: christian@4183: The output documents looks like this: christian@4183: christian@4183: christian@4183: christian@4183: christian@4183: christian@4183: ... christian@4183: christian@4183: christian@4183: christian@4183: christian@4183: christian@4183: christian@4183: christian@4183: ... christian@4183: christian@4183: christian@4183: christian@4183: The element contains the extent of the whole river christian@4183: and its db id. christian@4183: The sections contains serveral elements. christian@4183: They have a meassure date, db id, a name and a number of s. christian@4183: These sectors are q classified from/to ranges. Classes are: christian@4183: christian@4183: 0: smaller (MNQ+MQ)/2 christian@4183: 1: (MNQ+MQ)/2 to (MQ+MHQ)/2 christian@4183: 2: (MQ+MHQ)/2 to HQ5 christian@4183: 3: greater HQ5 christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: christian@4183: New. Cacheable instance of the overview. christian@4183: TODO: Apply a filter mechanism when generating the output. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FixingsOverviewFactory.java: christian@4183: New. Fetched the fixing overviews from cache if configured. christian@4183: christian@4183: * doc/conf/conf.xml: Added the service. christian@4183: * doc/conf/cache.xml: Configured the cache for the fixing overviews. christian@4183: christian@4183: 2012-02-17 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java(getMinMaxQ): christian@4183: Argh! Forget to check in the range method. christian@4183: christian@4183: 2012-02-17 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java(getMinMaxQ): christian@4183: Symmetrical to getMinMaxW() add two methods to find min/max Q for a given christian@4183: km or a range. The range method is maybe a bit slow. christian@4183: christian@4183: 2012-02-17 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java(getMinMaxW): christian@4183: Added signature to give w extend for a given km range. christian@4183: christian@4183: 2012-02-17 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java(getMinMaxW): christian@4183: Added method to find the w extent for a given km. Useful christian@4183: for validating "W auf freier Strecke". christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/HYKFactory.java: christian@4183: Removed superfluous import. christian@4183: christian@4183: 2012-02-17 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, christian@4183: src/main/java/de/intevation/flys/utils/FLYSUtils.java, christian@4183: doc/conf/artifacts/winfo.xml: christian@4183: Renamed state data fields: wq_mode -> wq_isq christian@4183: wq_free -> wq_isfree christian@4183: wq_selection -> wq_isrange christian@4183: christian@4183: 2012-02-17 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: christian@4183: Write the description instead of the Q value to CSV file. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java: christian@4183: Added parameter to overriden method. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java: christian@4183: Get Qs without range. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Adjusted i18n string for CSV metadata. christian@4183: christian@4183: 2012-02-17 Ingo Weinzierl christian@4183: christian@4183: Part II/III flys/issue497 (Diagrammeigenschaften in Zeitseriendiagrammen) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Apply legend specific settings (show/hide). christian@4183: christian@4183: 2012-02-17 Ingo Weinzierl christian@4183: christian@4183: Part I/III flys/issue497 (Diagrammeigenschaften in Zeitseriendiagrammen) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Moved christian@4183: adjustPlot() from XYChartGenerator to ChartGenerator which enables the christian@4183: TimeseriesChartGenerator to call this method as well. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Call adjustPlot() in generateChart() to apply the settings specific to christian@4183: gridlines in the timeseries plot. christian@4183: christian@4183: 2012-02-16 Raimund Renkert christian@4183: christian@4183: Refactored the wq data fields. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: christian@4183: Changed the wq data fields to boolean values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java: christian@4183: Changed the wq data fields to boolean values and added method that christian@4183: returns the km input mode. christian@4183: christian@4183: 2012-02-16 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: christian@4183: Fixed W->Q conversion for "W fuer ungleichwertige Abflusslaengsschnitte." christian@4183: christian@4183: 2012-02-16 Ingo Weinzierl christian@4183: christian@4183: flys/issue509 (Dauerlinie: Q-Achse sollte bei 0 beginnen) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: christian@4183: Set the lower bounds of the Q axis to 0 to avoid displaying negative christian@4183: discharge values. christian@4183: christian@4183: 2012-02-16 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WKms.java: christian@4183: (guessWaterIncreasing): Removed from interface. christian@4183: christian@4183: 2012-02-16 Felix Wolfsteller christian@4183: christian@4183: Fix flys/issue150 (exposure of gravitational anomalies) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WKms.java: christian@4183: (guessWaterIncreasing): In analogy to W->WQ->WQKms defined and christian@4183: implemented. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: (needInvertAxis): Changed Parameter type to WKms (was WQKms). christian@4183: (doW): Use in this case weaker wkms cast to find out whether axis christian@4183: has to be inverted. christian@4183: christian@4183: 2012-02-15 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/HYKFactory.java: Fixed christian@4183: SQL statement to fetch hyk formations for rivers with 'km_up' = 0. christian@4183: christian@4183: 2012-02-14 Sascha L. Teichmann christian@4183: christian@4183: Another partial fix for flys/issue499: Do the W to Q conversions christian@4183: needed for "W am Pegel" correctly. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: christian@4183: Repaired getQsForW(): The mapping from W to Q is not unique! There christian@4183: could be more then one Q having the the same W. christian@4183: Ws are not strictly monoton/sorted so doing a binary search on this christian@4183: is just a fail. We now scan them linearly. christian@4183: christian@4183: XXX: The whole class is mess. The scaling stuff is a stupid christian@4183: and there is no caching. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Fetch the master discharge table for converting Ws to Qs. Handle christian@4183: the case that there are more Qs for a given W. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: christian@4183: Adjusted to new semantic. christian@4183: christian@4183: 2012-02-13 Felix Wolfsteller christian@4183: christian@4183: Partial Fix flys/issue500: text-orientation for texts. christian@4183: christian@4183: * doc/conf/themes.xml: Change default text orientation for text christian@4183: annotations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Minor cosmetics. christian@4183: christian@4183: * src/main/java/de/intevation/flys/themes/ThemeAccess.java: christian@4183: Parse and apply text rotation field. christian@4183: christian@4183: 2012-02-13 Sascha L. Teichmann christian@4183: christian@4183: Partial fix for flys/issue499 (Wasserspiegellagen: Berechnung für W frei und Pegel kaputt) christian@4183: There are still validation issue in the client. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Fixed state evaluation for "W auf freier Strecke"/"W am Pegel". christian@4183: There is still an issue in the client with the input validation christian@4183: which prevents entering the right W values for christian@4183: "W auf freier Strecke". :-/ christian@4183: christian@4183: 2012-02-13 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Make it compilable again. christian@4183: christian@4183: 2012-02-13 Felix Wolfsteller christian@4183: christian@4183: Partial Fix flys/issue500: text-backgrounds for manual points. christian@4183: christian@4183: * doc/conf/themes.xml: Added text-related style items to manual christian@4183: point themes. christian@4183: christian@4183: 2012-02-13 Felix Wolfsteller christian@4183: christian@4183: Partial Fix flys/issue500 christian@4183: christian@4183: * src/main/java/de/intevation/flys/themes/ThemeAccess.java: christian@4183: Parse whether to show text background. Apply to textannotation. christian@4183: christian@4183: 2012-02-13 Felix Wolfsteller christian@4183: christian@4183: Fix flys/issue490 christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Pass artifact and facet for doAnnotation. christian@4183: christian@4183: 2012-02-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java: christian@4183: Use AddScaleFunction instead of LinearFunction. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/AddScaleFunction.java: christian@4183: New. f(x) = m*(x+b). I know its aequivalent to m*x + m*b but it christian@4183: makes more clear that the datum [m] (PNP) is substracted before the christian@4183: scaling to cm is done. christian@4183: christian@4183: 2012-02-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Bugfix: take christian@4183: care on empty ArtifactAndFacet objects in doAnnotations(). christian@4183: christian@4183: 2012-02-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java: christian@4183: Inherits from ReferenceCurveGenerator now which really simplifies it a lot. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: christian@4183: Added to methods to be overwritten by sub classes. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Adjusted i8n. christian@4183: christian@4183: 2012-02-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java: christian@4183: Indexed access to getInCm. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java: christian@4183: Simplified. Do not provide any data to blackboard. Only side effect the christian@4183: call context. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: christian@4183: Added convinience method to i18n string with defaulting to key name. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: christian@4183: Label the axis according the scale types of the data. christian@4183: TODO: Let the NormalizedReferenceCurveGenerator be a sub class of christian@4183: this. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: i18n for the reference curve axes. christian@4183: christian@4183: 2012-02-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveExporter.java: christian@4183: Fixed wrong double array dimension for PDF exports and write correct christian@4183: differences into PDF. christian@4183: christian@4183: 2012-02-10 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/BlackboardDataFacet.java: christian@4183: Adjust function to deliver data provider ('blackboard') keys. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java: christian@4183: Change the way we exploit the blackboard-mechanism. TODOs added. christian@4183: christian@4183: 2012-02-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Argh! Finally found the stupid bug in the W~W relation: christian@4183: Used iQ1 index on W2(Q2). christian@4183: christian@4183: 2012-02-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Improved error messsages even more. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Adjusted messages. christian@4183: christian@4183: 2012-02-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java: christian@4183: Forget to put new created WWAxisType onto blackboard. christian@4183: christian@4183: 2012-02-10 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java: christian@4183: Adjust offset of linear function by same factor as the values. christian@4183: christian@4183: 2012-02-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: Write christian@4183: correct min and max values for date axes into the info document. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Enabled zooming for timeseries charts. christian@4183: christian@4183: 2012-02-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/Bounds.java, christian@4183: src/main/java/de/intevation/flys/jfree/TimeBounds.java, christian@4183: src/main/java/de/intevation/flys/jfree/DoubleBounds.java: Added a method christian@4183: applyBounds(ValueAxis, int) that might be used to adapt the range of the christian@4183: axis to the bounds adding a space to the left and right. christian@4183: christian@4183: 2012-02-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Defined christian@4183: new abstract methods for setting and getting Bounds. Modified and christian@4183: renamed getValueAxisRange(). This method is now called christian@4183: getValueAxisRangeFromRequest() and returns no longer a Range object but christian@4183: a String array that consists of the raw string values speicified in the christian@4183: request document. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Implemented the missing method getDomainAxisRange(). This method returns christian@4183: a Range object based on the String array returned from christian@4183: getValueAxisRangeFromRequest(). christian@4183: christian@4183: 2012-02-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/TimeBounds.java: Added new christian@4183: methods getLowerAsDate() and getUpperAsDate(). The toString() method christian@4183: will now return a string that contains a human readable date string. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/DoubleBounds.java: Made 'lower' christian@4183: always be smaller than 'upper' in the default constructor. christian@4183: christian@4183: 2012-02-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Give more precise message when an error occurs in W~W relation. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Improved error messages. christian@4183: christian@4183: 2012-02-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Modified christian@4183: and renamend getDomainAxisRange(). This method is now called christian@4183: getDomainAxisRangeFromRequest() and returns no longer a Range object but christian@4183: a String array that consists of the raw string values specified in the christian@4183: request document. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Implemented the missing method getDomainAxisRange(). This method returns christian@4183: a Range object based on the String array returned from christian@4183: getDomainAxisRangeFromRequest(). christian@4183: christian@4183: 2012-02-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartHelper.java: Added a christian@4183: helper function to determine the min and max bounds (x and y) for christian@4183: TimeSeriesCollections. christian@4183: christian@4183: 2012-02-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/TimeBounds.java, christian@4183: src/main/java/de/intevation/flys/jfree/DoubleBounds.java: Removed christian@4183: useless imports. christian@4183: christian@4183: 2012-02-10 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WW.java: christian@4183: Add accessors to relative heights. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: christian@4183: Add relative heights (to gauge) to csv export. christian@4183: christian@4183: 2012-02-09 Ingo Weinzierl christian@4183: christian@4183: * pom.xml: Added dependency to GeoTools swing module. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/map/PrintMap.java: Standalone christian@4183: demo application to print WMS layers to file. christian@4183: christian@4183: 2012-02-09 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/TimeBounds.java, christian@4183: src/main/java/de/intevation/flys/jfree/DoubleBounds.java, christian@4183: src/main/java/de/intevation/flys/jfree/Bounds.java: New model classes that christian@4183: should be used for adapting axes ranges later. christian@4183: christian@4183: 2012-02-09 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java: christian@4183: Generate a valid intial i18n name. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: christian@4183: Pass call context to calculation. christian@4183: christian@4183: 2012-02-09 Ingo Weinzierl christian@4183: christian@4183: flys/issue485 (Themen können umgenannt werden, dies wird nicht in der Legende reflektiert) christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Use ArtifactAndFacet.setFacetDescription() to set the description for christian@4183: themes which are stored in the Collection's XML attribute. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java, christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: christian@4183: Some refactoring of doXXXOut() methods. We pass the ArtifactAndFacet christian@4183: objects of doOut() into those concrete doOut() methods which allows us to christian@4183: generate series names for chart curves. christian@4183: christian@4183: 2012-02-09 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Replaced dashes by underscores in entities christian@4183: to ease translation. christian@4183: christian@4183: 2012-02-09 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: christian@4183: Fixed problem with including Y-Zeros. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java, christian@4183: src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-02-09 Felix Wolfsteller christian@4183: christian@4183: Allow points in "new chart"s. christian@4183: christian@4183: * doc/conf/artifacts/chart.xml: Added manualpoint facets to christian@4183: compatibility lists. christian@4183: christian@4183: 2012-02-09 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/Style.java: New. A Style object christian@4183: needs to implements a method applyTheme() which takes a christian@4183: XYLineAndShapeRenderer. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/XYStyle.java: New. This subclass of christian@4183: Style modifies the XYLineAndShapeRenderer specified in applyTheme(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StyledSeries.java: New. This christian@4183: interface defines two methods getStyle() and setStyle() to adjust and christian@4183: retrieve the Style of a series. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StyledTimeSeries.java: New. christian@4183: Implementation of StyledSeries that subclasses JFreeChart's TimeSeries. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StyledXYSeries.java: Removed the christian@4183: code for adapting a XYLineAndShapeRenderer. Instead of implementing this christian@4183: stuff in StyledXYSeries itself, this instance now implements StyledSeries christian@4183: and stores an instance of XYStyle. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java: christian@4183: Create new instances of StyledTimeSeries now which enables styling in this christian@4183: chart. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Enabled christian@4183: styling of series for all series that implement StyledSeries. christian@4183: christian@4183: 2012-02-09 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java(relateWs): christian@4183: Be more conservative about arrays and indices in "Bezugslinienverfahren". christian@4183: christian@4183: 2012-02-09 Felix Wolfsteller christian@4183: christian@4183: Allow areas in new chart/longitudinal_section. christian@4183: christian@4183: * doc/conf/artifacts/chart.xml: Added area facet to compatibility christian@4183: list. christian@4183: christian@4183: 2012-02-09 Felix Wolfsteller christian@4183: christian@4183: Fix flys/issue490. Allow CollisionFree..Annotations to collide with christian@4183: non-collision-free annotations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotationEntity.java: christian@4183: New, to take advantage of cheap instanceof operator. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java: christian@4183: Only avoid collisions with members of same family (i.e. allow christian@4183: collision with annotations of other types). christian@4183: christian@4183: 2012-02-09 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/themes.xml: Added themes for historical discharge curves and christian@4183: the differences to a reference curve. christian@4183: christian@4183: 2012-02-09 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: Some christian@4183: bugfixes and improvements: christian@4183: 1) take only historical discharge tables into account for calculation christian@4183: 2) use the correct values for computing differences christian@4183: 3) moved timerange preparation into an own method christian@4183: christian@4183: 2012-02-09 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/EnterMultipleLocationsState.java: christian@4183: Fix call to StringUtils.join . christian@4183: christian@4183: 2012-02-09 Felix Wolfsteller christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n string for waterlevels (from datacage). christian@4183: christian@4183: 2012-02-09 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/EnterMultipleLocationsState.java: christian@4183: Locale-format multiple double values also. christian@4183: christian@4183: 2012-02-09 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Registered a new facet for difference curves christian@4183: to the historical discharge output. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/HistoricalWQTimerange.java: christian@4183: New model that is able to store a further double value "diff" besides a W, christian@4183: Q and a Timerange. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: Create christian@4183: new HistoricalWQTimerange instances with difference between the reference christian@4183: discharge table and the historical discharge tables. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: New type christian@4183: for historical differences. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQTimerange.java: Cast christian@4183: Timerange array in getTimeranges(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/HistoricalDischargeDifferenceFacet.java: christian@4183: New Facet for historical discharge difference curves. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java: christian@4183: Create new Facets for the difference curves if the processed data are from christian@4183: type HistoricalWQTimerange. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java: christian@4183: Added doOut() path for difference curves. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveExporter.java: christian@4183: Increased the size of a double array to be able to get results from christian@4183: HistoricalWQTimerange. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added translation for warning christian@4183: if no reference discharge table was found for the specified gauge. christian@4183: christian@4183: 2012-02-09 Raimund Renkert christian@4183: christian@4183: Added PDF export to reference curve calculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: christian@4183: Added PDF export. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java, christian@4183: doc/conf/artifacts/winfo.xml: christian@4183: Add facet for PDF export to state. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WWQQJRDataSource.java: christian@4183: New. Datasource for JasperReports containing reference curve data. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n strings for JasperReports template file and calculation mode. christian@4183: christian@4183: * doc/conf/jasper/reference.jasper, christian@4183: doc/conf/jasper/reference_en.jasper: christian@4183: New. Templates for reference curve PDF export. christian@4183: christian@4183: 2012-02-09 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java(getReferenceEndKms): christian@4183: Prevent duplicates in end kms for reference curve calculation. christian@4183: christian@4183: 2012-02-09 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: doc/conf/artifacts/winfo.xml: Renamed data item names to allow christian@4183: translations. christian@4183: christian@4183: 2012-02-08 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: christian@4183: Give (Normalized)ReferenceCurveFacets are more appropriate christian@4183: description (to be seen in client). christian@4183: christian@4183: 2012-02-08 Felix Wolfsteller christian@4183: christian@4183: Prepare Reference curves to eat multiple locations as 'Ziel'. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/EnterLocationState.java: christian@4183: Cosmetics. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/EnterMultipleLocationsState.java: christian@4183: New. State to provoke multi_location_panel. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Made end state of ref curves a (new) christian@4183: EnterMultipleLocationState. christian@4183: christian@4183: 2012-02-08 Ingo Weinzierl christian@4183: christian@4183: flys/issue483 (Historische Abflusstafeln ohne Ergebnis) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: Add christian@4183: a problem for the calculation report if no discharge tables were found christian@4183: for the given timerange. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added translation for error christian@4183: messages created by Calculation6. christian@4183: christian@4183: 2012-02-08 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/Formatter.java: christian@4183: Format kms in error reports at least with one digit after christian@4183: the decimal separator. christian@4183: christian@4183: 2012-02-08 Sascha L. Teichmann christian@4183: christian@4183: Fix flys/issue468 (Fehler beim Projekt-Duplizieren) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReportGenerator.java: christian@4183: Always create a new XML document when calling report generation. christian@4183: XXX: There is a bug somewhere which calls error reporting twice christian@4183: when cloning a collection. Speculation: It has something to do with christian@4183: the settings stuff. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java, christian@4183: src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: christian@4183: Remove superfluous imports. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WSPLGENCalculation.java: christian@4183: Added missing Override annotation. christian@4183: christian@4183: 2012-02-08 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: christian@4183: Handle Manual Point Facets, added TODO. christian@4183: christian@4183: 2012-02-08 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java: christian@4183: Subclass BlackboardDataFacet to repair areas over cross sections. christian@4183: christian@4183: 2012-02-08 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Let text christian@4183: and line annotations placed at x or y axes always be in foreground. christian@4183: christian@4183: 2012-02-08 Felix Wolfsteller christian@4183: christian@4183: Fix flys/issue474 (manual points in reference curves). christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml, christian@4183: doc/conf/artifacts/manualpoints.xml: christian@4183: Add manualpoints to lists just so that really everybody knows. christian@4183: christian@4183: * doc/conf/themes.xml: Add styles for manual points in ref curves. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Add ref curve chart types. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: christian@4183: Handle manual point facets. christian@4183: christian@4183: 2012-02-08 Felix Wolfsteller christian@4183: christian@4183: Partial Fix flys/issue474. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added translation for christian@4183: normalized_reference_curve. christian@4183: christian@4183: 2012-02-08 Felix Wolfsteller christian@4183: christian@4183: Fix flys/issue475. christian@4183: christian@4183: * doc/conf/themes.xml: Register theme for reference_curve_normalized. christian@4183: christian@4183: 2012-02-08 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Add a "/" to the christian@4183: URL of the user wms if the URL configured in conf.xml doesn't end with christian@4183: a "/". christian@4183: christian@4183: 2012-02-08 Felix Wolfsteller christian@4183: christian@4183: Fix flys/issue472. christian@4183: christian@4183: * doc/conf/themes.xml: Added theme for discharge_curve manualpoints. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added discharge_curve as chart type. christian@4183: christian@4183: 2012-02-08 Sascha L. Teichmann christian@4183: christian@4183: Fix flys/issue484 ((i18n: Ungleichwertige... Report)) christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Fixed key spelling. christian@4183: christian@4183: 2012-02-08 Felix Wolfsteller christian@4183: christian@4183: Fix flys/issue478 (Manuelle Punkte: Stil nicht änderbar). christian@4183: christian@4183: * doc/conf/themes: Map correct theme to manualpoint themes. christian@4183: christian@4183: 2012-02-08 Felix Wolfsteller christian@4183: christian@4183: Partial fix flys/issue472 . christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Add manual points to compatibility christian@4183: list of cross_sections. christian@4183: christian@4183: * doc/conf/artifacts/manualpoints.xml: Add manualpoints to list of christian@4183: generated facets. christian@4183: christian@4183: 2012-02-08 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/themes.xml: Commented styling option for show area until christian@4183: area calculation works. christian@4183: christian@4183: 2012-02-08 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation.java: christian@4183: i18n the km of the error report. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/resources/Resources.java: christian@4183: Fixed potential race conditions. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/Formatter.java: Added christian@4183: formatter for error report kms. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveExporter.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: christian@4183: Commented out some imports. They are used be out commented code. christian@4183: christian@4183: 2012-02-07 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/LocationProvider.java: christian@4183: Use the correct km key for an unspecific km for fetching the whole river christian@4183: annotations. christian@4183: christian@4183: 2012-02-07 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/conf.xml: Added missing config of chart info generator christian@4183: of normalized reference curve. christian@4183: christian@4183: 2012-02-07 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/conf.xml: Fixed wrong chart info generator name for historical christian@4183: discharge curves. christian@4183: christian@4183: 2012-02-07 Raimund Renkert christian@4183: christian@4183: Added PDF export for historical discharge curve calculations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveExporter.java: christian@4183: Implemented PDF export for calculation results. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQTJRDataSource.java: christian@4183: New. Datasource for JasperReports. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: christian@4183: Added facet for PDF export to historical discharge curve output mode. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n strings for historical discharge curve export. christian@4183: christian@4183: * doc/conf/jasper/historical-discharge.jasper, christian@4183: doc/conf/jasper/historical-discharge_en.jasper: christian@4183: New. Templates for JasperReports PDF creation. christian@4183: christian@4183: 2012-02-07 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: christian@4183: Handle WWQQs, extended CSV export of reference curves. christian@4183: christian@4183: 2012-02-07 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/AbstractExporter.java: christian@4183: Recactored, moved Formatter accessors to base class AbstractExporter. christian@4183: christian@4183: 2012-02-07 Felix Wolfsteller christian@4183: christian@4183: Let reference curve calculation result in specific WWQQ, extended CSV christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java christian@4183: (getWW,getWWQQ): Renamed and changed result type. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: christian@4183: Result in WWQQs, not in WWs. christian@4183: christian@4183: 2012-02-07 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Log error as warning. christian@4183: christian@4183: 2012-02-06 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/LinearFunction.java: christian@4183: New. Linear function f(x) = m*x + b. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java: christian@4183: Do the normalizing. Cascading functions is not required. christian@4183: christian@4183: 2012-02-06 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveInfoGenerator.java: christian@4183: Added missing chart info generator for the normalized reference curves. christian@4183: christian@4183: 2012-02-06 Felix Wolfsteller christian@4183: christian@4183: * src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_de.properties: Fix i18n. christian@4183: christian@4183: 2012-02-06 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java: christian@4183: Added optional boolean flag to indicated if the data should be 'normalized'. christian@4183: TODO: Build the cascading normalising function call chain. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: christian@4183: Fetch WWAxisTypes from call context to do the right scaling. christian@4183: christian@4183: 2012-02-06 Raimund Renkert christian@4183: christian@4183: Added service for discharge infos at a specific gauge. christian@4183: christian@4183: * doc/conf/conf.xml: Added service factory entry. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/DischargeInfoService.java: christian@4183: New. Returns description, start year and end year of discharges at a christian@4183: specific gauge. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/GaugeTimerangeState.java: christian@4183: Return a more specific ui provider string. christian@4183: christian@4183: 2012-02-06 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/conf.xml: Registered generator for normalized reference curves. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added "reference_curve_normalized". christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: christian@4183: Added facets for normalized reference curves. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java: christian@4183: Generator for normalized reference curves. christian@4183: christian@4183: 2012-02-06 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added config for "reduzierte Bezugslinie". christian@4183: christian@4183: 2012-02-06 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added error report. christian@4183: christian@4183: 2012-02-06 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: Set christian@4183: proper bounds for date axis elements; tell the transformation matrix which christian@4183: type it is (number/date). christian@4183: christian@4183: 2012-02-06 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: christian@4183: Include location description string in csv output of referencecurve- christian@4183: exporter. christian@4183: christian@4183: 2012-02-06 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WW.java: Added constructor call. christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WWQQ.java: New. christian@4183: Stores the Qs for the Ws, too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java: Create christian@4183: WWQQs instead of WWs. christian@4183: christian@4183: 2012-02-06 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: christian@4183: Added further i18n stubs and slightly more data. christian@4183: christian@4183: 2012-02-06 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java(relateWs): christian@4183: Return the Qs of the Ws, too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java: christian@4183: Adjusted to cope with the return Qs. TODO: Create WQWQ or WWQQ dataset christian@4183: for storing the result. christian@4183: christian@4183: 2012-02-06 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: christian@4183: Added further i18n stubs. christian@4183: Also added a second Y axis (experimental, to ease axis labeling etc.). christian@4183: christian@4183: 2012-02-06 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Register new export output and csv christian@4183: facet for reference curves. christian@4183: christian@4183: * doc/conf/conf.xml: Register Exporter for reference curve. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: christian@4183: Primitive exporter, bland copy of another one. christian@4183: christian@4183: 2012-02-06 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: christian@4183: Enabled some i18n of labels. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Basic i18n for reference christian@4183: curves added. christian@4183: christian@4183: 2012-02-06 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/conf.xml: Registered the HistoricalDischargeCurveInfoGenerator. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveInfoGenerator.java: christian@4183: New. This info generator returns information of a christian@4183: HistoricalDischargeCurveGenerator. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: Add an christian@4183: attribute "axistype" to axes nodex based on the JFreeChart Axis type. christian@4183: Number axes get a "number", date axes a "date". christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Defined an christian@4183: abstract method getRangesForAxis(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: Awaits christian@4183: now an instance of ChartGenerator instead of XYChartGenerator. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Implemented the getRangesForAxis() method (copied from XYChartGenerator). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Added christian@4183: @Override annotation to getRangesForAxis(). christian@4183: christian@4183: 2012-02-06 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, christian@4183: src/main/java/de/intevation/flys/exports/WDifferencesExporter.java: christian@4183: Cosmetics. christian@4183: christian@4183: 2012-02-06 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: christian@4183: Add CSV facet (not yet evaluated). christian@4183: christian@4183: 2012-02-06 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveExporter.java: christian@4183: New. This OutGenerator exports historical discharge curves to CSV and PDF. christian@4183: Currently, only the CSV export is implemented! christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Registered a new Output CSV for historical christian@4183: discharge curves. christian@4183: christian@4183: * doc/conf/conf.xml: Registered the HistoricalDischargeCurveExporter. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java: christian@4183: Generate new Facets for CSV and PDF output. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/Formatter.java: Added new functions christian@4183: that return number formatters for historical discharge curves and a date christian@4183: formatter for short dates. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added strings for CSV header of christian@4183: historical discharge curve export. christian@4183: christian@4183: 2012-02-06 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Adjusted to name change in River ('hibernate fix'). christian@4183: christian@4183: 2012-02-03 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Adapted the data type of W/Q input values christian@4183: for historical discharge curve calculation (intarray -> doublearray). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeState.java: christian@4183: Adapted the data type of W/Q input values. christian@4183: christian@4183: 2012-02-03 Sascha L. Teichmann christian@4183: christian@4183: First steps to serve the data in cm if we are are gauges only. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Fetch map gauge station -> gauge datum from backend for reference curve. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/LinearFilterFunction.java: christian@4183: New. Linear transforms another function. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/FilterFunction.java: christian@4183: New. Allows cascading functions. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java: christian@4183: New. Classifier what kind of axis types are needed. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/NormalizedReferenceCurveFacet.java: christian@4183: Removed. Is now obsolete. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WW.java: christian@4183: Stores gauge station kms for start and end km if they are any. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java: christian@4183: Should generate a WWAxisTypes classifier via side effect to the christian@4183: call context. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java: christian@4183: Figure out for each start/end km if its a gauge station and store this christian@4183: information in the result WWs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: christian@4183: Uses the WWAxisTypes classifier now to generate the right data. christian@4183: TODO: Use the blackboard object. christian@4183: christian@4183: 2012-02-03 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/EnterLocationState.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-02-03 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Set number of interpolation steps for relation curve to 200. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: christian@4183: Do not sort the XYSeries. christian@4183: christian@4183: 2012-02-03 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveInputState.java: christian@4183: Removed. Was stub. christian@4183: christian@4183: 2012-02-03 Felix Wolfsteller christian@4183: christian@4183: Improved Reference Curves. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Add start/end input step for reference christian@4183: curves. christian@4183: christian@4183: * doc/conf/themes.xml: Add theme for reference curve. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Disable start/end point-hack for reference curve. Go with 'live' christian@4183: values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: christian@4183: i18n. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/EnterLocationState.java: christian@4183: New. State to enter location. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/InputDoubleState.java: christian@4183: New. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: christian@4183: Take WW name to display in themepanel. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added translations. christian@4183: christian@4183: 2012-02-03 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: Use christian@4183: the current date for discharge tables which doesn't have a stop time set. christian@4183: A warning message is written to log. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java: christian@4183: Generate report facet before leaving the computeXXX() method when no christian@4183: calculation results has been computed. christian@4183: christian@4183: 2012-02-03 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a function christian@4183: that returns the name of a reference gauge (for historical discharge christian@4183: curves). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java: christian@4183: Create title, subtitle and axes labels for charts of this type. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added title, subtitle and axes christian@4183: labels for historical discharge curves. christian@4183: christian@4183: 2012-02-03 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Fix. christian@4183: christian@4183: 2012-02-03 Felix Wolfsteller christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added translations for christian@4183: states (will be shown in client). christian@4183: christian@4183: 2012-02-03 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: christian@4183: Ja!vadoc. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Declare getYAxisWalker as abstract to avoid weird issue with christian@4183: overriden methods of this name. christian@4183: christian@4183: 2012-02-03 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: christian@4183: Use the WW.ApplyFunctionIterator to fetch the data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-02-03 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Registered a ReportFacet for historical christian@4183: discharge curve report. christian@4183: christian@4183: * doc/conf/conf.xml: Registered a ReportGenerator for historical discharge christian@4183: curves. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: Add christian@4183: problems if we were not able to find a Q for a given W. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java: christian@4183: Generate a ReportFacet if there were problems during calculcation. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added error messages for the christian@4183: case that we were not able to find a Q for a given W while calculating christian@4183: historical discharge curve data. christian@4183: christian@4183: 2012-02-03 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java: christian@4183: Improved adding new data for historical discharge curves: skip NaN christian@4183: values; use JFreeChart's Day TimePeriod instead of Second. christian@4183: christian@4183: 2012-02-03 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java: Refactoring: christian@4183: moved addDatasets(), applyThemes() and some other methods into christian@4183: ChartGenerator; enhanced the AxisDataset interface. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Implemented necessary abstract methods and improved internal AxisDataset christian@4183: class (added new methods). christian@4183: christian@4183: 2012-02-03 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartHelper.java: Added a christian@4183: function that expands a given range. Take care on NaN in getRanges(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java: christian@4183: Prevent of NullPointerExceptions in isMinimumShapeVisible() and christian@4183: isMaximumShapeVisible(). christian@4183: christian@4183: 2012-02-02 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java: christian@4183: Create new AxisDatasets and new TimeSeriesCollections for each Facet. christian@4183: christian@4183: 2012-02-02 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQTimerange.java: Added a christian@4183: method getTimerange(idx) that returns the Timerange at a given index. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/HistoricalDischargeFacet.java: christian@4183: Return the correct WQTimerange object in getData(). christian@4183: christian@4183: 2012-02-02 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java: More christian@4183: refactoring: the AxisDataset is defined by an interface in ChartGenerator christian@4183: now. Each subclass of ChartGenerator should implement its own AxisDataset. christian@4183: This allows us to provide multiple XYDataset types in different charts. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Implemented some necessary methods (abstract definitions of parent class) christian@4183: and create new empty timeseries charts. christian@4183: christian@4183: 2012-02-02 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartHelper.java: New helper christian@4183: class for working with charts. christian@4183: christian@4183: 2012-02-02 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Removed useless import. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java: More christian@4183: refactoring: moved more base code from XYChartGenerator to its parent christian@4183: class ChartGenerator. christian@4183: christian@4183: 2012-02-02 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java: christian@4183: Refactored. Use supers static field. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: christian@4183: Refactored. Use static field. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java, christian@4183: src/main/java/de/intevation/flys/utils/FLYSUtils.java christian@4183: (getMinMax, getRiverMinMax): Refactored. Moved to FLYSUtils. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/MinMaxState.java: christian@4183: Add so-called javadoc. christian@4183: christian@4183: 2012-02-02 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java: Moved christian@4183: further base code from XYChartGenerator into its ChartGenerator. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: Override generateChart() instead of generate() which is now implemented christian@4183: in ChartGenerator. christian@4183: christian@4183: 2012-02-02 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: christian@4183: New. This ChartGenerator should be used for timeseries charts. Currently, christian@4183: this class is a stub only! WORK IS IN PROGRESS! christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java: christian@4183: Subclasses TimeseriesChartGenerator now instead of XYChartGenerator, christian@4183: because historical discharge curve charts will have a time x axis set. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java: Moved some christian@4183: basic stuff from XYChartGenerator into ChartGenerator. christian@4183: christian@4183: 2012-02-02 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/charts/TimeseriesStepChart.java: christian@4183: Added standalone demo app for evaluating different timeseries charts. christian@4183: christian@4183: 2012-02-02 Raimund Renkert christian@4183: christian@4183: Issue 466: CSV export for chart themes. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Export a CSV file if the requested format is 'csv'. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: christian@4183: Generate the CSV file containing X-Y-data of all activated themes. christian@4183: christian@4183: 2012-02-01 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: christian@4183: Moved code to load values of a discharge table into an own static christian@4183: function to be able to reuse it in Calculation6. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: christian@4183: Implemented the findValueForW(). christian@4183: christian@4183: 2012-02-01 Felix Wolfsteller christian@4183: christian@4183: Fake some reference curve input values to have working prototype christian@4183: to work on. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Syntax-stunt fake reference inputs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WW.java christian@4183: (getW1): Accessor for first w at index (for the raw ww). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java christian@4183: (doReferenceOut): Plot the raw W-over-W. christian@4183: christian@4183: 2012-02-01 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Create time christian@4183: millis for timerange used in Calculation6. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: Added christian@4183: the first step of the calculation: fetch relevant discharge tables based christian@4183: on the given input parameters. The calculated values are not the right christian@4183: ones! Finding Ws and Qs in discharge tables is still not implemented! WORK christian@4183: IN PROGRESS! christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java: christian@4183: Create facets for each WQTimerange object calculated by Calculation6. christian@4183: christian@4183: 2012-02-01 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Timerange.java: Added a christian@4183: new constructor that takes Date objects for start and end time. christian@4183: christian@4183: 2012-02-01 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/W.java: christian@4183: Forget to create ws data in constructor. christian@4183: christian@4183: 2012-02-01 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Replaced Reference Curve input state christian@4183: with LocationSelect-State for debugging purposes. Add output to christian@4183: reference.curve- state. christian@4183: christian@4183: 2012-02-01 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/conf.xml: Register ReferenceCurve*Generators. christian@4183: christian@4183: 2012-02-01 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java: christian@4183: Cosmetics. christian@4183: christian@4183: 2012-02-01 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: christian@4183: Added pro forma facet. christian@4183: christian@4183: 2012-02-01 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java: christian@4183: Added comment. christian@4183: christian@4183: 2012-02-01 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added reference curve facet type. christian@4183: christian@4183: 2012-02-01 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Fetch christian@4183: necessary parameters for 'historical discharge curve' calculation and call christian@4183: Calculation6 with those parameters. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: christian@4183: Modified default constructor and calculate() signatures and added a christian@4183: parameter check which is evaluated before the calculation starts. christian@4183: christian@4183: 2012-02-01 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ReferenceCurveInfoGenerator.java: christian@4183: Added outline of a new chart-generator. christian@4183: christian@4183: 2012-02-01 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Timerange.java: New. christian@4183: This class might be used to store timeranges. Start and end time are christian@4183: stores as long (milliseconds since january 1, 1970). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQTimerange.java: christian@4183: New. This class should be used to save Ws, Qs and timeranges. christian@4183: christian@4183: 2012-02-01 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added helper christian@4183: methods to extract int[] and double[] from string. christian@4183: christian@4183: 2012-02-01 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Registered new facet type christian@4183: 'historical_discharge.historicalq' to the 'historical_discharge' output. christian@4183: christian@4183: * doc/conf/conf.xml: Registered new HistoricalDischargeCurveGenerator for christian@4183: output type 'historical_discharge'. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added christian@4183: new facet type for HISTORICAL_DISCHARGE_Q. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveGenerator.java: christian@4183: New. This ChartGenerator is used to generate new charts for historical christian@4183: discharge curves. WORK IN PROGRESS! christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation6.java: New. christian@4183: This class should 'compute' the historical discharge curves. WORK IN christian@4183: PROGRESS! christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/HistoricalDischargeFacet.java: christian@4183: New. This Facet is used during the calculation of historical discharge christian@4183: curves. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Added stubs christian@4183: to trigger the calculation of data used for generating historical christian@4183: discharge curve charts. christian@4183: christian@4183: 2012-02-01 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: Removed needless imports. christian@4183: christian@4183: 2012-02-01 Felix Wolfsteller christian@4183: christian@4183: * src/main/resources/messages_de.properties, christian@4183: src/main/resources/messages_de_DE.properties: christian@4183: Fixed "W bei ..m" -> "W fuer ...n" . christian@4183: christian@4183: 2012-02-01 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Avoid NPE, add warning to log to not forget about it. christian@4183: christian@4183: 2012-01-31 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation.java: christian@4183: Fixed problems with unformatted numbers in error message. christian@4183: christian@4183: 2012-01-31 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeState.java: christian@4183: Override getLabelFor() to return the I18N string for the selected christian@4183: evaluation mode. christian@4183: christian@4183: 2012-01-31 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Modified types of parameters in the christian@4183: 'historical discharge curves' transitions. christian@4183: christian@4183: 2012-01-30 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Fix transition type (Stupid Bug 1.0 reverse). christian@4183: christian@4183: 2012-01-30 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ReferenceGaugeState.java: christian@4183: Override getLabelFor() method defined in DefaultState to return the name christian@4183: of a Gauge based on the official number which is stored in the christian@4183: parameterization. christian@4183: christian@4183: 2012-01-30 Felix Wolfsteller christian@4183: christian@4183: Allow manual points in more diagram types. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Add respective facet types to christian@4183: compatibility lists of output modes. christian@4183: christian@4183: * doc/conf/artifacts/manualpoints.xml: Mention facet types. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added ChartType enum to ease later iteration. christian@4183: (IS.MANUALPOINTS): Added helper. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ManualPointsFacet.java: christian@4183: Help artifact figuring out which data to provide by passing facet christian@4183: name. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/ManualPointsArtifact.java: christian@4183: Respond to getPointData with correct data item, depending on facet christian@4183: name. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ManualPointsSingleState.java: christian@4183: Iterate over chart types. Add facets if corresponding data is found. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: christian@4183: Handle manual point facets. christian@4183: christian@4183: 2012-01-30 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Clone christian@4183: StateData model objects to save parameters in this Artifact - create christian@4183: new StateData instances only if no StateData model was found for a christian@4183: parameter. This solves the problem of loosing the type of a StateData. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: Implemented a getLabelFor() method that is used to format a parameter christian@4183: value. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: christian@4183: Adapted method signature of transform(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/MinMaxState.java: christian@4183: Override getLabelFor() method to create a well formatted label for min/max christian@4183: values. christian@4183: christian@4183: 2012-01-30 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/StateFactory.java: christian@4183: Bugfix: use correct order of parameters in DefaultStateData constructor. christian@4183: christian@4183: 2012-01-30 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Fixed a stupid bug. Use christian@4183: ValueCompareTransition instead of DefaultTransition to evaluate values. christian@4183: christian@4183: 2012-01-30 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/MinMaxState.java: christian@4183: Write default values for min and max items into the DESCRIBE document. christian@4183: christian@4183: 2012-01-30 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WW.java: christian@4183: Added field 'startKm' and 'endKm' to make it easier to associate christian@4183: gauge to km to return Ws in cm if km is at a gauge. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java: christian@4183: Construct the WWs with startKm and endKm. This is necessary because christian@4183: if an error occurs in calcuting an in between km in a list of end kms christian@4183: the index does not correspond to the input value any more. christian@4183: christian@4183: 2012-01-30 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added transitions for "historical discharge christian@4183: curves" calculation. christian@4183: christian@4183: 2012-01-30 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: (doPoints): Skip 'inactive' points. christian@4183: christian@4183: 2012-01-28 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WW.java: christian@4183: Removed the createNormalized() method because it did not christian@4183: solve all problems with the transformation of the W~W data we have. christian@4183: christian@4183: - We need to shift the values to be based in (0, 0). christian@4183: - We need to linear transform the values if they are at gauges. christian@4183: - Copying the data is memory expensive. christian@4183: christian@4183: Therefore there is now a new inner class ApplyFunctionIterator christian@4183: that is able to transform the values in an iterator like manner. christian@4183: The transform functions default to the identity. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/Sub.java: New. christian@4183: Simple function that subtract a scalar from the parameter. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/W.java: Added christian@4183: method minWs() to calulate the minimal W of the data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/NormalizedReferenceCurveFacet.java: christian@4183: getData() returns a WW.ApplyFunctionIterator with identity transform. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java: christian@4183: getData() returns a WW.ApplyFunctionIterator with a base shift to (0, 0). christian@4183: christian@4183: 2012-01-27 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WW.java: christian@4183: Added method createNormalized() to shift the data to start in (0, 0). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/NormalizedReferenceCurveFacet.java: christian@4183: Returns the 'normalized' data of the reference curve. christian@4183: christian@4183: 2012-01-27 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/NormalizedReferenceCurveFacet.java: christian@4183: New. Facet for the normalized W~W relation. christian@4183: TODO: Implement the on-the-fly creation logic. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java: christian@4183: New. Facet for the W~W relation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: Cosmetics. christian@4183: christian@4183: 2012-01-27 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java: christian@4183: Added stub loop for creating facets. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: christian@4183: Cosmetics. christian@4183: christian@4183: 2012-01-27 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Call the 'Bezugslinienverfahren'. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: I18N for the 'Bezugslinienverfahren' error messages. christian@4183: christian@4183: 2012-01-27 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/themes.xml: Better theme for manual points. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Theme text part of manual points. Offset it a bit. christian@4183: christian@4183: 2012-01-27 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java: christian@4183: Fixed stupid bug. christian@4183: christian@4183: 2012-01-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ReferenceGaugeState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/GaugeTimerangeState.java: christian@4183: New. States used in the 'historical discharge curve' calculation. christian@4183: christian@4183: 2012-01-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/MinMaxState.java: New christian@4183: state that eases adding min/max value pairs to describe document. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/IntRangeState.java: christian@4183: New. Subclasses MinMaxState and allows adding min/max integer value pairs. christian@4183: christian@4183: 2012-01-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: Moved christian@4183: code to add items to a data node for dynamich UI into an own method. christian@4183: christian@4183: 2012-01-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQKmsFacet.java: Removed christian@4183: useless import. christian@4183: christian@4183: 2012-01-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added strings which are used n christian@4183: the calculation "historical discharge curve". christian@4183: christian@4183: 2012-01-27 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation5.java: christian@4183: New. Calcutation to be created from WINFOArtifact christian@4183: for the 'Bezugslinienverfahren'. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Added TODO about optimization of the 'Bezugslinienverfahren'. christian@4183: Added number of default samples of the W~W relation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WW.java: christian@4183: Added convinience constructor to store the calculation results. christian@4183: christian@4183: * ChangeLog: Removed false TODO. christian@4183: christian@4183: 2012-01-27 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/WDifferencesExporter.java: christian@4183: Read jasper template file from resources to support i18n reports. christian@4183: christian@4183: * doc/conf/jasper/wdifferences.jasper, christian@4183: doc/conf/jasper/duration.jasper, christian@4183: doc/conf/jasper/computed-discharge.jasper, christian@4183: doc/conf/jasper/waterlevel.jasper: christian@4183: Updated report template. Resized left margin. christian@4183: christian@4183: * doc/conf/jasper/computed-discharge_en.jasper, christian@4183: doc/conf/jasper/duration_en.jasper, christian@4183: doc/conf/jasper/wdifferences_en.jasper, christian@4183: doc/conf/jasper/waterlevel_en.jasper: christian@4183: New. Templates for english reports. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n strings for template files and modes. christian@4183: christian@4183: 2012-01-27 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Prevent second Legend Entry for points (prior was one for the christian@4183: TextAnnotations and one for the points). christian@4183: christian@4183: 2012-01-27 Felix Wolfsteller christian@4183: christian@4183: Blindly render Text of manual points if it does not collide with christian@4183: other text. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Handle TextAnnotations, create some for manual points. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: christian@4183: Added setter for TextAnnotations, documentation. christian@4183: christian@4183: 2012-01-27 Felix Wolfsteller christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: christian@4183: 2012-01-27 Sascha L. Teichmann christian@4183: christian@4183: Refactored class hierachy to integrate model for W~W: christian@4183: christian@4183: NamedObjImpl christian@4183: \-- W christian@4183: +-- WW christian@4183: \-- WQ christian@4183: +-- WQDay christian@4183: \-- WQKms christian@4183: \-- WQCKms christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/W.java: christian@4183: New. Base class christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WW.java: christian@4183: New. Model for W~W christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQKms.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WQDay.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WQ.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WQCKms.java: christian@4183: Adjusted to follow the new class hierarchy. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-01-27 Felix Wolfsteller christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties, christian@4183: src/main/java/de/intevation/flys/artifacts/states/ManualPointsSingleState.java: christian@4183: i18n for ManualPointsFacets. christian@4183: christian@4183: 2012-01-27 Raimund Renkert christian@4183: christian@4183: Issue 138: PDF output for calculations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WDifferencesExporter.java: christian@4183: Create the PDF data source and generate the PDF report output. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: christian@4183: Add the PDF facet to state. Add export facets only once. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: christian@4183: Added PDF facet to state. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WKmsJRDataSource.java: christian@4183: Added new field type 'differences'. christian@4183: christian@4183: * doc/conf/jasper/wdifferences.jasper: christian@4183: New. Template for w-differences PDF export. christian@4183: christian@4183: 2012-01-27 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java: christian@4183: New method that creates and returns the chosen differences of w-difference christian@4183: calculation as string. christian@4183: christian@4183: 2012-01-27 Raimund Renkert christian@4183: christian@4183: Issue 138: PDF output for calculations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DurationCurveExporter.java: christian@4183: Create the PDF data source and generate the PDF report output. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, christian@4183: doc/conf/artifacts/winfo.xml: christian@4183: Added PDF facet to state. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WKmsJRDataSource.java: christian@4183: Added new field type 'day'. christian@4183: christian@4183: * doc/conf/jasper/duration.jasper: christian@4183: New. Template for duration curve PDF report. christian@4183: christian@4183: 2012-01-26 Raimund Renkert christian@4183: christian@4183: Issue 138: PDF output for calculations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: christian@4183: Create the PDF datasource and generate the PDF report output. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, christian@4183: doc/conf/artifacts/winfo.xml: christian@4183: Added PDF facet to state. christian@4183: christian@4183: * doc/conf/jasper/computed-discharge.jasper: christian@4183: New. Template for computed discharge PDF report. christian@4183: christian@4183: 2012-01-26 Raimund Renkert christian@4183: christian@4183: Issue 138: PDF output for calculations. christian@4183: christian@4183: * pom.xml: New Dependency to net.sf.jasperreports/jasperreports and christian@4183: org.codehaus.groovy/groovy-all. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/AbstractExporter.java: christian@4183: Added methods for PDF generation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: christian@4183: Create the PDF data source and generate the PDF report output. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WKmsJRDataSource.java: christian@4183: New. Data source for jasper reports containing the waterlevel calculation christian@4183: result. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: christian@4183: Added facet for PDF export to state. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added PDF facet type. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/WDifferencesExporter.java: christian@4183: Added stub for inherited abstract method. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: christian@4183: Added PDF facet to outputmode 'export'. christian@4183: christian@4183: * doc/conf/jasper, christian@4183: doc/conf/jasper/waterlevel.jasper: christian@4183: New. Folder for jasperreports templates and first template for christian@4183: waterlevel report. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n string for calculation mode. christian@4183: christian@4183: 2012-01-26 Felix Wolfsteller christian@4183: christian@4183: Renderer 'manual' points in LongitudinalSectionGenerator. christian@4183: christian@4183: * pom.xml: New dependency to org.json/json. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: (doOut): Handle manual points. christian@4183: (doPoints): Add point- series. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added MANUALPOINTS Facet Type. christian@4183: christian@4183: * doc/conf/themes.xml: Added Default Theme for Manual Points. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added manual point facet to christian@4183: compatibility list of longitudinal section diagram. christian@4183: christian@4183: 2012-01-26 Felix Wolfsteller christian@4183: christian@4183: Cosmetics. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ManualPointsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/ManualPointsArtifact.java: christian@4183: Removed obsolete imports. christian@4183: christian@4183: 2012-01-26 Felix Wolfsteller christian@4183: christian@4183: Add initial infrastructure for user-provided data ('manual points'). christian@4183: christian@4183: * doc/conf/artifacts/manualpoints.xml: Trivial state model for new christian@4183: Artifact. christian@4183: christian@4183: * doc/conf/conf.xml: Registered manualpoint artifact and factory. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ManualPointsFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/ManualPointsSingleState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/ManualPointsArtifact.java: christian@4183: New. Basic infrastructure for ManualPoints. christian@4183: christian@4183: 2012-01-25 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Removed superfluous condition checks. christian@4183: christian@4183: 2012-01-25 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Cosmetics, documentation. christian@4183: christian@4183: 2012-01-25 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Add states/transitions stubs for christian@4183: "Bezugsllinenverfahren." christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/ReferenceCurveInputState.java: christian@4183: Stubs for the two new states. christian@4183: christian@4183: 2012-01-25 Sascha L. Teichmann christian@4183: christian@4183: * contrib/visualize-transitions.xsl: Fixed output of the conditions christian@4183: of the transitions. Now you can see the circumstances christian@4183: when a branch is taken. christian@4183: christian@4183: 2012-01-25 Raimund Renkert christian@4183: christian@4183: Issue 461. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Override buildChartSection() to disable the chart subtitle entry in christian@4183: ChartSettings. christian@4183: christian@4183: 2012-01-24 Sascha L. Teichmann christian@4183: christian@4183: I18N for WINFO calculations messages. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation.java: christian@4183: Allow optional arguments in error messages to support meaningful christian@4183: formatting containing e.g. numbers. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/resources/Resources.java: christian@4183: Added a convenience getMsg() method. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/Calculation2.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/Calculation3.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: christian@4183: Adjusted the code to use the I18N symbols now. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added the I18N strings. christian@4183: christian@4183: 2012-01-23 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Handle the case in "W auf freier Strecke" where more than christian@4183: one Q is related to a W. TODO: Generate user report. christian@4183: christian@4183: 2012-01-23 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Added code for the simple case of "Bezugslinienverfahren" ("W auf freier Strecke"). christian@4183: TODO: Handle case if the model returns more than one Q for a given W. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: christian@4183: Micro optimizations. christian@4183: christian@4183: 2012-01-23 Felix Wolfsteller christian@4183: christian@4183: Fix flys/issue452 (Annotations at second y-axis). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added new type (duration_curve.mainvalues.q). christian@4183: christian@4183: * doc/conf/themes.xml: Added theme mapping for new facet type. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: christian@4183: Create another Facet. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added new facet type to compatibility christian@4183: list. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: christian@4183: Handle new Facet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: christian@4183: Added field to be able to remember which axis to stick to. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java: christian@4183: Tell Annotations to stick to Q axis in the special duration_curve christian@4183: environment. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: (AxisDataset): Added plotAxisIndex to now have a christian@4183: two-way-association. christian@4183: Tell own axisDatasets to which 'jfreechart'-axis they are assigned. christian@4183: Evaluate which axis the StickyAxisAnnotations should be sticked to, christian@4183: and calculate text and line positions accordingly. christian@4183: Removed junk. christian@4183: christian@4183: 2012-01-23 Felix Wolfsteller christian@4183: christian@4183: Fix compilation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java: christian@4183: Use StickyAxisAnnotations instead of XYTextAnnotations. christian@4183: christian@4183: 2012-01-23 Felix Wolfsteller christian@4183: christian@4183: Some unification of Annotation handling. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: christian@4183: Add a third annotation type (now have text, hyk and sticky). christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java: christian@4183: Use double instead of float values, removed commented code. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: christian@4183: Reduced to keep information about placements etc only. Not a christian@4183: Annotation (in JFreeChart sense) anymore. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Use StickyAxisAnnotations instead of XYTextAnnotations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/themes/ThemeAccess.java: christian@4183: Added new LineStyle class. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Call addAnnotationsToRenderer later, where positioning information christian@4183: is already known. christian@4183: (addAnnotationsToRenderer): Deal with the three Annotation types. christian@4183: Instead of StickyAnnotations, add christian@4183: CollisionFreeXYText- and christian@4183: XYLineAnnotations. christian@4183: (Area): Helper class. christian@4183: christian@4183: 2012-01-23 Felix Wolfsteller christian@4183: christian@4183: Some unification of Annotation handling. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: christian@4183: christian@4183: 2012-01-23 Felix Wolfsteller christian@4183: christian@4183: Fix flys/issue395 (SVG/PDF-Export: Längsschitt enthält keine christian@4183: Streckenfavoriten.) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: christian@4183: Fix pdf/svg rendering of annotatios, by adding a christian@4183: ChartRenderingInfo-object to the chart.draw call. christian@4183: christian@4183: 2012-01-20 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Added new key and getter for a short subtitle. The short subtitle is christian@4183: used if no range exists. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n string for shor subtitle. christian@4183: christian@4183: 2012-01-20 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/ChartArtifact.java: christian@4183: Removed state validation. Validation prevents drawing the diffenrences christian@4183: diagramm and all states except of WDifferencesState always return christian@4183: true. christian@4183: christian@4183: 2012-01-20 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java: christian@4183: New. Candidate to replace StickyAxisAnnotation eventually. christian@4183: christian@4183: 2012-01-20 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java: christian@4183: Added null-guards to functions parameters. christian@4183: christian@4183: 2012-01-20 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/HYKFactory.java: christian@4183: Respect flowing direction of river when finding valid christian@4183: hykformations. christian@4183: christian@4183: 2012-01-20 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: christian@4183: Add an empty facet to this state if the artifact is a Chartartifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Do not add the range to subtitle if no range exists. christian@4183: christian@4183: 2012-01-20 Raimund Renkert christian@4183: christian@4183: 'New chart' for cross sections. christian@4183: christian@4183: * doc/conf/artifacts/chart.xml: Updated the states and transitions for christian@4183: new charts. christian@4183: christian@4183: * doc/conf/meta-data.xml: Added cross sections to datacage. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: christian@4183: Changed cast from WINFOArtifact to FLYSArtifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/ChartArtifact.java: christian@4183: Changed artifact data strings for chart_type. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Changed i18n string for cross sections and logitudinal sections. christian@4183: christian@4183: 2012-01-20 Felix Wolfsteller christian@4183: christian@4183: Add basic (text) styling for HYKs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Minor cleanup, pass HYK theme on. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Apply TextStyle to TextAnnotation part for HYK zones. christian@4183: christian@4183: * src/main/java/de/intevation/flys/themes/ThemeAccess.java: christian@4183: (TextStyle): New class to bundle text-styling info. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: christian@4183: Refactored constructors to ease setting Style in the newly christian@4183: created usage scenario. christian@4183: christian@4183: 2012-01-20 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/StaticHYKState.java: christian@4183: Cleanup. Mark spot where State-based caching could happen. christian@4183: christian@4183: 2012-01-20 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/HYKFacet.java: christian@4183: Cosmetics. christian@4183: christian@4183: 2012-01-20 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/cache.xml: Added Cache for HYKS. christian@4183: christian@4183: 2012-01-20 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/HYKFactory.java: christian@4183: Made HYKFactory.Zone Serializable. christian@4183: christian@4183: 2012-01-20 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/HYKArtifact.java: christian@4183: Cosmetics. christian@4183: christian@4183: 2012-01-20 Felix Wolfsteller christian@4183: christian@4183: Added style definition for hyks. christian@4183: christian@4183: * doc/conf/themes.xml: Added hyk style (text). christian@4183: christian@4183: 2012-01-19 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/cache.xml: Removed cache "service-distanceinfo". christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java: christian@4183: Now uses the annotations from the LocationProvider and the christian@4183: XML documents are no longer cached. christian@4183: christian@4183: 2012-01-19 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/cache.xml: Removed "annotations" cache. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: christian@4183: Removed annotation caching. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/LocationProvider.java: christian@4183: Changed internal data structure to FastAnnotations which are also cached. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java: christian@4183: Use FastAnnotations now which are fetched via the LocationProvider. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Added christian@4183: time measurement for writing the CVS output. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/StaticHYKState.java: christian@4183: Removed superfluous import. christian@4183: christian@4183: 2012-01-19 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Respect visibility flag of HYK facet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Log malcondition, make colored hyk-box a bit smaller. christian@4183: christian@4183: 2012-01-19 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/DataFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/StaticWQKmsArtifact.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java: christian@4183: Cosmetics, docs, improved logging. christian@4183: christian@4183: 2012-01-19 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Recommend hyks for current river if hit by christian@4183: a crosssection-out. christian@4183: christian@4183: 2012-01-19 Felix Wolfsteller christian@4183: christian@4183: Somewhat improved HYK handling and rendering. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/HYKArtifact.java: christian@4183: Store ids in more sensibly named data item and expose it. christian@4183: Spawn all facets in inactive state. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/HYKFactory.java: christian@4183: Make HYK name accessible, do not query hyks by river, but by hyk-id, christian@4183: made query more real-world. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/StaticHYKState.java: christian@4183: Use hyks name as facet name, pass hyk-id when asking for hyks. christian@4183: christian@4183: 2012-01-19 Felix Wolfsteller christian@4183: christian@4183: Somewhat improved HYK handling and rendering. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: christian@4183: Added ability to store 'zones', next to text annotations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: (getLowestYValue, getUppestYValue, colorForHYKZone), christian@4183: (addBoxAnnotations): New. Create box annotations from zones. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: (doHYK): New, handle hyk facets by adding zones to annotation christian@4183: container. christian@4183: christian@4183: 2012-01-19 Felix Wolfsteller christian@4183: christian@4183: Preparing improved HYK handling. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/HYKFactory.java: christian@4183: (Zone.getTo): New accesor. christian@4183: TODOs and documentation added. christian@4183: christian@4183: 2012-01-18 Raimund Renkert christian@4183: christian@4183: 'New Chart' for w-differences curve. christian@4183: christian@4183: * doc/conf/artifacts/chart.xml: Added empty facet to output mode. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: christian@4183: Add an empty facet if the artifact is a ChartArtifact. christian@4183: christian@4183: 2012-01-18 Raimund Renkert christian@4183: christian@4183: 'New Chart' for discharge longitudinal section curve. christian@4183: christian@4183: * doc/conf/artifacts/chart.xml: Added transition for location input. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: christian@4183: Changed cast from WINFOArtifact to FLYSArtifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java: christian@4183: Add an empty facet if the artifact is a ChartArtifact. christian@4183: christian@4183: 2012-01-18 Raimund Renkert christian@4183: christian@4183: 'New Chart' for duration curve. christian@4183: christian@4183: * doc/conf/artifacts/chart.xml: Added state and transition for location input. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: christian@4183: Changed cast from WINFOArtifact to FLYSArtifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java: christian@4183: Add an empty facet if the artifact is a ChartArtifact. christian@4183: christian@4183: 2012-01-18 Felix Wolfsteller christian@4183: christian@4183: Added accidentally ommitted HYKFacet, fixing build. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/HYKFacet.java: christian@4183: New, stubby facet for hyk infrastructure. christian@4183: christian@4183: 2012-01-18 Raimund Renkert christian@4183: christian@4183: 'New Chart' for computed discharge curve. christian@4183: christian@4183: * doc/conf/artifacts/chart.xml: Fixed transitions and added state for km input. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/EmptyFacet.java: christian@4183: New. Added an empty facet to avoid deleting an empty output. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java: christian@4183: Changed some return values if the artifact is a ChartArtifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java: christian@4183: Changed casts from WINFOArtifact to FLYSArtifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java: christian@4183: Add an empty facet if the artifact is a ChartArtifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Set a default axis range if the range is null. christian@4183: christian@4183: 2012-01-18 Felix Wolfsteller christian@4183: christian@4183: Added stub hyk infrastructure. christian@4183: christian@4183: * doc/conf/artifacts/hyk.xml: Added trivial transition configuration christian@4183: for hyk artifacts. christian@4183: christian@4183: * doc/conf/conf.xml: Register HYK artifact and its transition conf. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/HYKArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/HYKFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/StaticHYKState.java: christian@4183: Added static 'hyk' artifact, facet and state. christian@4183: christian@4183: 2012-01-18 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Add 'hyk' facet type. christian@4183: christian@4183: 2012-01-18 Felix Wolfsteller christian@4183: christian@4183: Add hyk facet to compatibility list of winfo.xml . christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Add hyk facets to compatibility list. christian@4183: christian@4183: 2012-01-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a christian@4183: method getDataAsLong that returns a Long representation of a data item or christian@4183: null if no such data item is existing or it cannot be parsed as Long. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a function christian@4183: that returns the selected reference gauge (specified by 'reference_gauge' christian@4183: parameter) of a FLYSArtifact. christian@4183: christian@4183: 2012-01-17 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/LocationProvider.java: christian@4183: Cache a TreeMap of the annotation values of whole christian@4183: rivers. This is _much_ more efficient than firing an HQL/SQL statement for christian@4183: each km and caching these results. christian@4183: christian@4183: 2012-01-17 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FastCrossSectionLine.java: christian@4183: Deleted. It is in the backend now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/FastCrossSectionChunk.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/FastCrossSectionLineFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WaterLineArtifact.java, christian@4183: src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Adjusted to use the fast cross section line from backend now. christian@4183: christian@4183: * doc/conf/cache.xml: Store cross section lines cache on disk. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/StaticWQKmsState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/DataFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: Removed christian@4183: superfluous imports. christian@4183: christian@4183: 2012-01-17 Felix Wolfsteller christian@4183: christian@4183: Fix assignment of stateId/hash in WaterlevelFacet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: christian@4183: More verbose logging, fix hash/stateid assignment. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/BlackboardDataFacet.java: christian@4183: (deepCopy): implemented. christian@4183: christian@4183: 2012-01-17 Felix Wolfsteller christian@4183: christian@4183: "Ported" StaticWQKmsArtifact to use compute-type caching mechanism. christian@4183: christian@4183: * doc/conf/artifacts/staticwqkms.xml: Declare trivial info. christian@4183: christian@4183: * doc/conf/conf.xml: Register staticwqkms artifact and factory. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQKmsFacet.java: christian@4183: Sublacss DataFacet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/StaticWQKmsState.java: christian@4183: New. State. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWQKmsArtifact.java: christian@4183: Refactored. Most computation and stuff now done in State and Facet. christian@4183: christian@4183: 2012-01-17 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: christian@4183: Minor cosmetics. christian@4183: christian@4183: 2012-01-17 Felix Wolfsteller christian@4183: christian@4183: Refactoring. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/BlackboardDataFacet.java: christian@4183: Added new constructor. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java: christian@4183: Refactored, subclass BlackboardDataFacet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: christian@4183: Refactored, subclass DataFacet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java: christian@4183: Adjusted. christian@4183: christian@4183: 2012-01-17 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java: christian@4183: Cosmetics, added new constructor. christian@4183: christian@4183: 2012-01-16 Sascha L. Teichmann christian@4183: christian@4183: Use improved caching for cross section data. christian@4183: !!! This commit needs heavy testing !!! christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/CrossSectionKMService.java: christian@4183: Refactored to provide the map to determine the nearest cross section line christian@4183: neighbors for a given km to the public. This is a bit hackish because christian@4183: it hhould have its own factory which is then used by this service and christian@4183: other parts of the code. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: christian@4183: searchCrossSectionLine() now returns a FastCrossSectionLine. To find this christian@4183: line efficiently it uses the map of the CrossSectionKMService which christian@4183: already provides a nearest neighbor searching mechanism for cross christian@4183: section lines. The FastCrossSectionLine is fetched with the christian@4183: FastCrossSectionLineFactory which uses a cache as described in the christian@4183: previous commit. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java christian@4183: src/main/java/de/intevation/flys/artifacts/WaterLineArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Uses christian@4183: the FastCrossSectionLine instead of CrossSectionLines now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FastCrossSectionLine.java: christian@4183: Added method fetchCrossSectionProfile() to access the point data in christian@4183: the profile generating compatible way. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/ChartArtifact.java: Removed christian@4183: superfluous import. christian@4183: christian@4183: 2012-01-16 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/cache.xml: Added cache for fast section lines chunks. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FastCrossSectionChunk.java: christian@4183: New. Chunks of FastCrossSectionLines. Stores cross section lines for ranges christian@4183: of one KM. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FastCrossSectionLineFactory.java: christian@4183: New. Access fast cross section lines. It uses the cache 'fast-cross-section-lines' christian@4183: configured in cache.xml to store chunks of cross section lines. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FastCrossSectionLine.java: christian@4183: New. Stores the important data (points) of a cross section line. christian@4183: christian@4183: 2012-01-16 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: christian@4183: Added a new calculation option for historical discharge curves. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added translations for christian@4183: historical discharge curves. christian@4183: christian@4183: 2012-01-16 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added certain facets to to christian@4183: compatibility matrices. christian@4183: christian@4183: 2012-01-16 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/annotation.xml: Fixed accidental change. christian@4183: christian@4183: 2012-01-16 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/annotation.xml: Cosmetics. christian@4183: christian@4183: 2012-01-16 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/meta-data.xml: Enabled old floodmap calculations for output christian@4183: type 'map'. christian@4183: christian@4183: 2012-01-13 Raimund Renkert christian@4183: christian@4183: Initial implementation for module 'new chart'. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/ChartArtifact.java: christian@4183: New. Artifact for module 'new chart'. christian@4183: christian@4183: * doc/conf/artifacts/chart.xml: christian@4183: New. Artifact description for the new artifact. christian@4183: christian@4183: * doc/conf/conf.xml: christian@4183: Added new artifact to config. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n strings for 'new chart' chart types. christian@4183: christian@4183: 2011-01-13 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: christian@4183: Cosmetics. christian@4183: christian@4183: 2011-01-13 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Avoid NPE when copying data from one artifact to another. christian@4183: christian@4183: 2011-01-13 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: (expandRange): Prevent collapse due to negative values. christian@4183: christian@4183: 2012-01-12 Raimund Renkert christian@4183: christian@4183: * doc/conf/artifacts/map.xml, christian@4183: doc/conf/conf.xml, christian@4183: src/main/java/de/intevation/flys/artifacts/MapArtifact.java: christian@4183: Changed the MapArtifact name to 'new_map'. christian@4183: christian@4183: 2011-01-12 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: christian@4183: Added code to calculate the area of the generated polygons. christian@4183: TODO: Render the generated area sum to the plot. christian@4183: christian@4183: 2011-01-12 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: christian@4183: Replaced System.err.println()s with proper logging. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WaterlevelInfoState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Removed christian@4183: superfluous imports. christian@4183: christian@4183: 2011-01-12 Felix Wolfsteller christian@4183: christian@4183: flys/issue450 (i18n: Datenkorb: longitudinal-section) christian@4183: christian@4183: * doc/conf/meta-data.xml: Replaced dash by underscore in christian@4183: longitudinal-section. christian@4183: christian@4183: 2011-01-12 Felix Wolfsteller christian@4183: christian@4183: Towards areas on other than the first axes. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/BlackboardDataFacet.java: christian@4183: Changed signature on which to provide data via the blackboard. christian@4183: Include facets name to allow unique identification. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/AreaFacet.java: christian@4183: Store name of one of the facets involved in area creation. christian@4183: (AreaFacet.Data): New class to hold result data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: New methods to find out whether we have a general Q or W type of christian@4183: facet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: (doArea): Use new Result-Data object instead of Object[], resolve christian@4183: which axis to put area to. christian@4183: (axisIdxForFacet): New. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Subclass LongitudinalSectionGenerator. christian@4183: christian@4183: 2011-01-12 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelInfoState.java: christian@4183: Do not intefere with CrossSections. christian@4183: christian@4183: 2011-01-12 Felix Wolfsteller christian@4183: christian@4183: Cosmetics, cleanups. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: (getCrossSections, getCrossSectionNames): Removed. christian@4183: christian@4183: 2011-01-11 Felix Wolfsteller christian@4183: christian@4183: flys/issue439 (Streckenfavoriten lassen sich nicht über den Datenkorb christian@4183: hinzuladen) christian@4183: christian@4183: * doc/conf/meta-data.xml: Made Annotations available via datacage christian@4183: in longitudinal section, cosmetics. christian@4183: christian@4183: 2012-01-11 Raimund Renkert christian@4183: christian@4183: * doc/conf/conf.xml: christian@4183: Added output generator for output type 'map'. christian@4183: christian@4183: * doc/conf/artifacts/map.xml: christian@4183: Changed output name to 'map'. christian@4183: christian@4183: * doc/conf/meta-data.xml: christian@4183: Added new output type 'map'. christian@4183: christian@4183: 2011-01-11 Felix Wolfsteller christian@4183: christian@4183: Fix flys/issue446 (Dauerline/Abflusskurve am Pegel: Eigenschaften vom christian@4183: Hauptwertthema nicht aufrufbar) christian@4183: christian@4183: * doc/conf/themes.xml: Add default styles for mainvalues.q/w and other christian@4183: themes. christian@4183: christian@4183: 2012-01-11 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java: christian@4183: Removed XPath injection security hole. A serious one because it allowed christian@4183: inspecting the conf.xml file ... with all the db passwords. christian@4183: christian@4183: 2012-01-11 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2012-01-11 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/meta-data.xml: Added the definition of old calculation results christian@4183: for floodmaps. christian@4183: christian@4183: 2012-01-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: Added christian@4183: methods getLayers() and removeLayer(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a christian@4183: method getFacets() which returns a list of Facets supported by this christian@4183: Artifact. In addition, the FLYSArtifact is now more verbose while christian@4183: filtering Facets for Outputs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Implemented initialize() which now copies the shapefile directory of the christian@4183: model Artifact and modifies its Facets (adapts the shapepath which is the christian@4183: uuid of the Artifact). christian@4183: christian@4183: 2012-01-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java, christian@4183: src/main/java/de/intevation/flys/collections/OutputParser.java: Made christian@4183: them more verbose for better debugging. christian@4183: christian@4183: 2012-01-09 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Initialize() now also calls State.initialize() for each State. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Override initialize() which is defined in AbstractState. NOTE: Currently, christian@4183: this method has no code. christian@4183: christian@4183: 2012-01-07 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/CacheInvalidationService.java: christian@4183: New. The service to invalidate the caches. (Argh! Forgot to 'svn add') christian@4183: christian@4183: 2012-01-06 Ingo Weinzierl christian@4183: christian@4183: flys/issue298 (Karte: Automatischer Zoom auf Berechnungsergebnisse) christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java: Added a christian@4183: debug statement that prints out the WSPLGEN extent. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/MapGenerator.java: Create new christian@4183: Envelope instances for initial and max extent if they are not existing. christian@4183: Some debug statements have now been removed. christian@4183: christian@4183: 2011-01-06 Felix Wolfsteller christian@4183: christian@4183: Add cache for 'static' wqkms (e.g. BaseData) to default cache conf. christian@4183: christian@4183: * doc/conf/cache.xml: Add Cache Config for static wqkms. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/StaticWQKmsCacheKey.java: christian@4183: Adjust typo in cache name, minor cosmetic. christian@4183: christian@4183: 2011-01-06 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MapArtifact.java: christian@4183: The map artifact has two states now and overrides describe() to christian@4183: generate UI sections in the describe response. christian@4183: The map state overrides computeAdvance() instead of computeFeed(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java: christian@4183: Changed the WMSDBArtifact in WMSDBState to FLYSArtifact and adjusted christian@4183: constructors in state classes. christian@4183: christian@4183: * doc/conf/artifacts/map.xml: christian@4183: Added initial state and transition. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added i18n strings for new state. christian@4183: christian@4183: 2011-01-06 Felix Wolfsteller christian@4183: christian@4183: Partial fix for flys/issue437 (Querprofil: Zugeladene Basisdaten christian@4183: ignorieren W/Q-heit, falsche Namen). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: christian@4183: Set name also for first column (zero based). christian@4183: christian@4183: 2012-01-06 Ingo Weinzierl christian@4183: christian@4183: flys/issue196 (i18n/l10n: Zahlenformate einheitlich) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQ.java: New method christian@4183: getRawValue() that extracts the raw double value from 'name' parameter. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/Formatter.java: New method christian@4183: getRawFormatter() that returns a NumberFormat instance for the current christian@4183: locale. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: christian@4183: Localized the W/Q labels in CSV exports. christian@4183: christian@4183: 2011-01-06 Felix Wolfsteller christian@4183: christian@4183: flys/issue442 (i18n: Datenkorb: flood-protections) christian@4183: christian@4183: * doc/conf/meta-data.xml: Replaced dash in flood-protection by christian@4183: underscore to allow translation. christian@4183: christian@4183: 2011-01-06 Felix Wolfsteller christian@4183: christian@4183: flys/issue438 (i18n: Datenkorb: additionals) christian@4183: christian@4183: * doc/conf/meta-data.xml: Fix typo. christian@4183: christian@4183: 2011-01-05 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/CacheInvalidationService.java: christian@4183: New. Uses the CacheFactory to invalidate caches by their names. christian@4183: This can be used by external ETL processes like the AFT/DIPS importer christian@4183: to prevent cache inconsistencies. christian@4183: christian@4183: Input documents look like this: christian@4183: christian@4183: christian@4183: christian@4183: ... christian@4183: christian@4183: christian@4183: christian@4183: Output documents look like this: christian@4183: christian@4183: christian@4183: All elements removed. christian@4183: ... christian@4183: Error: Cache not found. christian@4183: christian@4183: christian@4183: * doc/conf/conf.xml: Added the cache invalidation service. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FLYSService.java: christian@4183: Added Override annotation. christian@4183: christian@4183: 2011-01-05 Felix Wolfsteller christian@4183: christian@4183: flys/issue432 (Diagrammeigenschaften/Flächenrenderer: christian@4183: Legenden-schriftgröße für Flächenthemen wird ignoriert) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Respect legend item size when generating legend items for christian@4183: area dataseries. christian@4183: christian@4183: 2011-12-09 Raimund Renkert christian@4183: christian@4183: Implemented new module "new map". christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MapArtifact.java: christian@4183: New. Artifact for the new module, extends RiverAxisArtifact and christian@4183: contains the MapState class. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java: christian@4183: Added empty constructor to embedded state classes to allow instantiation christian@4183: of MapState that extends the RiverAxisState. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/MapGenerator.java: christian@4183: Do not generate an initialExtent element if the initial extent is christian@4183: empty. christian@4183: christian@4183: * doc/conf/artifacts/map.xml: christian@4183: New. Describes the state for the new module. christian@4183: christian@4183: * doc/conf/conf.xml: christian@4183: Added new config file. christian@4183: christian@4183: 2012-01-05 Ingo Weinzierl christian@4183: christian@4183: flys/issue444 (error_no_export_found bei "W bei ungleichwertigem Abfluss") christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java: If no boolean christian@4183: value "wq_free" exists in getWQMode(), false is the default. christian@4183: christian@4183: 2011-01-05 Felix Wolfsteller christian@4183: christian@4183: flys/issue443 (Querprofile: Hibernate LazyInitializationException) christian@4183: christian@4183: * doc/conf/cache.xml: Disable cache for cross-sections. christian@4183: christian@4183: 2012-01-05 Ingo Weinzierl christian@4183: christian@4183: flys/issue447 (W-Differenzen: Fehler beim Hinzufügen einer Parameterisierung) christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/CollectionAttribute.java: christian@4183: Added a new method cleanEmptyOutputs() which removes Outputs that have christian@4183: no Facets set. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java: Call christian@4183: CollectionAttribute.cleanEmptyOutputs() at the end of write() to remove christian@4183: empty Outputs that have been added during the merge process. christian@4183: christian@4183: 2012-01-05 Ingo Weinzierl christian@4183: christian@4183: flys/issue440 (Karte: WSPLGEN Berechnungen für Mosel schlagen fehl) christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Modified the christian@4183: getRiverBoundary() method because the signature of christian@4183: RiverAxis.getRiverAxis() has changed. This method will now take each christian@4183: geometry into account, that is retrieved by christian@4183: RiverAxis.getRiverBoundary(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java: christian@4183: Use GeometryUtils.getRiverBoundary() to determine the boundary of a christian@4183: river. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Create the riveraxis shapefile with all geometries returned by christian@4183: RiverAxis.getRiverAxis(). christian@4183: christian@4183: 2012-01-05 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Repaired christian@4183: broken items in legend. The new renderer requires the current plot. This christian@4183: is set now. christian@4183: christian@4183: 2012-01-04 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/themes.xml: Added a new field 'pointsize' to the virtual theme christian@4183: 'HiddenColorLines'. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Added methods to christian@4183: parse the new field of 'HiddenColorLines'. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StyledXYSeries.java: Apply the christian@4183: pointsize defined in themes. christian@4183: christian@4183: 2012-01-04 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java: christian@4183: Use correct keys for buffering in getMinimum() and getMaximum(). christian@4183: christian@4183: 2012-01-04 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StyledXYSeries.java, christian@4183: src/main/java/de/intevation/flys/exports/StyledAreaSeriesCollection.java, christian@4183: src/main/java/de/intevation/flys/exports/EnhancedLineAndShapeRenderer.java: christian@4183: Moved to de.intevation.flys.jfree. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StyledXYSeries.java, christian@4183: src/main/java/de/intevation/flys/jfree/StyledAreaSeriesCollection.java, christian@4183: src/main/java/de/intevation/flys/jfree/EnhancedLineAndShapeRenderer.java: christian@4183: Moved from de.intevation.flys.exports. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: christian@4183: Added necessary imports. christian@4183: christian@4183: 2012-01-04 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/EnhancedLineAndShapeRenderer.java: christian@4183: Buffered the computation results of getMinimum() and getMaximum(). christian@4183: christian@4183: 2012-01-04 Ingo Weinzierl christian@4183: christian@4183: flys/issue393 (Themenstileditor: Minimum anzeigen / Beschriftung anzeigen) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/EnhancedLineAndShapeRenderer.java: christian@4183: New renderer that overrides JFreeChart's XYLineAndShapeRenderer. This christian@4183: renderer brings the option to explicitly display the minimum and/or christian@4183: maximum or a series as shape. Currently, there are no options to adjust christian@4183: the style of those shapes. christian@4183: christian@4183: * doc/conf/themes.xml: Added a new virtual theme 'MinMaxPoints'. All line christian@4183: theme inherit from that theme now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Added methods to christian@4183: parse the fields 'showminimum' and 'showmaximum' of 'MinMaxPoints' theme. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: Added christian@4183: methods to apply the fields of the new Theme 'MinMaxPoints'. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Modified christian@4183: the getRenderer() method which now always returns a new instance of christian@4183: EnhancedLineAndShapeRenderer. christian@4183: christian@4183: 2011-01-02 Felix Wolfsteller christian@4183: christian@4183: Allow styling of outline of areas. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: christian@4183: Allow styling of outline of areas. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StyledAreaSeriesCollection.java: christian@4183: Parse outline style for areas, apply it to renderer. christian@4183: christian@4183: 2012-01-03 Ingo Weinzierl christian@4183: christian@4183: flys/issue104 (W-INFO: Wasserspiegellagenberechnung / Strecke) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: Call christian@4183: the new flys-backend method Wst.determineMinMaxQFree() to determine the christian@4183: min/max Qs at a given kilometer. christian@4183: christian@4183: 2011-01-02 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/themes.xml: Reflect name chnage of longitudinal sections christian@4183: area artifacts and include ColorLine style for area styles. christian@4183: christian@4183: 2012-01-02 Ingo Weinzierl christian@4183: christian@4183: flys/issue370 (WINFO: Berechnungsausgabe W/Pegel [cm] fehlt bei Wasserspiegellage und W am Pegel) christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java: New method that christian@4183: extracts the double value of a WQ object's name. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Adapted christian@4183: the header of CSV exports and the content of the "W at gauge" column. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java: christian@4183: Adapted method signatures that have been changed in WaterlevelExporter. christian@4183: christian@4183: 2012-01-02 Ingo Weinzierl christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added strings used in the CSV christian@4183: export. christian@4183: christian@4183: 2012-01-02 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Check christian@4183: if the location of a CSV row is in range of the reference gauge. Write christian@4183: "outside reference gauge" into CSV in such cases. christian@4183: christian@4183: 2012-01-02 Ingo Weinzierl christian@4183: christian@4183: PART II of flys/issue125 (W-INFO: Wasserspiegellagenberechnung / tabellarische Berechnungsausgabe) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Add the christian@4183: named main value of a Q and the name of the gauge used for the calculation christian@4183: if the WQ mode is "W at gauge" or "Q at gauge". christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java: christian@4183: Adapted the method signatures that have been modified in christian@4183: WaterlevelExporter. christian@4183: christian@4183: 2012-01-02 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StyledAreaSeriesCollection.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/AxisSection.java, christian@4183: src/main/java/de/intevation/flys/exports/ExportSection.java, christian@4183: src/main/java/de/intevation/flys/exports/LegendSection.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartSection.java: Removed christian@4183: unused imports. christian@4183: christian@4183: 2012-01-02 Ingo Weinzierl christian@4183: christian@4183: PART I of flys/issue125 (W-INFO: Wasserspiegellagenberechnung / tabellarische Berechnungsausgabe) christian@4183: christian@4183: * doc/conf/cache.xml: Registered a new Cache for the LocationProvider. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/LocationProvider.java: christian@4183: New. This class is able to return the description of a location based on a christian@4183: river and kilometer parameter. The LocationProvider stores single christian@4183: locations into a Cache if one is configured for this class. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java: christian@4183: Added a method that returns a single Annotation for a specific kilometer and christian@4183: river. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a method christian@4183: getLocationDescription() that might be used to determine the description christian@4183: of a specified kilometer for a given river. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Make use christian@4183: of FLYSUtils.getLocationDescription() to add a new column that contains christian@4183: the location description. christian@4183: christian@4183: 2011-12-29 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: Write christian@4183: min/max values for free Qs into Artifact's DESCRIBE document. christian@4183: christian@4183: 2011-12-28 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: Fixed christian@4183: broken order to determine the step width of Qs and Ws. christian@4183: christian@4183: 2011-12-28 Ingo Weinzierl christian@4183: christian@4183: flys/issue104 (W-INFO: Wasserspiegellagenberechnung / Strecke) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: christian@4183: Validate user defined free Q values. christian@4183: christian@4183: 2011-12-28 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: christian@4183: Compute better step width based on a maximal number of steps = 30. christian@4183: Results with digits are rounded up. E.g.: christian@4183: Q range = 9.6 - 1750 christian@4183: Step width = 58.01 christian@4183: Rounded result = 60 christian@4183: christian@4183: 2011-12-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/AxisSection.java, christian@4183: src/main/java/de/intevation/flys/exports/LegendSection.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartSection.java: Subclasses christian@4183: TypeSection to be able to use convinience methods for string, integer, christian@4183: double and boolean values. christian@4183: christian@4183: 2011-12-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: The christian@4183: getSize() method now returns null if no width and height is specified in christian@4183: the request document or if width/height <= 0. It no longer returns the christian@4183: result of getDefaultSize(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Set the christian@4183: size of a chart export to the size specified in the ChartSettings if christian@4183: there are no valid values in the request document. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: Set the christian@4183: chart size to ChartGenerator.getDefaultSize() if no valid values are christian@4183: returned by ChartGenerator.getSize(). This has been done autoamtically christian@4183: before. christian@4183: christian@4183: 2011-12-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/TypeSection.java: New. This christian@4183: Section defines some convinience methods to add/set string, integer, christian@4183: double and boolean values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ExportSection.java: New. christian@4183: Subclasses TypeSection. The ExportSection currently offers attributes christian@4183: 'width' and 'height'. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartSettings.java: Added christian@4183: getter/setter methods to support an ExportSection. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Create an christian@4183: ExportSection while initial ChartSettings creation. christian@4183: christian@4183: 2011-12-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Added and christian@4183: make use of a new method createLegendLabelFont() to create unified Fonts for christian@4183: LegendItems. This method considers the user defined size for LegendItems. christian@4183: christian@4183: 2011-12-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Implemented adjustAxes(). This method now sets the label Font of the X christian@4183: axis. Its size is determined by getXAxisLabelFontSize(). christian@4183: christian@4183: 2011-12-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/AxisSection.java: Added method christian@4183: getFontSize() to retrieve the font size for an axis. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Modified createYAxis(int): call super.createYAxis(int) and adjust christian@4183: necessary settings - no Axis creation takes place here. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Added christian@4183: getXAxisLabelFontSize() and getYAxisLabelFontSize(int) to retrieve the christian@4183: user defined font size for an axis. The getYAxisLabelFontSize() is used in christian@4183: createYAxis(int) to set the font size for axes labels. christian@4183: christian@4183: 2011-12-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Override getYAxisWalker(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Create new christian@4183: instances of IdentifiableNumberAxis in createYAxis(int) default christian@4183: implementation. christian@4183: christian@4183: 2011-12-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/AxisSection.java: Added christian@4183: getLabel() to retrieve the axis label. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: christian@4183: Override getDefaultXAxisLabel() and getDefaultYAxisLabel() defined in christian@4183: XYChartGenerator. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Implement christian@4183: getXAxisLabel() and getYAxisLabel(int). Both methods search for an axis christian@4183: label defined in the ChartSettings first. If no label is specified or if christian@4183: no ChartSettings is set, getDefaultXAxisLabel() or christian@4183: getDefaultYAxisLabel(int) is called to retrieve the initial/default axis christian@4183: label. christian@4183: christian@4183: 2011-12-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartSettings.java: Modified the christian@4183: signature of addAxisSection(). This method now accepts AxisSections only. christian@4183: In addition, there is a new method getAxisSection(String) that returns an christian@4183: AxisSection specified by its identifier. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/AxisSection.java: Added new christian@4183: methods getIdentifier(), isFixed(), getUpperRange() and getLowerRange() to christian@4183: retrieve the attributes supported by this Section. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Make use christian@4183: of axes ranges specified in ChartSettings if an axis is fixed. christian@4183: christian@4183: 2011-12-23 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/IdentifiableNumberAxis.java: New. christian@4183: Subclasses JFreeChart's NumberAxis and offers a getId() method which christian@4183: returns an identifiable key. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Implements christian@4183: a createNumberAxis() method that should be used by all subclasses to christian@4183: create new axes. This method returns an instance of IdentifiableNumberAxis christian@4183: which is required for zooming. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: christian@4183: Create new NumberAxis instances by using XYChartGenerator.createNumberAxis(). christian@4183: christian@4183: 2011-12-23 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Implemented the methods getChartTitle() and getChartSubtitle(). Both christian@4183: methods try to get the required information from ChartSettings. If no christian@4183: ChartSettings is set for this OutGenerator, these methods will call christian@4183: getDefaultChartTitle() and getDefaultChartSubtitle(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: christian@4183: Renamed getChartTitle() and getChartSubtitle() to christian@4183: getDefaultChartTitle() and getDefaultChartSubtitle(). In addition, the christian@4183: methods addSubtitles() became more robust - these OutGenerators add christian@4183: subtitles only if the subtitle is not empty. christian@4183: christian@4183: 2011-12-23 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/OutGenerator.java: Added a christian@4183: setSettings(Settings) method. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Call OutGenerator.setSettings() before calling doOut() for each Facet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Implemented christian@4183: setSettings() and added convinience methods to access chart specific christian@4183: settings. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/MapGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/AbstractExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/ATExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/ReportGenerator.java: Implemented christian@4183: setSettings(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Make use christian@4183: of the attributes specified in the Settings: the title, subtitle, christian@4183: displayGrid and displayLegend settings are functional now. christian@4183: christian@4183: 2011-12-23 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartSettings.java, christian@4183: src/main/java/de/intevation/flys/exports/LegendSection.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartSection.java: Use more christian@4183: concrete classes than Settings and Section in these classes to avoid a lot christian@4183: of castings. christian@4183: christian@4183: 2011-12-22 Ingo Weinzierl christian@4183: christian@4183: flys/issue242 (W-INFO: Fehlende Header in Datenexporten) christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added functions christian@4183: getQs(), getWs(), getGauge(), getGaugename() and getRivername() that all christian@4183: take a parameter FLYSArtifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Moved the christian@4183: implementation of getGauge() to FLYSUtils. The getGauge() in this class christian@4183: just calls and returns FLYSUtils.getGauge(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Write a christian@4183: header into a CSV export containing meta information about this export. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added strings used in the CSV christian@4183: export as header. christian@4183: christian@4183: 2011-12-22 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: (getKm): Removed, not called anymore. christian@4183: christian@4183: 2011-12-22 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Include km of cross-section-master in diagrams subtitle (fetched christian@4183: from 'blackboard'. christian@4183: christian@4183: 2011-12-22 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java: christian@4183: Cosmetics, docs. christian@4183: christian@4183: 2011-12-22 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java christian@4183: (getInitialFacetActivity): Only newest CrossSection is initially christian@4183: active. christian@4183: christian@4183: 2011-12-22 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFactory.java christian@4183: (isNewest): New, query whether a CrossSection is the newest for its christian@4183: river, doc. christian@4183: christian@4183: 2011-12-21 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a christian@4183: convinience method to retrieve the value of an data object stored at christian@4183: FLYSArtifact as Boolean value. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a method that christian@4183: returns the named value of a given double value. This method returns only christian@4183: the named value, if the WQ mode is "Q at gauge" and if the value fits to a christian@4183: named value. In addition to this method, there is a new method to retrieve christian@4183: the selected WQ mode as 'WQ_MODE' enum. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/AbstractExporter.java: christian@4183: Removed prepareData() and its call. The data preparation had a bad side christian@4183: effect: the modifications are "persisted" into cache, which has again bad christian@4183: side effects. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Removed christian@4183: prepareData(). The label creation for columns in the WST export will now christian@4183: take place in addWSTColumn(). With help of the master Artifact (I forgot christian@4183: this Artifact in my last commit) we are able to replace Q values with christian@4183: their named main value. christian@4183: christian@4183: 2011-12-21 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: christian@4183: Cover 'locations' case for initial km of cross section artifacts. christian@4183: christian@4183: 2011-12-21 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: christian@4183: (initialize): Eat ld_from from master artifact. christian@4183: (setup): Set cross_section.km to either masters km or the lowest christian@4183: defined cross-section line, whatever is bigger. christian@4183: christian@4183: 2011-12-21 Ingo Weinzierl christian@4183: christian@4183: flys/issue252 (W-INFO: Wasserspiegellagenberechnung / Mitführung der Jährlichkeiten in der Diagramm-/Ergbnisausgabe) christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a function christian@4183: stripNamedMainValue(). The result of this function is a named main value's christian@4183: base name without declaration of a year. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/AbstractExporter.java: Added a christian@4183: method pepareData() that is called in doOut() before the data supported by christian@4183: the current Facet is added using addData(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Override christian@4183: the prepareData() method to reset the name of WQKms objects. The Qs in a christian@4183: waterlevel export should be the Q value or the named main value if the christian@4183: value fits to a named main value. christian@4183: christian@4183: 2011-12-20 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Survive cases where the first dataset has an area-renderer assigned. christian@4183: christian@4183: 2011-12-20 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/AreaArtifact.java: christian@4183: Store additional parameter (whether or not to fill everything in christian@4183: between two curves.) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/AreaFacet.java: christian@4183: Deliver additional info from artifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Evaluate new parameter. christian@4183: christian@4183: 2011-12-20 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/themes.xml: Add transparency setting to area theme style. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Helper to christian@4183: access transparency setting in theme. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StyledAreaSeriesCollection.java: christian@4183: Respect transparency setting. christian@4183: christian@4183: 2011-12-20 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WKmsFacet.java: christian@4183: Subclass BlackboardDataFacet to provide data for area calculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Cast data to WKms instead of WQKms. christian@4183: christian@4183: 2011-12-20 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: christian@4183: Use a ';' as seperator between Qs and Ws. christian@4183: christian@4183: 2011-12-20 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java christian@4183: (doOut, doArea): Added handling for areafacets. Code yet mostly christian@4183: copied from CrossSectionGenerator. christian@4183: christian@4183: 2011-12-20 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: christian@4183: Refactoring, subclass BlackboardDataFacet, remove duplicate code. christian@4183: christian@4183: 2011-12-20 Felix Wolfsteller christian@4183: christian@4183: Cosmetics. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml, christian@4183: src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Renamed facet for consistency reasons. christian@4183: christian@4183: 2011-12-20 Felix Wolfsteller christian@4183: christian@4183: Make Waterlevelfacet deliver data via blackbord. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: christian@4183: Subclass BlackboardDataFacet. christian@4183: christian@4183: 2011-12-20 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: christian@4183: Create all formatted string labels for Ws and Qs in this class, because christian@4183: this class is the only instance that knows that there are double values christian@4183: to format. christian@4183: christian@4183: 2011-12-20 Felix Wolfsteller christian@4183: christian@4183: Introduced new Facet that will deliver whatever getData returns via christian@4183: blackbord under key which is defined by convention. Attention, the christian@4183: data is not cached if handled this way. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/BlackboardDataFacet.java: christian@4183: New facet, will be useful for easing implementation of facets that christian@4183: can contribute to area-computations. christian@4183: christian@4183: 2011-12-20 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/VisibleAttribute.java: christian@4183: Removed obsolete imports. christian@4183: christian@4183: 2011-12-20 Felix Wolfsteller christian@4183: christian@4183: Removed obsolete imports. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/AreaFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/AreaArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/AreaCreationState.java, christian@4183: src/main/java/de/intevation/flys/exports/StyledAreaSeriesCollection.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Removed obsolete imports. christian@4183: christian@4183: 2011-12-20 Felix Wolfsteller christian@4183: christian@4183: With StableXYDifferenceRenderer, create legend items in rectangular christian@4183: form, to discern "line" from "area" in legend. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java christian@4183: (legendLine, legendShape): Renamed. christian@4183: (getLegendItem): Create LegendItem with fill, use PositivePaint for christian@4183: that. christian@4183: christian@4183: 2011-12-20 Felix Wolfsteller christian@4183: christian@4183: Added further 'area' infrastructure. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StyledAreaSeriesCollection.java: christian@4183: New, "area dataset". christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java christian@4183: (doOut): Use helper to decide if facet is an 'area' facet. christian@4183: (doArea): Construct StyledAreaSeriesCollection instead of two christian@4183: dataseries. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: (AxisDataset.isArea): Distinguish area datasets with instanceof. christian@4183: (AxisDataset.addArea): New. Replaces addAreaDataset. christian@4183: (addAreaSeries): Simplified with new custom SeriesCollection. christian@4183: (applyTheme): Register and style StableXYDifferenceRenderer for christian@4183: StyledAreaSeriesCollections. christian@4183: Added various TODOs and debug output to stabilize development. christian@4183: christian@4183: 2011-12-20 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added facets to compatibility christian@4183: matrices. christian@4183: christian@4183: * doc/conf/themes.xml: Added Area theme defaults. christian@4183: christian@4183: 2011-12-20 Felix Wolfsteller christian@4183: christian@4183: Lay ground for having areas in longitudinal section diagrams, too. christian@4183: This is done by different naming of the facets. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/AreaFacet.java: christian@4183: Make the name dynamic. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added further facet types, helper. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/AreaArtifact.java: christian@4183: Store name for facets in data item, restrict access to some fields. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/AreaCreationState.java: christian@4183: Use AreaArtifacts data item to use name for facets. christian@4183: christian@4183: 2011-12-20 Felix Wolfsteller christian@4183: christian@4183: Cosmetics. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java, christian@4183: src/main/java/de/intevation/flys/exports/StyledXYSeries.java: christian@4183: Doc. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: christian@4183: Whitespace. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Doc and christian@4183: whitespace. christian@4183: christian@4183: 2011-12-19 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java christian@4183: (parseBoolean): New, extracted, updated callers. christian@4183: (parseFillColorField, parseShowBorder): New, for area styles. christian@4183: christian@4183: 2011-12-19 Ingo Weinzierl christian@4183: christian@4183: flys/issue202 (W-INFo: Wasserspiegellagenberechnung / Vorbelegung Strecke) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: Added a system property which is used to determine, if the DESCRIBE christian@4183: document of an Artifact should include default values (values, that have christian@4183: been inserted by the user some time ago) or not. The default case is, christian@4183: that the DESCRIBE does NOT include default values. To enable default christian@4183: values, set "flys.use.default.values" to "true". christian@4183: christian@4183: 2011-12-19 Ingo Weinzierl christian@4183: christian@4183: flys/issue419 (Themen-Name "Q(null)" bei W bei ungl. A.) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java: christian@4183: Use correct variable to create Facet names. christian@4183: christian@4183: 2011-12-19 Ingo Weinzierl christian@4183: christian@4183: flys/issue380 (W-INFO / Überschwemmungskarte, falsches DGM) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a christian@4183: convinience method that returns a parameter of FLYSArtifact as Integer. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java: Override christian@4183: validate() to determine, if the DGM selected by the user is valid for the christian@4183: current calculation range and river. christian@4183: christian@4183: 2011-12-19 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Roll-back accidentally committed changes. christian@4183: christian@4183: 2011-12-19 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java christian@4183: (doOut): Hide 'invisible' (deleted) themes from Outgenerators. christian@4183: christian@4183: 2011-12-19 Felix Wolfsteller christian@4183: christian@4183: Added area.name data item and access to areaartifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/AreaFacet.java: christian@4183: Rephrased debug output, do survive case where only one curve is christian@4183: given for area calculation (this is the "above" or "under" case). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/AreaArtifact.java christian@4183: (getAreaName): Access "area.name" data item. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/AreaCreationState.java: christian@4183: Respect area.name data of artifact when reproducing facets. christian@4183: christian@4183: 2011-12-16 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/conf.xml: Fix, accidentally added wrong factory in last christian@4183: commit. christian@4183: christian@4183: 2011-12-16 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/conf.xml: Register area artifact factory. christian@4183: christian@4183: 2011-12-16 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added area artifacts to cross-section christian@4183: compatibility matrix. christian@4183: christian@4183: 2011-12-16 Felix Wolfsteller christian@4183: christian@4183: Add area dataseries when facet delivering one. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java christian@4183: (doOut): Handle area facets. christian@4183: (doArea): Register areas for area facets. christian@4183: christian@4183: 2011-12-16 Felix Wolfsteller christian@4183: christian@4183: Add simple area registerig functions. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: (AxisDataset.addAreaDataset): New, add an area dataset. christian@4183: (AxisDataset.isArea): New. christian@4183: (addAreaSeries): New. Add Area Dataset. christian@4183: (applyThemes): Pass info if we have an area, to set different christian@4183: renderer. christian@4183: christian@4183: 2011-12-16 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/StaticState.java: christian@4183: Added convenience function and easy sybclassing. christian@4183: christian@4183: 2011-12-16 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Register AREA ("area") facet type. christian@4183: christian@4183: 2011-12-16 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: christian@4183: Register blackboard key uuid+index and respond with data to it, as christian@4183: assumed by the areaartifact and facet. christian@4183: christian@4183: 2011-12-16 Felix Wolfsteller christian@4183: christian@4183: Added partial area-infrastructure. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/AreaFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/AreaArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/AreaCreationState.java: christian@4183: New artifact, facet and state for area rendering. christian@4183: christian@4183: 2011-12-16 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Defined an christian@4183: interface YAxisWalker that allows to walk over each Y axis definition in christian@4183: subclasses. This walker can be retrieved using the new getYAxisWalker() christian@4183: method. The AxisSections are built in this class now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Implemented the YAxisWalker interface and the getYAxisWalker() method. christian@4183: Removed the code to build AxisSections. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: christian@4183: Implemented getYAxisLabel(int pos) and getYAxisWalker(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: christian@4183: Implemented the getYAxisWalker() method. christian@4183: christian@4183: 2011-12-16 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Some optimizations during out() operation - the CollectionAttribute is christian@4183: parsed a single time now (*i guess*). This code really needs some christian@4183: refactoring! christian@4183: christian@4183: 2011-12-16 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Added an INFO message that displays the duration time for the out() christian@4183: operation. christian@4183: christian@4183: 2011-12-16 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Calls super.buildAxisSections(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Implemented the method buildAxisSections(). The result list will contain christian@4183: an AxisSection for the X axis. christian@4183: christian@4183: 2011-12-16 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java: Bugfix: christian@4183: Add new Outputs to the current CollectionAttribute if no old one is christian@4183: existing. christian@4183: christian@4183: 2011-12-16 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java: christian@4183: Directly fetch key/value pairs when writing a collection attribute. christian@4183: christian@4183: 2011-12-16 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartSettings.java: Added new christian@4183: functions that allow parsing a ChartSettings object from DOM Node. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeParser.java: Parse christian@4183: the Settings of each Output. christian@4183: christian@4183: 2011-12-16 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/CollectionAttribute.java: christian@4183: Added a method to set a new Settings object for a specific Output and a christian@4183: method to clear the list of Facets of a specific Output. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java: The christian@4183: AttributeWriter no longer creates new CollectionAttributes - it only christian@4183: modifies the old CollectionAttribute. At first, it clears the Facets of christian@4183: all Outputs. Finally, the merged Facets are added to the Outputs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Added the CollectionAttribute to the AttributeWriters constructor. christian@4183: christian@4183: 2011-12-16 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DoubleAttribute.java: New. An christian@4183: Attribute that stores double values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/AxisSection.java: Added methods christian@4183: to set values for 'fixation', 'font-size', 'lower' and 'upper'. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Set new attributes mentioned above for each axis' AxisSection. christian@4183: christian@4183: 2011-12-15 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/AxisSection.java: Added methods christian@4183: to set the axis label and id. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Improved christian@4183: the ChartSettings that will now contain a set of AxisSections. The new christian@4183: buildAxisSections() method in this class is not implemented and needs to christian@4183: be implemented by subclasses. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Override buildAxisSections() of XYChartGenerator to create an AxisSection christian@4183: for each axis that is able to be displayed in this sort of chart. In christian@4183: addition, there is a new method getYAxisLabel(int) that returns the label christian@4183: for a specific Y axis. christian@4183: christian@4183: 2011-12-15 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/IntegerAttribute.java: New. christian@4183: Concrete subclass of a DefaultAttribute for storing integer values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LegendSection.java: New. A christian@4183: concrete Section subclass to store legend specific attributes. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/BooleanAttribute.java, christian@4183: src/main/java/de/intevation/flys/exports/StringAttribute.java: Removed christian@4183: needless import of org.w3c.dom.Attr. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartSettings.java: ChartSettings christian@4183: is able to store a Section for legends now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Added christian@4183: methods to retrieve the font size of legends and if the legend should be christian@4183: visible or not. In addition, the ChartSettings returned by this instance christian@4183: will now contain a LegendSection as well. christian@4183: christian@4183: 2011-12-15 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Introduced christian@4183: methods getChartSubtitle() and isGridVisible(). getChartSubtitle() returns christian@4183: in this implementation null. Concrete subclasses should override this christian@4183: mehtod if they require subtitles in charts. isGridVisible() determines if christian@4183: the grid in the chart should be visible or not. This method return always christian@4183: true in this implementation. christian@4183: In addition, the Settings object returned by getSettings() will now have a christian@4183: ChartSection set properly. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: christian@4183: Override getChartSubtitle(). christian@4183: christian@4183: 2011-12-15 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Prepare the OutGenerator (process each of the Output's Facets) during the christian@4183: describe() operation to be able to return an initial Settings object. christian@4183: christian@4183: 2011-12-15 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/BooleanAttribute.java, christian@4183: src/main/java/de/intevation/flys/exports/VisibleAttribute.java, christian@4183: src/main/java/de/intevation/flys/exports/StringAttribute.java: Fixed wrong christian@4183: usage of DOM operations. christian@4183: christian@4183: 2011-12-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/BooleanAttribute.java, christian@4183: src/main/java/de/intevation/flys/exports/VisibleAttribute.java, christian@4183: src/main/java/de/intevation/flys/exports/StringAttribute.java: New. christian@4183: Concrete subclasses of a DefaultAttribute. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartSettings.java, christian@4183: src/main/java/de/intevation/flys/exports/AxisSection.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartSection.java: christian@4183: Implementations for chart settings. WORK IN PROGRESS! christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Override christian@4183: the getSettings() method. The implementation here returns a ChartSettings christian@4183: instance. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/EmptySettings.java: Modified the christian@4183: node name of the settings ("art:settings" -> "settings"). christian@4183: christian@4183: 2011-12-14 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: christian@4183: Cosmetics, doc. christian@4183: christian@4183: 2011-12-14 Felix Wolfsteller christian@4183: christian@4183: Cosmetics. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java: christian@4183: Remove needless imports. christian@4183: christian@4183: 2011-12-14 Felix Wolfsteller christian@4183: christian@4183: Fix/Guard certain misconditions. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Do christian@4183: not crash when given null-range. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java: christian@4183: Do not crash when given malformed array. christian@4183: christian@4183: 2011-12-14 Felix Wolfsteller christian@4183: christian@4183: Cosmetics. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java, christian@4183: ChangeLog: Whitespace cosmetic. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: christian@4183: Annotation cosmetic. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/ExternalWMSArtifact.java: christian@4183: Convenience cosmetic. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/DataUtil.java: christian@4183: vim-magicosmetic. christian@4183: christian@4183: 2011-12-14 Felix Wolfsteller christian@4183: christian@4183: Implement new WaterLineArtifact where needed so far. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Declare that we implement WaterLineArtifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: christian@4183: (getWaterLines): Implement to fulfil new WaterLineArtifact- christian@4183: interface-impl. Also generate new Facet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: christian@4183: Do not depend on WINFOArtifacts, but on WaterLineArtifacts instead. christian@4183: christian@4183: 2011-12-14 Felix Wolfsteller christian@4183: christian@4183: Added interface WaterLineArtifact to be implemented by artifacts christian@4183: that know how to create a water line "against" a cross section. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WaterLineArtifact.java: christian@4183: New, straight-forward interface. christian@4183: christian@4183: 2011-12-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/EmptySettings.java: An christian@4183: implementation of the Settings interface defined in the artifact-database christian@4183: module. This implementation accepts no Section objects at all and creates christian@4183: an empty "settings" Node in its toXML() operation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/OutGenerator.java: Defined a new christian@4183: method getSettings() that returns a Settings instance. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ReportGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/MapGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/AbstractExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/ATExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: christian@4183: Implemented the getSettings() operation. All OutGenerators will currently christian@4183: return an instance of EmptySettings. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Before the DESCRIBE document is created, we gonna evaluate each Output christian@4183: defined in the Collection's attribute document, if it has a Settings christian@4183: object set. If this is not the case, the relevant OutGenerator is called christian@4183: to retrieve a new instance of Settings. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/CollectionAttribute.java: christian@4183: Append the Settings of Outputs to the Output nodes in the XML christian@4183: representation. christian@4183: christian@4183: 2011-12-13 Felix Wolfsteller christian@4183: christian@4183: Recommend cross-sections. christian@4183: christian@4183: * doc/conf/meta-data.xml: When having a cross-section out, recommend christian@4183: respective artifacts. christian@4183: christian@4183: 2011-12-13 Felix Wolfsteller christian@4183: christian@4183: Register factory for CrossSectionArtifacts. christian@4183: christian@4183: * doc/conf/conf.xml: Register CrossSectionArtifact-Factory. christian@4183: christian@4183: 2011-12-13 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/CollectionAttribute.java: christian@4183: New. This class will store the information provided in the Collection's christian@4183: attribute (which is a DOM document). christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/CollectionDescriptionHelper.java: christian@4183: Store an instance of CollectionAttribute and append its XML representation christian@4183: to the DESCRIBE document. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java: Removed christian@4183: all DOM operations from this writer. Its new task is to create a new christian@4183: CollectionAttribute object which represents a merged version of the old christian@4183: CollectionAttribute and the information provided by the Collection's child christian@4183: Artifacts. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeParser.java: The christian@4183: result of AttributeParser's parse() operation is a CollectionAttribute christian@4183: object now. The methods getOuts() and getFacets() are as of now proxy christian@4183: methods that call the relevant methods of CollectionAttribute. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Some structural changes in the process to build the attribute Document of christian@4183: the Collection's DESCRIBE. We will no longer work with Document during christian@4183: this process but with instances of CollectionAttribute. christian@4183: christian@4183: 2011-12-13 Felix Wolfsteller christian@4183: christian@4183: Server-side of newer Cross-Section diagram construction architecture. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java christian@4183: (searchCrossSectionKmLine, getCrossSectionSnapKm), christian@4183: (getCrossSectionData): Removed, most functionality contained in christian@4183: CrossSectionArtifact. christian@4183: (getWaterLines): Now get CrossSectionLines to calculate water line. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: christian@4183: Get a CrossSectionLine from blackboard. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Hard TODO, commented out function needed for subtitle to allow christian@4183: compilation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java: christian@4183: Added Empty-Dataset- guard. christian@4183: christian@4183: 2011-12-13 Felix Wolfsteller christian@4183: christian@4183: Cosmetics. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Cosmetics. christian@4183: christian@4183: 2011-12-13 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/CrossSectionKMService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2011-12-13 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/CollectionDescriptionHelper.java: christian@4183: New. This class helps generating the DESCRIBE document of a collection. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Moved some of the code to create the DESCRIBE document out to christian@4183: CollectionDescriptionHelper. christian@4183: christian@4183: 2011-12-12 Felix Wolfsteller christian@4183: christian@4183: Resolve todo about wrongly named cross sections. christian@4183: Open StaticState to allow that facets survive a compute. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/StaticState.java christian@4183: (computeAdvance, computeFeed, computeInit): Override to call christian@4183: staticCompute. christian@4183: (staticCompute): New. Do nothing but be able to be overridden. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java christian@4183: (setup): Fetch facets name from db (resolves todo). christian@4183: (getCurrentState): override staticstates staticcompute to let christian@4183: facets survive a compute. christian@4183: christian@4183: 2011-12-12 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java, christian@4183: src/main/java/de/intevation/flys/wsplgen/WSPLGENCallable.java: Renamed christian@4183: JobExecutor to WSPLGENCallable (because it is a Callable now). In addition christian@4183: to the call() method which starts the WSPLGEN process, this Callable christian@4183: offers a cancelWSPLGEN() method to destroy a running WSPLGEN process. christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/WSPLGENFuture.java: A FutureTask christian@4183: that overrides cancel(boolean). Before this instance call christian@4183: super.cancel(boolean), it executes WSPLGENCallable.cancelWSPLGEN() to kill christian@4183: a running WSPLGEN process. christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/Scheduler.java: The Scheduler is christian@4183: no longer a Runnable. It makes now use of a ScheduledThreadPoolExecutor to christian@4183: schedule the incoming WSPLGENJobs. The ScheduledThreadPoolExecutor has a christian@4183: fixed number of worker threads that process the jobs. The number is 1 per christian@4183: default; it can be modified using a System property "wsplgen.max.threads". christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: Added christian@4183: a string constant SCHEDULER. christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/SchedulerSetup.java: A christian@4183: LifetimeListener that currently implements the systemUp() method to create christian@4183: an instance of Scheduler. After its creation, the Scheduler is put into christian@4183: the GlobalContext using FLYSContext.SCHEDULER as key. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Fetch the Scheduler from GlobalContext. christian@4183: christian@4183: * doc/conf/conf.xml: Registered SchedulerSetup as LifetimeListener. christian@4183: christian@4183: 2011-12-09 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java: christian@4183: (describe): Add data items to StaticFLYSArtifacts describe-doc. christian@4183: christian@4183: 2011-12-09 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/StaticState.java: christian@4183: (addDefaultChartOutput): Convenienve function to add a chart-output. christian@4183: christian@4183: 2011-12-09 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java: christian@4183: Play nice with CrossSectionArtifact. Employ blackboard. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: christian@4183: Spawn a CrossSectionFacet, handle various data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: christian@4183: Do not produce CrossSectionFacets anymore, these now "belong" to christian@4183: CrossSectionArtifacts. christian@4183: christian@4183: 2011-12-09 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/cache.xml: Added cross_sections cache. christian@4183: christian@4183: 2011-12-09 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFactory.java: christian@4183: (getCrossSection, getCrossSectionUncached): New, access specific christian@4183: CrossSection, employ caching. christian@4183: christian@4183: 2011-12-09 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java: christian@4183: New artifact to handle cross-section access. christian@4183: christian@4183: 2011-12-09 Raimund Renkert christian@4183: christian@4183: Issue 413. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: christian@4183: Apply point size from theme attribute linewidth. christian@4183: christian@4183: 2011-12-08 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java, christian@4183: src/main/java/de/intevation/flys/exports/OutGenerator.java, christian@4183: src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: christian@4183: Cosmetics. christian@4183: christian@4183: 2011-12-08 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/CrossSectionKMService.java: christian@4183: Documentation added, let a value be its own neighbour (distance 0). christian@4183: christian@4183: 2011-12-08 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: christian@4183: Added "Bezugslinie" to list of calculation alternatives. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_de.properties: Added I18N. christian@4183: christian@4183: 2011-12-06 Felix Wolfsteller christian@4183: christian@4183: Further flys/issue420 fix (No Discharge Curves for Mosel). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: (includeYRange, mergeRanges): Moved NaN-guard to lowest level. christian@4183: (combineXRanges): Also NaN guard the X Axis extent. christian@4183: christian@4183: 2011-12-06 Felix Wolfsteller christian@4183: christian@4183: Partial fix for flys/issue420 (Berechnete Abflusskurve: Kein Diagramm für christian@4183: Mosel). Protect axis extent calculation from empty or invalid christian@4183: datasets. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: (includeRange, includeYRange): Renamed, updated callers. christian@4183: (includeYRange): Protect from merging extent with NaNs. christian@4183: (debugDatasets): Be more verbose on the datasets. christian@4183: (zoom): Doc. christian@4183: christian@4183: 2011-12-06 Felix Wolfsteller christian@4183: christian@4183: Fix flys/issue423 (Diagramm: Hauptwerte bei Abflusskurve am Pegel christian@4183: werden an Y-Achse nicht angezeigt) - show not "raw" (vs interpolated) christian@4183: values at Gauge. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java: christian@4183: Add parameterization to let facet know whether to fetch data at christian@4183: Gauges or at Artifacts position. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: christian@4183: Let the MainValueFacets know whether to ask for interpolated christian@4183: MainValues; (do not interpolate for Gauges Main Values). christian@4183: (getMainValuesQ, getMainValuesW): Added parameter to control christian@4183: interpolation. christian@4183: christian@4183: 2011-12-05 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Modified christian@4183: prefix constants for Mapserver layers and renamed constants (which have christian@4183: been postfixes before). christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java: Adjusted christian@4183: usage of Mapserver constants to the changes described above. christian@4183: christian@4183: 2011-12-05 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Bugfix: Evaluate the correct parameter whether to set the floodplain or christian@4183: not. In addition, the scenario parameter used by WSPLGEN is now set christian@4183: correctly. christian@4183: christian@4183: 2011-12-05 Felix Wolfsteller christian@4183: christian@4183: Allow longitudinal_section.q facets in wdiff states output. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added longitudinal_section.q facets christian@4183: to w-diff states out compatibility- matrix. christian@4183: christian@4183: 2011-12-05 Felix Wolfsteller christian@4183: christian@4183: Refactored Longitudinal*/WDiff-*Generator hierarchy and change axis christian@4183: ordering, resolved label-i18n TODO. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: christian@4183: Merge, avoid duplicate code, fix axis ordering in w-diff diagram, christian@4183: label in ls-diagramm. christian@4183: christian@4183: 2011-12-05 Ingo Weinzierl christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added missing state titles. christian@4183: christian@4183: 2011-12-05 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: christian@4183: Do not include zero on first axis. christian@4183: christian@4183: 2011-12-02 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: (buildArtifactNode): Include artifacts state data in description christian@4183: document of collection. christian@4183: christian@4183: 2011-11-30 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ReportGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/AbstractExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/ATExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/OutGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java, christian@4183: src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2011-11-30 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Removed import to make it compileable again. christian@4183: christian@4183: 2011-11-30 Felix Wolfsteller christian@4183: christian@4183: Introduce pre-rendering inter-facet communication phase ('blackboard christian@4183: pass'). christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java christian@4183: (doBlackboardPass): New. Before actually calling doOut, bundle christian@4183: ArtifactAndFacets and let them register christian@4183: themselfes as DataProvider in CallContext if they christian@4183: want ("announce on blackboard"). christian@4183: christian@4183: 2011-11-30 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java christian@4183: (doOut): Adjusted signature. christian@4183: christian@4183: 2011-11-30 Felix Wolfsteller christian@4183: christian@4183: Changed doOut signature to use ArtifactAndFacet, which will be christian@4183: side effect of upcoming "blackboard" feature. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java christian@4183: (getRangesForDataset, getRangesForAxis): Renamed, removed TODO. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java christian@4183: (createAxis): Update call to XYChartGenerator.getRangesForAxis, christian@4183: cosmetics. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/OutGenerator.java christian@4183: (doOut): Changed Signature to accet ArifactAndFacet instead of christian@4183: Artifact and Facet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ReportGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/MapGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/AbstractExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/ATExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java christian@4183: (doOut): Adjusted to new signature. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: (adjustAxes): Removed, we do not need a (manual) second axis. christian@4183: christian@4183: 2011-11-28 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: christian@4183: Fix compilation, use features of XYChartGenerator. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Set default behaviour such that 0 is not included in ranges. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: christian@4183: Set behaviour of axis such that 0 is not (automagically) included. christian@4183: christian@4183: 2011-11-28 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java: christian@4183: Fix wrong documentation. christian@4183: christian@4183: 2011-11-28 Felix Wolfsteller christian@4183: christian@4183: Fix LongitudinalSections multi-axes plotting behavior. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Removed obsolete functions, use better working multi-axis christian@4183: magic by XYChartGenerator. christian@4183: christian@4183: 2011-11-28 Felix Wolfsteller christian@4183: christian@4183: Overhaul dataset/axis/renderer housekeeping in Mother of all christian@4183: ChartGenerators. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Refactored, keep axis/rendering relevant information in objects christian@4183: of new class AxisDataset. Removed some obsolete code while adding christian@4183: documentation. christian@4183: christian@4183: 2011-11-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java(relateWs): christian@4183: Added the implementation of the 'Bezugslinienverfahren'. Should christian@4183: be complete but needs testing! christian@4183: TODO: Setup a Calculation and integrate it into WINFO. christian@4183: christian@4183: 2011-11-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Refactored the code for the "berechnete Abflusskurve" to enable christian@4183: the "Bezugslinienverfahren" to use the same code paths. It also christian@4183: removes a good deal of already existing code duplication. christian@4183: christian@4183: 2011-11-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java(findQsForW): christian@4183: Added method findQsForW(w, km) to retrieve the Qs that correspond christian@4183: for the given w and km. christian@4183: christian@4183: This is to be called when doing a "W auf freier Strecke" calculation christian@4183: to find out the Qs belonging to the user given W. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2011-11-25 Felix Wolfsteller christian@4183: christian@4183: Fix bug when adding Q data in LongitudinalSectionGenerator. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Add data from Q -Facet as Q over Km points. christian@4183: christian@4183: 2011-11-25 Felix Wolfsteller christian@4183: christian@4183: Added handling of empty plots. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: (createAxes, removeEmptyRangeAxes): Survive empty datasets map, create christian@4183: primary axis. christian@4183: (recoverEmptyPlot): New. christian@4183: christian@4183: 2011-11-25 Felix Wolfsteller christian@4183: christian@4183: Let first visible axis be always on the left. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: (createAxes): When creating axes, keep track of which is the first christian@4183: one. Set its location to "left". christian@4183: christian@4183: 2011-11-24 Felix Wolfsteller christian@4183: christian@4183: Use multiple axis in relevant generators. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: christian@4183: (createYAxis): Implemented. christian@4183: Define and use YAXIS enum for axes. christian@4183: christian@4183: 2011-11-24 Felix Wolfsteller christian@4183: christian@4183: Fix theming and legend items for plot with multiaxis feature. christian@4183: Decouple renderer index from dataset index. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: (applyThemes): Do not get renderer based on dataset/axis-index but christian@4183: count. christian@4183: christian@4183: 2011-11-24 Felix Wolfsteller christian@4183: christian@4183: In XYChartGenerators allow more than two datasets. christian@4183: Assign axis to indices of datasets, do not show axis if corresponding christian@4183: dataset is set to be not visible. christian@4183: Do proper axis-setting in LongitudinalSectionGenerator only (other christian@4183: will follow). Based on a patch by Sascha Teichmann. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Keep relation between index and dataset, once its added. Compute christian@4183: ranges per index. Allow subclasses to override createAxes to specify christian@4183: internationalized labels etc. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java: christian@4183: Add datasets to first index. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Implement createYAxis to create correct first, second and third christian@4183: axis. Added enum to easy identification of axis. Stripped down christian@4183: adjustAxis which was used to create second axis. christian@4183: Add datasets at correct indices. christian@4183: christian@4183: 2011-11-23 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/templating/StackFrames.java, christian@4183: src/main/java/de/intevation/flys/artifacts/datacage/templating/FunctionResolver.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Cosmetics, docs. christian@4183: christian@4183: 2011-11-23 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: christian@4183: Cosmetics, docs. christian@4183: christian@4183: 2011-11-23 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTableCacheKey.java: christian@4183: Cosmetics, docs. christian@4183: christian@4183: 2011-11-23 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: christian@4183: Resolved TODO about caching certain WstValueTables. christian@4183: christian@4183: 2011-11-22 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/ExternalWMSArtifact.java: New. christian@4183: This Artifact is used to allow users adding external WMS layers to their christian@4183: floodmaps. An ExternalWMSArtifact stores an URL of a WMS, the name and the christian@4183: title of the WMS layer. The internal State extends WMSBackgroundState. christian@4183: christian@4183: * doc/conf/conf.xml: Registered the ExternalWMSArtifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added a christian@4183: new type "floodmap.externalwms" which is used by the ExternalWMSArtifact. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Allowed the "floodmap.externalwms" facet for christian@4183: floodmaps. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java: christian@4183: Some refactoring to allow easier subclassing. christian@4183: christian@4183: 2011-11-22 Felix Wolfsteller christian@4183: christian@4183: Fixed flys/411. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java: christian@4183: Use different queries to avoid costy joins. christian@4183: christian@4183: 2011-11-22 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java: christian@4183: Use different queries to avoid costy joins. Patch by Sascha christian@4183: Teichmann, minor typo-fix. christian@4183: christian@4183: 2011-11-17 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added other.wkms.interpol facet christian@4183: to compatibility matrix for computed discharge curves. christian@4183: christian@4183: 2011-11-17 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: christian@4183: Resolve cosmetic todo, use importData-convenience method. christian@4183: christian@4183: 2011-11-17 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Handle STATIC_WKMS_INTERPOL and WQ/Points as Annotations. christian@4183: christian@4183: 2011-11-17 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java: christian@4183: Give Facet different name when its a flood*, so that it can be christian@4183: understood to be e.g. a flood-protection further down the processing christian@4183: line. christian@4183: christian@4183: 2011-11-17 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Prevent ArrayIndexOutOfBounds, log method entry. christian@4183: christian@4183: 2011-11-17 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added new Facet Type: Interpolated W/Km values. christian@4183: christian@4183: 2011-11-16 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java, christian@4183: src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Avoid christian@4183: WMS layer names that begin with digits. This would lead to invalid christian@4183: WMSGetFeatureInfo responses, where the name of a layer is the name of a christian@4183: XML node. christian@4183: christian@4183: 2011-11-16 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Added and use *_wq macros for interpolated christian@4183: w/q data (currently used in computed discharge curve only). christian@4183: christian@4183: 2011-11-16 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Handle STATIC_WQ_ANNOTATION type facets, build and add annotations christian@4183: for these. christian@4183: christian@4183: 2011-11-16 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java: christian@4183: Set Facet type (name) based on static datas name (special case christian@4183: everything starting with "height"). christian@4183: christian@4183: 2011-11-16 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Extended compatibility matrices. christian@4183: christian@4183: 2011-11-16 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added new STATIC_WQ_ANNOTATIONS Facet Type. christian@4183: christian@4183: 2011-11-16 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: christian@4183: Added a method isQueryable() that determines if a layer is queryable via christian@4183: WMS GetFeatureInfo request. This method returns false as default. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WMSDBLayerFacet.java: christian@4183: Override isQueryable(). All WMSDBLayerFacets are queryable via WMS christian@4183: GetFeatureInfo request. christian@4183: christian@4183: 2011-11-16 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java: christian@4183: Added functionality to artifact to use single column wst christian@4183: interpolators. christian@4183: christian@4183: 2011-11-16 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: christian@4183: Added methods to create WstValueTables (interpolators) for specific christian@4183: columns of wsts. christian@4183: christian@4183: 2011-11-16 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/themes.xml: Added Point Style for other.wq data. christian@4183: christian@4183: 2011-11-16 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Do not re-evaluate constant size() in for-loops. christian@4183: christian@4183: 2011-11-16 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java: christian@4183: Get ld_locations not locations data item to determine km. christian@4183: (getDataAsDouble): New helper function to get data item as double. christian@4183: christian@4183: 2011-11-16 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Recommend fixations for computed discharge christian@4183: curve outs, minor refactoring of dc conf. christian@4183: christian@4183: 2011-11-16 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/conf.xml: Added wqinterpol factory to produce christian@4183: WQKmsInterpolArtifacts. christian@4183: christian@4183: 2011-11-16 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Use StyledSeriesBuilder to add WQ data from WQKms to Series. christian@4183: christian@4183: 2011-11-16 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Handle interpolated WQ data. christian@4183: christian@4183: 2011-11-16 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWQKmsArtifact.java: christian@4183: Adjusted to similar implementations. Added TODO about merging with christian@4183: these similar implementations. christian@4183: christian@4183: 2011-11-16 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Removed logging noise, find better suited rows for interpolation. christian@4183: christian@4183: 2011-11-16 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: christian@4183: Cache WstValueTables that were fetched by wst_id. christian@4183: christian@4183: 2011-11-16 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java: christian@4183: (getWstName): Fix and use SQL statement. christian@4183: christian@4183: 2011-11-15 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WQKmsInterpolArtifact.java: christian@4183: Added new Facet and Artifact to access W over Q data. christian@4183: christian@4183: 2011-11-15 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: (importData): New function to copy data from one artifact to christian@4183: another. christian@4183: christian@4183: 2011-11-15 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java christian@4183: (getTable): New methods to get WstValueTable for given wst_id. christian@4183: Prepolate Arrays with NaNs. christian@4183: christian@4183: 2011-11-15 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java: christian@4183: (getWKmsName): Fix definition. christian@4183: christian@4183: 2011-11-15 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java: christian@4183: (getWKmsName): New function. Get name (description) of a WST. christian@4183: christian@4183: 2011-11-15 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added new "other.wq"/STATIC_WQ Facet-Type, e.g. for fixations in christian@4183: discharge curves. christian@4183: christian@4183: 2011-11-15 Felix Wolfsteller christian@4183: christian@4183: Picky cosmetics. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/ManagedFacetAdapter.java, christian@4183: src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java: christian@4183: Cosmetics, docs. christian@4183: christian@4183: 2011-11-15 Felix Wolfsteller christian@4183: christian@4183: Added translations for Mosel, Elbe and Saar. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added translations christian@4183: for Mosel, Elbe, Saar. christian@4183: christian@4183: 2011-11-15 Felix Wolfsteller christian@4183: christian@4183: Added new interpolation mechanism to WstValueTable to interpolate christian@4183: given columns only. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java christian@4183: (linearW): New, interpolate a given columns w's between given rows. christian@4183: (interpolateWQColumnwise): New, interpolate between rows ws at a christian@4183: given column and km. christian@4183: christian@4183: 2011-11-14 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Minor doc added. christian@4183: christian@4183: 2011-11-13 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WQKmsFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java, christian@4183: src/main/java/de/intevation/flys/themes/ThemeFactory.java: christian@4183: Removed dead ';' from empty bodies. christian@4183: christian@4183: 2011-11-13 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: christian@4183: s/reset/resetQuick/s in TDoubleArrayLists. christian@4183: christian@4183: 2011-11-13 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: christian@4183: Added system properties 'waterlevel' and 'km'. Useful to christian@4183: init the UI with a given waterlevel and drawing the cross-sections christian@4183: at the given km. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: christian@4183: Spliting by NaNs definition holes _should_ work now. Needs christian@4183: some more testing. christian@4183: TODOs: christian@4183: - Use log4j instead of println for logging. christian@4183: - Subclass XYDifferenceRenderer instead of replacing it totally. christian@4183: christian@4183: 2011-11-12 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: christian@4183: Draw water, too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: christian@4183: First code to split datasets by NaNs. WIP. christian@4183: christian@4183: 2011-11-12 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: christian@4183: Draw ground with StableXYDifferenceRenderer. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: christian@4183: Removed XYDatasetToZeroMapper stuff. Not needed any longer christian@4183: because we use rendereres on dataset basis now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/XYDatasetToZeroMapper.java: christian@4183: Removed.Not longer needed. christian@4183: christian@4183: 2011-11-11 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Include computed discharge curves in dc christian@4183: conf. christian@4183: christian@4183: 2011-11-11 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Somewhat unify user-part of dc config. christian@4183: christian@4183: 2011-11-11 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/themes.xml: Modified some floodmap styles and added a christian@4183: backgroundcolor attribute to polygon themes. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MapserverStyle.java: christian@4183: Added support for backgroundcolor. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Parse christian@4183: backgroundcolor from theme document. If a value is given, the christian@4183: backgroundcolor is set on the Mapserver style. christian@4183: christian@4183: 2011-11-11 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MapserverStyle.java: christian@4183: Set correct Mapserver attribute name to adjust the width of a line. christian@4183: christian@4183: 2011-11-11 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/themes.xml: Added 'textcolor' and 'textsize' attributes to the christian@4183: existing 'Kms' theme. christian@4183: christian@4183: * doc/conf/mapserver/fontset.txt: Defined a 'DefaultFont' that is used as christian@4183: default font for Mapserver labels. christian@4183: christian@4183: * doc/conf/mapserver/db_layer.vm: Add a Mapserver LABELITEM if a value is christian@4183: provided by LayerInfo object. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java: Added a christian@4183: getLabelItem() method that returns null as default. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSKmArtifact.java: Override christian@4183: getLabelItem() to return "km" which is the database field that contains christian@4183: the kilometer information. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WMSDBLayerFacet.java: christian@4183: Added an attribute labelItem with appropriate getter/setter methods. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MapserverStyle.java: christian@4183: Splitted up the internal class Clazz. Now, there are two new inner christian@4183: classes Style and Label that fulfill the appropriate Mapfile sections of christian@4183: Mapserver. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Also Read font christian@4183: attributes and add new Clazz Label for the Mapserver layer. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Set the christian@4183: "labelItem" attribute on the LayerInfo object used to fill DB layer christian@4183: templates. christian@4183: christian@4183: 2011-11-11 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Re-use macros to include more data to christian@4183: datacage in more situations. christian@4183: christian@4183: 2011-11-11 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: christian@4183: Removed needless imports. christian@4183: christian@4183: 2011-11-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSFixpointsArtifact.java: New christian@4183: WMSDBArtifact that creates facets for "fixpoints" relation. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Registered "floodmap.fixpoints" as valid christian@4183: "floodmap" facet. christian@4183: christian@4183: * doc/conf/conf.xml: Registered the new WMSFixpointsArtifact. christian@4183: christian@4183: * doc/conf/themes.xml: Added a theme for "floodmap.fixpoints". christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added christian@4183: Facet type "floodmap.fixpoints". christian@4183: christian@4183: * doc/conf/meta-data.xml: Made "floodmap.fixpoints" available via datacage. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added titles for christian@4183: "floodmap.fixpoints" facets. christian@4183: christian@4183: 2011-11-10 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Refactored and (re)use macros. christian@4183: christian@4183: 2011-11-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSBuildingsArtifact.java: New christian@4183: WMSDBArtifact that creates facets for "buildings" relation. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Registered "floodmap.buildings" as valid christian@4183: "floodmap" facet. christian@4183: christian@4183: * doc/conf/conf.xml: Registered the new WMSBuildingsArtifact. christian@4183: christian@4183: * doc/conf/themes.xml: Added a theme for "floodmap.buildings". christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added christian@4183: Facet type "floodmap.buildings". christian@4183: christian@4183: * doc/conf/meta-data.xml: Made "floodmap.buildings" available via datacage. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added titles for christian@4183: "floodmap.buildings" facets. christian@4183: christian@4183: 2011-11-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSLineArtifact.java: New christian@4183: WMSDBArtifact that creates facets for "lines" relation. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Registered "floodmap.lines" as valid christian@4183: "floodmap" facet. christian@4183: christian@4183: * doc/conf/conf.xml: Registered the new WMSLineArtifact. christian@4183: christian@4183: * doc/conf/themes.xml: Added a theme for "floodmap.lines". christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added christian@4183: Facet type "floodmap.lines". christian@4183: christian@4183: * doc/conf/meta-data.xml: Made "floodmap.lines" available via datacage. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added titles for facets. christian@4183: christian@4183: 2011-11-10 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Adjusted DC configuration to christian@4183: also allow heightmarks and base data in discharge longitudinal christian@4183: sections. Minor refac. christian@4183: christian@4183: 2011-11-10 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Adjusted DC configuration to let old christian@4183: calculations be available for discharge longitudinal sections. christian@4183: christian@4183: 2011-11-10 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java: christian@4183: Handle other WQKm and WKm Facets. christian@4183: christian@4183: 2011-11-10 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java christian@4183: (IS): New inner class with static method to allow queries whether christian@4183: a type belongs to a however-defined "group". christian@4183: christian@4183: 2011-11-10 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/conf.xml: Reverted accidental commit. christian@4183: christian@4183: * doc/conf/meta-data.xml: Extracted annotations-macro, add recommendation christian@4183: for discharge longitudinal sections. christian@4183: christian@4183: 2011-11-10 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/conf.xml: Reverted accidental commit. christian@4183: christian@4183: * doc/conf/meta-data.xml: Extracted annotations-macro, add recommendation christian@4183: for discharge longitudinal sections. christian@4183: christian@4183: 2011-11-10 Felix Wolfsteller christian@4183: christian@4183: Made discharge longitudinal section out compatible with annotations. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added facets to compatibility list christian@4183: for discharge longitudinal section outs. christian@4183: christian@4183: 2011-11-10 Felix Wolfsteller christian@4183: christian@4183: Extracted Annotations-Macro in dc conf, recommend Annotations for christian@4183: discharge longitudinal sections. (Note correction two commits later). christian@4183: christian@4183: * doc/conf/conf.xml: Extracted annotations-macro, add recommendation christian@4183: for discharge longitudinal sections. christian@4183: christian@4183: 2011-11-10 Felix Wolfsteller christian@4183: christian@4183: Handle Annotations in DischargeLongitudinalSection diagrams. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java: christian@4183: Call doAnnotations for LONGITUDINAL_ANNOTATION facets. christian@4183: christian@4183: 2011-11-10 Felix Wolfsteller christian@4183: christian@4183: Resolve code duplicate. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java christian@4183: (doAnnotationsOut): Removed duplicate code. christian@4183: Theoretically handle WQKMS data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: christian@4183: Adjusted call to doAnnotationOut. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java christian@4183: (doAnnotations): Doc from LongitudinalSectionGenerator. christian@4183: christian@4183: 2011-11-10 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Include exception when logging issue with spline creation. christian@4183: christian@4183: 2011-11-10 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java: christian@4183: When during XPath evaluation an exception is thrown, log the christian@4183: expression that caused the trouble. christian@4183: christian@4183: 2011-11-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: christian@4183: Use separate XYDataset for each curve. This is needed because christian@4183: "Raum/Flaeche" needs specialized renderers, which are not compatible christian@4183: with the standard renderers. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: christian@4183: Removed superfluous import. christian@4183: christian@4183: 2011-11-09 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSFloodplainArtifact.java: New christian@4183: Artifact that is used to create WMS layers for floodplains in maps. christian@4183: christian@4183: * doc/conf/conf.xml: Registered the new WMSFloodplainArtifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added christian@4183: a new type 'floodmap.floodplain'. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Registered the 'floodmap.floodplain' facet christian@4183: for floodmaps. christian@4183: christian@4183: * doc/conf/themes.xml: Added a theme for 'floodmap.floodplain' facets. christian@4183: christian@4183: * doc/conf/meta-data.xml: Added configuration for 'floodplain'. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added facet titles for christian@4183: 'floodmap.floodplain' facets. christian@4183: christian@4183: 2011-11-09 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSCatchmentArtifact.java: New christian@4183: Artifact that is used to create WMS layers for catchments in maps. christian@4183: christian@4183: * doc/conf/conf.xml: Registered the new WMSCatchmentArtifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added christian@4183: a new type 'floodmap.catchment'. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Registered the 'floodmap.catchment' facet christian@4183: for floodmaps. christian@4183: christian@4183: * doc/conf/themes.xml: Added a theme for 'floodmap.catchment' facets. christian@4183: christian@4183: * doc/conf/meta-data.xml: Added configuration for 'catchments'. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added facet titles for christian@4183: 'floodmap.catchment' facets. christian@4183: christian@4183: 2011-11-09 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSHwsArtifact.java: New christian@4183: Artifact that is used to create WMS layers for flood protected works. christian@4183: christian@4183: * doc/conf/conf.xml: Registered the new WMSHwsArtifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added christian@4183: a new type 'floodmap.hws'. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Registered the 'floodmap.hws' facet for christian@4183: floodmaps. christian@4183: christian@4183: * doc/conf/themes.xml: Added a theme for 'floodmap.hws' facets. christian@4183: christian@4183: * doc/conf/meta-data.xml: Added configuration for 'hws'. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added facet titles for christian@4183: 'floodmap.hws' facets. christian@4183: christian@4183: 2011-11-09 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/mapserver/dbconnection.include: Removed. DB connections are christian@4183: supported by LayerInfo objects now. So, we do not need to configure it any christian@4183: more. christian@4183: christian@4183: * doc/conf/mapserver/db_layer.vm: The database connection is provided by christian@4183: LayerInfo objects. The "INCLUDE dbconnection.include" has been replaced. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java: The inner christian@4183: State class got two new methods that provide information about db christian@4183: connection string and connection type. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WMSDBLayerFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java: Both christian@4183: classes support getter/setter for connection and connectionType. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Fill christian@4183: LayerInfo objects used to create DB layers with the connection and christian@4183: connection type provided by WMSDBLayerFacet. christian@4183: christian@4183: 2011-11-09 Felix Wolfsteller christian@4183: christian@4183: Allow height marks with points style in w-differences diagrams. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: christian@4183: Handle HEIGHTMARKS_POINTS facets. christian@4183: christian@4183: 2011-11-09 Felix Wolfsteller christian@4183: christian@4183: Made Q Duration curve initially inactive. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java christian@4183: (getInitialFacetActivity): Return 0 for DURATION_Q facets. Minor christian@4183: cosmetics. christian@4183: christian@4183: 2011-11-09 Felix Wolfsteller christian@4183: christian@4183: Recommend mainvalues for Duration Curve Diagrams. christian@4183: christian@4183: * doc/conf/meta-data.xml: Recommend mainvalues for duration curve christian@4183: diagrams. refactored into macro. christian@4183: christian@4183: 2011-11-09 Felix Wolfsteller christian@4183: christian@4183: Handle MainValue Facets in Duration Curve Diagrams. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: christian@4183: Handle MainValues. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Adjusted to call doAnnotations. christian@4183: christian@4183: 2011-11-09 Felix Wolfsteller christian@4183: christian@4183: Move do*Annotation* (like mainvalue) in XYChartGenerator. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java christian@4183: (doAnnotations): New, moved from DischargeCurveGenerator. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java christian@4183: (doMainValueAnnotations): Moved to superclass. christian@4183: christian@4183: 2011-11-09 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: christian@4183: Removed duplicate code. christian@4183: christian@4183: 2011-11-09 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java christian@4183: (): Minor cosmetics, added stability. christian@4183: (getInitialFacetActivity): Let facets be inactive in duration curve christian@4183: diagrams. christian@4183: christian@4183: 2011-11-09 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Allow other.wqkms facets in many christian@4183: outputs, mainvalues in duration curves. christian@4183: christian@4183: 2011-11-09 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/mapserver/dbconnection.include: Adapted connection params for christian@4183: using an oracle database. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSQPSArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSKmArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: christian@4183: Added Oracle support for Mapserver's DATA attribute. Oracle doesn't allow christian@4183: a "USING UNIQUE id" string in this attribute which is required by Postgis. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Modified the geometry type of "talaue.shp" from MultiPolygon to Polygon. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a function christian@4183: which returns true, if the backend uses an Oracle db instance. Otherwise, christian@4183: it returns false. christian@4183: christian@4183: 2011-11-08 Felix Wolfsteller christian@4183: christian@4183: Fix flys/issue406 (Themestyle-editor: themes for "other.wkms" and christian@4183: "other.wqkms" missing) christian@4183: christian@4183: * doc/conf/themes.xml: Fixed typos in WKms and WQKms theme names. christian@4183: christian@4183: 2011-11-08 Felix Wolfsteller christian@4183: christian@4183: Fix flys/issue405 (Datacage: Recommendations get loaded twice). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java christian@4183: (setup): Do not try/catch exception. christian@4183: (spawn_state): Generate just one "general" output. christian@4183: christian@4183: 2011-11-08 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: christian@4183: Added a log.warn() which prints out an exception - previously it was christian@4183: just skipped. christian@4183: christian@4183: 2011-11-08 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/meta-data.xml: Removed orphaned datacage configuration which is christian@4183: no longer loadable. christian@4183: christian@4183: 2011-11-07 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/conf.xml: Added an "post-describe" hook which is necessary to christian@4183: load recommendations for "floodmaps". christian@4183: christian@4183: 2011-11-07 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java christian@4183: (loadRows, loadColumns, loadQRanges): Refactored in preparation to christian@4183: ability to create WstValueTables for given wst_id and christian@4183: column_pos (interpolation for static data). christian@4183: christian@4183: 2011-11-07 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java: christian@4183: Minor, picky cosmetics. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQKmsFactory.java: christian@4183: Removed junk. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Added documentation. christian@4183: christian@4183: 2011-11-07 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Be more specific in what to catch. christian@4183: christian@4183: 2011-11-04 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/meta-data.xml: Added the CrossSectionTracks to the "floodmap" christian@4183: datacage configuration. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added a christian@4183: FacetType "floodmap.qps". christian@4183: christian@4183: * doc/conf/conf.xml: Defined an ArtifactFactory for the "wmspqsartifact" christian@4183: string. The factory will create new instances of WMSQPSArtifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSQPSArtifact.java: New. This christian@4183: Artifact is used to create "floodmap.qps" facets. It has an internal fixed christian@4183: State WMSQPSState. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added the "floodmap.qps" layer to the christian@4183: "floodmap" output. christian@4183: christian@4183: * doc/conf/themes.xml: Added a theme for "floodmap.qps" facets. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added strings for the QPS WMS christian@4183: layer used in floodmaps. christian@4183: christian@4183: 2011-11-04 Felix Wolfsteller christian@4183: christian@4183: Re-enable mainvalue-recommendations for computed discharge curves, christian@4183: as the NPE should be gone. christian@4183: christian@4183: * doc/conf/meta-data.xml: Uncomment mainvalue recommendations. christian@4183: christian@4183: 2011-11-04 Felix Wolfsteller christian@4183: christian@4183: When querying metadata/datacage, use only output-names of outputs that christian@4183: actually exists (in the sense of having facets). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: christian@4183: Get output names from artifact, not from state. christian@4183: christian@4183: 2011-11-04 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/meta-data.xml: Removed DEMs from floodmap configuration, christian@4183: because we are not able to draw DEMs into maps. christian@4183: christian@4183: 2011-11-04 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: christian@4183: Subclasses WMSDBArtifact now and defines an inner class RiverAxisState christian@4183: which subclasses WMSDBState. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: christian@4183: Removed. The RiverAxisState is an inner class of RiverAxisArtifact now christian@4183: which subclasses WMSDBState. christian@4183: christian@4183: * doc/conf/artifacts/riveraxis.xml: Removed, because the RiverAxisArtifact christian@4183: has a fixed static State only. christian@4183: christian@4183: * doc/conf/conf.xml: Removed riveraxis.xml definition. christian@4183: christian@4183: 2011-11-04 Felix Wolfsteller christian@4183: christian@4183: For a Flys-Collection, add outputt to attributes-part of describe christian@4183: document only if they contain facets. -> Prevent empty output nodes christian@4183: in flys-collections outputs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java: christian@4183: (writeFacets): Added return type to indicate whether any facet was christian@4183: written. Decide whether to add an output-node depending on this christian@4183: return value. christian@4183: christian@4183: 2011-11-04 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Create christian@4183: line and polygon layers for barriers only if they are really existing. christian@4183: christian@4183: 2011-11-04 Felix Wolfsteller christian@4183: christian@4183: Disable mainvalue-recommendations for discharge curves as they trigger christian@4183: a yet-to-be understood NPE. christian@4183: christian@4183: * doc/conf/meta-data.xml: Comment mainvalue-recommendations for christian@4183: discharge curves. christian@4183: christian@4183: 2011-11-04 Felix Wolfsteller christian@4183: christian@4183: Added new matching condition for theme-mappings: the name of christian@4183: the output. christian@4183: christian@4183: * src/main/java/de/intevation/flys/themes/ThemeMapping.java: christian@4183: Added output field and function to match it against a given christian@4183: output name. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: christian@4183: Createing ThemeMapping with output attribute from configuration. christian@4183: christian@4183: * src/main/java/de/intevation/flys/themes/ThemeFactory.java: christian@4183: (getTheme(FLYSContext, string)): Removed, never called. christian@4183: (getTheme): Added outputName argument, match it. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Pass outputs name until it can be matched against mapping. christian@4183: christian@4183: 2011-11-04 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/themes.xml: Added default themes for other.w(q)kms. christian@4183: christian@4183: 2011-11-04 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: christian@4183: Cosmetics, reduce logging noise. christian@4183: christian@4183: 2011-11-03 Felix Wolfsteller christian@4183: christian@4183: Added access to static W_Q_Kms - data in much the same way then static christian@4183: WKms. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/StaticWQKmsCacheKey.java: christian@4183: Cache Key for static wqkms data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQKmsFacet.java: christian@4183: Facet for WQKms. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQKmsFactory.java: christian@4183: Factory to access WQKms. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWQKmsArtifact.java: christian@4183: Artifact that provides 'static' WQKms. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added STATIC_WQKMS type. christian@4183: christian@4183: 2011-11-03 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/XYDatasetToZeroMapper.java: christian@4183: New. Maps series to zero to be compatible with XYDifferenceRenderer. christian@4183: It returns an iterator over XYDatasets to enable splitting by NaNs, christian@4183: which still needs to be implemented. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: christian@4183: Uses a XYDatasetToZeroMapper now. Fixed package name. christian@4183: christian@4183: 2011-11-03 Felix Wolfsteller christian@4183: christian@4183: Added new matching options for theme-mappings to allow more christian@4183: overspecification of defaults (e.g. now name,description-pattern and christian@4183: master-artifacts attributes are matched). The first full match from christian@4183: the configuration file is done. christian@4183: New matching option in the masterAttr- field of a mapping are christian@4183: super-basic until new use-cases come up. christian@4183: Concrete new themes are point-styles of Ws when locations where chosen christian@4183: to calculate. christian@4183: christian@4183: * doc/conf/themes.xml: Added newly defined Themes. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Put master-artifact in flys-context. christian@4183: christian@4183: * src/main/java/de/intevation/flys/themes/ThemeMapping.java: christian@4183: Accept masterAttr in constructor. christian@4183: (masterAttrMatches): New, check masterAttr-condition against christian@4183: artifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: christian@4183: When creating ThemeMappings, pass in masterAttr. christian@4183: christian@4183: * src/main/java/de/intevation/flys/themes/ThemeFactory.java: christian@4183: (getTheme): Evaluate masterAttr-condition, always return first full christian@4183: match. christian@4183: christian@4183: 2011-11-03 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: christian@4183: Added ARTIFACT key, documentation. christian@4183: christian@4183: 2011-11-03 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java: christian@4183: New. At the moment a pure copy of JFreeChart's XYDifferenceRenderer. christian@4183: Needs to be refactored to cope with its limitations: christian@4183: christian@4183: - Series numbers need to be zero based. We have more than two series christian@4183: in our diagrams. christian@4183: christian@4183: - Cannot handle definition holes indicated by NaNs. We have these christian@4183: cases e.g. more than one "Fliessbereich". christian@4183: christian@4183: 2011-11-03 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: christian@4183: Reenabled dumping data to disk. christian@4183: christian@4183: 2011-11-03 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Removed superfluous import. christian@4183: christian@4183: 2011-11-03 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java: christian@4183: Use new pair in stack of results and connections because they are christian@4183: always used in pairs. Maintaining two separate stacks is not christian@4183: needed any longer. christian@4183: christian@4183: 2011-11-03 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/Pair.java: New. A generic pair. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: christian@4183: Rewritten to useful as test bed for "Raum/Flaeche" operations. christian@4183: christian@4183: 2011-11-02 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java: Added christian@4183: setter methods for all parameters and removed the constructors. There is christian@4183: just an empty constructor - all parameters need to be set via setter christian@4183: methods. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Modified the christian@4183: creation of LayerInfo objects. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DBLayerInfo.java: christian@4183: Removed, because the internal structure and constructors of LayerInfo have christian@4183: changed, so that we gonna use LayerInfo for all layers now. christian@4183: christian@4183: * doc/conf/themes.xml: Modified the color definitions of christian@4183: 'floodmap.riveraxis' and 'floodmap.kms' themes and added a 'symbol' field christian@4183: to 'floodmap.kms'. christian@4183: christian@4183: * doc/conf/mapserver/symbols.sym, christian@4183: doc/conf/mapserver/fontset.txt: New. Required by Mapserver. christian@4183: christian@4183: * doc/conf/mapserver/db_layer.vm: Added an 'EXTENT' field that is filled christian@4183: using LayerInfo.getExtent(). christian@4183: christian@4183: * doc/conf/mapserver/mapfile.vm: Modified FONTSET directory and added a christian@4183: SYMBOLSET. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java: Added an christian@4183: abstract method getGeometryType(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSKmArtifact.java: Override christian@4183: getGeometryType() of WMSDBArtifact. This Artifact provides "POINT"s. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: christian@4183: Create new WMSDBLayerFacets with geometry type "LINE". christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WMSDBLayerFacet.java: christian@4183: Added a 'geometryType' attribute and getter/setter methods. This attribute christian@4183: determines the type of geometry provided by this database wms layer. Types christian@4183: could be "POLYGON", "POINT", "LINE" and so on. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MapserverStyle.java: christian@4183: Added a 'symbol' attribute to the inner class Clazz. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Added a function to christian@4183: parse the symbol field of a theme. This symbol is used for christian@4183: MapserverStyle.Clazz. christian@4183: christian@4183: 2011-11-02 Felix Wolfsteller christian@4183: christian@4183: Apply point theme to heightmarks when imported in longitudinal christian@4183: section diagram. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added new FacetType HEIGHTMARK_POINTS. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WKmsFacet.java: christian@4183: Allow name to be given in constructor. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: christian@4183: If heightmarks were loaded, give respective name in WKmsFacet christian@4183: generation. christian@4183: christian@4183: * doc/conf/themes.xml: Added virtual "Points" and concrete christian@4183: heightmark_points - theme. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Made longitudinal_section output christian@4183: compatible with heightmarks_points. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Render heightmarks like other wkms. christian@4183: christian@4183: * doc/conf/meta-data.xml: Changed heightmark ids such that it can be christian@4183: identified in StaticWKmsFacet . christian@4183: christian@4183: 2011-11-02 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: christian@4183: Documentation added. christian@4183: christian@4183: 2011-11-02 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java: christian@4183: Fix bug where (wrong) active-attribute was set, doc. christian@4183: christian@4183: 2011-11-02 Felix Wolfsteller christian@4183: christian@4183: Refactoring to allow mainvalues in both discharge and computed christian@4183: discharge curve diagrams. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java christian@4183: (addPointsQW): New helper function. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Moved doMainValueQAnnotations, doMainValueWAnnotations from child- christian@4183: to parent-class, extracetd doDischargeOut. Use christian@4183: StyledSeriesBuilder.addPointsQW . christian@4183: christian@4183: 2011-11-02 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: christian@4183: Removed logger/debugging noise. christian@4183: christian@4183: 2011-11-02 Felix Wolfsteller christian@4183: christian@4183: 1) Pass outputs name to artifacts getInitialFacetActivity(). christian@4183: 2) Do not allow "gaps" in positions of facets in outputs in attributes christian@4183: of collection (prevent e.g. positions 1,3,5; will become 1,2,3 christian@4183: instead). christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java: christian@4183: Pass outputname to artifacts getInitialFacetActivity(), prevent christian@4183: gaps in facets positions in outputs (1,3,10 become 1,2,3). christian@4183: christian@4183: 2011-11-02 Felix Wolfsteller christian@4183: christian@4183: 1) Give Artifacts information about the out when they have to decide christian@4183: whether a given facet is initially in/active by adding parameter christian@4183: to getInitialFacetActivity(+outputName). christian@4183: 2) Generate separate Set of MainValueFacets for discharge curves. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: (getInitialFacetActivity): Adjusted, new parameter outputName. christian@4183: Added MAINVALUES_{Q,W} definition. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java: christian@4183: Accept name in constructor. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: christian@4183: Create second pair of MainValuesFacets, give distinguishable names. christian@4183: christian@4183: 2011-11-02 Felix Wolfsteller christian@4183: christian@4183: Added compatibility of (computed)discharge-curve diagrams with christian@4183: mainvalues. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added mainvalues to compatibility list christian@4183: of (computed) discharge curve outputs. These facet-definitionss can christian@4183: differ in names because we can can have up to 4 mainvalue facets in christian@4183: one state. christian@4183: christian@4183: 2011-11-01 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSKmArtifact.java: Determine christian@4183: the extent of such WMS layer based on the list of RiverAxisKm objects christian@4183: returned by the backend. christian@4183: christian@4183: 2011-11-01 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/meta-data.xml: Added a datacage node that represents a christian@4183: kilometer WMS layer. christian@4183: christian@4183: * doc/conf/conf.xml: Added a new Artifact WMSKmArtifact. christian@4183: christian@4183: * doc/conf/themes.xml: Added a style for 'floodmap.kms' facets. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Defined 'floodmap.kms' as valid floodmap christian@4183: facet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added christian@4183: a 'floodmap.kms' facet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a method to christian@4183: determine the srid of a river based on its name. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java: New. This christian@4183: Artifact should act as base Artifact for WMS layers that represent data christian@4183: from database datastore. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSKmArtifact.java: New. This christian@4183: Artifact is used to generate facets for kilometer WMS layers. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added default descriptions christian@4183: for 'floodmap.kms' facets. christian@4183: christian@4183: 2011-11-01 Felix Wolfsteller christian@4183: christian@4183: Fix incompilability. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelInfoState.java: christian@4183: Adjust to changed CrossSectionFacet. christian@4183: christian@4183: 2011-11-01 Felix Wolfsteller christian@4183: christian@4183: Minor preparations to handle multiple cross sections in one christian@4183: diagram/artifact, faking certain aspects (e.g. ability to display christian@4183: multiple cross sections, but let these fetch the exactly same data christian@4183: for now). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Parameterize but fake access to cross-section (always take first christian@4183: one). christian@4183: (getCrossSectionName,getCrossSectionNames): Renamed, access names christian@4183: of all cross-sections, so that at least facets with different names christian@4183: are created (they will still deliver the same data). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java: christian@4183: Allow indexing. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: christian@4183: Index created cross-sections. christian@4183: christian@4183: 2011-11-01 Felix Wolfsteller christian@4183: christian@4183: Show multiple water lines and facets in cross-section diagram if christian@4183: multiple waterlevel values had been entered. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java christian@4183: (appendBackgroundActivity): Made static. christian@4183: (getWaterLines): Add 'idx' argument to specify index of queried christian@4183: waterlevel. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: christian@4183: Add index. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: christian@4183: Add one Facet for each of the computed waterlevels. christian@4183: christian@4183: 2011-10-31 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/geom/VectorUtils.java: christian@4183: Added code to calculate intersection points. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: christian@4183: Added polygons for trivial cases. WIP christian@4183: christian@4183: 2011-10-31 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: christian@4183: Made it compilable again. christian@4183: christian@4183: 2011-10-31 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/geom/VectorUtils.java: christian@4183: Made X() and Y() access macros public. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: christian@4183: More code. WIP. christian@4183: christian@4183: 2011-10-31 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: christian@4183: Handle start points when building polygons. Work in progress. christian@4183: christian@4183: 2011-10-31 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/geom/VectorUtils.java: christian@4183: New. Vector operations on Point2D. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: christian@4183: Moved vector operations to VectorUtils. christian@4183: christian@4183: 2011-10-31 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java: christian@4183: Do not call size() in for loop again and again. christian@4183: christian@4183: 2011-10-30 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: christian@4183: Interim check in. Work in progress. christian@4183: christian@4183: 2011-10-28 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java: New. christian@4183: Polygon class to help creating "Raum/Flaeche" renderers with gaps in christian@4183: their definitions. WORK IN PROGRESS! christian@4183: christian@4183: 2011-10-28 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/themes.xml: Added a default theme for the riveraxis used in the christian@4183: floodmap. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MapserverStyle.java: christian@4183: New. This class is used by ThemeUtil to create a style which is christian@4183: compatible for Mapserver- christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java: Added a method to christian@4183: retrieve a Mapserver compatible style (as string) based on a given christian@4183: Document (that comes from CollectionItem's attribute). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java: christian@4183: Implemented the setStyle() and getStyle() methods. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Added a christian@4183: new parameter 'style' to createDatabaseLayer(). This parameter is set on christian@4183: LayerInfo. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/MapGenerator.java: Create christian@4183: Mapserver compatible styles and call createDatabaseLayer() with this christian@4183: style. christian@4183: christian@4183: 2011-10-28 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Defined "floodmap.riveraxis" and christian@4183: "floodmap.wmsbackground" as compatible layers for the floodmap output. christian@4183: christian@4183: * doc/conf/mapserver/db_layer.vm: New. This layer template is used for christian@4183: Mapserver layers with database datastore. christian@4183: christian@4183: * doc/conf/mapserver/dbconnection.include: New. The database configuration christian@4183: used in the db_layer template. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a method christian@4183: getUserWMSUrl() that returns the URL to the user specific WMS server. christian@4183: This method requires a UUID of an Artifact to identify the owner of the christian@4183: Artifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java: Use christian@4183: FLYSUtils.getUserWMSUrl() to create the URL to the user WMS for christian@4183: WMSLayerFacets creation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WMSDBLayerFacet.java: christian@4183: New. Subclasses WMSLayerFacet to save data and filter parameters used christian@4183: for database storage in Mapfiles. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DBLayerInfo.java: New. christian@4183: Subclasses LayerInfo to save database relevant parameters. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: christian@4183: Creates new WMSDBLayerFacets, so that the riveraxis layer data is christian@4183: fetched from database. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Added a christian@4183: public method that allows creating layers (type LINE) based on christian@4183: WMSDBLayerFacets. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/MapGenerator.java: Enabled christian@4183: support for Facets other than "floodmap.wsplgen" and "floodmap.barriers". christian@4183: Those other Facets are supposed to be WMSDBLayerFacets. christian@4183: christian@4183: 2011-10-28 Felix Wolfsteller christian@4183: christian@4183: Refactored, added StyledSeriesBuilder to unify adding points to christian@4183: XYSeries. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java: christian@4183: New class to help with adding points to XYSeries. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: christian@4183: Use StyledSeriesBuilder to add points to series. christian@4183: christian@4183: 2011-10-28 Felix Wolfsteller christian@4183: christian@4183: Added DC-conf, such that static data can be loaded from w-difference christian@4183: diagrams datacage. christian@4183: christian@4183: * doc/conf/meta-data.xml: Minor "refactoring" (definition of two christian@4183: macros, allow certain static data to be loaded via datacage to christian@4183: w-difference diagrams, too. christian@4183: christian@4183: 2011-10-28 Felix Wolfsteller christian@4183: christian@4183: Load and display annotations in w-differences, minor polishing. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Use FacetType 'instead' of string. Allow Annotations in christian@4183: WDifferences- diagram. christian@4183: christian@4183: * doc/conf/meta-data.xml: Recommend annotations in w-differences case. christian@4183: christian@4183: 2011-10-28 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java: christian@4183: Survive case where a given output doesnt exist in compatibility christian@4183: matrix. christian@4183: christian@4183: 2011-10-28 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/StaticState.java: christian@4183: Added simpler constructor. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: christian@4183: Adjusted construction of StaticStates. christian@4183: christian@4183: 2011-10-28 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Allow Annotations in longitudinal and christian@4183: w-differences diagrams. christian@4183: christian@4183: 2011-10-28 Felix Wolfsteller christian@4183: christian@4183: Use artifacts configuration (e.g. winfo.xml) to define which facets christian@4183: can be used in which output. Hide no-matches. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java, christian@4183: src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Added use of "compatibility matrix". Only include facets in in christian@4183: collections description document that are marked compatible in the christian@4183: masterartifacts configuration (e.g. winfo.xml). christian@4183: christian@4183: 2011-10-28 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java christian@4183: (mergeAttributes, getMasterArtifact): Extraced, updated caller. christian@4183: Cosmetics to reduce indentation one step. christian@4183: christian@4183: 2011-10-28 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java christian@4183: (getStateHistoryIds): New, return list of current and all previous christian@4183: state ids. christian@4183: christian@4183: 2011-10-28 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Trigger the re-creation of FLYS mapfile if endOfLife() of this state is christian@4183: called. christian@4183: christian@4183: 2011-10-28 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/mapserver/mapfile.vm: The "layers" injected by VelocityEngine is christian@4183: now used to include layers. A single string in this list represents the christian@4183: path to a file which contains a LAYER section for Mapserver' Mapfile. christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: Removed the christian@4183: update() call of MapfileGenerator. Mapfiles are generated by MapGenerator christian@4183: only which requires a FLYSArtifactCollection.doOut()! christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/MapGenerator.java: Call update() christian@4183: of MapfileGenerator to trigger the re-creation of mapfile(s). christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Collect all christian@4183: LAYER snippets from filesystem and inject the filepath for each snippet christian@4183: into the Mapfile template. christian@4183: christian@4183: 2011-10-28 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java, christian@4183: src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Cosmetics, doc. christian@4183: christian@4183: 2011-10-28 Felix Wolfsteller christian@4183: christian@4183: Let OutputParser and AttributeParser collect all facets on the way. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/OutputParser.java, christian@4183: src/main/java/de/intevation/flys/collections/AttributeParser.java: christian@4183: Collect all facets while iterating over Outputs and Attributes, christian@4183: documentation added. christian@4183: christian@4183: 2011-10-28 Felix Wolfsteller christian@4183: christian@4183: Extracted getFlysContext from FLYSArtifacts into FLYSUtils. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java christian@4183: (getFlysContext): Added, extracted from FLYSArtifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: (getFlysContext): Moved to FLYSUtils, updated callers. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Update callers to getFlysContext. christian@4183: christian@4183: 2011-10-28 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/MapGenerator.java: Bugfix: christian@4183: Catch IOException - flys-artifacts compiles again. christian@4183: christian@4183: 2011-10-28 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Defined "floodmap.barriers" as valid facet christian@4183: for floodmaps. christian@4183: christian@4183: * doc/conf/mapserver/shapefile_layer.vm: New. Currently a copy of christian@4183: layer.vm. This template will evolve to a special mapserver layer christian@4183: template with a shapefile data source. christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java: Fixed broken christian@4183: facet name of barriers. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Added christian@4183: public methods for creating wsplgen and barriers layer files for christian@4183: mapserver. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/MapGenerator.java: Use christian@4183: MapfileGenerator to create new layer files for wsplgen and barriers. christian@4183: christian@4183: 2011-10-28 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Added new christian@4183: method gerRiverBoundary() which returns an Envelope object (which christian@4183: represents the bounding box of a Geometry) of a riveraxis specified by its christian@4183: rivername. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: Use christian@4183: Geometry.getRiverBoundary() to determine the max extent of a river. christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: Use christian@4183: JTS Envelope to save the bounding boxes of WMS layers. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java: christian@4183: Adapted the code to apply the changes in GeometryUtils (use Envelope to christian@4183: determine the max extent of the river axis). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/MapGenerator.java: New (work in christian@4183: progress). This Generator will currently return a map configuration in XML christian@4183: which consists of parameters required by OpenLayers to create a map. christian@4183: christian@4183: * doc/conf/conf.xml: Registered the new MapGenerator. christian@4183: christian@4183: 2011-10-27 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Do not recommend historical data to load christian@4183: when having computational discharge curves. christian@4183: christian@4183: 2011-10-27 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Reduce noise, given "error" message was more of "debug" nature. christian@4183: christian@4183: 2011-10-27 Felix Wolfsteller christian@4183: christian@4183: Restore mapping of state id to facets (essentially revert, revision christian@4183: 3083 and 3088). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: (getInitialFacetActivity): Be more explicit on which facets to christian@4183: introduce inactivated. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: christian@4183: Minor refactoring, declare a string final static. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSBackgroundArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Restore association from state id to facets. christian@4183: christian@4183: 2011-10-26 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java, christian@4183: src/main/java/de/intevation/flys/collections/OutputParser.java: christian@4183: Cosmetics, documentation. christian@4183: christian@4183: 2011-10-26 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Prepare rendering of "other/static wkms" (functional) and christian@4183: w-differences (not yet fully functional). christian@4183: christian@4183: 2011-10-26 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Cosmetics. christian@4183: christian@4183: 2011-10-26 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: christian@4183: Do not store facets in a map from stateId to list of facets, but in christian@4183: a pure list instead. christian@4183: christian@4183: 2011-10-26 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Adjusted to newer semantics, christian@4183: minor cleanups. christian@4183: christian@4183: 2011-10-26 Felix Wolfsteller christian@4183: christian@4183: Resolve association of facets to states in artifacts. This eases christian@4183: merging of outputs and facets and inhibition of unwanted outputs christian@4183: substiantially (at the price of slightly more expensive merging). christian@4183: Also, the semantics of artifacts configuration files (e.g. winfo.xml) christian@4183: is changed (facet elements within an output elements are used for christian@4183: merging). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSBackgroundArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Do not store facets in a map from stateId to list of facets, but in christian@4183: a pure list instead. christian@4183: christian@4183: 2011-10-26 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Added dc configuration for some data christian@4183: that can be loaded from longitudinal section diagrams. christian@4183: christian@4183: 2011-10-25 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Cosmetics, docs. christian@4183: christian@4183: 2011-10-25 Felix Wolfsteller christian@4183: christian@4183: Let Qs in Longitudinal Diagram be inactive, initally. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: (getInitialFacetActivity): Do not let Facets ending with a 'q' christian@4183: enter in active state. christian@4183: christian@4183: 2011-10-25 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Fix broken datacage config. christian@4183: christian@4183: 2011-10-25 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Configured to include correct id to christian@4183: clone artifact that produces w-diff. christian@4183: christian@4183: 2011-10-25 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: christian@4183: Revert correct behaviour of Annotations (the small axis tick shall christian@4183: always be drawn). Minor refactoring. christian@4183: christian@4183: 2011-10-25 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Added configuration to include differences christian@4183: in datacage when longitudinal sections are shown (yet not christian@4183: functional). christian@4183: christian@4183: 2011-10-25 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: Cosmetics. christian@4183: christian@4183: 2011-10-24 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/themes.xml: Added theme for w_differences facets. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java christian@4183: (createSecondAxisRange): Survive parameter-nullness for now. christian@4183: Added documentation. christian@4183: christian@4183: 2011-10-21 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/themes/ThemeAccess.java: christian@4183: New. Caching wrapper around an XML document theme. It uses ThemeUtil christian@4183: to access the values and stores them in instance variable. christian@4183: Background: ThemeUtil use XPath a lot which is expensive. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Use ThemeAccess to style the annotations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: christian@4183: Removed some XPath strings. They are in ThemeUtil. christian@4183: christian@4183: 2011-10-21 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java: christian@4183: Added methods to parse further attributes. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: christian@4183: Apply the theme attributes and use ThemeUtils to get the attribute values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: christian@4183: Removed the spamy debug output. christian@4183: christian@4183: 2011-10-21 Sascha L. Teichmann christian@4183: christian@4183: To obtain the size of a diagram it is rendered twice. The christian@4183: second time the generated image is omitted so the concrete christian@4183: rendered image is not needed. To save CPU cycles in this pass christian@4183: the image is rendered to to /dev/null Graphics2D object. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: christian@4183: Added boolean system property "info.rendering.nop.graphics" (default: false). christian@4183: With this property set the info rendering is done via a new christian@4183: NOPGraphics2D opbject which does not render the image. christian@4183: christian@4183: * src/main/java/de/intevation/flys/java2d/NOPGraphics2D.java: christian@4183: New. Implements java.awt.Graphics2D trivial empty methods. christian@4183: This prevents rendering. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: christian@4183: Commented out spamy debug output christian@4183: christian@4183: 2011-10-21 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: christian@4183: Draw the text background and use orientation attribute. christian@4183: christian@4183: 2011-10-21 Raimund Renkert christian@4183: christian@4183: * doc/conf/themes.xml: christian@4183: Renamed 'textbackground' to 'backgroundcolor' to have 'color' in the christian@4183: attribute name. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java: christian@4183: Process text attributes correctly. christian@4183: christian@4183: 2011-10-20 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/CrossSectionKMService.java: christian@4183: New. Service to lookup the Nth nearest neighbors for a set of given christian@4183: cross section ids and kms. christian@4183: christian@4183: * doc/conf/conf.xml: Registered service. christian@4183: christian@4183: * doc/conf/cache.xml: Cache config. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2011-10-20 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java: christian@4183: Added methods to extract further attributes from theme. christian@4183: christian@4183: 2011-10-20 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/themes.xml: Added main value themes for longitudinal section christian@4183: charts. christian@4183: christian@4183: * src/main/java/de/intevation/flys/themes/ThemeMapping.java: New. This christian@4183: class stores the name of a facet, the related theme and a pattern christian@4183: string. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: christian@4183: Read the pattern string and store a list of ThemeMapping objects in the christian@4183: FLYSContext. christian@4183: christian@4183: * src/main/java/de/intevation/flys/themes/ThemeFactory.java: Modified christian@4183: getTheme() which now takes the FLYSContext, the name of a facet and an christian@4183: optional pattern string. Now, we can have specialized Themes for each christian@4183: chart type. E.g. the facet "longitudinal_section.w" maps the default christian@4183: Theme for W lines in longitudinal section charts. If the optional christian@4183: pattern string matches the pattern ".*(HQ1000)(\D.*)*", the ThemeFactory christian@4183: will return the Theme "LongitudinalSectionW_HQ1000". christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Use the description of a facet as pattern string to get the relevant christian@4183: Theme from ThemeFactory. christian@4183: christian@4183: 2011-10-20 Raimund Renkert christian@4183: christian@4183: * doc/conf/themes.xml: christian@4183: Added new theme attributes. christian@4183: christian@4183: 2011-10-19 Felix Wolfsteller christian@4183: christian@4183: Fix WDifference plots where masterartifact has no range set. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: christian@4183: (addSubtitles): Overridden, the master artifact has no christian@4183: range. christian@4183: christian@4183: 2011-10-19 Felix Wolfsteller christian@4183: christian@4183: Fix masterartifact in collections in cases where the original christian@4183: masterartifacts facets do not come first in certain list. Query christian@4183: 'backend'/db instead. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Set 'real' master artifact, defined to be oldest belonging to this christian@4183: collection. christian@4183: christian@4183: 2011-10-19 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: christian@4183: Modified the method signature of createStaticData() which now also christian@4183: requires a FLYSArtifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: christian@4183: Override createStaticData() to create titles for Qs manually - we want christian@4183: to display the named main values if existing for the selected Qs. christian@4183: christian@4183: 2011-10-19 Raimund Renkert christian@4183: christian@4183: * doc/conf/themes.xml: christian@4183: ComputedDischargeCurveW and ComputedDischargeCurveQ inherit attributes from christian@4183: theme 'Text'. christian@4183: christian@4183: 2011-10-19 Sascha L. Teichmann christian@4183: christian@4183: Fix for flys/issue316 christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: Added christian@4183: constructor to not sort the data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Use the not sorting constructor of StyledXYSeries. christian@4183: christian@4183: 2011-10-19 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: christian@4183: moved the code to create WSP W and Q facet names to FLYSUtils. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java: New functions for christian@4183: creating WSP W and Q facet names and for querying a named main value christian@4183: based on a given gauge and value. The names of W and Q facets will now christian@4183: depend on the selected Q and Q mode: if the mode is "q at gauge" and a christian@4183: named value is found for the given value, the facet's name contains the christian@4183: named value instead of the value itself. christian@4183: christian@4183: 2011-10-19 Felix Wolfsteller christian@4183: christian@4183: Fix datacage configuration to let client load ZUS and flood christian@4183: protections. christian@4183: christian@4183: * doc/conf/meta-data.xml: Use 'ids' instead of 'id' to help client. christian@4183: christian@4183: 2011-10-19 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java: christian@4183: Added methods to parse text attributes from theme document. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: christian@4183: Apply a theme to axis annotations. christian@4183: christian@4183: 2011-10-19 Felix Wolfsteller christian@4183: christian@4183: Create (data) Label from data string (client will be adjusted to send christian@4183: the name). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: christian@4183: Create label from input data string, documentation added, junk christian@4183: removed. christian@4183: christian@4183: 2011-10-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java(zoom): christian@4183: Do not crash if no axis is given. christian@4183: christian@4183: 2011-10-19 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Added christian@4183: getFormat() which extracts the format string from XML request document. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: Adapted christian@4183: method signatures of exportImage(), exportSVG() and exportPDF(). All christian@4183: methods now take a CallContext object which stores extra chart export christian@4183: parameters. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Enabled PDF and SVG chart exports based on the "format" string given in christian@4183: the XML request document. christian@4183: christian@4183: 2011-10-18 Felix Wolfsteller christian@4183: christian@4183: Simplify rendereing W(Q)Kms in WDifferencesCurveGenerator. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: christian@4183: (doWOut, doWOut): Simplified. christian@4183: christian@4183: 2011-10-18 Felix Wolfsteller christian@4183: christian@4183: Render zus and flood-protections in WDifferences-diagrams. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: christian@4183: Added basic respect of "other.wkms"- facets. christian@4183: christian@4183: christian@4183: 2011-10-18 Felix Wolfsteller christian@4183: christian@4183: Adjusted Datacage-Configuration to fetch "extra longitudinal...." christian@4183: (.zus) - waterlevels in certain case (in system-part). christian@4183: christian@4183: * doc/conf/meta-data.xml: Adjusted to present extra-kms with christian@4183: staticwkms factory in certain case. christian@4183: christian@4183: 2011-10-17 Raimund Renkert christian@4183: christian@4183: * doc/conf/themes.xml: christian@4183: Added new virtual theme for text with the attributes 'font', 'textcolor' christian@4183: and 'textsize'. christian@4183: christian@4183: 2011-10-18 Felix Wolfsteller christian@4183: christian@4183: Give StaticWKmsArtifacts proper names, and pre-deselect them. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: christian@4183: (getInitialFacetActivity): Overridden to let facets enter plot christian@4183: inactively. christian@4183: (setup): Give Facets the name of the Wst. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java: christian@4183: Refactored to expose getWKmsName separately. christian@4183: christian@4183: 2011-10-18 Felix Wolfsteller christian@4183: christian@4183: Adjusted Datacage-Configuration to fetch flood-protections when christian@4183: waterlevels are requested (in system-part). christian@4183: christian@4183: * doc/conf/meta-data.xml: Adjusted to present flood-protections with christian@4183: staticwkms factory in certain case. christian@4183: christian@4183: 2011-10-18 Felix Wolfsteller christian@4183: christian@4183: Register staticwkms factory. christian@4183: christian@4183: * doc/conf/conf.xml: Register staticwkms factory to spawn StaticWKms- christian@4183: Artifacts. christian@4183: christian@4183: 2011-10-18 Felix Wolfsteller christian@4183: christian@4183: Fetch name of static WKms. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java: christian@4183: Removed dependence on "kind", but fetch name for created WKms. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: christian@4183: Remove dependence on Kind. christian@4183: christian@4183: 2011-10-18 Felix Wolfsteller christian@4183: christian@4183: Store parameterization in data, not in Artifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: christian@4183: Resolve col_pos and wst_id field, use data instead. christian@4183: christian@4183: 2011-10-18 Felix Wolfsteller christian@4183: christian@4183: Add convenience-method to add defaultdata (string). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: (addStringData): Add Default (String) Data . christian@4183: christian@4183: 2011-10-18 Felix Wolfsteller christian@4183: christian@4183: Add a new Artifact and Facet (StaticWKmsArtifact, WKmsFacet) to christian@4183: access WKms obtainable with the WKmsFactory. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticWKmsArtifact.java: christian@4183: New, artifact with single state to get WKms from WKmsFactory. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WKmsFacet.java: christian@4183: New Facet to display W over km. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added new type name. christian@4183: christian@4183: 2011-10-18 Felix Wolfsteller christian@4183: christian@4183: Add WKMsFactory to access 'static' wst-data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/StaticWKmsCacheKey.java: christian@4183: Cache Key for the static WKms data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java: christian@4183: New, creates WKms from wst-id and column. Does not yet fetch the christian@4183: name. christian@4183: christian@4183: * doc/conf/cache.xml: Added cache configuration for static wkms data. christian@4183: christian@4183: 2011-10-18 Felix Wolfsteller christian@4183: christian@4183: Cosmetics, docs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: christian@4183: Cosmetics, docs. christian@4183: christian@4183: 2011-10-18 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java: christian@4183: Added constructor that takes name, docs. christian@4183: christian@4183: 2011-10-18 Felix Wolfsteller christian@4183: christian@4183: Fix issue that Annotations do not come with theme/style. christian@4183: christian@4183: * doc/conf/themes.xml: Added "Annotations" default style. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Set style of annotations, minor cosmetics. christian@4183: christian@4183: 2011-10-17 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Made inner class ThemeList static. christian@4183: s/new Integer(small)/Integer.valueOf(small)/ christian@4183: christian@4183: 2011-10-17 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: The inner class ThemeList makes now use of ManagedDomFacet to read the christian@4183: attributes of Facets saved in the Collection's attribute. christian@4183: christian@4183: 2011-10-17 Sascha L. Teichmann christian@4183: christian@4183: flys/issue314: Variables in datacage are now case insensitive. christian@4183: (H2 returns meta data variables uppercase) christian@4183: christian@4183: * doc/conf/meta-data.xml: christian@4183: Made a statement more precise. Added some debug output. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/templating/CompiledStatement.java: christian@4183: Use uppercase variable names. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/templating/StackFrames.java, christian@4183: src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java, christian@4183: src/main/java/de/intevation/flys/artifacts/datacage/templating/FunctionResolver.java, christian@4183: src/main/java/de/intevation/flys/artifacts/datacage/templating/ResultData.java: christian@4183: Variables are now treated as uppercase. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: christian@4183: Input variables are now treated uppercase. christian@4183: christian@4183: 2011-10-17 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/ManagedFacetAdapter.java: christian@4183: Prepared Facets to support a "visible" attribute. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/OutputParser.java: Adapted christian@4183: the constructor call of ManagedFacetAdapter. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: The inner class ThemeList now supports the "visible" attribute of christian@4183: ManagedFacets. christian@4183: christian@4183: 2011-10-17 Raimund Renkert christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: christian@4183: Added method to apply line type. christian@4183: christian@4183: * doc/conf/themes.xml: christian@4183: Changed initial default value for line type. christian@4183: christian@4183: 2011-10-17 Ingo Weinzierl christian@4183: christian@4183: flys/issue226 (W-INFO: Dauerlinienberechung /Abbbildung x-Achse) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: christian@4183: Set the upper bound of these charts to 364. christian@4183: christian@4183: 2011-10-17 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/GaugesFactory.java: christian@4183: Added a function that returns a Gauge based on its name. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java: christian@4183: Create proper descriptions for facets. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: Added a christian@4183: setter for labels. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: christian@4183: Use the string returned by Facet.getDescription() as series names. The christian@4183: ThemePanel and the Legend will always display the same titles for curves christian@4183: now. christian@4183: christian@4183: christian@4183: 2011-10-17 Felix Wolfsteller christian@4183: christian@4183: Fix flys/issue363 (W-INFO/ Abflusskurve, Extremwert-Rendering). christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java: christian@4183: (parseLineWidth): New. Get line width from Document. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: When adding annotations, parse line width from theme, set it. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: christian@4183: When painting, set Paint and stroke early enough. christian@4183: christian@4183: 2011-10-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Put the christian@4183: config directory into the Velocity context. It is available as christian@4183: '$CONFIGDIR' in templates. christian@4183: christian@4183: * doc/conf/mapserver/mapfile.vm: Set the debug file to christian@4183: "$CONFIGDIR/flys-user-wms.log" and added a LEGEND section. christian@4183: christian@4183: * doc/conf/mapserver/wsplgen_class.vm: Adapted the class names. Those christian@4183: names are displayed in the image served by GetLegendGraphic. christian@4183: christian@4183: 2011-10-14 Felix Wolfsteller christian@4183: christian@4183: Add possibility of programmatic configuration of initial "activity" christian@4183: state (active or inactive) of (Managed)Facets by introducing christian@4183: FLYSArtifact.getInitialFacetActivity. This method shall be overriden christian@4183: by subclasses where Facets are wanted to come to live inactive. christian@4183: Artifacts will be asked only once how the MangedFacet should come to live, christian@4183: namely when AttributeWriter finds a genuinely new Facet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java christian@4183: (getInitialFacetActivity): christian@4183: New function to let Artifact decide whether a ManagedFacet shall christian@4183: initially be set to active or inactive. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java: christian@4183: Accept database in constructor. For genuinely new Facets, spawn its christian@4183: mother artifact and ask whether the (Managed)Facet shall be active christian@4183: or inactive (initially). christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java christian@4183: (buildOutAttributes): Pass database to AttributeWrite (which needs it christian@4183: to spawn artifacts), rename items parameter to reflect content. christian@4183: christian@4183: 2011-10-13 Felix Wolfsteller christian@4183: christian@4183: Cosmetics, removed obsolete imports. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java, christian@4183: src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: christian@4183: Removed obsolete imports. christian@4183: christian@4183: 2011-10-12 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Added a further attribute "mark.selected" to the barriers feature type. christian@4183: This attribute is used in the client, where we are not able to remove it christian@4183: properly. Reading the GeoJSON string without this attribute is no longer christian@4183: possible... strange! christian@4183: christian@4183: 2011-10-12 Felix Wolfsteller christian@4183: christian@4183: Added i18n for label of wdiff "pair select" states data. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added i18n for christian@4183: state.winfo.waterlevel_pair_select . christian@4183: christian@4183: 2011-10-12 Felix Wolfsteller christian@4183: christian@4183: Addressed "Wrong labels" [6] part of flys/issue371 (W-INFO / Differenzen: christian@4183: Anmerkungen zur Umsetzung) . christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WDifferencesExporter.java: christian@4183: Adjusted variable names to avoid conflict in subclasses, adjusted christian@4183: default value for i18n string. christian@4183: christian@4183: 2011-10-12 Felix Wolfsteller christian@4183: christian@4183: Cosmetics, docs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Cosmetics: Space after full stop in commments, slightly improved christian@4183: documentation, added one debug message. christian@4183: christian@4183: 2011-10-12 Felix Wolfsteller christian@4183: christian@4183: Fix remainder of flys/issue304 (Erweiterte Funktionen W-Differenzen) . christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Removed obsolete data of christian@4183: WDifferencesState. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java: christian@4183: Re-enable facet-filtering, but adjust filters before that happens christian@4183: (former longitudinal_section output is now w_differences output). christian@4183: christian@4183: 2011-10-11 Felix Wolfsteller christian@4183: christian@4183: Added wdiff-chart translations. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added i18n for wdiff. christian@4183: christian@4183: 2011-10-11 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: christian@4183: Expose translateable Strings as constants. christian@4183: christian@4183: 2011-10-11 Felix Wolfsteller christian@4183: christian@4183: Fix most labels in w-differences charts. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: christian@4183: Remove most static final i18n-variables in favor of direct String christian@4183: usage or usage of methods. By this, allow easier adoption of labels christian@4183: in subclasses. christian@4183: christian@4183: 2011-10-11 Ingo Weinzierl christian@4183: christian@4183: flys/issue383 (Zweite Y-Achse wird beim Zoomen/Verschieben nicht angepasst.) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Call adjustAxes() before applying zoom settings with autoZoom(). We need christian@4183: to add new y-axes first before we adjust their ranges. christian@4183: christian@4183: 2011-10-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: s/new Integer(small)/Integer.valueOf(small)/ christian@4183: christian@4183: 2011-10-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Do not fire change events for each and every data point added. christian@4183: christian@4183: 2011-10-10 Felix Wolfsteller christian@4183: christian@4183: Fix WDifferences with more than one Pair (crashed due to incorrect index for christian@4183: facets.) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: christian@4183: Fix wrong index for difference facets (allows for more than one christian@4183: difference facet per artifact without crashes). christian@4183: christian@4183: 2011-10-10 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: christian@4183: Use slightly modified doWOut-implementation from christian@4183: LongitudinalSectionGenerator (here need to add Ws to different axis). christian@4183: christian@4183: 2011-10-10 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: christian@4183: Fix import/reference. christian@4183: christian@4183: 2011-10-10 Felix Wolfsteller christian@4183: christian@4183: Let WaterlevelPairSelectState include diffids-data (if any) to enable christian@4183: future work on repopulation of Grid in GUI when jumping back christian@4183: (reparameterization). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: christian@4183: (createItems): Override to include old data. christian@4183: christian@4183: 2011-10-10 Ingo Weinzierl christian@4183: christian@4183: flys/issue150 (Diagramm: Anzeige von W bergauf) christian@4183: flys/issue345 (W-INFO / Wasserspiegellagenberechnung, Diagrammausgabe) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Corrected the determination to invert the x axis, so that waterlines christian@4183: will start with their highest value at the left and end with their christian@4183: lowest values at the right. christian@4183: christian@4183: 2011-10-10 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java: christian@4183: Cosmetics, added an (@Override) annotation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CalculationResult.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: Cosmetics, added documentation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: christian@4183: Cosmetics, whitespace after full stops in comments, added christian@4183: (@Override) annotation. christian@4183: christian@4183: 2011-10-10 Ingo Weinzierl christian@4183: christian@4183: flys/issue220 (Diagramm: Achsenbeschriftungen an verschiedenen Achsen müssen gleich aussehen) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Adjusted the label font of the 2nd y-axis - now, both axes labels look christian@4183: equal. christian@4183: christian@4183: 2011-10-10 Ingo Weinzierl christian@4183: christian@4183: flys/issue189 (WINFO/Dauerlinie: Sortierung der Berechnungsausgabe nach Dauerzahlen aufsteigend) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQDay.java: Added a christian@4183: method that determines if the items (days) in this object are increasing christian@4183: or not. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DurationCurveExporter.java: christian@4183: Changed the order of the CSV export - the highest day is at the top of christian@4183: the export; the lowest day is at the bottom. christian@4183: christian@4183: 2011-10-07 Sascha L. Teichmann christian@4183: christian@4183: Worked on flys/issue150 (Diagramm: Anzeige von W bergauf). christian@4183: Still does not work in all cases. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java (generateChart()): christian@4183: Reordered calls to ensure that the inversion of the x axis is christian@4183: not eliminated by other chart generation steps as a side effect. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Assuming that JFreeChart is inverting axis automatically if the christian@4183: KMs are reversed ordered only do invert only in some situations. christian@4183: christian@4183: Do not invert axis for Q (@Ingo: This is wrong! We must do this christian@4183: if we are only displaying the Qs and the Ws are deactived). christian@4183: christian@4183: 2011-10-07 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Take care on empty ranges while preparing ranges for single points. christian@4183: christian@4183: 2011-10-07 Ingo Weinzierl christian@4183: christian@4183: flys/issue114 (W-INFO: Wasserspiegellagenberechnung / Ort (Spezialfall: Generierung eines Diagramms bei punkthafter Berechnung)) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Expand christian@4183: ranges for x and y axes if there is just a single point in a series - christian@4183: JFreeChart requires a range where lower <> upper. christian@4183: christian@4183: 2011-10-07 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DistanceSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/RangeState.java, christian@4183: src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Add whitespace after full stop in comments, minor doc improvements. christian@4183: christian@4183: 2011-10-07 Ingo Weinzierl christian@4183: christian@4183: flys/issue353 (W-INFO / Wasserspiegellagenberechnung, Diagramm) christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Adapted the process of collecting outs for Artifacts/Facets. We will now christian@4183: call OutGenerator.doOut() for each Artifact and Facet - never mind if christian@4183: the facet is activated (visible) or not. The OutGenerator should decide christian@4183: on its own whtat to do with facets which are "marked" as _not_ visible. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/OutGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ReportGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/AbstractExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/ATExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: christian@4183: Adapted the signature of OutGenerator.doOut(). There will be a new christian@4183: boolean parameter "visible" that determines if the facet specified in christian@4183: this method is visible for this output or not. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Now, christian@4183: that we walk over every Artifact/Facet, we are able to collect min/max christian@4183: data for all axes. We store these information and use them to set the christian@4183: ranges of x and y axes. The result of this: a chart can have proper axes christian@4183: set without any data in it. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: Use christian@4183: min/max ranges stored while calling doOut() for each Artifact/Facet christian@4183: instead of fetching those information from chart's Datasets (which could christian@4183: be null). christian@4183: christian@4183: 2011-10-07 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/Formatter.java: Changed the max christian@4183: number of digits for AT exports from 0 to 2. christian@4183: christian@4183: 2011-10-06 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ATWriter.java: Get rid christian@4183: of buggy first line code. christian@4183: christian@4183: 2011-10-05 Sascha L. Teichmann christian@4183: christian@4183: fixed flys/issue201 christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Replace >= with > in km index lookup because last km was not found. christian@4183: christian@4183: 2011-10-05 Sascha L. Teichmann christian@4183: christian@4183: fixed flys/issue177 christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: christian@4183: Revert rev2245. Code works fine now! :-) christian@4183: christian@4183: 2011-10-05 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: Stores a christian@4183: list of XYTextAnnotations instead of FLYS specific Annotations. This christian@4183: makes this class suitable for other annotation types as well. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java: christian@4183: Both facets' getData() will now return an instance of FLYSAnnotation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java: christian@4183: Create XYTextAnnotations used to instantiate an object of christian@4183: FLYSAnnotation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Removed the code to add annotations to the plot. This task is general christian@4183: enough to move this code to parent class. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Instances of this class are now able to store - besides first and second christian@4183: axes datasets - a list of annotations. This annotations are added to the christian@4183: plot after the datasets have been added. To support LegendItems for christian@4183: those annotions, it was necessary to create a the LegendItemCollection christian@4183: by ourself. This work is done while applying the themes for each series christian@4183: in the chart. christian@4183: christian@4183: 2011-10-05 Sascha L. Teichmann christian@4183: christian@4183: Removed code duplication of guessWaterIncreasing() christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WKms.java(allKms, allWs): christian@4183: Added methods to fetch all kms and all ws. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/DataUtil.java: Generalized to christian@4183: get WKms as arguments. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQKms.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WQ.java: Implements christian@4183: the extended WKms interface. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: christian@4183: Uses the generalized DataUtil.guessWaterIncreasing(). christian@4183: christian@4183: 2011-10-05 Ingo Weinzierl christian@4183: christian@4183: flys/issue347 (W-INFO / Wasserspiegellagenberechnung, Längsschnittdiagramm) christian@4183: flys/issue303 (Keine Streckenfavoriten, wenn nur Q im Längsschnittdiagram ausgewählt) christian@4183: flys/issue353 (W-INFO / Wasserspiegellagenberechnung, Diagramm) christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/FLYSAnnotation.java: New. A christian@4183: wrapper for Annotations which allows us to provide a description for a christian@4183: set of annotations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java: christian@4183: The getData() will now return an instance of FLYSAnnotation that wraps christian@4183: the Annotations returned by the AnnotationArtifact. The lebel of christian@4183: FLYSAnnotation is the description of this Facet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Modified the way to add Annotations. We will no longer create an empty christian@4183: series to support a LegendItem for a set of Annotations, but we will add christian@4183: a LegendItem manually to the LegendItemCollection of the plot. In christian@4183: addition, we are now able to display annotations if one of the two christian@4183: y-axes are missing. If there are no y-axes existing, we are not able to christian@4183: display annotations yet. christian@4183: christian@4183: 2011-10-05 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: christian@4183: Lifted the wrong point. Now all backjump corrections look fine. :-) christian@4183: christian@4183: 2011-10-05 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: christian@4183: Fixed bugs and make use of a cache for annotations now. christian@4183: christian@4183: 2011-10-04 Sascha L. Teichmann christian@4183: christian@4183: Worked on flys/issue31 christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: christian@4183: Simplified the code a lot. Needs testing. Maybe flys/issue31 is gone christian@4183: christian@4183: 2011-10-04 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Fetch the WstUnit value from river - the Wst itself no longer supports a christian@4183: Unit iself. christian@4183: christian@4183: 2011-10-04 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java, christian@4183: src/main/java/de/intevation/flys/utils/DoubleUtil.java: Moved some generic christian@4183: double array code to DoubleUtil. christian@4183: christian@4183: 2011-10-04 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/DoubleUtil.java (interpolateSorted): christian@4183: Added code to linear interpolate double values in a sorted array. christian@4183: Keys and values are given as double arrays. Keys need to be sorted. christian@4183: christian@4183: 2011-10-04 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2011-10-04 Ingo Weinzierl christian@4183: christian@4183: flys/issue330 (Dauerlinie kann nicht berechnet werden) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation3.java: christian@4183: Add a problem if no data was found for duration curves. christian@4183: christian@4183: 2011-10-04 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/themes/Theme.java, christian@4183: src/main/java/de/intevation/flys/themes/DefaultTheme.java: Added christian@4183: getter/setter methods to provide a facet (string) and index (int). Both christian@4183: values are written as attribute to the Theme's XML representation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Set the "facet" and "index" values of themes. christian@4183: christian@4183: 2011-10-04 Ingo Weinzierl christian@4183: christian@4183: flys/issue346 (W-INFO / Anzeige der Höheninformation) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Modified x and y axis title. The x axis title is now "RIVERNAME-km"; the christian@4183: y axis title is now "W[WST_UNIT]" where WST_UNIT depends on the unit of christian@4183: the WST. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Modified i18n expressions for christian@4183: x and y axis of longitudinal section charts. christian@4183: christian@4183: 2011-09-30 Ingo Weinzierl christian@4183: christian@4183: flys/issue351 (W-INFO / Wasserspiegellagenberechnungen) christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/DoubleUtil.java: Modified the christian@4183: explode() function that returns a list of values specified by min, max christian@4183: and an interval. If the last value, determined by the interval, is christian@4183: bigger than the max value, it is not included in the result list. christian@4183: christian@4183: 2011-09-30 Felix Wolfsteller christian@4183: christian@4183: flys/issue334 (Querprofil-Diagramm: Ausgabe dieses Diagrammtyps christian@4183: möglich, obwohl WSP Berechnung keine Ergebnisse liefert) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: christian@4183: (compute): Add Facets regarding CrossSections only if data available. christian@4183: christian@4183: 2011-09-29 Ingo Weinzierl christian@4183: christian@4183: flys/issue176 (Diagramm: Benennung eines Abflusses bei gewählter Höhe am Pegel) christian@4183: flys/issue349 (W-INFO / Wasserspiegellagenberechnung, Längsschnittdiagramm) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: christian@4183: Create titles for W and Q waterlevel facets with proper fractions. christian@4183: christian@4183: 2011-09-30 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: christian@4183: (createStaticData, getLabels): Create proper labels for differences. christian@4183: christian@4183: 2011-09-29 Sascha L. Teichmann christian@4183: christian@4183: flys/issue244 (WINFO: Export von AT-Dateien im ersten Teil unterschiedlich) christian@4183: flys/issue332 (W-INFO / Berechnung Abflusskurve, Export, FLYS 2.5) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ATWriter.java: Due to a rounding christian@4183: issue the w's of the first line underun the minimal w of the curve at times. christian@4183: An extra test was introduced to suppress the output of the q's of the wrong w's. christian@4183: christian@4183: 2011-09-28 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: christian@4183: Use StringUtil.wWrap , fix wrong loop, minor refac and cosmetics. christian@4183: christian@4183: 2011-09-28 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: christian@4183: Extracted/use StringUtil.wWrap . christian@4183: christian@4183: 2011-09-28 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java: christian@4183: Log the gauge which has been determined. christian@4183: christian@4183: 2011-09-28 Ingo Weinzierl christian@4183: christian@4183: flys/issue332 (W-INFO / Berechnung Abflusskurve, Export, FLYS 2.5) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ATExporter.java: Store the christian@4183: master Artifact which is set via setMasterArtifact(). This is required christian@4183: for meta information used while preparing the header row of AT exports. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ATWriter.java: Print a header christian@4183: row into the AT export for being compatible with desktop FLYS. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added header row for AT christian@4183: export files. christian@4183: christian@4183: 2011-09-28 Ingo Weinzierl christian@4183: christian@4183: flys/issue328 (W-INFO / ÃœSK: Auswahl der Wasserspiegellage / Auswahlunterstützung) christian@4183: christian@4183: * doc/conf/meta-data.xml: Added an out 'waterlevels' that might be used to christian@4183: fetch user specific waterlevels (same as longitudinal sections, but christian@4183: without Q facet). christian@4183: In addition, the system specific datacage stuff is now fetched, when: christian@4183: a) no user-id is given christian@4183: b) a user-id is given and there is a parameter 'load-system' christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: christian@4183: If the label of the WQKms object specified by the waterlevel selection christian@4183: begins with a "Q", the label is wrapped into a "W()", e.g. "W(Q=1200)". christian@4183: christian@4183: 2011-09-28 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Made christian@4183: feed() able to remove existing data items from Artifact's data pool. christian@4183: Therefore, the value for the item which should be removed needs to an christian@4183: empty string. christian@4183: christian@4183: 2011-09-28 Felix Wolfsteller christian@4183: christian@4183: Extracted StringUtil.unbracket from WaterlevelSelectState.strip. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: christian@4183: Extract and use StringUtil.unbracket, minor doc. christian@4183: christian@4183: 2011-09-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: christian@4183: Changed access of getCurrentState() from protected to public. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: We christian@4183: use the configured Outputs instead of the actuel Outputs of an Artifact christian@4183: to make recommendations, now. This has the bad side effect of giving christian@4183: recommendations for Outputs that we might _NOT_ be able to produce. But christian@4183: otherwise, we would not be able to give recommendations for states with christian@4183: long calculation times that start background threads for calculation (as christian@4183: WSPLGEN caluclations does). christian@4183: christian@4183: 2011-09-27 Felix Wolfsteller christian@4183: christian@4183: Enable "auto-scaling" axis for waterlevels in WDifference-plots. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: (createSecondaryAxis, zoomY): Refactored to allow modification in christian@4183: siblings. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: christian@4183: (createSecondaryAxisRange): Override to achieve expected behavior. christian@4183: Also adjusted label. christian@4183: christian@4183: 2011-09-27 Felix Wolfsteller christian@4183: christian@4183: In W-Difference Calculation, respect indices of selected facets. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: christian@4183: (computeAdvance): Respect index of selected facets. christian@4183: christian@4183: 2011-09-27 Sascha L. Teichmann christian@4183: christian@4183: flys/issue317: (Querprofil-Diagramm: Referenzen auf CrossSectionApp entfernen) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Removed dependency to demo app. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: christian@4183: Refactored to use logic from the models. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/geom/Lines.java: christian@4183: Moved some logic from the demo app to this model. christian@4183: christian@4183: 2011-09-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/FacetCreator.java: New. Code christian@4183: from FloodMapState moved to its own class with the intent, to use it in christian@4183: classes different from FloodMapState. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Removed the inner class FacetCreator. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: Stores christian@4183: an instance of FacetCreator. christian@4183: NOTE: Maybe we should move the WSPLGEN parameters into an own class christian@4183: which might be serializable. christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: Use the christian@4183: FacetCreator instance stored in the WSPLGENJob to create a new WSPLGEN christian@4183: facet if the calculation was successfully (without errors). Finally, the christian@4183: facets of FacetCreator are added to the Facet list of the FLYSArtifacts. christian@4183: christian@4183: 2011-09-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Put Artifact in background mode first before starting WSPLGEN, otherwise christian@4183: a very fast errors (call CallContext.afterBackground() before Artifact is christian@4183: in Background mode) might lead to an inconsistent state. christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java: Repaired christian@4183: broken error num parsing. christian@4183: christian@4183: 2011-09-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java: Track christian@4183: critical errors as well (improved regular expression for errors). christian@4183: christian@4183: 2011-09-27 Sascha L. Teichmann christian@4183: christian@4183: * ChangeLog: Fixed whitespace usage. christian@4183: christian@4183: 2011-09-27 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/RiverService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java christian@4183: src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java, christian@4183: src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2011-09-27 Ingo Weinzierl christian@4183: christian@4183: flys/issue68 (Diagramm: Werte an der Y-Achse benötigen i18n) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Added a christian@4183: method to retrieve the current/preferred locale specified by CallMeta. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Introduced two methods localizeDomainAxis() and localizeRangeAxis(). christian@4183: Both methods of this class override the NumberFormat used to format axes christian@4183: numbers. Those methods are called by localizeAxes() - which has private christian@4183: access - for each domain and range axis of the current XYPlot. christian@4183: christian@4183: 2011-09-27 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/cache.xml: Number of cached annotations was much christian@4183: to low. christian@4183: christian@4183: 2011-09-27 Felix Wolfsteller christian@4183: christian@4183: Improved w-differences diagram generation where multiple differences christian@4183: can be shown. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java: christian@4183: New facet type. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: christian@4183: Employ new DifferenceCurveFacet, return CalculationResult that can christian@4183: store more than one WKms. christian@4183: christian@4183: 2011-09-27 Ingo Weinzierl christian@4183: christian@4183: flys/issue320 (ÃœSK:Mapserver hat Probleme beim Shapefilepath mit "../" im Pfad) christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Use christian@4183: File.getCanonicalPath() to substitute "../" in shapefile directories. christian@4183: christian@4183: 2011-09-26 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: The extent of the WSPLGEN result layer is now specified by the extent of christian@4183: the CrossSectionTracks that matches the start and end kilometer of the christian@4183: WSPLGEN calculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/GeometryUtils.java: New function christian@4183: that creates the OpenLayers bounding box based on two Geometries. christian@4183: christian@4183: 2011-09-26 Felix Wolfsteller christian@4183: christian@4183: Improved w-differences diagram generation with included "absolute" christian@4183: values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: christian@4183: Fixed one (of two) incorrect labels. christian@4183: (doWaterlevelOut): Survive non-found gauge, fetch kilometer and w christian@4183: instead of values for w and q. christian@4183: christian@4183: 2011-09-26 Felix Wolfsteller christian@4183: christian@4183: Add positional-conflict-awareness when merging Facets for a christian@4183: FLYSArtifactCollection. First come first serve. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java: christian@4183: (writeFacets): First, sort incoming facets into 2 groups: christian@4183: "genuinely new" and "already there", then for each new check christian@4183: whether the position is already taken. If so, push "up" (position++) christian@4183: until no conflict exists anymore. christian@4183: christian@4183: 2011-09-26 Ingo Weinzierl christian@4183: christian@4183: flys/issue296 (Karte: Bezeichnungen verbessern) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: I18N of the WSPLGEN and barriers facets (WMS layers). christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added strings for the wsplgen christian@4183: and barriers WMS layers. christian@4183: christian@4183: 2011-09-26 Felix Wolfsteller christian@4183: christian@4183: Fix (revert) access to position in ManagedDomFacet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java: christian@4183: (getPosition): Do not add prefix when querying position ("pos") christian@4183: attribute, add a logger for faster future debugging. christian@4183: christian@4183: 2011-09-23 Felix Wolfsteller christian@4183: christian@4183: Squash positional conflict-bug. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java: christian@4183: (mergeFacets): Removed, replaced in parts by pickFacet. christian@4183: (pickFacet): New, return facet to be added to document. christian@4183: Documentation added. christian@4183: christian@4183: 2011-09-23 Felix Wolfsteller christian@4183: christian@4183: Squash a bug about wrongly named "art:pos" attribute in ManagedDomFacet (was christian@4183: "pos"). Added documentation from commit message. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java: christian@4183: Added documentation (commit message with minor adjustments). christian@4183: (getPosition, setPosition): Include PREFIX in attribute name. christian@4183: christian@4183: 2011-09-23 Felix Wolfsteller christian@4183: christian@4183: Refactoring, doc. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java: christian@4183: (mergeFacets): Removed, replaced in parts by pickFacet. christian@4183: (pickFacet): New, return facet to be added to document. christian@4183: Documentation added. christian@4183: christian@4183: 2011-09-23 Felix Wolfsteller christian@4183: christian@4183: Cosmetics, docs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java: christian@4183: Documentation added. christian@4183: christian@4183: 2011-09-22 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: christian@4183: Subclasses the FLYSService now - this should improve the database christian@4183: connection handling. christian@4183: christian@4183: 2011-09-22 Bjoern Schilberg christian@4183: christian@4183: * doc/mapserver/mosel-mapfile.map: christian@4183: Full blown mosel wms mapfile. christian@4183: christian@4183: 2011-09-22 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/FLYSService.java: christian@4183: New. A subclass of DefaultService which is used in FLYS to init and christian@4183: shutdown database connections. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/services/RiverService.java: christian@4183: Centralized the initialization and shutdown of database connections. christian@4183: These services now subclass FLYSService which handles the database stuff. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java: The christian@4183: current database connection is not closed here - this is done in a christian@4183: Service or in the CallContext. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: It's christian@4183: not necessary to create new database connections here. We already have christian@4183: an existing connection which is initialized by CallContext. christian@4183: christian@4183: 2011-09-22 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DistanceOnlySelect.java: christian@4183: Override validate() of parent classes to suppress "step" validation christian@4183: which is not present in this state. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/RangeState.java: Added christian@4183: new method validateBounds() which really just validates a boundary christian@4183: without "step" parameter. christian@4183: christian@4183: 2011-09-21 Felix Wolfsteller christian@4183: christian@4183: Added WaterlevelArtifact to accompany WINFOArtifacts in WDifferencesPlots. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java: christian@4183: New WaterlevelArtifact. christian@4183: christian@4183: * doc/conf/conf.xml: christian@4183: Added configuration for WaterlevelArtifact configuration (path to state-xml) christian@4183: waterlevel-factory. christian@4183: christian@4183: * doc/conf/artifacts/waterlevel.xml: christian@4183: New, trivial state description for Waterlevelartifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelInfoState.java: christian@4183: New, only state for WaterlevelArtifact. christian@4183: christian@4183: 2011-09-21 Felix Wolfsteller christian@4183: christian@4183: Cosmetics, docs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, christian@4183: src/main/java/de/intevation/flys/collections/AttributeWriter.java, christian@4183: src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Cosmetics, documentation. christian@4183: christian@4183: 2011-09-21 Felix Wolfsteller christian@4183: christian@4183: Added WaterlevelOut-processing ability to WDifferencesCurveGenerator. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: christian@4183: Process LONGITUDINAL_W facets. christian@4183: christian@4183: 2011-09-21 Felix Wolfsteller christian@4183: christian@4183: Improved WDifferenceState in preparation to be able to deal with multiple christian@4183: pairs for differences. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: christian@4183: Prepare multiple-pairs-case. christian@4183: christian@4183: 2011-09-21 Ingo Weinzierl christian@4183: christian@4183: flys/issue315 (Ãœberschwemmungsfläche: String bei Streckenauswahl) christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added a new state for floodmap's range christian@4183: input. This state will accept a km range only, there is no step width. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DistanceOnlySelect.java: christian@4183: New. The state which is used to enter a km range with step width. christian@4183: christian@4183: 2011-09-21 Felix Wolfsteller christian@4183: christian@4183: Cosmetics, improved debug output, doc. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: christian@4183: Improved debug output. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java: christian@4183: Added documentation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: christian@4183: Removed commented code. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeParser.java: christian@4183: Whitespace cosmetics. christian@4183: christian@4183: 2011-09-21 Felix Wolfsteller christian@4183: christian@4183: Avoid NullPointerException when drawing XYChart without data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Guard calls to dataset to avoid NullPointerException. christian@4183: christian@4183: 2011-09-21 Ingo Weinzierl christian@4183: christian@4183: flys/issue325 (FLYS Client: Auswahl des DGM zeigt numerischen Wert an) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java: Write christian@4183: a better label for the selected DEM into the static DESCRIBE. Use the christian@4183: name of the DEM file as label instead of the database id. christian@4183: christian@4183: 2011-09-16 Bjoern Schilberg christian@4183: christian@4183: * doc/mapserver/fontset.txt: christian@4183: Added initial font set for km_annotation layer. christian@4183: * doc/mapserver/symbols/symbols.sym: christian@4183: Added square symbol for km and fixpoint layer. christian@4183: * doc/mapserver/saar-mapfile.map: christian@4183: Adjust styling in the flys karte-archiv way. christian@4183: christian@4183: 2011-09-19 Ingo Weinzierl christian@4183: christian@4183: Tagged RELEASE 2.5 christian@4183: christian@4183: * Changes: Prepared changes for release. christian@4183: christian@4183: 2011-09-19 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Removed christian@4183: needless imports. christian@4183: christian@4183: 2011-09-16 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/meta-data.xml: Improved datacage configuration for DEMs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Query DGMs by the given ID in the FLYS data pool - not by given range christian@4183: values. christian@4183: christian@4183: 2011-09-16 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/meta-data.xml: Added a section for DEMs to the floodmap christian@4183: section. christian@4183: christian@4183: 2011-09-16 Felix Wolfsteller christian@4183: christian@4183: Fix build. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/state/WDifferencesState.java: christian@4183: Fix build. christian@4183: christian@4183: 2011-09-16 Felix Wolfsteller christian@4183: christian@4183: Take a given WaterlevelPair-String, load artifact and plot the diff. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/state/WDifferencesState.java: christian@4183: Load correct artifacts. christian@4183: christian@4183: 2011-09-16 Bjoern Schilberg christian@4183: christian@4183: * doc/mapserver/*: Added inital mapserver configuration files. christian@4183: christian@4183: 2011-09-16 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/meta-data.xml: Moved the system specific configuration into a christian@4183: macro to the top of the configuration document. Call this macro at the christian@4183: end of the user specific part and in the part that should contain the christian@4183: system specific stuff only! christian@4183: christian@4183: 2011-09-16 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: Defined createItem() here and adapted some method signatures, because I christian@4183: need the CallContext deeper in code than expected. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: christian@4183: Write the name of the selected waterlevel into the static DESCRIBE. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ScenarioSelect.java: christian@4183: Adapted method signatures that have been changed in DefaultState. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: christian@4183: Removed method createItem() which is now defined in the upper class christian@4183: DefaultState. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added string for selected christian@4183: waterlevel that is displayed in static UI. christian@4183: christian@4183: 2011-09-16 Ingo Weinzierl christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added state label for christian@4183: waterlevel selection. christian@4183: christian@4183: 2011-09-15 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: christian@4183: Validate incoming data string and strip brackets. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Fetch waterlevel data from external Artifact if existing. If no external christian@4183: Artifact is specified that provides waterlevel data, we gonna try to christian@4183: fetch it from the current Artifact. christian@4183: christian@4183: 2011-09-15 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: christian@4183: Removed needless import which caused compile errors. christian@4183: christian@4183: 2011-09-15 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: Added a transform() method. This method should be used to transform christian@4183: input data in form of a string into a better data structure. This state christian@4183: provides a simple implementation which just returns a StateData object christian@4183: that contains exactly the input string. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Transform christian@4183: input strings using DefaultState.transform() before they are added to christian@4183: its data pool. christian@4183: christian@4183: 2011-09-15 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Made collection solid for the case if it has no Artifacts. christian@4183: christian@4183: 2011-09-15 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Fetch Artifact christian@4183: from ArtifactDatabase properly. Write better error logs if that process christian@4183: fails. christian@4183: christian@4183: 2011-09-14 Felix Wolfsteller christian@4183: christian@4183: Extend WDifferences branch to have calculations in dedicated, new state. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added new State and Transition in christian@4183: WDifferences-branch. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java: christian@4183: New state. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: christian@4183: Specify to not take input, prepare getting other facets. christian@4183: christian@4183: 2011-09-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java: This christian@4183: state now desires the UIProvider 'dem_datacage_panel'. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java: christian@4183: New. This state is used to define the desired UIProvider christian@4183: 'wsp_datacage_panel'. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added a new way to start a WSPLGEN christian@4183: calculation when choosing the calculation type 'floodmap'. christian@4183: christian@4183: 2011-09-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java: Merge christian@4183: facets only if their name AND their owner artifact are equal. christian@4183: christian@4183: 2011-09-14 Felix Wolfsteller christian@4183: christian@4183: Partial Fix flys/issue304 (3) (Baseline). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: christian@4183: Show Baseline in WDifferencesPlot. christian@4183: christian@4183: 2011-09-14 Felix Wolfsteller christian@4183: christian@4183: Fix flys/issue310 (cross-section theme). christian@4183: christian@4183: * doc/conf/themes.xml: CrossSection-Themes: profile thin, water blue. christian@4183: christian@4183: 2011-09-14 Felix Wolfsteller christian@4183: christian@4183: Fix flys/issue310 (cross-section theme). christian@4183: christian@4183: * doc/conf/themes.xml: CrossSection-Themes: profile thin, water blue. christian@4183: christian@4183: 2011-09-13 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Add an quick and simple error to the report if an error occured while christian@4183: WSPLGENJob creation. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added error messages for christian@4183: WSPLGEN job creation errors. christian@4183: christian@4183: 2011-09-13 Felix Wolfsteller christian@4183: christian@4183: Fix crash when drawing StickyAxisAnnotation when no range was given. christian@4183: User-directed issues remain ( flys/issue303 ). christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java christian@4183: (draw): christian@4183: Guard access to domainAxis, rangeAxis and the corresponding ranges. christian@4183: Warn and exit if any was null. christian@4183: christian@4183: 2011-09-13 Ingo Weinzierl christian@4183: christian@4183: flys/issue290 (Karte: Eingabe von Differenzen zw. WSP und Gelände findet christian@4183: keine Ausprägung in der Karte) christian@4183: christian@4183: * doc/conf/mapserver/wsplgen_class.vm: Added styles for DIFF attribute. christian@4183: christian@4183: * doc/conf/mapserver/mapfile.vm: Set debug default to '5'. christian@4183: christian@4183: 2011-09-12 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Add a first WSPLGEN status message (notifies the user about a christian@4183: queued job) after the job has been added to the Scheduler. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added english and german christian@4183: status message text. christian@4183: christian@4183: 2011-09-12 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Write christian@4183: shapefiles only if there are features for it existing. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: A WSPLGEN facet is only created, if the calculation was successfully christian@4183: added to the Scheduler. A barrier facet is only created if the WSPLGEN christian@4183: calculation has been added to the scheduler AND if there are digitized christian@4183: geometries existing. christian@4183: christian@4183: 2011-09-12 Felix Wolfsteller christian@4183: christian@4183: Copied and slightly modified implementation of guessWaterIncreasing from christian@4183: WQKms to (new) DataUtils. Accidentally commited usage in last commit, to christian@4183: correct orientation of diagram (invert x axis). christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/DataUtils.java: christian@4183: New file with guessWaterIncreasing implementation from WQKms, christian@4183: slightly adjusted. christian@4183: christian@4183: 2011-09-12 Felix Wolfsteller christian@4183: christian@4183: Cosmetics. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java: christian@4183: Cosmetics. christian@4183: christian@4183: 2011-09-12 Felix Wolfsteller christian@4183: christian@4183: Added CSV Export for W-Differences. christian@4183: christian@4183: * doc/conf/conf.xml: Added Exporter. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Removed transition over distances christian@4183: state, added export outputmode and facet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WDifferencesExporter.java: christian@4183: New, CSV-Exporter for WDifferences. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: christian@4183: Add export facet. christian@4183: christian@4183: 2011-09-12 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java: christian@4183: Cosmetics, docs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java, christian@4183: src/main/java/de/intevation/flys/exports/AbstractExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveExporter.java: christian@4183: Cosmetics. christian@4183: christian@4183: 2011-09-12 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: Sourced the code to append a concrete data item to the static DESCRIBE christian@4183: part out to an own method (appendStaticData()). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ScenarioSelect.java: christian@4183: Override appendStaticData() to suppress the GeoJSON string to be christian@4183: included in the static DESCRIBE. christian@4183: christian@4183: 2011-09-12 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java, christian@4183: src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Removed needless imports. christian@4183: christian@4183: 2011-09-09 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CalculationMessage.java: christian@4183: New. A subclass of Message (in the Artifacts system). It stores a christian@4183: string message and a progress (in form of step x/y). christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/JobObserver.java: The observer christian@4183: now writes background messages into the artifact system using the christian@4183: CallContext.addBackgroundMessage(). We use instances of christian@4183: CalculationMessage here, that makes the WINFOArtifact able to put christian@4183: progress information into the Artifact's DESCRIBE as well. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Write christian@4183: status message and progress information into the DESCRIBE if the christian@4183: Artifact has started a background process. christian@4183: christian@4183: 2011-09-09 Felix Wolfsteller christian@4183: christian@4183: Fix flys/issue280 . christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: christian@4183: Do not draw boxes around annotations. christian@4183: christian@4183: 2011-09-09 Felix Wolfsteller christian@4183: christian@4183: Fix flys/issue279 . christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Fix behaviour in various thinkable malconditions. christian@4183: christian@4183: 2011-09-09 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Made one case of cross section fetching more robust. christian@4183: christian@4183: 2011-09-09 Felix Wolfsteller christian@4183: christian@4183: Fix Facet name and Legend of W-Differences, also insert state to specify christian@4183: distance. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Add additional transitions to walk over christian@4183: distances state. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: christian@4183: Set facets description. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: christian@4183: Take facets description as legend. christian@4183: christian@4183: 2011-09-09 Felix Wolfsteller christian@4183: christian@4183: Added configuration to kick-in w-differences branch of winfo. christian@4183: christian@4183: * doc/conf/conf.xml: Register new (w-differences) OutputGenerators. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Register new state and transitions. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: christian@4183: Added new (w-differences) calculation mode. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WDifferencesCurveInfoGenerator.java: christian@4183: New file, implementing naive approach to display w-differences christian@4183: (accidentially omitted in last commit). christian@4183: christian@4183: 2011-09-09 Felix Wolfsteller christian@4183: christian@4183: Added very stubby WDifferences State/OutGenerator for WINFOArtifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added w_differences facet type. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java: christian@4183: New file, implements naive approach to calculate w-differences (of christian@4183: calculations identified by hardcoded uuids!) and register respective facet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java: christian@4183: New file, implementing naive approach to display w-differences. christian@4183: christian@4183: 2011-09-09 Felix Wolfsteller christian@4183: christian@4183: Implement getArtifact(uuid,context) in FLYSUtils. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java (getArtifact): christian@4183: Added implementation, partially resolving a TODO. Added logger instance. christian@4183: christian@4183: 2011-09-08 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WSPLGENCalculation.java: christian@4183: New. This sublcass of Calculation saves warnings and errors that occur christian@4183: while WSPLGEN is running. christian@4183: Note, that the interface of this class doesn't exactly apply the interface christian@4183: of Calculation. Maybe, we should generalize this interface! christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: Stores christian@4183: an instance of WSPLGENCalculation now. We use this instance to save christian@4183: warnings and errors. christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java: Use the christian@4183: WSPLGENCalculation to save errors and warnings. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WSPLGENReportFacet.java: christian@4183: New. This facet is used for WSPLGEN reports. It stores an instance of christian@4183: WSPLGENCalculation which saves ERRORS and WARNINGS that occur while christian@4183: WSPLGEN execution. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Create a WSPLGENReportFacet for WSPLGEN reports. christian@4183: christian@4183: * doc/conf/conf.xml: Added an OutputGenerator 'report' for WSPLGEN christian@4183: reports. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added an output 'report' for WSPLGEN christian@4183: reports. christian@4183: christian@4183: 2011-09-08 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/math/WKmsOperation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: christian@4183: Cosmetics, docs. christian@4183: christian@4183: 2011-09-08 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/JobObserver.java: Small christian@4183: adjustments that makes it easier to subclass this observer. christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java: New. A christian@4183: sublcass of JobObserver which analyses the WSPLGEN output for errors and christian@4183: warnings. christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: Use christian@4183: JobObserver and ProblemObserver to track the whole WSPLGEN output and christian@4183: print number of errors/warnings to log output. christian@4183: christian@4183: 2011-09-08 Felix Wolfsteller christian@4183: christian@4183: Added translation of w_differences. christian@4183: christian@4183: * src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_de.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages.properties: christian@4183: Added "w_differnces" translation. christian@4183: christian@4183: 2011-09-07 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Appended christian@4183: a new attribute 'background-processing' to the DESCRIBE of this christian@4183: Artifact. Its value is 'true' if this Artifact has started a background christian@4183: thread which has not finished yet - otherwise it is 'false. christian@4183: christian@4183: 2011-09-07 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java, christian@4183: src/main/java/de/intevation/flys/utils/GeometryUtils.java: Moved the christian@4183: code to determine the extent of a river based on its axis to christian@4183: GeometryUtils. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Determine the extent of the selected river and set the WMSLayerFacet's christian@4183: extent attribute. christian@4183: christian@4183: 2011-09-07 Felix Wolfsteller christian@4183: christian@4183: Added Themeing support for CrossSection Diagrams. christian@4183: christian@4183: * doc/conf/themes.xml: christian@4183: Added new themes and mappings, slightly modified longitudinalsection christian@4183: theme. christian@4183: christian@4183: 2011-09-07 Felix Wolfsteller christian@4183: christian@4183: In CrossSection Diagram fix subtitle to display the km of which the data is christian@4183: actually displayed (maybe contrasting users wish). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: (getCrossSectionSnapKm): New method to fetch the actual km of crosssection. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Add correct km to charts subtitle. christian@4183: christian@4183: 2011-09-07 Felix Wolfsteller christian@4183: christian@4183: Fix various display-issues like i18n in cross-section diagram. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: christian@4183: Set description of facets to expected values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/exports/CrossSectionGenerator.java: christian@4183: Fix i18n of chart title. Set subtitle to expected value, pass facets christian@4183: description to StyledSeries to see expected legend. christian@4183: christian@4183: 2011-09-07 Felix Wolfsteller christian@4183: christian@4183: Cosmetics, resolved refactoring todo. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java christian@4183: (compute, computeAdvance, computeFeed): Refactored, extracted method, christian@4183: resolving duplicate code and TODO. christian@4183: christian@4183: 2011-09-07 Felix Wolfsteller christian@4183: christian@4183: Fix waterline "calculation" at given km. Chosen approach is christian@4183: "head-through-wall". christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Some refactoring to do the same calculation twice easier and be able christian@4183: to "cross" waterline against correct profile data. christian@4183: christian@4183: christian@4183: 2011-09-07 Felix Wolfsteller christian@4183: christian@4183: Fix setting of kilometer for profile (not yet waterlevel) of cross section christian@4183: diagram. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: (getCrossSectionData): Respect corss_section.km data; do naive linear christian@4183: search for profile data for this km. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java: christian@4183: Declare a ComputeType. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: christian@4183: Implement computeFeed. christian@4183: christian@4183: 2011-09-07 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Minor cosmetics. christian@4183: christian@4183: 2011-09-07 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/DataFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/state/DefaultState.java: christian@4183: Cosmetics, docs. christian@4183: christian@4183: 2011-09-06 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/mapserver/barrier_polygons_class.vm, christian@4183: doc/conf/mapserver/barrier_lines_class.vm, christian@4183: doc/conf/mapserver/wsplgen_class.vm: Default Mapserver styles for christian@4183: barriers and WSPLGEN results. Those styles are only used as long as we christian@4183: don't have map specific themes (as already used in charts). christian@4183: christian@4183: * doc/conf/mapserver/layer.vm: Implements a fallback mechanism for styling christian@4183: barrier lines/polygons and WSPLGEN results. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java: Added a christian@4183: getStyle() method that currently returns "null". This method needs to be christian@4183: implemented when map themes are introduced. christian@4183: christian@4183: 2011-09-06 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java: Renamed christian@4183: some attributes to make their job in the mapfile more obvious. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added christian@4183: new facet type for barriers. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: Add christian@4183: a facet for the barriers layer. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Parse christian@4183: barriers (lines and polygons) and create two new layers for each type - christian@4183: those layers are grouped. christian@4183: christian@4183: * doc/conf/mapserver/layer.vm: Renamed attribute based on changes in christian@4183: LayerInfo and added support for Group-Layers. christian@4183: christian@4183: 2011-09-06 Raimund Renkert christian@4183: christian@4183: * doc/conf/conf.xml: christian@4183: Added driver to database configuration for use with postgresql. christian@4183: christian@4183: 2011-09-06 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/mapserver/mapfile.vm: Removed FONTSET attribute and set quotes christian@4183: for SHAPEPATH. christian@4183: christian@4183: 2011-09-05 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WSPLGENFacet.java: christian@4183: Removed. We gonna use the WMSLayerFacet until now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Add a WMSLayerFacet after we triggered the Scheduler to start a WSPLGEN christian@4183: calculation. christian@4183: christian@4183: 2011-09-05 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/mapserver/layer.vm, christian@4183: doc/conf/mapserver/mapfile.vm: Small bugfixes and style improvements. christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: Trigger the christian@4183: MapfileGenerator after a WSPLGEN job has finished regardless if it has christian@4183: been finished successfully or not. christian@4183: christian@4183: 2011-09-05 Ingo Weinzierl christian@4183: christian@4183: * pom.xml: Added Apache Velocity 1.7 for templating support. christian@4183: christian@4183: * doc/conf/conf.xml: Added config options for mapserver/template relevant christian@4183: stuff. christian@4183: christian@4183: * doc/conf/mapserver/mapfile.vm, christian@4183: doc/conf/mapserver/layer.vm: New. A default mapfile template and a christian@4183: template used for layers. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/LayerInfo.java: New. christian@4183: This class is used while reading WMS layer relevant information from christian@4183: filesystem. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: New. This christian@4183: thread is used for creating mapfiles for Mapserver. The MapfileGenerator christian@4183: runs in daemon mode (own thread) and creates mapfiles based on WMS christian@4183: layer relevant information read from filesystem. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java, christian@4183: src/main/java/de/intevation/flys/utils/FLYSUtils.java: Moved shapefile christian@4183: specific XPath expressions from FloodMapState to FLYSUtils which is a christian@4183: better place to use it in other classes (as MapfileGenerator). christian@4183: christian@4183: 2011-09-05 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: christian@4183: Bugfixed broken attribute assignment. christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: Call christian@4183: CallContext.afterBackground() after a WSPLGEN job has finished to remove christian@4183: the background lock from Artifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Call CallContext.afterCall(BACKGROUND) to lock the Artifact for christian@4183: background processing. christian@4183: christian@4183: 2011-09-02 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: New. This christian@4183: class is used to start WSPLGEN for a specific WSPLGENJob. The System christian@4183: property "wsplgen.bin.path" tells the JobExecutor where the WSPLGEN christian@4183: binary is placed (which means in general, the property points to the christian@4183: 'wsplgen.exe'). christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/Scheduler.java: New. This christian@4183: scheduler currently allows to start just a single WSPLGEN Thread. All christian@4183: WSPLGEN calculations should be started using Scheduler.addJob(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/wsplgen/JobObserver.java: New. This christian@4183: thread reads log messages from WSPLGEN and listens for specific christian@4183: messages. It should be used to update status messages of the WSPLGEN christian@4183: calculation that is currently running. christian@4183: There is a System property that tells the JobObserver to log all WSPLGEN christian@4183: output to log4j: enable WSPLGEN output with "-Dwsplgen.log.output=true". christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: Added christian@4183: the FLYSArtifact, the current working directory and the CallContext. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Use the Scheduler to start new WSPLGEN calculations. christian@4183: christian@4183: 2011-09-02 Felix Wolfsteller christian@4183: christian@4183: Add CrossSectionInfoGenerator. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionInfoGenerator.java: christian@4183: New, trivial implementation of CrossSectionInfoGenerator. christian@4183: christian@4183: * doc/conf/conf.xml: christian@4183: Register CrossSectionInfoGenerator. christian@4183: christian@4183: 2011-09-01 Felix Wolfsteller christian@4183: christian@4183: Cleanups of CrossSection*. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: New methods to retrieve name of utilized CrossSection. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Cleanup, get rid of copied unused method, documentation and more sensible christian@4183: translations. christian@4183: christian@4183: * src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_de.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages.properties: christian@4183: Added cross_section* translations, also cleanups. christian@4183: christian@4183: 2011-09-01 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Set the "typ" attribute of lines and polygons in barrier shapefiles. christian@4183: christian@4183: 2011-09-01 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Set the Z values of line and polygon barrier geometries. Both barrier christian@4183: shapefiles will contain 3D geometries now. christian@4183: christian@4183: 2011-09-01 Felix Wolfsteller christian@4183: christian@4183: Get real data to display in CrossSection (although ignorant of christian@4183: parameterization), making use of the showcase code of the CrossSectionApp- christian@4183: Standalone application. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Add new facet (~waterline) to state/out. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: New methods to get relevant data. So far just takes the first value of christian@4183: everything and assuming a waterlevel at 130m. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java: christian@4183: New Facet responsible of water level in cross section. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: christian@4183: Made some functionality publicly and statically available. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java: christian@4183: Update call. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added new christian@4183: Facet type. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: christian@4183: Added new Facet to out. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Respect new facet and facets data. christian@4183: christian@4183: 2011-09-01 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Close an open christian@4183: shapefile transaction and catch exceptions which are thrown while christian@4183: shapefile creation here. If there occured an error, this functions christian@4183: returns FALSE, otherwise TRUE. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Removed exception handling while shapefile creation - this is done in christian@4183: GeometryUtils now. christian@4183: christian@4183: 2011-09-01 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Renamed the file for WSPLGEN required waterlevels to "waterlevels.wst". christian@4183: WSPLGEN did not work with the former "waterlevels.txt" file. christian@4183: christian@4183: 2011-09-01 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/GeometryUtils.java: New static christian@4183: function that builds new SimpleFeatureTypes with additional attributes. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Write attributes "ELEVATION" and "KILOMETER" into the crosssection christian@4183: tracks shapefiles. christian@4183: christian@4183: 2011-08-31 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a method christian@4183: stub that should return a FLYSArtifact based on a given UUID. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Write the selected WST file for WSPLGEN. Note, that this is the WST file christian@4183: of the current WINFO artifact. Furthermore, there is currently no way christian@4183: for the user to select a column from WST file, so we currently use the christian@4183: column that is written to WST file at first. christian@4183: christian@4183: 2011-08-31 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Changed christian@4183: the parameter order of a compute(...) method. This makes me able to call christian@4183: this without a hash value. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java: christian@4183: Adapted the parameter order of the compute() call (see above). christian@4183: christian@4183: 2011-08-31 Felix Wolfsteller christian@4183: christian@4183: More bones to CrossSection sceleton. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java: christian@4183: New, yet trivial implementations of Factory and Facet for CrossSections. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: christian@4183: Add new CrossSection- (instead of Default-)Facet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Adjusted to use (touch) new Factory and Facet. christian@4183: christian@4183: 2011-08-31 Felix Wolfsteller christian@4183: christian@4183: Cosmetics. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Cosmetics. christian@4183: christian@4183: 2011-08-31 Felix Wolfsteller christian@4183: christian@4183: Cosmetics. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java, christian@4183: src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: Removed obselete imports. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: christian@4183: Removed obselete imports, whitespaces. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Whitespaces, docs. christian@4183: christian@4183: 2011-08-31 Felix Wolfsteller christian@4183: christian@4183: Fix translations of Main Values Facets. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: christian@4183: Do acrobatics to keep state transient but get translated title. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesQFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/MainValuesWFacet.java: christian@4183: Changed constructor to get description (which is then already be translated) christian@4183: dynamically, adjust deepCopy. christian@4183: christian@4183: * src/main/java/de/intevation/flys/states/StaticState.java: christian@4183: Adjust constructor accordingly. christian@4183: christian@4183: 2011-08-31 Felix Wolfsteller christian@4183: christian@4183: Add sceleton for CrossSection outs. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: christian@4183: Added new output mode to respective state of winfo artifact configuration. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: christian@4183: Add new Dummy-Facet in state. christian@4183: christian@4183: * doc/conf/conf.xml: christian@4183: Registered new OutputGenerator. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added new CROSS_SECTION type. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java: christian@4183: New, stubby skeleton for an CrossSectionGenerator. christian@4183: christian@4183: * src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_de.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages.properties: christian@4183: Added cross_section translation, also cleanups (e.g. main values). christian@4183: christian@4183: 2011-08-31 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: Marked christian@4183: required parameters with a comment. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Export floodplains (german 'Talaue') to shapefile and write its file christian@4183: path into the WSPLGEN job. christian@4183: christian@4183: 2011-08-31 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Search for a DGM that fits to the current river and km range and write christian@4183: its file path into the WSPLGEN job. christian@4183: christian@4183: 2011-08-30 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Improved christian@4183: exception handling: exceptions are catched in GeometryUtils now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Write river axis and crosssections to shapefiles and save shapefile christian@4183: pathes in WSPLGENJob. christian@4183: christian@4183: 2011-08-30 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Use the coorect SRID for reading GeoJSON and writing line/polygon christian@4183: shapefiles. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/GeometryUtils.java: Use a christian@4183: concrete coordinate system while feature type creation. christian@4183: christian@4183: 2011-08-30 Ingo Weinzierl christian@4183: christian@4183: * pom.xml: Added GeoTools 2.7.2 dependencies for Shapefile, GeoJSON and christian@4183: EPSG support. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: Store christian@4183: 'LIN' parameter in a list now. A WSPLGEN parameter might contain many christian@4183: LINs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/GeometryUtils.java: New functions christian@4183: to create FeatureTypes and to write shapefiles. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Write user specified barriers into a shapefile placed in the artifact christian@4183: directory. christian@4183: christian@4183: 2011-08-30 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java: Added a function christian@4183: that extracts the SRID defined in the global configuration file for a christian@4183: given river. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: christian@4183: Removed the code that extracts the river SRID - use FLYSUtils instead. christian@4183: christian@4183: 2011-08-29 Felix Wolfsteller christian@4183: christian@4183: Use FLYSUtils.getRiver instead of WINFOArtifact.getRiver. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: christian@4183: Use FLYSUtils.getRiver instead of WINFOArtifact.getRiver. christian@4183: christian@4183: 2011-08-29 Felix Wolfsteller christian@4183: christian@4183: Use FLYSUtils.getRiver instead of WINFOArtifact.getRiver. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: christian@4183: Use FLYSUtils.getRiver instead of WINFOArtifact.getRiver. christian@4183: christian@4183: 2011-08-29 Felix Wolfsteller christian@4183: christian@4183: Commit accidentally omitted result of refactoring (WINFO/FLYSUtils/getRiver). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Removed implementations of getRiver, update calls to use FLYSUtils. christian@4183: christian@4183: 2011-08-29 Felix Wolfsteller christian@4183: christian@4183: Interpolate Q main values, generate interpolated W main values on the fly from christian@4183: Q main values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: christian@4183: (getGaugeDatum): removed, obsolete christian@4183: (getLocation): new, gets location christian@4183: Use WstValueTable to look up interpolated Qs of MainValues. In absence of christian@4183: the same functionality for Ws, generate W Main Values from Q Main Values. christian@4183: christian@4183: 2011-08-29 Felix Wolfsteller christian@4183: christian@4183: Use new helper class FLYSUtils, minor refactorization. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: christian@4183: Use new functionality of helper class, convenience of FLYSArtifact. christian@4183: christian@4183: 2011-08-29 Felix Wolfsteller christian@4183: christian@4183: Refactored to use new Helper class FLYSUtils, moved getRiver-functionality christian@4183: in there. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java (getRiver): christian@4183: New function to retrieve river of an artifact, slightly modified from christian@4183: WINFOArtifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: christian@4183: Removed implementations of getRiver, update calls to use FLYSUtils. christian@4183: christian@4183: 2011-08-29 Felix Wolfsteller christian@4183: christian@4183: Minor cosmetics. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Resolved a TODO. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Added some documentation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: christian@4183: Minor cosmetic. christian@4183: christian@4183: 2011-08-26 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/meta-data.xml: Made it Oracle compatible. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/templating/CompiledStatement.java: christian@4183: If running in debug mode log executed statements. christian@4183: Helps debugging Oracle connections. christian@4183: christian@4183: 2011-08-26 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Set some WSPLGENJob parameters which are stored at FLYSArtifact. christian@4183: christian@4183: 2011-08-26 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/FLYSUtils.java: New. This helper christian@4183: class should provide some basic FLYS stuff. Currently, there are functions christian@4183: that return the km range/location. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Removed christian@4183: the methods that return the km range/locations. This is implemented in christian@4183: FLYSUtils now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java: Adapted christian@4183: the WINFO method calls to retrieve the km range/locations - call christian@4183: FLYSUtils now. christian@4183: christian@4183: 2011-08-26 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: New method christian@4183: to destroy a single state. christian@4183: christian@4183: 2011-08-26 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: christian@4183: Cosmetic, remove debug output and comments, minor style adjustments. christian@4183: christian@4183: 2011-08-26 Felix Wolfsteller christian@4183: christian@4183: Added limited themeing-support for MainValues. christian@4183: christian@4183: * doc/conf/themes.xml: christian@4183: Added Q/W-MainValues themes. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Added limited theming support, add legend entry for main values. christian@4183: christian@4183: 2011-08-26 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/conf.xml: Added a configuration node that points to the directory christian@4183: where shapefiles should be stored in. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WSPLGENJob.java: New. christian@4183: This class is used to save/write the parameter for a WSPLGEN calculation. christian@4183: WSPLGEN's *.par files are written using the toFile() method. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: A directory for all WSPLGEN stuff is created in computeAdvance() - those christian@4183: directory and all its contained files are removed in endOfLife(). christian@4183: christian@4183: 2011-08-26 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/ThemeUtil.java: christian@4183: New Util to work with theme-related stuff. christian@4183: christian@4183: 2011-08-26 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: christian@4183: Use NamedDoubles instead of MainValues, try to adjust scale of Ws. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Use NamedDoubles instead of MainValues, generalize annotation handling, to christian@4183: allow easier reusability and themeing. christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: christian@4183: Added convenience constructor, exemplary switch on bordered text. christian@4183: christian@4183: 2011-08-26 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/meta-data.xml: christian@4183: Recommend MainValues for Computed discharge curves. christian@4183: christian@4183: 2011-08-26 Felix Wolfsteller christian@4183: christian@4183: New NamedDouble class which implements a -pair. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/NamedDouble.java: christian@4183: New, implementation of a double with a string or vice versa. christian@4183: christian@4183: 2011-08-26 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Call christian@4183: State.endOfLife() for all States when endOfLife() of the Artifact is christian@4183: called. christian@4183: christian@4183: 2011-08-26 Felix Wolfsteller christian@4183: christian@4183: Also plot "W"-MainValues (on vertical axis), take correct parameters, but christian@4183: do not convert to correct scale (cm vs NN+m). christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: christian@4183: Naive attempt at allowing the vertical axis to be sticked at. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Store Q and W MainValues separately, add them to plot as annotations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: christian@4183: Serve the MainValues, parameterized on river and location, Q and W. christian@4183: Removed Facet-implementation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Updated Facet Types. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java: christian@4183: src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java: christian@4183: New, trivial facets, extracted from MainValuesArtifact. christian@4183: christian@4183: 2011-08-26 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Call christian@4183: State.endOfLife() of each State that is no longer in the queue of the christian@4183: artifact when this artifact steps back to a previous state. christian@4183: christian@4183: 2011-08-25 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Plot MainValues delivered by MainValuesFacet in much the same ways than christian@4183: Annotations in LongitudinalSection plots. christian@4183: christian@4183: 2011-08-25 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: christian@4183: Prepare further differentiation between Annotations that stick to X or Y- christian@4183: Axis, copied some positioning logic into StickyAxisAnnotation christian@4183: implementation. christian@4183: christian@4183: 2011-08-25 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Minor cosmetics. christian@4183: christian@4183: 2011-08-25 Felix Wolfsteller christian@4183: christian@4183: Added MainValue-Fetching-Capabilities to MainValuesArtifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java christian@4183: (initialize, getMinValues): christian@4183: Let MainValuesArtifact return "real" MainValues, although ignorant of all christian@4183: parameterization. christian@4183: christian@4183: 2011-08-25 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java christian@4183: (MainValueFacet): christian@4183: Improved and straightened implementation, added code-Annotations and Todos. christian@4183: christian@4183: 2011-08-25 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java christian@4183: (MainValueFacet): christian@4183: Improved and straightened implementation, added code-Annotations and Todos. christian@4183: christian@4183: 2011-08-25 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java christian@4183: (getState): christian@4183: Resolved multiple creation of state (yet not very clean). christian@4183: christian@4183: 2011-08-25 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Cosmetics, docs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: christian@4183: Cosmetics. christian@4183: christian@4183: 2011-08-25 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added new (MainValues) Facet-Type. christian@4183: christian@4183: 2011-08-24 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java: christian@4183: Added a method that returns a River object based on its database id. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: The christian@4183: data that is required for this artifact is fetched from database instead christian@4183: from a Master-Artifact. The creation of static artifacts should use christian@4183: database ids instead of cloning a Master-Artifact. christian@4183: christian@4183: 2011-08-24 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: christian@4183: Removed needless imports. christian@4183: christian@4183: 2011-08-24 Felix Wolfsteller christian@4183: christian@4183: Added configuration for factory and rule for MainValueArtifacts. christian@4183: christian@4183: * doc/conf.xml: christian@4183: Add a mainvalue factory to serve MainValueArtifacts. christian@4183: christian@4183: * doc/conf/meta-data.xml: christian@4183: Recomment mainvalue artifact when computed_discharge_curve can be put out. christian@4183: christian@4183: 2011-08-24 Felix Wolfsteller christian@4183: christian@4183: Let MainValuesArtifact have a state, outputmode and facet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/StaticState.java: christian@4183: New, a non-abstract DefaultState. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: christian@4183: Progressed with implementation, use StaticState to hook output modes and christian@4183: facet in; use (Static)FLYSArtifact implementation. christian@4183: christian@4183: 2011-08-24 Felix Wolfsteller christian@4183: christian@4183: Smaller cosmetics. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: christian@4183: Cosmetics in comments. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: christian@4183: Added @Override annotations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java: christian@4183: Use brackets to improve readability of ternary operator. christian@4183: christian@4183: 2011-08-24 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/meta-data.xml: Use "ids" in user specific part, too. christian@4183: christian@4183: 2011-08-24 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/meta-data.xml: s/db-ids/ids/g to unify system and user specific christian@4183: loading. christian@4183: christian@4183: 2011-08-24 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Extracted access to state and states in order to have fewer places to christian@4183: modify when going for single/trivial state- artifacts. christian@4183: christian@4183: 2011-08-24 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java: christian@4183: Append the river's srid to the WMSLayerFacet. christian@4183: christian@4183: 2011-08-24 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: christian@4183: Minor fixes, ressurect Facet implementation as inner class. christian@4183: christian@4183: 2011-08-24 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Moved the input of barriers one state christian@4183: earlier where the scenario is selected as well. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ScenarioSelect.java: christian@4183: This state now desires the "map_digitize" UI provider and returns both christian@4183: items "scenario" and "uesk.barriers" in the dynamic describe part. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Removed the UI provider and the computeFeed() which is no longer needed, christian@4183: because there is no more user input in this state. christian@4183: christian@4183: 2011-08-24 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: christian@4183: Repaired broken xpath expressions (the config changed in one of the last christian@4183: commits) and make use of the variable support in xpath expressions to christian@4183: replace the rivername. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSBackgroundArtifact.java: christian@4183: Save the rivername while initializing this artifact. This is now christian@4183: necessary, because each river can have its own background wms christian@4183: configured. christian@4183: christian@4183: 2011-08-23 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: christian@4183: Repaired broken river-wms initialization. christian@4183: christian@4183: 2011-08-23 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/DataFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/DurationCurveFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/ManagedFacetAdapter.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WSPLGENFacet.java: christian@4183: Made facets cloneable with the right type. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2011-08-23 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Declare the first artifact of an output as master artifact (artifacts christian@4183: are ordered by their creation time). christian@4183: christian@4183: 2011-08-23 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: christian@4183: Removed facet interface. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Make artifacts cloneable. TODO: Override deepCopy() in subclassed christian@4183: states and facets. christian@4183: christian@4183: 2011-08-23 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/conf.xml: Added the MapInfoService and adapted the floodmap christian@4183: configuration. Now, each river can have its own background wms layer christian@4183: defined. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java: christian@4183: New. This service returns some basic information used to create maps for christian@4183: a specific river. The name of the desired river needs to be defined at christian@4183: "/mapinfo/river/text()". christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: christian@4183: Adapted an xpath expression that points to the srid of a river in the christian@4183: floodmap configuration (which changed). christian@4183: christian@4183: 2011-08-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Build out/facet filter from XML document passed at creation time. christian@4183: christian@4183: 2011-08-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Added some code to filter outs/facets by an optional positive list. christian@4183: This is needed to only expose parts of the facets. This christian@4183: is needed for artifacts which are loaded into a collection. christian@4183: TODO: create the filter from the XML document passed at creation christian@4183: time. christian@4183: christian@4183: 2011-08-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Moved all christian@4183: WINFO specific code to WINFOArtifact. FLYSArtifact is now only revolving christian@4183: about state affairs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Re-inserted christian@4183: the specific stuff here. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java: christian@4183: Adjusted the casts. christian@4183: christian@4183: 2011-08-22 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/meta-data.xml: Filter by outs in user template part. christian@4183: christian@4183: 2011-08-22 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Defined an input value for the GeoJSON christian@4183: string to save user defined barriers in the map. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: Added a computeFeed() method. In addition, this state now prefers the christian@4183: "noinput" UI provider. christian@4183: christian@4183: 2011-08-19 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/conf.xml: Each river requires a SRID definition. This christian@4183: definition is used to transform the river's geometries into the desired christian@4183: projection. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: christian@4183: This facets are able to save a SRID. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: christian@4183: The extent that is written into the WMSLayerFacet is determined by the christian@4183: boundary of the geometry. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/GeometryUtils.java: New. A christian@4183: utility class that provides helper functions for geometries. Currently, christian@4183: one function is defined, that creates a boundary string for OpenLayers. christian@4183: christian@4183: 2011-08-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/ProfileDistanceSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/RangeState.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2011-08-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: Removed CallContext from state validation. It is not needed and hindered christian@4183: the extraction of all out of an artifact if you don't have a christian@4183: call context (like initial scan of datacage database). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: christian@4183: Extract all outs now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, christian@4183: src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/FloodplainChoice.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/ScenarioSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/ProfileDistanceSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DefaultState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/RangeState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Adjusted calls. christian@4183: christian@4183: 2011-08-19 Felix Wolfsteller christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Added lacalization of "Streckenfavoriten". christian@4183: christian@4183: 2011-08-19 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Picky white-space cosmetics. christian@4183: christian@4183: 2011-08-19 Felix Wolfsteller christian@4183: christian@4183: Added stub implementation of new MainValuesArtifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java: christian@4183: New. Stub implementation for new MainValuesArtifact. christian@4183: christian@4183: 2011-08-19 Sascha L. Teichmann christian@4183: christian@4183: Fixed flys/issue262 christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: christian@4183: Unified user and system tempate. christian@4183: Looks for "/artifact-database/metadata/template/text()" christian@4183: in conf.xml. Defaults to "${artifacts.config.dir}/meta-data.xml". If user id is christian@4183: given its the default connection for contexts. christian@4183: christian@4183: * doc/conf/conf.xml: Adjusted christian@4183: * doc/conf/meta-data-system.xml, doc/conf/meta-data-user.xml: Deleted. christian@4183: * doc/conf/meta-data.xml: Unified version of user and system template. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/templating/App.java: christian@4183: Adjusted the test program. christian@4183: christian@4183: 2011-08-18 Sascha L. Teichmann christian@4183: christian@4183: Fixed flys/issue260 christian@4183: christian@4183: * doc/conf/meta-data-user.xml: Uses master_artifacts view now. christian@4183: christian@4183: 2011-08-18 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/datacage.sql: Added view master_artifacts to select christian@4183: the master artifacts of the collections more easily. christian@4183: To upgrade existing database: christian@4183: christian@4183: CREATE VIEW master_artifacts AS christian@4183: SELECT a2.id AS id, christian@4183: a2.gid AS gid, christian@4183: a2.state AS state, christian@4183: a2.creation AS creation, christian@4183: ci2.collection_id AS collection_id christian@4183: FROM collection_items ci2 christian@4183: JOIN artifacts a2 christian@4183: ON ci2.artifact_id = a2.id christian@4183: JOIN (SELECT ci.collection_id AS c_id, christian@4183: MIN(a.creation) AS oldest_a christian@4183: FROM collection_items ci christian@4183: JOIN artifacts a christian@4183: ON ci.artifact_id = a.id christian@4183: GROUP BY ci.collection_id) o christian@4183: ON o.c_id = ci2.collection_id christian@4183: WHERE a2.creation = o.oldest_a; christian@4183: christian@4183: TODO: Use the view in the templates. christian@4183: christian@4183: 2011-08-18 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/meta-data-user.xml: Removed state filter because it was broken. christian@4183: Simplified by joining two contexts. christian@4183: christian@4183: 2011-08-18 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: christian@4183: Fix issues with lines of annotation when zoomed (wrong scale used). christian@4183: christian@4183: 2011-08-18 Felix Wolfsteller christian@4183: christian@4183: Added legend for annotations to LongitudinalSectionDiagram. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Added a pseudo-dataseries/collection to employ existing infrastructure for christian@4183: displaying localized label for Annotations (yet unthemed). christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: christian@4183: Made label-string available for localization. christian@4183: christian@4183: 2011-08-17 Felix Wolfsteller christian@4183: christian@4183: Moved StickyAxisAnnotation into new package de.intevation.flys.jfree . christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StickyAxisAnnotation.java: christian@4183: Deleted/moved to src/main/java/de/intevation/flys/jfree/ . christian@4183: christian@4183: * src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java: christian@4183: New/moved from src/main/java/de/intevation/flys/export/ , adjusted christian@4183: package statement, made class public. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Added import statement for de.intevation.flys.jfree.StickyAxisAnnotation . christian@4183: christian@4183: 2011-08-17 Felix Wolfsteller christian@4183: christian@4183: Extracted and renamed CustomAnnotation to StickyAxisAnnotation. Also removed christian@4183: needless imports. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/StickyAxisAnnotation.java: christian@4183: Extracted class implementation CustomAnnotation and renamed to christian@4183: StickyAxisAnnotation. christian@4183: christian@4183: 2011-08-17 Felix Wolfsteller christian@4183: christian@4183: Improved CustomAnnotations and rendering thereof, now including an christian@4183: "axis mark" (little line at axis), also prepared possibility to put christian@4183: annotations on Y-axis. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Improved CustomAnnotation to include marks on the axis and better spacing christian@4183: from it. christian@4183: christian@4183: 2011-08-17 Felix Wolfsteller christian@4183: christian@4183: Implemented proof-of-concept collision-detection when drawing christian@4183: CustomAnnotations (text only). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: christian@4183: Pass a fresh ChartRenderingInfo-Object to createBufferedImage, such that christian@4183: information can be collected while rendering. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Exploit the fact that XYTextAnnotation already registers drawn shape in the christian@4183: ChartRenderingInfo if it exists and either an URL or tooltip is set. christian@4183: Before drawing, calculate own shape and compare against already registered christian@4183: shapes. christian@4183: christian@4183: 2011-08-16 Felix Wolfsteller christian@4183: christian@4183: Implemented (yet dummy) custom Annotation class. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Added implementation of yet dummy CustomAnnotation class. christian@4183: christian@4183: 2011-08-16 Felix Wolfsteller christian@4183: christian@4183: Slightly improved rendering of annotations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Slightly improved rendering of annotations. Still no valid collision christian@4183: detection. Annotations are drawn every 2 km; first come first serve. christian@4183: christian@4183: 2011-08-15 Sascha L. Teichmann christian@4183: christian@4183: Fix for flys/issue191 christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQ.java(longestIncreasingWRangeIndices): christian@4183: Added a method to find the longest index range with increasing w values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ATWriter.java: Export the longest christian@4183: range of monotone increasing w values instead of the first one. christian@4183: TODO: The first line of the export is still broken. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: christian@4183: Removed superfluous import. christian@4183: christian@4183: 2011-08-12 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: christian@4183: Resolved two TODOs: get Annotations of selected River, get "point" christian@4183: Annotations only. christian@4183: christian@4183: 2011-08-12 Felix Wolfsteller christian@4183: christian@4183: Added functionality to query range and point-annotations only to christian@4183: AnnotationFactory. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java christian@4183: (getPointAnnotations, getAnnotationsBreadth): christian@4183: New functions to query breadth and point-only annotations. christian@4183: christian@4183: 2011-08-11 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: christian@4183: Added a development mode for recommendations. Enabled with christian@4183: stetting system property 'flys.datacage.recommendations.development' to true. christian@4183: When set the XML template are re-read if the timestamps of the christian@4183: files have changed so you do not have to restart the server again and again. christian@4183: christian@4183: * doc/conf/meta-data-user.xml: Sort collections by creation time in descending order. christian@4183: christian@4183: 2011-08-11 Felix Wolfsteller christian@4183: christian@4183: Rather picky cosmetics only. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java, christian@4183: src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WQKms.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DefaultState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, christian@4183: src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: End comments on a full stop, separate from closing '*/' by whitespace, christian@4183: adjusted javadoc comments. christian@4183: christian@4183: 2011-08-11 Felix Wolfsteller christian@4183: christian@4183: Made Annotations visible in LongitudinalSection diagrams. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Register new Facet Type, let LongitudinalSectionGenerator include christian@4183: Annotations in diagram (yet unfiltered and independent of river). christian@4183: christian@4183: 2011-08-11 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/conf.xml, christian@4183: doc/conf/artifacts/annotation.xml, christian@4183: doc/conf/meta-data-system.xml: christian@4183: Added configuration for AnnotationArtifacts. christian@4183: christian@4183: 2011-08-11 Felix Wolfsteller christian@4183: christian@4183: Added demo- implementation of a AnnotationArtifact and its Facet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/AnnotationRiverState.java: christian@4183: New. Initial version of an AnnotationArtifact and its State and Facet. christian@4183: christian@4183: 2011-08-10 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/datacage.sql: Extended schema for artifacts and collections christian@4183: to have creation times, too. christian@4183: christian@4183: To update existing databases: christian@4183: christian@4183: ALTER TABLE artifacts ADD COLUMN creation TIMESTAMP NOT NULL DEFAULT current_timestamp; christian@4183: ALTER TABLE collections ADD COLUMN creation TIMESTAMP NOT NULL DEFAULT current_timestamp; christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: christian@4183: Store creation times for artifacts and collections, too. christian@4183: christian@4183: * src/main/resources/datacage-sql/org-h2-driver.properties, christian@4183: src/main/resources/datacage-sql/org-postgresql-driver.properties: christian@4183: Adjusted SQL statements. christian@4183: christian@4183: 2011-08-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: christian@4183: Make it compilable again (BackendListener interface changed). christian@4183: christian@4183: 2011-08-10 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/meta-data-user.xml: Added grouping element around w/q of each christian@4183: longitudinal section artifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/templating/CompiledStatement.java, christian@4183: src/main/java/de/intevation/flys/artifacts/datacage/templating/StackFrames.java: christian@4183: Added some debugging capabilities. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/templating/ResultData.java: christian@4183: Added isEmpty() method. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java: christian@4183: Now it is possible to nest into other elements in the christian@4183: body. This is useful and needed for grouping and repeating results. christian@4183: christian@4183: 2011-08-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: christian@4183: User connection was cached, system was not. Lead to incorrect results. christian@4183: christian@4183: 2011-08-09 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/meta-data-user.xml: Added element christian@4183: around old calculations. christian@4183: christian@4183: 2011-08-09 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java: christian@4183: Cosmetic: Replaced usage of legacy java.util.Stack with java.util.Deque. christian@4183: christian@4183: 2011-08-04 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/meta-data-user.xml: Use 'CAST(x AS uuid)' instead of 'x::uuid' christian@4183: to be more compatible. christian@4183: christian@4183: 2011-08-04 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: christian@4183: If given an artifact place its identifier into parameters passed to template. christian@4183: Fixed swapped user/system connections if using the user template. christian@4183: christian@4183: * doc/conf/meta-data-user.xml: Recommend w/q facet from old calculations christian@4183: if an artifact was given that represents a longitudinal section christian@4183: "Laengsschnitt". christian@4183: christian@4183: TODO I: The template uses PostgreSQL specific UUID casts. christian@4183: TODO II: We need to find a way only to recommend the master artifacts. christian@4183: christian@4183: 2011-08-04 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java: christian@4183: Added a tag to place comments in the meta data templates. christian@4183: comments are copied through. christian@4183: christian@4183: * doc/conf/meta-data-user.xml: Added a simple test. christian@4183: christian@4183: 2011-08-04 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: christian@4183: Be a bit more tolerant about empty strings for UUIDs of artifact and user. christian@4183: christian@4183: 2011-08-03 Sascha L. Teichmann christian@4183: christian@4183: Bring user specific meta data service to life. christian@4183: christian@4183: * doc/conf/conf.xml: There are now two templates to configure: christian@4183: The system template (only the data from the backend) and the christian@4183: user template (the datcage db and the backend db), christian@4183: christian@4183: * doc/conf/meta-data-template.xml: Deleted. christian@4183: * doc/conf/meta-data-user.xml: New. The user specific template. TODO: Write it! christian@4183: * doc/conf/meta-data-system.xml: New. The system template. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/templating/NoneUserSpecific.java: christian@4183: Deleted. christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: christian@4183: New. The logic to fill the templates. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: christian@4183: Adjusted to follow the new call signatures. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: christian@4183: Refactored. Removed the old code and only leave the new service. Following christian@4183: XPaths are evaluated on the incomming document: christian@4183: christian@4183: "/art:meta/art:artifact-id/@value" The UUID of the artifact. Optional. christian@4183: Used to fill the template enviroment. christian@4183: "/art:meta/art:user-id/@value" The UUID of the user. Optional. christian@4183: If given the user specific template is filled. christian@4183: "/art:meta/art:outs/@value" The list of outs used to recommend for the christian@4183: various outputs. christian@4183: "/art:meta/art:parameters/@value" A list of key/value pairs to inject more christian@4183: filters to the templating. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/templating/App.java: christian@4183: Change to follow the new recommendations semantics. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java: christian@4183: Added symbolic constants to distinguish "user" and "system" db connections. christian@4183: christian@4183: 2011-08-03 Felix Wolfsteller christian@4183: christian@4183: * doc/conf/conf.xml: christian@4183: Cosmetics, let comments start with a capital and end on a full stop, christian@4183: removed incorrect comment. christian@4183: christian@4183: 2011-08-03 Felix Wolfsteller christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Cosmetics, let comments start with a capital and end on a full stop. christian@4183: christian@4183: 2011-08-03 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java(extractOutputNames): christian@4183: Fixed potential NPE. christian@4183: christian@4183: 2011-08-03 Sascha L. Teichmann christian@4183: christian@4183: Added support for more than one db connection in datacage templating. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java: christian@4183: Now you can pass a list of named db connections to the build process. christian@4183: The purpose is to mix more then one database (e.g. the backend db and christian@4183: the user specific one). christian@4183: christian@4183: To use this feature you can add an "connection" attribute christian@4183: to with the name of the connection to use. christian@4183: If no connection name is given the last used is used again. christian@4183: Initially the first connection in the given list is used. christian@4183: If the context is left the connection that was active before christian@4183: will be active again in a stacking manner. christian@4183: christian@4183: When creating NamedConnection objects you can set a boolean flag christian@4183: if the results coming from the connection should be cached. This christian@4183: is useful e.g. for the user specific database which runs in-memory christian@4183: so caching would introduce some superfluous overhead. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/templating/CompiledStatement.java: christian@4183: When executing the queries explicitly pass if caching should be used. christian@4183: christian@4183: 2011-08-02 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: christian@4183: Forgot to fetch dialect dependent SQL statement for deleting christian@4183: artifacts by uuid. christian@4183: christian@4183: 2011-08-02 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: christian@4183: Set the name of the collections at initial scan, too. christian@4183: christian@4183: 2011-08-02 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: christian@4183: Fixed wrong SQL references. christian@4183: christian@4183: 2011-08-02 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: christian@4183: Fixed two NPEs. christian@4183: christian@4183: 2011-08-02 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/DatacageBackendListener.java, christian@4183: src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: christian@4183: Forwarded kill collections and artifacts events to datacage. christian@4183: christian@4183: * src/main/resources/datacage-sql/org-h2-driver.properties, christian@4183: src/main/resources/datacage-sql/org-postgresql-driver.properties: christian@4183: Added statement to delete artifact by uuid. christian@4183: christian@4183: 2011-08-02 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/DatacageBackendListener.java: christian@4183: Made it compilable again. The signature of BackendListener has changed. christian@4183: christian@4183: 2011-08-01 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: christian@4183: Completed the backend listener stuff. christian@4183: christian@4183: TODO I: Added some cleanup for orphaned artifacts. christian@4183: TODO II: Figure out a way to delete collections/artifacts christian@4183: which are delete from backend without the christian@4183: backend API. christian@4183: christian@4183: * src/main/resources/datacage-sql/org-h2-driver.properties, christian@4183: src/main/resources/datacage-sql/org-postgresql-driver.properties: christian@4183: Added needed statements. christian@4183: christian@4183: 2011-08-01 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: christian@4183: Update collection names on change. Remove artifacts from collections. christian@4183: christian@4183: * src/main/resources/datacage-sql/org-h2-driver.properties, christian@4183: src/main/resources/datacage-sql/org-postgresql-driver.properties: christian@4183: Added needed statements. christian@4183: christian@4183: 2011-08-01 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/DatacageBackendListener.java: christian@4183: Call datacage with the global context. This is needed to access the state engine. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: Changed christian@4183: signatures to take the global context, too. Create artifacts via backend listener christian@4183: interface. christian@4183: christian@4183: 2011-08-01 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/DatacageBackendListener.java: christian@4183: Fixed recursion bug. christian@4183: christian@4183: 2011-08-01 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/DatacageBackendListener.java: christian@4183: Added debug output. christian@4183: christian@4183: 2011-08-01 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/conf.xml: Added backend listener for datacage. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/DatacageBackendListener.java: christian@4183: New. Proxies backend listener calls to datacage. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: christian@4183: Implements backend listener. TODO: Update the datacage database christian@4183: according the change calls. christian@4183: christian@4183: 2011-08-01 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta, christian@4183: src/main/java/de/intevation/flys/artifacts/datacage/templating: christian@4183: Moved/renamed package to better fit the common semantics. christian@4183: DataCage.java is now call NoneUserSpecific.java to reflect the christian@4183: fact that it is the template for the user independent db christian@4183: analysis. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java, christian@4183: src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: christian@4183: Ajusted imports and calls. christian@4183: christian@4183: 2011-08-01 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/conf.xml: For documentation purposes added a out-commented christian@4183: section with the default configuration of the datacage. christian@4183: christian@4183: 2011-07-31 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: christian@4183: Delete the artifacts at before initial scan, too. They are independent christian@4183: from users. Fixed problem when writing state data content. christian@4183: christian@4183: * src/main/resources/datacage-sql/org-h2-driver.properties: Added christian@4183: statement to delete the artifacts at initial scan, too. christian@4183: christian@4183: * src/main/resources/datacage-sql/org-postgresql-driver.properties: christian@4183: New. PostgreSQL version of the statements. The database scheme christian@4183: is the same as H2. Very useful for debugging. christian@4183: christian@4183: 2011-07-31 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: christian@4183: Added kludge for the types of artifact data. They seem to be null christian@4183: in some circumstances. Needs to be debugged! christian@4183: christian@4183: 2011-07-31 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/DBConfig.java: christian@4183: Fixed default connection URL to use a namend in-mermory database. christian@4183: christian@4183: 2011-07-31 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/datacage.sql: Fixed constraint. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: christian@4183: Added some debug output. christian@4183: christian@4183: 2011-07-29 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/datacage.sql: Removed artifact_id from facet because there christian@4183: is a link via out_id -> outs.id: artifact_id -> artifacts to christian@4183: find the corresponding artifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, christian@4183: src/main/resources/datacage-sql/org-h2-driver.properties: Store christian@4183: facets of outs into datacage db at initial scan. christian@4183: christian@4183: 2011-07-29 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, christian@4183: src/main/resources/datacage-sql/org-h2-driver.properties: christian@4183: Store outs of artifacts into datacage db at initial scan. christian@4183: TODO: store facets. christian@4183: christian@4183: 2011-07-29 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/datacage.sql: Added 'type' column in artifacts data. christian@4183: Maybe useful for filtering. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, christian@4183: src/main/resources/datacage-sql/org-h2-driver.properties: christian@4183: Store artifact data into db at initial scan. christian@4183: TODO: store outs and facets. christian@4183: christian@4183: 2011-07-29 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, christian@4183: src/main/resources/datacage-sql/org-h2-driver.properties: christian@4183: Add artifacts into datacage db at initial scan. christian@4183: TODO: Store data, outs and facets. christian@4183: christian@4183: 2011-07-28 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/datacage.sql: Fixed spelling in sequence name. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, christian@4183: src/main/resources/datacage-sql/org-h2-driver.properties: Simply add christian@4183: collection item at initial scan if artifact was stored before. christian@4183: TODO: Store new artifacts. christian@4183: christian@4183: 2011-07-28 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, christian@4183: src/main/resources/datacage-sql/org-h2-driver.properties: Add christian@4183: collections at initial scan. christian@4183: christian@4183: 2011-07-28 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, christian@4183: src/main/resources/datacage-sql/org-h2-driver.properties: Add users christian@4183: at initial scan. christian@4183: christian@4183: 2011-07-28 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/datacage.sql: Using sequences for id generation now christian@4183: to make schema more compatible. christian@4183: christian@4183: 2011-07-28 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java, christian@4183: src/main/resources/datacage-sql/org-h2-driver.properties: Clear database christian@4183: before initial scan. christian@4183: christian@4183: 2011-07-28 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/DBConnection.java: christian@4183: Deleted. This stuff comes from the artifact database now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/DBConfig.java: christian@4183: New. The db config of the datacage database. christian@4183: christian@4183: * src/main/resources/datacage-sql/org-h2-driver.properties: New. christian@4183: The SQL statements needed for the datacage. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: christian@4183: Make use of the db config. christian@4183: christian@4183: 2011-07-27 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java: christian@4183: New. A artifact database lifetime listener to build the initial christian@4183: index of the artifacts in database. christian@4183: christian@4183: * doc/conf/conf.xml: Added the datacage to the list of lifetime christian@4183: listeners. christian@4183: christian@4183: 2011-07-27 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/datacage.sql: Added an explicit table for the outs christian@4183: of an artifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Make the current outs of an artifact accessible only with christian@4183: the global context. christian@4183: christian@4183: 2011-07-27 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/datacage.sql: Added ON DELETE CASCADE constraints. christian@4183: Added state in facet. christian@4183: christian@4183: 2011-07-26 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/datacage.sql: New. H2 Schema for the datacage database. christian@4183: Uses special features like IDENTITY (autoincrement) typed columns. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/datacage/DBConnection.java: christian@4183: Pooled connection. christian@4183: christian@4183: * pom.xml: Added dependencies to H2 and Apache DBCP. christian@4183: christian@4183: 2011-07-26 Sascha L. Teichmann christian@4183: christian@4183: * src/test/java/de/intevation/flys/artifacts/AppTest.java, christian@4183: src/main/java/de/intevation/flys/artifacts/App.java: Removed. christian@4183: This the stupid "Hello, World!" app initially created by the christian@4183: maven archetype. It was never used. christian@4183: christian@4183: 2011-07-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: christian@4183: Argh! Usage the DOM was not thread safe (discovered with ab). christian@4183: christian@4183: 2011-07-25 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/meta-data-template.xml: '$recommended' lead to XPath christian@4183: errors. Using "dc:contains($parameters, 'recommended')" helps. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java, christian@4183: src/main/java/de/intevation/flys/artifacts/services/meta/FunctionResolver.java: christian@4183: Added some debugging. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/DataCage.java: christian@4183: Added parameters as 'parameters' to parameters. Usefull to check christian@4183: for containment of variables. christian@4183: christian@4183: 2011-07-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: christian@4183: Added 'if log.isDebugEnabled() {}'. christian@4183: christian@4183: 2011-07-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: christian@4183: Made Artifact UUID optional and accept extra parameters, too. This enables christian@4183: the service to be used without an arttifact and test all filters. christian@4183: christian@4183: christian@4183: christian@4183: christian@4183: christian@4183: christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/FunctionResolver.java: christian@4183: 'contain' accept Maps and collection, too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/DataCage.java: christian@4183: Made artifact option (= null) in recommendations. christian@4183: christian@4183: 2011-07-21 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/CompiledStatement.java: christian@4183: Moved connection specific into inner class. The enables the reuse of the christian@4183: compiled statement. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: The christian@4183: SQL statements are now only compiled once at creation time of the builder. christian@4183: Each connection now reuses them. christian@4183: christian@4183: 2011-07-21 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/cache.xml: Added configuration for static datacage db access. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/App.java: Using christian@4183: caches seems to need an explicit System.exit(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/CompiledStatement.java: christian@4183: Added support for caching the SQL statements and there results. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: Some christian@4183: clean up. Reordered code for performance. Strip SQL statements more christian@4183: aggressively. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/ResultData.java: christian@4183: Made it Serializable. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/cache/CacheFactory.java: christian@4183: Introduced system property 'flys.artifacts.cache.config.file' to make christian@4183: the caching configurable without pulling up the whole stack. christian@4183: christian@4183: 2011-07-22 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Prepared the FLYSArtifactCollection to support the storage of already christian@4183: loaded recommendations in its attribute document. christian@4183: christian@4183: 2011-07-21 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: christian@4183: Adjusted to use the DataCage recommendations. The incomming document christian@4183: can pass the artifacts UUID by '/art:outs/@value' the outs as a christian@4183: comma separated list in '/art:outs/@value' and optional a set of christian@4183: filters comma separated in '/art:filters/@value'. christian@4183: christian@4183: If UUID and OUTS are not given the old service is used. This christian@4183: should be removed as soon as the client uses the new service. christian@4183: christian@4183: 2011-07-21 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/CompiledStatement.java: christian@4183: Allow '-' in variable names. christian@4183: christian@4183: 2011-07-21 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/meta-data-template.xml: Now, the river-id is really added to christian@4183: the factory node of the wmsbackground layer. christian@4183: christian@4183: 2011-07-21 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/meta-data-template.xml: Added the river-id to the factory node christian@4183: of the riveraxis and wmsbackground layer. christian@4183: christian@4183: 2011-07-21 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/services/RiverService.java: christian@4183: Adjusted to implement changed Service interface. christian@4183: christian@4183: 2011-07-21 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Refactored christian@4183: the method that retrieves the Outputs for the Artifact. Now, we are able christian@4183: to query the Outputs for the current state, and all outputs separately. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: The christian@4183: recommendations provided by this monitor will take the Outputs of the christian@4183: current state only into account. christian@4183: christian@4183: 2011-07-21 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/meta-data-template.xml: Added conditions for each output type. christian@4183: Splitted the "floodmap" output into two parts: a recommended one and a christian@4183: complete one. The recommended part will only build the document tree for christian@4183: the recommended artifacts; the complete part will build the whole document christian@4183: tree that is available for a floodmap. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: christian@4183: This Hook now uses the DataCage to generate the recommended artifacts. christian@4183: The output-defaults configurtion is needless now. christian@4183: christian@4183: * doc/conf/output-defaults.xml: Removed. The configuration of recommended christian@4183: artifacts takes place in meta-data-template.xml. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/DataCage.java: christian@4183: Bugfix: the DataCage didn't start working if its builder was NOT null, christian@4183: but it shouldn't start if the builder IS null. christian@4183: christian@4183: 2011-07-21 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: christian@4183: Now it is possible to directly pass a Node as a root to the builder. christian@4183: The owning document if fetch by Node.getOwnerDocument(). This is christian@4183: useful if you want to generate the recommendation directly into christian@4183: an already existing document under a given node. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/DataCage.java: christian@4183: Changed the signature of recommend() to accept a node where to christian@4183: append the recommendations. christian@4183: christian@4183: 2011-07-20 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: christian@4183: Added a macro mechanism: christian@4183: christian@4183: christian@4183: '5' ist nicht in der Liste der Outs. christian@4183: christian@4183: christian@4183: christian@4183: christian@4183: christian@4183: Macros can be defined everywhere in the template christian@4183: with 'macro'. There bodies can contain all valid elements christian@4183: including other 'macro's and 'call-macro's. They are christian@4183: called with their 'name' with 'call-macro'. The control flow christian@4183: is continued inside the body of the called macro and christian@4183: will continue right after the calling 'call-macro' when christian@4183: the macro body is finished. christian@4183: christian@4183: 2011-07-20 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: christian@4183: Added a new 'if' construct similiar to XSLT: christian@4183: christian@4183: christian@4183: '5' ist nicht in der Liste der Outs. christian@4183: christian@4183: christian@4183: The control flow is continued inside the 'if' if the 'test' attribute christian@4183: as an XPath expression on an empty document evalutes to true. christian@4183: Else the inside is skipped. There is no 'else'. Use 'choose'/'otherwise' christian@4183: if you need this. christian@4183: christian@4183: 2011-07-20 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/DataCage.java: christian@4183: Added a recommend() method to generate recommendations for christian@4183: a given artifact, outs and extra parameters. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added christian@4183: method to extract all data at once. christian@4183: christian@4183: 2011-07-20 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/FunctionResolver.java: christian@4183: New. Custom XPath function provider. Provides christian@4183: 'dc:contains(Object [] haystack, Object needle)' by now. Should be christian@4183: useful to check containments in 'out' lists later. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: christian@4183: Register the FunctionResolver to the evaluated XPaths. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/App.java: christian@4183: Added code to parse christian@4183: "param:a,b,c" to "param" -> new String [] { "a", "b", "c" } to christian@4183: help testing the 'dc:contains' XPath function. christian@4183: christian@4183: 2011-07-20 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/conf.xml: Added wms configurations for Saar, Mosel and Elbe. christian@4183: Each river supported by FLYS requires such a WMS configuration. A WMS christian@4183: should contain layers for the river axis, buildings, kilometer labels christian@4183: and maybe a background layer as well. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: christian@4183: Added key that is used to store a map of WMS URLs - for each river a christian@4183: WMS URL. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: christian@4183: Parse the river WMS from global configuration. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: christian@4183: Create WMSLayerFacets with URLs based on the river and the river wms christian@4183: configuration stored in the FLYSContext. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSBackgroundArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: christian@4183: Adapted the initialize() signature and the method call of computeInit() christian@4183: which requires a FLYSContext to retrieve the river WMS configurations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: Added the context object parameter to the computeInit() method. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Call christian@4183: initialize() with the context object - which is a FLYSContext or a christian@4183: CallContext. christian@4183: christian@4183: 2011-07-20 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/App.java: christian@4183: Check if builder was created properly before using it. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/StackFrames.java: christian@4183: Implements now variable provider for XPath expressions. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: christian@4183: Added new choose/when/otherwise construct similiar to XSLT christian@4183: christian@4183: christian@4183: christian@4183: Es ist die Mosel. christian@4183: christian@4183: christian@4183: Es ist die Saar. christian@4183: christian@4183: christian@4183: Es ist weder Mosel noch Saar. christian@4183: christian@4183: christian@4183: christian@4183: A 'choose' block can contain a list of 'when's and an optional christian@4183: 'otherwise'. For each 'when' the test attribute is evaluated christian@4183: as an XPath expression on an empty document. The result of christian@4183: the evaluation is taken as a boolean value. If its value is christian@4183: true the control flow is continued inside the corresponding christian@4183: 'when' and the other choose elements are not tested. christian@4183: If the value is values the testing continues with the next christian@4183: 'when'. If no 'test' expression is evaluated to true, the christian@4183: control flow continues inside the 'otherwise'. If no 'otherwise' christian@4183: is given nothing happens at all. christian@4183: christian@4183: 2011-07-20 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/conf.xml: Added a config section for floodmaps. Currently, the christian@4183: background layer's url and layername is defined here. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java: christian@4183: Read the background layer configuration from conf.xml. Those values are christian@4183: used to create the WMSLayerFacet. christian@4183: christian@4183: 2011-07-20 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java: christian@4183: The background layer facet will no longer have an extent set. christian@4183: christian@4183: 2011-07-20 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java: christian@4183: Set the extent of the created WMSLayerFacets and i18n its descriptions. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added I18N strings for the christian@4183: background an river axis layer. christian@4183: christian@4183: 2011-07-20 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: christian@4183: This facet type has a method to set the extent of a WMS layer. The christian@4183: extent is written to the facets XML node in toXML() as well. christian@4183: christian@4183: 2011-07-20 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Adapted christian@4183: the signature of setup() which requires a CallMeta parameter now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WMSBackgroundArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: Use christian@4183: the CallMeta object retrieved in setup() to call initialize(). It is now christian@4183: able to i18n things. christian@4183: christian@4183: 2011-07-20 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/App.java: New. christian@4183: Standalone app to debug the datacage template. To use in a maven environment: christian@4183: christian@4183: -Dmeta.data.template=PATH_TO_META_DATA-TEMPLATE.XML \ christian@4183: -Dmeta.data.parameters=river:Mosel \ christian@4183: -Dmeta.data.output=OUTPUT.XML \ christian@4183: -Dflys.backend.user=DB_USER \ christian@4183: -Dflys.backend.password=DB_PASSWORD \ christian@4183: -Dflys.backend.url=DB_CONNECTION_URL \ christian@4183: -Dexec.mainClass=de.intevation.flys.artifacts.services.meta.App christian@4183: christian@4183: 2011-07-20 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/DataCage.java: christian@4183: New. First step to factor out the "Datenkorb" logic into a service independent christian@4183: singleton. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: christian@4183: Uses the "Datenkorb" singleton now. christian@4183: christian@4183: 2011-07-20 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java: christian@4183: Removed "index" property, because it is already existing in parent christian@4183: class. christian@4183: christian@4183: 2011-07-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: christian@4183: Improved error handling. christian@4183: christian@4183: 2011-07-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/resources/metadata/template.xml: Deleted. christian@4183: christian@4183: * doc/conf/meta-data-template.xml: New. Was template.xml christian@4183: christian@4183: * doc/conf/conf.xml: Made meta data template configurable. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: christian@4183: Load template from configuration not from resources. christian@4183: christian@4183: 2011-07-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/resources/metadata/template.xml: s/[a-z]+-id/db-id/ christian@4183: Make database ids identifiable with unique name "db-id". christian@4183: christian@4183: 2011-07-19 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java: christian@4183: Override the toXML() method. Subclasses can now write their own XML christian@4183: representation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java: christian@4183: New. This ManagedFacet uses an Element (DOM) to store the information christian@4183: about a facet. The intent of this facet type is to represent a facet christian@4183: stored in an Collection attribute. Different facets can have different christian@4183: attributes that we need to parse, but the only thing ManagedFacets need christian@4183: to do, is to adjust the attributes "active" and "position". So, those christian@4183: values are set directly on the Element, the other attributes aren't christian@4183: touched. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ManagedFacetAdapter.java: christian@4183: New. This facet is a wrapper for another facet. This subclass of a christian@4183: ManagedFacet overrides the toXML() method. The XML representation is christian@4183: defined by the inner facet that is stored as member variable. The christian@4183: ManagedFacet specific attributes "artifact", "facet", "pos" and "active" christian@4183: are added manually. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java: Uses christian@4183: the toXML() method to write a facet node into the attribute document. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeParser.java: Uses christian@4183: the ManagedDomFacet to save the information of a facet which is christian@4183: contained in the attribute part of a Collection's DESCRIBE document. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/OutputParser.java: Uses the christian@4183: ManagedFacetAdapter to save a facet, because we want to keep the christian@4183: specific facet to be able to write its specific XML representation into christian@4183: the Collection's DESCRIBE document. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Adapted the XPath of facets stored in the attribute part of the christian@4183: DESCRIBE. christian@4183: christian@4183: 2011-07-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a christian@4183: method that returns the Outputs for the Artifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Adapeted the call of OutputParser. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/OutputParser.java: christian@4183: Simplified the code to read the Outputs of Artifacts. This parser will christian@4183: now longer parse the DESCRIBE documents of the Artifacts, but query the christian@4183: Outputs via FLYSArtifact.getOutputs() directly. christian@4183: christian@4183: 2011-07-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java: christian@4183: Adapted the function call of ProtocolUtils.appendOutputModes(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: christian@4183: Override toXML() to add the URL and layernames to the XML representation christian@4183: of this facet. christian@4183: christian@4183: 2011-07-18 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/wmsbackground.xml, christian@4183: doc/conf/artifacts/riveraxis.xml: New configurations for an Artifact christian@4183: that is used as background layer in floodmaps, and an artifact that is christian@4183: used as layer showing the river axis in a floodmap. christian@4183: christian@4183: * doc/conf/output-defaults.xml: New file to configure default artifacts christian@4183: for specific output states. E.g. the floodmap state recommends a christian@4183: background layer and a layer displaying the river axis. In suche case, christian@4183: the floodmap state recommends two artifacts for the two layers. christian@4183: christian@4183: * doc/conf/conf.xml: Added new artifacts/artifact-factories and a Hook to christian@4183: monitor artifacts (-> CollectionMonitor.java). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: christian@4183: New. This facet is used to represent a layer in a map. So, this facet christian@4183: stores information about a WMS URL and the layer names provided by this christian@4183: WMS. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added christian@4183: facet types for the wmsbackground and riveraxis. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WMSBackgroundArtifact.java: christian@4183: New. An artifact and its default state. The intent of these classes is christian@4183: to generate WMSLayerFacets which represent background layers in maps. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/RiverAxisState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/RiverAxisArtifact.java: New. christian@4183: An artifact and its default state. The intent of these classes is to christian@4183: generate WMSLayerFacets which represent layers that display a river christian@4183: axis. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: Added the INIT ComputeType. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a christian@4183: case for the INIT ComputeType while computing data. christian@4183: christian@4183: 2011-07-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: Added a method computeInit() which is called to initialize data/facets christian@4183: after an artifact has been created. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Repaired christian@4183: broken XPath. christian@4183: christian@4183: 2011-07-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: christian@4183: Removed the code to generate new artifacts. Instead of creating new christian@4183: artifacts automatically, we decided to suggest creating new artifacts christian@4183: from specific types. Therefore, the DESCRIBE document of the artifacts christian@4183: is extended with a node that contains recommended artifact types. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: FLYSArtifacts might be setup with the identifier of an other christian@4183: FLYSArtifact. Subclasses are able to override a method called christian@4183: initialize(Artifact, GlobalContext). This might be helpful to extract christian@4183: required values or clone artifacts. christian@4183: christian@4183: 2011-07-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: christian@4183: Adapted the signature of createArtifactContext() - it returns an christian@4183: instance of GlobalContext now. christian@4183: christian@4183: 2011-07-14 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/geom/Lines.java: christian@4183: Debugged the water fill algorithm. Added a lot of logging. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: christian@4183: Added a text field to give a water level to fill in. christian@4183: christian@4183: 2011-07-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Moved code christian@4183: to create the output modes based on the given facets to FLYSArtifact. In christian@4183: addition, FLYSArtifact got a new method that returns a specific input christian@4183: value as string. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java: New. christian@4183: This hook monitors the "post-feed" and "post-advance". If the monitored christian@4183: Artifact's state has configured recommended artifacts, this hook will christian@4183: create new Artifacts. christian@4183: christian@4183: TODO: We have to add the UUIDs of the new Artifacts to the DESCRIBE christian@4183: document of the artifact to let the client know, that there are new christian@4183: recommended Artifacts. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java: New. christian@4183: This Artifact is the base class for Artifacts, that represent static christian@4183: data. E.g. this could be a decoration theme in a chart or a background christian@4183: layer in the map. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/OutputState.java: New. christian@4183: This state might be used as base class for states, that doesn't require christian@4183: any user input, but only provide static Facets added by a computeFeed() christian@4183: operation. So, subclasses need to implement computeFeed() only. christian@4183: christian@4183: 2011-07-13 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java: christian@4183: New. Standalone Swing-App to test cross sections from database without the christian@4183: hassles of our complete software stack. Runnable from a maven environment: christian@4183: christian@4183: $ mvn -e \ christian@4183: -Dflys.backend.user=DB_USER \ christian@4183: -Dflys.backend.password=DB_PASSWD \ christian@4183: -Dflys.backend.url=DB_CONNECTION_URL \ christian@4183: -Dexec.mainClass=de.intevation.flys.artifacts.charts.CrossSectionApp \ christian@4183: exec:java christian@4183: christian@4183: You can set the river to be used with the system property 'river'. christian@4183: Defaults to 'Mosel'. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WSPLGENFacet.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2011-07-13 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: The FloodMapState has a new Outputmode christian@4183: called "floodmap" now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WSPLGENFacet.java: New. christian@4183: This facet is used to generate WSPLGEN results. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added christian@4183: the WSPLGENFacet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: christian@4183: This state will now generate WSPLGENFacets. christian@4183: christian@4183: 2011-07-12 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/geom/Lines.java: christian@4183: Fixed corner case. christian@4183: christian@4183: 2011-07-11 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/geom/Lines.java: New. christian@4183: fillWater() generates a list of wet lines for a given profile and a christian@4183: given water level. christian@4183: christian@4183: 2011-07-08 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: The christian@4183: Outputs created while generating the DESCRIBE document will now have the christian@4183: 'type' member set. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/OutputParser.java: Read the christian@4183: 'type' member from DESCRIBE document. christian@4183: christian@4183: 2011-07-06 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Removed a typo. christian@4183: christian@4183: 2011-07-06 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java: christian@4183: DataFacet are now able to store the ID of the state which has created christian@4183: this Facet. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: christian@4183: Initialize DataFacets with the ID of this state. This is necessary to christian@4183: renew the waterlevel data if it is no longer existing in the cache. christian@4183: christian@4183: 2011-07-06 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java: A christian@4183: report facet can now store the state's id and the artifact's hash value christian@4183: when it has been created. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: christian@4183: Initialize the ReportFacet and WaterlevelFacet with state id and hash christian@4183: information. This has been necessary to retrieve reports and waterlevels christian@4183: in states after this one - in states that we need to enter for floodmap christian@4183: parameterization. christian@4183: christian@4183: 2011-07-05 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelGroundDifferences.java: christian@4183: Changed the desired UI provider. christian@4183: christian@4183: 2011-07-05 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added the option to continue the christian@4183: waterlevel parameterization with the intent to create flood maps. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: christian@4183: This state is no longer a final state. The user has the option to christian@4183: continue with the parameterization for flood maps based on the current christian@4183: waterlevel. Therefore, this states desires the "continue" UI provider. christian@4183: Clients should recognice this to just step to the next state or display christian@4183: a button that lets the user step to the next state manually. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/FloodplainChoice.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/ScenarioSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DGMSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/ProfileDistanceSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WaterlevelGroundDifferences.java: christian@4183: New. These states are used to parameterize a further calculation type: christian@4183: flood map. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Required strings for the christian@4183: flood maps states. christian@4183: christian@4183: 2011-07-04 Sascha L. Teichmann christian@4183: christian@4183: Fix(?) for flys/issue114 christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQ.java: christian@4183: Make guessing a bit more robust. christian@4183: christian@4183: 2011-07-03 Sascha L. Teichmann christian@4183: christian@4183: Added the math needed to calculate "W-Differenzen" in "Laengsschnitten". christian@4183: Needs testing! christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/NamedObject.java: christian@4183: Made it an interface to be usable in more than one inheritance chain. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/NamedObjectImpl.java: christian@4183: Implements the NamedObject interface and is the new base class of christian@4183: WQ and WKmsImpl. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WKms.java: christian@4183: New. Interface to associate kms with ws. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: christian@4183: Changed the base class to NamedObjectImpl. Renamed getKms(int) christian@4183: to getKm(int) to make clear it return a single scalar value christian@4183: and fullfil the WKms interface. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java: christian@4183: New. Implements the WKms interface. Intended to be a lightweight christian@4183: datastore for "zusaetzliche Laengsschnitte" and as results christian@4183: of the WKmsOperations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQ.java: christian@4183: Changed base class to NamedObjectImpl. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/WKmsOperation.java: christian@4183: New. Operations on WKms data. christian@4183: Currently only the SUBTRACTION operation is implemented. This christian@4183: one is needed to calculate the "W-Differenzen". The operation christian@4183: is insensitive about the km directions of the datasets. Missing christian@4183: values are interpolated linear. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Adjusted to satisfy the signature change of WQKMs. christian@4183: christian@4183: 2011-07-01 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/StyledXYSeries.java: New. This christian@4183: XYSeries stores the style information that should be used to render this christian@4183: series. These information are stored as raw XML documents. A public christian@4183: method can be used to apply those style information to a christian@4183: XYLineAndShapeRenderer. christian@4183: christian@4183: Note: The only two attributes currently supported by StyledXYSeries christian@4183: items are "linesize" and "linecolor". christian@4183: christian@4183: * doc/conf/themes.xml: Added some more basic themes for the four christian@4183: calculation methods. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: This christian@4183: generator now tries to apply themes for all series contained in the christian@4183: chart. If a series is no instance of StyledXYSeries, the default christian@4183: renderer is used. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Removed the code that had been introduced to adapt renderers statically. christian@4183: Now, each of these concrete ChartGenerators instantiates StyledXYSeries christian@4183: items to put the curves into the chart. Those items contain style christian@4183: information now! christian@4183: christian@4183: 2011-07-01 Ingo Weinzierl christian@4183: christian@4183: flys/issue135 (Diagramm: Trotz abgeschalteter Themen bleiben Beschriftungen bestehen) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: The way christian@4183: to store datasets has changed. Until this revision, the concrete christian@4183: generators managed their own datasets. E.g. the christian@4183: DischargeLongitudinalSectionGenerator had three datasets: w, q and christian@4183: corrected w. Now, there are just two datasets, managed by this base christian@4183: generator - one dataset for the first Y axis and one dataset for the christian@4183: second Y axis. This makes it easier to remove axes, that have no data to christian@4183: be displayed. All concrete chart generators have to add their XYSeries christian@4183: using two methods: addFirstAxisSeries() and addSecondAxisSeries(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Those concrete chart generators no longer manage datasets themself but christian@4183: they use the two methods described above, to plot the data to the first christian@4183: or second Y axis. christian@4183: christian@4183: 2011-07-01 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java: christian@4183: Added the option to use a filter to reduce the number of items returned christian@4183: by this service. christian@4183: christian@4183: 2011-06-30 Ingo Weinzierl christian@4183: christian@4183: flys/issue159 (WINFO: Radiobutton - Ortsauswahl bei "W für ungleichwertigen Abflusslängsschnitt" entfernen) christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Changed the kilometer range input for christian@4183: calculation 4. This calculation type requires a kilometer range. So, christian@4183: after choosing the calculation 4, the transition model leads to a state christian@4183: that just allows the input of a kilometer range with no option to christian@4183: enter locations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ComputationRangeState.java: christian@4183: New. A base state for the kilometer selection for calculations. The christian@4183: target of this state is to provide facets for the duration curves. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DistanceSelect.java: christian@4183: New. This state is used to enter a kilometer range. The difference to christian@4183: the LocationDistanceSelect state is, that there is no option to enter christian@4183: locations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/RangeState.java: christian@4183: Improved this state to be the base state for calculation ranges. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java christian@4183: src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: This christian@4183: state no longer inherits from RangeState which now is used as base christian@4183: state for kilometer ranges. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added new i18n strings for christian@4183: the DistanceSelect state. christian@4183: christian@4183: 2011-06-28 Sascha L. Teichmann christian@4183: christian@4183: * pom.xml: Downgraded Trove to 1.1-beta-5, because the new christian@4183: later ones are removed from the maven repos. christian@4183: christian@4183: The functionality we need is in 1.1 so this downgrade should christian@4183: cause no problems. christian@4183: christian@4183: Would be nice if we would support the maintainers of trove to christian@4183: bring there new versions back into the main maven repos. christian@4183: christian@4183: 2011-06-28 Ingo Weinzierl christian@4183: christian@4183: * pom.xml: Repaired the JBoss repository which place has changed. christian@4183: christian@4183: 2011-06-28 Ingo Weinzierl christian@4183: christian@4183: Tagged RELEASE 2.4 christian@4183: christian@4183: 2011-06-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/WstWriter.java: christian@4183: Append the corrected W column (if existing) to the WST export. christian@4183: christian@4183: 2011-06-27 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQ.java: christian@4183: Guessing increaing w is not based on direct neighbors any more. christian@4183: The second to be compared with is choosen by random of christian@4183: the values before the first one. This makes the guessing christian@4183: more robust against 'plateaus' of equal w values. christian@4183: christian@4183: 2011-06-27 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ATWriter.java: Array christian@4183: for constructing the spline was too large leading to non-increasing christian@4183: values. christian@4183: christian@4183: 2011-06-27 Sascha L. Teichmann christian@4183: christian@4183: Fix for flys/issue150 christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Invert the x axis if its guessed that water is increasing. christian@4183: christian@4183: 2011-06-27 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQ.java(guessWaterIncreasing): christian@4183: Added a method to guess based on a given factor of the size (default 0.05) christian@4183: if the water levels are increasing. Needed to determine in which direction christian@4183: the water level curve should be orientated. Based on random to avoid christian@4183: running over large dataset each time a diagram is generated. christian@4183: christian@4183: 2011-06-27 Ingo Weinzierl christian@4183: christian@4183: flys/issue177 (WINFO: Abflusskurven am Pegel verursachen ein Hängen des Servers) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: christian@4183: Commented out code to generate time ranges for series names. There christian@4183: seems to be a problem while loading the discharge tables of a gauge or christian@4183: while determining the start and/or end time of such discharge tables. christian@4183: christian@4183: 2011-06-26 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/**/*.java: Removed trailing whitespace. christian@4183: christian@4183: 2011-06-26 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Removed dead code. christian@4183: christian@4183: 2011-06-26 Sascha L. Teichmann christian@4183: christian@4183: Fix for flys/issue173 christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: christian@4183: Fixed the way the gauge was found for a given interval. christian@4183: The old way does not work because it was just tested if christian@4183: the station point was inside the segments which is not christian@4183: necessarily true. The obvious solution to simply check christian@4183: the overlapping intervals does not work either because christian@4183: the gauge ranges touch each other and so more than christian@4183: one gauge are returned in these cases. The River.maxOverlap() christian@4183: is now used to find the gauge with the max overlapping christian@4183: range. christian@4183: christian@4183: 2011-06-26 Sascha L. Teichmann christian@4183: christian@4183: Fix for flys/issue147 christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation1.java: christian@4183: Removed the 'kmUp' flag. It was an left over from former christian@4183: WSP calculations (w/o ref km) leading to wrong results now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Don't pass the kmUp flag to the calculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Added debug output to see the value of 'wq_free'. christian@4183: christian@4183: 2011-06-26 Sascha L. Teichmann christian@4183: christian@4183: Fix for flys/issue86 christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: The reference gauge for calculations "am Pegel" was determined christian@4183: wrong. christian@4183: christian@4183: 2011-06-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: christian@4183: Conversion w->q was broken. This should fix a number of issues christian@4183: around "W am Pegel" calculations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Issue an error report if a w->q conversion fails. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: The gauge to convert w->q with its discharge table was determined wrong. christian@4183: christian@4183: 2011-06-24 Ingo Weinzierl christian@4183: christian@4183: flys/issue174 (Diagramm: Q-Linie wird bei initialem Laden des Diagramms christian@4183: anders dargestellt als bei Ansicht auf gesamten Wertebereich) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: The chart will now have upper margins again. christian@4183: christian@4183: 2011-06-24 Ingo Weinzierl christian@4183: christian@4183: flys/issue172 (Diagramm: Ursprung der Diagramme bei Dauerzahlen) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: christian@4183: Charts of this type will have the lower X value set to "0". christian@4183: christian@4183: 2011-06-23 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ATWriter.java: christian@4183: Results are now in cm. Made it more robust against corner cases. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Removed superfluous import. christian@4183: christian@4183: 2011-06-23 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml, doc/conf/conf.xml: christian@4183: Added facet config for AT exports. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added 'at' facet type. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java: christian@4183: Generate AT facets. christian@4183: christian@4183: 2011-06-23 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ATExporter.java: New. christian@4183: Exporter for AT facets. Needs testing. christian@4183: christian@4183: 2011-06-23 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ATWriter.java: New. christian@4183: Writer for AT files. New code because our data model differs christian@4183: from Desktop-FLYS. Needs testing. christian@4183: christian@4183: 2011-06-23 Ingo Weinzierl christian@4183: christian@4183: flys/issue157 (Diagramm: Ursprung berechnete Abflusskurve) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Moved the method that adjusts the X-axis to include the "0" value from christian@4183: ComputedDischargeCurveGenerator to DischargeCurveGenerator. Now, both christian@4183: charts will include the "0" on the X-axis. christian@4183: christian@4183: 2011-06-23 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQDay.java: christian@4183: Based on WQ now to make it exportable as AT. christian@4183: christian@4183: 2011-06-23 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQ.java: christian@4183: New. Base class for WQKms. christian@4183: christian@4183: TODO 1: make it a base class for WQDay, too, christian@4183: TODO 2: Generate instances of WQ instead of WQKms in "Abflusskurven" christian@4183: calculations. This will save memory. christian@4183: christian@4183: AT exporter will get instances of this class as data model christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/NamedObject.java: christian@4183: Add default constructor to ease inheritance. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: christian@4183: Based on WQ now. Removed code allready defined in base class. christian@4183: christian@4183: 2011-06-23 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Add TODOs for error reports christian@4183: of "Abflusskurven am Pegel". Maybe we don't need them? christian@4183: christian@4183: * doc/conf/conf.xml: Configure report for each calculated output type. christian@4183: christian@4183: 2011-06-22 Ingo Weinzierl christian@4183: christian@4183: flys/issue164 (Berechnung 4: Umgekehrtes Berechnungsintervall führt zur) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: christian@4183: Create the items with range information for W and Q which allows the christian@4183: client to validate the user inserted values. christian@4183: christian@4183: 2011-06-21 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Arguments in filling datastructure were flip. Now christian@4183: the "Abflusskurve am Pegel" looks correct again. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2011-06-21 Sascha L. Teichmann christian@4183: christian@4183: Improved situtation on rendering "Abflusskurve am Pegel". Not christian@4183: fully working, yet. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Generate facets for the location path, too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Misspelled christian@4183: the facet which prevented the facets from being to the outputs. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: christian@4183: Extended to store the hash and the state id of the producing artifact/state christian@4183: else it results in NPEs because the data is calculated on later (wrong) states. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: christian@4183: Store the state id and the hash in the facet, too. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Add two christian@4183: method to do calculations for a state the artifact is currently not in christian@4183: and fetching the current state id. christian@4183: christian@4183: 2011-06-21 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Generate facets for "Abflusskurven am Pegel" christian@4183: Not working by now. :-/ christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: New facet type christian@4183: for "Abflusskurven am Pegel" christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Do calculation christian@4183: in the artifact not in the output generator. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: christian@4183: Generate the new facets. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: christian@4183: Fetch data from facet. christian@4183: christian@4183: 2011-06-22 Ingo Weinzierl christian@4183: christian@4183: flys/issue161 (Diagramm: Q-Achse in W-Längsschnitten immer bei Q=0) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: The Q axis (which is the second y axis) initially contains the 0 value. christian@4183: After a zoom action has taken place, this behaviour is no longer christian@4183: supported. christian@4183: christian@4183: 2011-06-21 Sascha L. Teichmann christian@4183: christian@4183: Draw correction curve again. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java: christian@4183: Use correction curve to map plot to axes. Not doing so prevented christian@4183: the correction curve from being drawn! christian@4183: Smaller code cleanups and simplifications. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQKms.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WQCKms.java: christian@4183: Added methods to directly access the components w, q and c christian@4183: at a given index. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: christian@4183: Attribute access via DOM instead of XPath. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Code simplification. christian@4183: christian@4183: 2011-06-21 Ingo Weinzierl christian@4183: christian@4183: flys/issue157 (Diagramm: Ursprung berechnete Abflusskurve) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Splitted christian@4183: up zooming for x and y axes to be able to override specific axis christian@4183: zoom behaviour. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: The lower bound of the x axis (which is the Q axis in such chart) is christian@4183: always 0. christian@4183: christian@4183: 2011-06-21 Ingo Weinzierl christian@4183: christian@4183: flys/issue90 (Diagramm: Trennung derDiagrammfläche und Achsenaufheben) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Added a margin between chart data and chart axes. christian@4183: christian@4183: 2011-06-21 Sascha L. Teichmann christian@4183: christian@4183: Fix for flys/issue158 christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java: christian@4183: Checks for right class now. christian@4183: christian@4183: 2011-06-21 Sascha L. Teichmann christian@4183: christian@4183: Fix for flys/issue154 christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: christian@4183: Checks for right class now. christian@4183: christian@4183: 2011-06-21 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Only generate 'outs' if they have facets. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: christian@4183: 'boolean ? true : false' <=> 'boolean' christian@4183: christian@4183: 2011-06-21 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Added the time-to-live to the DESCRIBE document. christian@4183: christian@4183: 2011-06-20 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Configured states to generate report facets. christian@4183: christian@4183: 2011-06-20 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java: christian@4183: Return the report. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: christian@4183: Generate report facets if there are problems with the calculations. christian@4183: TODO: Adjust winfo.xml to configure the facets. christian@4183: christian@4183: 2011-06-20 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ReportGenerator.java: christian@4183: New. Generator for calculation reports. christian@4183: christian@4183: * doc/conf/conf.xml: Added ReportGenerator. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: Added type 'report'. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java: christian@4183: Specialized facet for serving reports. TODO: Added them to the christian@4183: calculation states. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation.java: christian@4183: Looped through CallMeta for i18n purposes. TODO: do i18n christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Removed superfluous import. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/AbstractExporter.java: christian@4183: Added some override annotations. christian@4183: christian@4183: 2011-06-20 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/CalculationResult.java: christian@4183: New. Used to transport the data and the error report. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/Calculation1.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/Calculation2.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/Calculation3.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/Calculation4.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/DurationCurveFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/Calculation.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java, christian@4183: src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveExporter.java: christian@4183: Use the CalculationResult now. christian@4183: christian@4183: 2011-06-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation1.java: christian@4183: Allow an explicit reference km to enable calculation "am Pegel". christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: If a calculation "am Pegel" is done, take start km of the christian@4183: calculation range and find the gauge in which range it is located. christian@4183: Take the station of the gauge as the reference km. If no gauge christian@4183: is found the calcualtion falls back to calculation "auf freier Strecke". christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Replaced another inefficient attribute extraction via XPath christian@4183: with direct DOM access. christian@4183: christian@4183: 2011-06-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java, christian@4183: src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Removed dead code. christian@4183: christian@4183: 2011-06-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java christian@4183: src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/DurationCurveFacet.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Only generate facets when needed. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/OutputParser.java: christian@4183: Removed more XPath for simply accessing attributes of an element. christian@4183: christian@4183: * doc/conf/cache.xml: 200 elements in memory for "computed.values" are enough, christian@4183: LRU as eviction strategy is sufficent. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java, christian@4183: src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Use christian@4183: more 'standard' Java naming conventions. christian@4183: christian@4183: 2011-06-17 Sascha L. Teichmann christian@4183: christian@4183: Merged in the facet-slt branch to bring in the 'facet' feature. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Fixed some facets. christian@4183: christian@4183: * doc/conf/cache.xml: Added a "computed.values" cache to store the christian@4183: results of the WINFO calculations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java: christian@4183: Add support for index per facet to make them unique and identifiable. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: christian@4183: New. Inteface to be used to access the facet names of the configuration. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DataFacet.java: New. christian@4183: A facet to be used to have raw access to the computed data of an artifact. christian@4183: Useful to export things like CSV and WST. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java: New. christian@4183: Specialized facet to access the water level data stored in WQKms arrays. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DurationCurveFacet.java: New. christian@4183: Specialized facet to access the duration data stored in WQDay data structures. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Facets are christian@4183: now generated dynamically from the current available ones stored with christian@4183: the artifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: Added christian@4183: methods computeAdvance() and computeFeed() called if artifact is fed or christian@4183: adance. This overwritten in subclasses to do the state depending calculations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java: These christian@4183: states overwrites the computeAdvance() and computeFeed() methods to do christian@4183: the corresponding WINFO calculations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Calls christian@4183: computeAdvance() and computeFeed() if artifact is fed or advanced. Centralized christian@4183: the caching mechanism. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/AbstractExporter.java, christian@4183: src/main/java/de/intevation/flys/collections/AttributeParser.java, christian@4183: src/main/java/de/intevation/flys/collections/OutputParser.java, christian@4183: src/main/java/de/intevation/flys/collections/AttributeWriter.java, christian@4183: src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Adjusted the code to cope with the indices of the facets. Used christian@4183: DOM to access the attributes instead of XPath. Removed smaller bugs christian@4183: concerning position generation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/OutGenerator.java: christian@4183: Forwarded facet references. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: christian@4183: Uses facets to fetch data and generate output now. christian@4183: christian@4183: 2011-06-17 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added a new parameter "wq_free" that christian@4183: determines the mode of calculation 1. If it is "false" (default), christian@4183: the calculation should be bound to a gauge. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a christian@4183: method to retrieve the information about the "wq_free" parameter. christian@4183: christian@4183: 2011-06-17 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added a facet for corrected W in christian@4183: computation 4. christian@4183: christian@4183: 2011-06-14 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java: christian@4183: Got rid of namespace in result document. christian@4183: christian@4183: 2011-06-14 Ingo Weinzierl christian@4183: christian@4183: flys/issue77 (Diagramm: Beschriftung der Kurven bei Dauerlinien) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: christian@4183: Give the curves in the chart names. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added titles for duration christian@4183: chart curves. christian@4183: christian@4183: 2011-06-14 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java: christian@4183: Write top 'Oberkante' and bottom 'Unterkante' to out going XML christian@4183: if they exist. christian@4183: christian@4183: 2011-06-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: christian@4183: Write the min/max W/Q ranges as art:range elements into the DESCRIBE. christian@4183: christian@4183: 2011-06-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java: christian@4183: This state that is used to retrieve locations will now write the christian@4183: kilometer range of the selected river into the DESCRIBE document. christian@4183: christian@4183: 2011-06-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation1.java: christian@4183: New. Factored out version of "Wasserspiegellage" calculation. christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: christian@4183: christian@4183: Removed some dead code. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQCKms.java: christian@4183: Added Override annotation and used quick access method. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Looped through error reporting use by interpolate. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Used factored out version of calculation 1. Removed dead code. christian@4183: christian@4183: 2011-06-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation2.java: christian@4183: New. Factored out version of "Abflusskurve". christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Loop errors through w/q at km interpolation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Use factored out version of calculation 2. christian@4183: christian@4183: 2011-06-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation3.java: christian@4183: New. Factored out version of "Dauerzahlen". christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Loop errors through for q->w interpolations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQDay.java: christian@4183: Added constructor to directly create with calculated results. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation.java: christian@4183: Added method to return the number of problems. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Use factored out version of calculation 3. christian@4183: christian@4183: 2011-06-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQKms.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WQCKms.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WQDay.java: christian@4183: Added methods to remove NaN values. christian@4183: christian@4183: 2011-06-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation.java: christian@4183: New. Base class for calculations. Used to collect problems occuring christian@4183: during calculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: christian@4183: Extends Calculation now. Looped through the problem reports to christian@4183: base class. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: christian@4183: Looped through the problem reports. christian@4183: christian@4183: 2011-06-09 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: christian@4183: Append the min/max range and a transformation matrix for each axis. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: christian@4183: Instantiate the InfoGeneratorHelper with a XYChartGenerator instance. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Changed the zoom operation. The zoom values defined in the chart request christian@4183: document are no longer absolute values for a specific axis. Those values christian@4183: represent percental values for the start and end point of x and y axes. christian@4183: E.g. a chart has three axes with the following ranges: christian@4183: - x axis : 0 - 10 christian@4183: - y axis 1: 20 - 40 christian@4183: - y axis 2: 40 - 90 christian@4183: - zoom values for x: 0.1 - 0.9 (10% - 90%) christian@4183: - zoom values for y: 0.2 - 0.8 (20% - 80%) christian@4183: The produced chart will have the following ranges: christian@4183: - x axis : 1 - 9 christian@4183: - y axis 1: 24 - 36 christian@4183: y axis 2: 50 - 80 christian@4183: christian@4183: 2011-06-09 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: christian@4183: Map datasets to axes correctly. christian@4183: christian@4183: 2011-06-08 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: christian@4183: Determine the gauges by their station positions. This hopfully christian@4183: fixes the problem with wrong assigned gauges and invalid segments. christian@4183: christian@4183: 2011-06-08 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Segment.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: christian@4183: Added more debug output. christian@4183: christian@4183: 2011-06-08 Ingo Weinzierl christian@4183: christian@4183: flys/issue103 PART 1 (WINFO: Wasserspiegellagenberechnung / Layout-Inkonsistenz) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: Selected values are formatted with the current locale. The static part christian@4183: of the DESCRIBE document will now contain i18n formatted numbers. christian@4183: christian@4183: 2011-06-08 Ingo Weinzierl christian@4183: christian@4183: flys/issue93 (WINFO: Benennung der Berechnungsart korrigieren) christian@4183: christian@4183: * src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_de.properties: Changed the name of christian@4183: calculation 4. christian@4183: christian@4183: 2011-06-08 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Made the range determination more robust against NaN values. christian@4183: christian@4183: 2011-06-08 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: The second y axis is set to position "1". It was set to "2" before, but christian@4183: in that case, there was no position "1". christian@4183: christian@4183: 2011-06-08 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: christian@4183: s@m³/s@m\\u00b3/s@ christian@4183: christian@4183: 2011-06-08 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: christian@4183: Only generate an axis element if a axis really exists. christian@4183: christian@4183: 2011-06-07 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: christian@4183: Simpified array swapping. christian@4183: christian@4183: 2011-06-07 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Use java.util.List instead of java.util.Vector christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2011-06-07 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: createItem() is not abstract any longer to avoid code repetitionin sub classes. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: christian@4183: Removed duplicated code, inserted default constructors and Override annotations. christian@4183: christian@4183: 2011-06-07 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: christian@4183: Append axes range information to the info document. christian@4183: christian@4183: 2011-06-07 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: If feed() fails do not store invalid values in database. christian@4183: christian@4183: 2011-06-06 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: christian@4183: Removed asymmetrical "- 1" from width calculation. christian@4183: christian@4183: 2011-06-05 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: christian@4183: Fixed problem when more than one value per segment are given. christian@4183: christian@4183: 2011-06-05 Sascha L. Teichmann christian@4183: christian@4183: Refactored version of "Berechnung 4" christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Segment.java: christian@4183: Added instance fields for a reference point (= location of gauge) christian@4183: and backup of values (needed for naming). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQCKms.java: christian@4183: Added a constructor to be created from a WQKms. This is helpful christian@4183: if a WQKms is replaced by a back jump correction. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Calculation4.java: christian@4183: New. Outfactored version of "W bei ungleichmaessigen Abflusslaengsschnitt". christian@4183: Much cleaner now and it should have a better handling of the corner christian@4183: cases. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Removed the linear interpolation stuff. It is now in Linear. Removed christian@4183: the LinearRemap interpolation method because it is not needed any christian@4183: longer. Added a method to interpolate a given km with a given christian@4183: function. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Removed the old calc 4 and used the new one. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/LinearRemap.java: christian@4183: Deleted. Not needed any longer. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/Function.java: christian@4183: New. Interface for a uni-variate real function. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/Identity.java: christian@4183: New. Implements Function with f(x) = x christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/Linear.java: christian@4183: New. Implements Function with f(x) = m*x + b christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Factored some stuff out to DoubleUtil. Removed some dead code. christian@4183: Does some rounding correct. christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/DoubleUtil.java: New. christian@4183: Centralized utils surrounding common double operations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2011-06-03 Ingo Weinzierl christian@4183: christian@4183: flys/issue90(Diagramm: Trennung der Diagrammfläche und Achsen aufheben) christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Determine the ranges of x and y axes. If no zoom ranges are given, we christian@4183: will determine the min and max xy values in the dataset manually, christian@4183: because JFreeCharts adds a margin to the left and right of the data christian@4183: area automatically.. christian@4183: christian@4183: 2011-06-03 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Moved christian@4183: the chart creation into an own public method. This lets the christian@4183: ChartInfoGenerator create charts without duplicating code. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: christian@4183: Limited the possible class for generators to XYChartGenerator. This christian@4183: enables the ChartInfoGenerator class to do the whole chart creation christian@4183: stuff itself without outsourcing the code to concrete subclasses. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionInfoGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionInfoGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveInfoGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeCurveInfoGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveInfoGenerator.java: christian@4183: Removed the code to generate charts - this is done in ChartInfoGenerator christian@4183: now. christian@4183: christian@4183: 2011-06-03 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Added new christian@4183: methods to extract the x and y ranges from request document. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Added a christian@4183: method that zooms the chart to the specified x and y ranges. christian@4183: christian@4183: 2011-06-02 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/conf.xml: Set collection ttl to 6 hours. christian@4183: christian@4183: 2011-06-01 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/Segment.java: christian@4183: New. Parse segments only once. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Expose new parser to artifacts. TODO: Use it. christian@4183: christian@4183: 2011-06-01 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Changed interpolation methods to interpolate to an arbitrary position christian@4183: in a given double result array as a preparation for segment independent christian@4183: calculation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Removed superfluous import. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: christian@4183: Fixed cause for crashing: Run back too far in some siutations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Refactored range code a bit. Needs more work. christian@4183: christian@4183: 2011-06-01 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: christian@4183: Interchange the lower and upper x value of the chart if the x-axis is christian@4183: inverted before the matrix values are computed. Now, the matrix is able christian@4183: to work with charts that have an inverted x-axis. christian@4183: christian@4183: 2011-06-01 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartInfoGenerator.java: New. A christian@4183: chart info generator generates a document that contains meta information christian@4183: for a specific chart. Concrete instances of this abstract class need to christian@4183: instantiate concrete ChartGenerators and dispatch nearly all methods of christian@4183: an OutGenerator (init(), doOut(), setMaster()) to this instance. The christian@4183: generate() method is implemented in the ChartInfoGenerator itself. It christian@4183: creates a chart with help of the ChartGenerator instance and builds a christian@4183: document that contains meta information of this chart. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: New. christian@4183: This helper is used to create the chart info document. At the moment, christian@4183: the only information that is included in this document is a christian@4183: transformation matrix to transform image coordinates into chart christian@4183: coordinates. christian@4183: christian@4183: NOTE: The transformation matrix creation needs some work to support christian@4183: charts with inverted X axis. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionInfoGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionInfoGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveInfoGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeCurveInfoGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveInfoGenerator.java: christian@4183: Concrete instances of ChartInfoGenerator that create the chart info for christian@4183: the currently supported chart types. christian@4183: christian@4183: * doc/conf/conf.xml: Registered new OutGenerators. christian@4183: christian@4183: 2011-05-31 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Added support for the 'type' paramter of the collection's out() christian@4183: operation. christian@4183: christian@4183: 2011-05-31 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Use an explicit reference km for interpolation now. christian@4183: christian@4183: 2011-05-30 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/cache.xml: Introduced cache to store the distance info per river. christian@4183: This boosts performance in following ab setup from 3.61 to 39.91 requests/secs. christian@4183: christian@4183: $ ab -c 20 -n 1000 -p distances.xml http://127.0.0.1:8181/service/distanceinfo christian@4183: christian@4183: $ cat distances.xml christian@4183: christian@4183: Elbe christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java: Added christian@4183: an iterator result to avoid construction expensive interim lists. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java: Use christian@4183: the cache if configured. christian@4183: christian@4183: 2011-05-30 Sascha L. Teichmann christian@4183: christian@4183: flys/issue82 christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Only successful interpolations are named. christian@4183: christian@4183: 2011-05-27 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: christian@4183: Make it work independent of river flow direction. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: christian@4183: Fixed bug in ordering segments christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Re-enabled christian@4183: calculation of the back jump correction. Fixed more flow direction issues. christian@4183: christian@4183: 2011-05-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Removed call of XMLDebug class which is not in the version control. christian@4183: christian@4183: 2011-05-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Moved the code part that skips themes right after the part that sets the christian@4183: master artifact for the OutGenerator. We need this master artifact to christian@4183: display empty charts - master artifact is used to create titles and christian@4183: axes. christian@4183: christian@4183: 2011-05-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Deactivated themes are not put into the chart. christian@4183: christian@4183: 2011-05-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeParser.java: christian@4183: Repaired broken XPath expressions to find the output modes in an christian@4183: attribute document of a collection. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java: This christian@4183: writer will now create a document that has a root node art:attribute. christian@4183: Before these changes, the document's root node was art:outputs which is christian@4183: part of the attribute document but not the right root node. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Adapted some XPath expressions and corrected the the process to create christian@4183: attribute documents. christian@4183: christian@4183: 2011-05-26 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/LinearRemap.java: christian@4183: Made it work independent of from/to order. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Added method to extract the ranges correctly from data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Use the correct ranges. Comment out backjump detection temporarily. christian@4183: christian@4183: 2011-05-26 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: christian@4183: Generate fields for w/q input depend on flow direction. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Moved km up question out of loop. christian@4183: 2011-05-26 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Take the flow direction into account. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: Prevent NPE. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/RangeState.java: christian@4183: Allow to be 'from' greater than 'to' in ranges. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Negate christian@4183: step if 'from' is greater than 'to'. christian@4183: christian@4183: 2011-05-26 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Round exploded values to a precision of 1e-6. christian@4183: christian@4183: 2011-05-25 Sascha L. Teichmann christian@4183: christian@4183: Qs are now stored in ranges for each column. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory2.java: christian@4183: Deleted. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: christian@4183: Was WstValueTableFactory2. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java: Fixed christian@4183: node linking bug. Removed dead code. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Q values are now stored in range trees by each column. The qs of the rows christian@4183: are removed and the calculations are adjusted. Removed dead code. christian@4183: christian@4183: 2011-05-24 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: christian@4183: Moved cache name to WstValueTableCacheKey. Do not cache null references. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTableCacheKey.java: christian@4183: Moved cache name into this class. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Store QRangeTree for each column of value table. TODO: Use them! christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory2.java: christian@4183: Intended as a replacement for WstValueTableFactory, but is work in progress. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java: Fixed christian@4183: index errors and added methods to dump as graphviz graph. christian@4183: christian@4183: 2011-05-24 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: christian@4183: Improved the validation of WQ values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Use the christian@4183: correct input data object to determine the selected WQ mode (range or christian@4183: single input). christian@4183: christian@4183: 2011-05-24 Ingo Weinzierl christian@4183: christian@4183: ISSUE-40 (part I/II) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: Write default values (values already selected by the user before) of the christian@4183: input data items into DESCRIBE. christian@4183: christian@4183: 2011-05-24 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: christian@4183: Removed needless imports. christian@4183: christian@4183: 2011-05-24 Ingo Weinzierl christian@4183: christian@4183: ISSUE-85 (part III/III) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: christian@4183: Added a static function that returns the kilometer values (double[]) christian@4183: from locations input (whitespace separated double values). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Adapted christian@4183: the getKms() method. It will now return a computed array of kilometers christian@4183: if we had inserted a range, or it will return the inserted kilometers if christian@4183: we had inserted locations. christian@4183: christian@4183: 2011-05-24 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: christian@4183: Moved cache key to separate class. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTableCacheKey.java: christian@4183: New. The new cache key class. christian@4183: christian@4183: 2011-05-24 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java: christian@4183: Model to store the q values of a WST column efficiently. First christian@4183: building block not to store the q values directly aside the christian@4183: w values. christian@4183: christian@4183: 2011-05-24 Ingo Weinzierl christian@4183: christian@4183: ISSUE-85 (part I/III) christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added two further field 'ld_mode' and christian@4183: 'ld_locations' to the range/locations state to track the selected mode christian@4183: and locations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: christian@4183: Added methods to validate the user inserted locations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a christian@4183: method to determine of a range or locations have been inserted. christian@4183: christian@4183: 2011-05-23 Ingo Weinzierl christian@4183: christian@4183: ISSUE-62 (part II/II) christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Dump the christian@4183: artifacts state/data in DEBUG mode in describe(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DefaultState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: christian@4183: States will no longer store data. The only reason for states storing christian@4183: StateData is to know about the necessary data for this state. If a State christian@4183: needs to access the user input for a specific StateData object, it needs christian@4183: to query the FLYSArtifact which stores the data. christian@4183: christian@4183: 2011-05-23 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a christian@4183: method to dump the artifacts state(s)/data. christian@4183: christian@4183: 2011-05-23 Sascha L. Teichmann christian@4183: christian@4183: flys/issue84 christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstFactory.java: christian@4183: Forget to select wst kind. christian@4183: christian@4183: 2011-05-20 Sascha L. Teichmann christian@4183: christian@4183: flys/issue81 christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: weights for kms were swapped. christian@4183: christian@4183: 2011-05-20 Ingo Weinzierl christian@4183: christian@4183: Tagged RELEASE 2.3.1 christian@4183: christian@4183: 2011-05-20 Ingo Weinzierl christian@4183: christian@4183: * Changes: Prepared changes for the upcoming release. christian@4183: christian@4183: 2011-05-20 Hans Plum christian@4183: christian@4183: * NEWS: christian@4183: Hint to Release 2.3.1. For further information look into module christian@4183: flys-client/NEWS christian@4183: christian@4183: 2011-05-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java (getExplodedValues): christian@4183: Increment kms array size by one to take the end of range, too. christian@4183: christian@4183: 2011-05-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: christian@4183: Sort by rows (should not be necessary). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Use unsharp km lookup (epsilon = 0.0001). This fixes the problem christian@4183: that some kms were not found. christian@4183: christian@4183: 2011-05-19 Ingo Weinzierl christian@4183: christian@4183: flys/issue66 christian@4183: christian@4183: * src/main/resources/messages_en.properties: Fixed broken template. christian@4183: christian@4183: 2011-05-19 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Set the name of the computed discharge curve objects. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: The curves of this chart will now have names that consist of the word christian@4183: 'Discharge Curve', the river name and the kilometer that has been used christian@4183: for the computation. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added i18n strings for the christian@4183: computed discharge curves. christian@4183: christian@4183: 2011-05-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Added convenience method isQ() to determine if we are christian@4183: doing Q calculations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Reintroduced titles for the "W for unausgeglichene Abfluesse". christian@4183: christian@4183: 2011-05-19 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: christian@4183: The curves will now have names that consist of the gauge name and its christian@4183: valid time range. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added i18n strings for the christian@4183: discharge curves. christian@4183: christian@4183: 2011-05-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Removed dead code. christian@4183: christian@4183: 2011-05-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Use the correct method to generate kms. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/LinearRemap.java: christian@4183: Added some logging to test the map in debug mode. christian@4183: christian@4183: 2011-05-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Made getExplodedValues static. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Use new logic to calculate "W fuer ungleichwertige Abfluesse". christian@4183: Not working, yet. christian@4183: christian@4183: * ChangeLog: Fixed former entry. christian@4183: christian@4183: 2011-05-18 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Registered the WST export for discharge christian@4183: longitudinal sections. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Set the christian@4183: names of the discharge longitudinal section computation results. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java: christian@4183: The W/Q curves in the chart will now have names. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: christian@4183: The WstWriter is filled with column names in an own method. So, we are christian@4183: able to override this process in subclasses. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java: christian@4183: Adapted the column names for the WST export. christian@4183: christian@4183: 2011-05-18 Sascha L. Teichmann christian@4183: christian@4183: Work on flys/issue69 christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Use new logic to calculate "Wasserstand/Wasserspiegellage". christian@4183: Compared to desktop FLYS are the results are structurally right christian@4183: but a bit off in the positions after the decimal points. christian@4183: Maybe a result of the interpolation? Need to debug this. christian@4183: christian@4183: 2011-05-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: W and Q curves will now have names based on the defined W or Q values christian@4183: for the waterlevel computation. christian@4183: christian@4183: 2011-05-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/NamedObject.java: christian@4183: New. This object is used to give objects a name. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: Inherit christian@4183: from NamedObject now. Because we need to display names for those objects christian@4183: in different places. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: The WQKms christian@4183: objects returned by a waterlevel computation will now have names. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: christian@4183: Insert the column names for the WSTs into the WstWriter. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WstWriter.java: The column christian@4183: names are written into the head of the WSTs now. christian@4183: christian@4183: 2011-05-17 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstLine.java: New. This christian@4183: class is used to store the W/Q values of a specific kilometer of a WST. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WstWriter.java: New. A writer christian@4183: that creates WSTs. christian@4183: christian@4183: TODO: The header of the WSTs is not finished. The Q descriptions are christian@4183: missing. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: christian@4183: Enabled WST exports. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Registered the WST export for waterlevels. christian@4183: christian@4183: 2011-05-17 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/utils/Formatter.java: New. This class christian@4183: supports functions to retrieve formatters for specific types of data christian@4183: used in FLYS. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/AbstractExporter.java: christian@4183: Removed the formatter declaration - the whole formatter stuff is done in christian@4183: Formatter now. christian@4183: christian@4183: 2011-05-17 Ingo Weinzierl christian@4183: christian@4183: ISSUE-72 christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java: christian@4183: Repaired broken XPath expressions to extract start and end kilometer. christian@4183: christian@4183: 2011-05-17 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Removed the Hibernate loading stuff. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: christian@4183: New. The Hibernate loading. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Use the WstValueTableFactory for loading now. christian@4183: christian@4183: 2011-05-17 Ingo Weinzierl christian@4183: christian@4183: Tagged RELEASE 0.1 aka Version 2.3.0 christian@4183: christian@4183: 2011-05-16 Hans Plum christian@4183: christian@4183: * NEWS: christian@4183: New. Giving some user specific perspective to new functionality and christian@4183: changes. This file references releases dates only; details can be find christian@4183: in the client module at flys-client. christian@4183: christian@4183: 2011-05-10 Sascha L. Teichmann christian@4183: christian@4183: First step to calculate "W fuer ungleichwertige Abfluesse" correctly. christian@4183: flys/issue55 christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/LinearRemap.java: christian@4183: New. Remaps "gleichwertige" Q values to the corresponding christian@4183: "ungleichwertige" Q values depending on km. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Remap the Q values "ungleichwertig" depending on the christian@4183: "gleichwertige" ones. christian@4183: christian@4183: 2011-05-10 Sascha L. Teichmann christian@4183: christian@4183: First step to fix flys/issue69 christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: New code path to implement the calculation of "Wasserstand/Wasspiegellage" christian@4183: correctly. TODO 1: Use new path in UI. TODO 2: Remove unused old code. christian@4183: christian@4183: 2011-05-13 Ingo Weinzierl christian@4183: christian@4183: * Changes: Prepared Changes for the upcoming release 2.3 - see Changes christian@4183: file to get to know about the changes of the version numbers. christian@4183: christian@4183: 2011-05-13 Ingo Weinzierl christian@4183: christian@4183: ISSUE-37 christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: This christian@4183: state would be happy if there is a UI provider called "river_panel". christian@4183: christian@4183: 2011-05-11 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Added new christian@4183: methods that return the requested chart size as integer array [width, christian@4183: height]. The requested size is read from the incomding request document. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: The size christian@4183: of a chart is no longer static. The requested size is fetched using christian@4183: ChartGenerator.getSize(). christian@4183: christian@4183: 2011-05-11 Ingo Weinzierl christian@4183: christian@4183: ISSUE-52 christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: The X-Axis of such a chart is inverted, if the head of the river is not christian@4183: at kilometer 0. This type of charts always have the head of the river at christian@4183: the left side. christian@4183: christian@4183: 2011-05-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: christian@4183: Make incoming XML symmetric to DistanceInfoService. christian@4183: christian@4183: 2011-05-10 Ingo Weinzierl christian@4183: christian@4183: ISSUE-47 christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Adjusted temporarily the color of the W, Q and corrected W curves to christian@4183: distinguish each other. christian@4183: christian@4183: 2011-05-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: christian@4183: Adjusted the plot of xy charts - the gridlines are displayed now. christian@4183: christian@4183: 2011-05-10 Ingo Weinzierl christian@4183: christian@4183: ISSUE-53 christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/resources/Resources.java: christian@4183: Added a method that returns the preferred locale based on the available christian@4183: locales of the server and the desired locales of the request (CallMeta). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/AbstractExporter.java: Added a christian@4183: method that creates a number formatter with minimum and maximum digits. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: christian@4183: Formatted the number values of the CSV exports. christian@4183: christian@4183: 2011-05-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/RangeWithValues.java: christian@4183: New. A data structure that enables us to save a data triple: a range christian@4183: that consist of lower and upper double value and a set of values that christian@4183: belong to this range. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: christian@4183: Implemented the validation of W/Q values. christian@4183: christian@4183: 2011-05-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/AbstractExporter.java: New christian@4183: method to retrieve i18n messages based on keys. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/WaterlevelExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/DurationCurveExporter.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: christian@4183: Added headers for CSV exports. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added new i18n strings for christian@4183: CSV headers. christian@4183: christian@4183: 2011-05-10 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: christian@4183: Fetches river name from incoming XML document. If no river is given all christian@4183: infos about all rivers are listed. christian@4183: christian@4183: * src/main/resources/metadata/template.xml: Templates honors the 'river' christian@4183: parameter. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: christian@4183: Extended to pass parameters to the templating. Added support for christian@4183: type conversion. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/StackFrames.java: christian@4183: Take parameters as an initial stack frame. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/TypeConverter.java: christian@4183: New. Converts types off stacked variables. christian@4183: christian@4183: 2011-05-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Added a christian@4183: method to add subtitles to charts. The implementation in this class does christian@4183: not add any subtitle. Concrete subclasses may override this method to christian@4183: add some. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Add subtitles to charts. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added i18n templates for christian@4183: compound messages (chart subtitles). christian@4183: christian@4183: 2011-05-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/resources/Resources.java: christian@4183: Added new methods to retrieve translated compound messages. christian@4183: christian@4183: 2011-05-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/OutGenerator.java: Added a christian@4183: method to set the master artifact that should be used for some special christian@4183: operations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/AbstractExporter.java: christian@4183: Implement the setMasterArtifact() method of the interface. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Call OutGenerator.setMasterArtifact(). christian@4183: christian@4183: NOTE: The determination of the master artifact needs to be implemented! christian@4183: christian@4183: 2011-05-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Removed christian@4183: hard coded dev code that defined a WQ mode. christian@4183: christian@4183: 2011-05-09 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: christian@4183: Stripped ugly extra whitespace from output introduced by christian@4183: templating. christian@4183: christian@4183: 2011-05-09 Sascha L. Teichmann christian@4183: christian@4183: * src/main/resources/metadata/template.xml: Added forgotten christian@4183: columns of fixation WSTs. christian@4183: christian@4183: 2011-05-09 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: Added a christian@4183: method to retrieve i18n strings. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Enabled i18n support for chart title and axes labels. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added i18n strings for the christian@4183: chart types above. christian@4183: christian@4183: 2011-05-09 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java: christian@4183: New. This OutGenerator exports the data of a discharge longitudinal christian@4183: section computation. christian@4183: christian@4183: * doc/conf/conf.xml: Added the DischargeLongitudinalSectionExporter. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added the exporter with CSV facet to the christian@4183: discharge_longitudinal_section state. christian@4183: christian@4183: 2011-05-07 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: christian@4183: Added code to make back jump correction work with both christian@4183: potential flow directions. christian@4183: christian@4183: 2011-05-06 Sascha L. Teichmann christian@4183: christian@4183: * src/main/resources/metadata/template.xml: christian@4183: Added data cage configuration for 'Längsschnitt'. christian@4183: christian@4183: 2011-05-06 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added the missing Q facet for discharge christian@4183: longitudinal sections. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQCKms.java: New. A christian@4183: derived dataset to store W/Q values with corrected Ws for a kilometer christian@4183: range. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: Some new christian@4183: methods and a new constructor to initialize this data object with a christian@4183: predefined set of values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: New christian@4183: methods to retrieve the W/Q values for the 'discharge longitudinal christian@4183: section' computation. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: New christian@4183: methods to retrieve and compute data used for the 'discharge christian@4183: longitudinal section' computation. christian@4183: christian@4183: 2011-05-05 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: christian@4183: Bugfix: just write the ranges of gauges into the DESCRIBE if the christian@4183: 'wq_values' data item is required. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added i18n messages used in christian@4183: the DESCRIBE of the WQAdapted state. christian@4183: christian@4183: 2011-05-05 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Changed the title of the y-axis (now 'W [NN+m]'). christian@4183: christian@4183: 2011-05-05 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Improved the transition model to reach the christian@4183: output state for creating 'discharge longitudinal section' charts. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a christian@4183: method that returns all gauges of the selected river based on a the christian@4183: given kilometer range. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: New. christian@4183: This state creates a set of elements for the DESCRIBE that consist of a christian@4183: tuple of kilometer values. The number of elements depend on the number christian@4183: of gauges intersected by the given kilometer range. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java: christian@4183: New. This state is the output state that is reached after the 'discharge christian@4183: longitudinal section' computation has been chosen. christian@4183: christian@4183: 2011-05-05 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Default christian@4183: step width between two kilometers added - if no step width is given, christian@4183: this default width is used. christian@4183: christian@4183: 2011-05-05 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Fixed a potential NullPointerException if there is just a single christian@4183: kilometer given to create a longitudinal section. christian@4183: christian@4183: 2011-05-04 Sascha L. Teichmann christian@4183: christian@4183: * pom.xml: Added http://repository.jboss.org/maven2 repo christian@4183: to fix flys/issue30 christian@4183: christian@4183: 2011-05-04 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: To make diagram generation possible ws are now generated from qs christian@4183: because they are many ws having different qs. christian@4183: christian@4183: 2011-05-04 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: christian@4183: Fetch the WQ data from WINFO artifact and write those values into the christian@4183: CSV export. christian@4183: christian@4183: 2011-05-04 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Added christian@4183: methods to compute and retrieve the data for discharge curves (computed). christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: Fetch the computed discharge curve data from WINFOArtifact and add the christian@4183: values into the JFreeChart dataset. christian@4183: christian@4183: 2011-05-04 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added new transitions and states to enable christian@4183: the WINFO artifact for computing discharge curves. christian@4183: christian@4183: * doc/conf/conf.xml: Added OutGenerators that generate computed discharge christian@4183: curves and exports for its data. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java: christian@4183: New. This state is reached if the user chose the computed discharge christian@4183: curve. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: christian@4183: New. This is only a stub implementation at the moment. This christian@4183: OutGenerator should create computed discharge curves later. It extends christian@4183: the DischargeCurveGenerator which should do the same stuff for discharge christian@4183: curves for gauges. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveExporter.java: christian@4183: New. This is only a stub implementation at the moment. This OutGenerator christian@4183: should create the exports of the discharge curve computation. christian@4183: christian@4183: 2011-05-03 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added a new output mode for the duration christian@4183: curve state (CSV export). christian@4183: christian@4183: * doc/conf/conf.xml: Added a new OutGenerator to export duration curve christian@4183: computations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/AbstractExporter.java: New. christian@4183: This abstract OutGenerator represents the base class for exporting christian@4183: computed data. Currently, the CSV export is supported. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: Moved christian@4183: the most code to export to CSV into the AbstractExporter. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DurationCurveExporter.java: christian@4183: New. This exporter exports the computed data of a duration computation. christian@4183: christian@4183: 2011-05-03 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Modified a wrong debug statement which would confuse the user. christian@4183: christian@4183: 2011-05-03 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added a new output mode for the waterlevel christian@4183: state (CSV export). christian@4183: christian@4183: * doc/conf/conf.xml: Added a new OutGenerator to export waterlevels. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/WaterlevelExporter.java: New. christian@4183: This OutGenerator exports the data of a waterlevel computation. Note: christian@4183: It is necessary to specify the desired facet (e.g. christian@4183: 'waterlevel_export.csv'). christian@4183: christian@4183: * pom.xml: Added a dependency to OpenCSV. christian@4183: christian@4183: 2011-05-03 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Introduced an "export" output target. If the target is "export", a christian@4183: facet (read from the incoming xml document) is a necessary parameter christian@4183: that determines which facets are written to the output. christian@4183: christian@4183: 2011-05-03 Ingo Weinzierl christian@4183: christian@4183: * src/main/resources/messages_en.properties: Bugfix: replaced german christian@4183: string (copy & paste mistake). christian@4183: christian@4183: 2011-05-03 Ingo Weinzierl christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added new i18n strings for christian@4183: for the location selection. christian@4183: christian@4183: 2011-05-03 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java: christian@4183: New. An OutGenerator for creating duration curves. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQDay.java: New. A christian@4183: model class to store necessary data for creating W and Q facets of a christian@4183: duration curve. This model stores W, Q and Days. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MainValuesFactory.java: christian@4183: Added a function to retrieve tuples of (day, q) based on a given gauge - christian@4183: these tuples are necessary for creating duration curves. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Added christian@4183: methods to compute and retrieve the data necessary for creating duration christian@4183: curves. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java: christian@4183: Bugfix: improved the access to the location array (avoid christian@4183: NullPointerException). christian@4183: christian@4183: * doc/conf/conf.xml: Registered the new OutGenerator for duration curves. christian@4183: christian@4183: 2011-05-03 Sascha L. Teichmann christian@4183: christian@4183: * contrib/visualize-transitions.xsl: State quoting was done wrong. christian@4183: christian@4183: 2011-05-02 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Enhanced the transition model to reach the christian@4183: final state for creating duration curves. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/LocationSelect.java: christian@4183: New. This state should be reached to just insert an array of locations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java: christian@4183: New. This state is reached if the duration curve calculation is christian@4183: selected. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Adjusted christian@4183: getDistance() so that it takes care on inserted locations - not just christian@4183: inserted ranges. christian@4183: christian@4183: 2011-05-02 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/cache/CacheFactory.java: christian@4183: Flush/persist caches at program exists. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Commented out too eloquent debug output. christian@4183: christian@4183: 2011-05-02 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: christian@4183: Uses the methods of FLYSArtifact to retrieve the necessary information christian@4183: rivername and selected distance. christian@4183: christian@4183: 2011-05-02 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Added interpolateW method to take reference to result ws array christian@4183: as an argument to avoid expensive array allocations in km iterating christian@4183: loops. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: christian@4183: Added a constructor to create backing trove datastructure christian@4183: with the right capacity. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Move allocation of result ws out of km loop. christian@4183: christian@4183: 2011-05-02 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added two further data items in the WQ christian@4183: selection state. Those items are necessary to store the information christian@4183: about the selected mode (range/single selection) and the values of the christian@4183: single selection. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: If christian@4183: there is no value for a data item, this item is not written into the christian@4183: static DESCRIBE part. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/RangeState.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: christian@4183: Renamed the method to validate upper and lower values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: This christian@4183: state can now handle values inserted in the single selection. Therefore, christian@4183: new validate methods has been added. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: The christian@4183: methods getWs() and getWs() take care on the values inserted in the christian@4183: single insert mode of the client which enables the user to insert single christian@4183: W and Q. christian@4183: christian@4183: 2011-05-02 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: christian@4183: Repaired getQForW() by calculating indices on right dimension. christian@4183: christian@4183: 2011-05-02 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: New christian@4183: methods for retrieving selected W values (getWs()). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: The christian@4183: method for retrieving waterlevel data takes care on selected Ws, now. christian@4183: The selected Ws are transformed using the DischargeTables.getQForW() christian@4183: into Q values. christian@4183: christian@4183: 2011-05-02 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: christian@4183: Removed an unused parameter 'result' of getQForW(). christian@4183: christian@4183: 2011-05-02 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Removed christian@4183: the getDataset() method and replaced it with a addDataset() method. christian@4183: On this way, concrete subclasses of this OutGenerator can have multiple christian@4183: datasets (e.g. different datasets for W and Q). This abstract method is christian@4183: called after the chart generation is finished. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: christian@4183: Both classes implement the addDataset() method. The christian@4183: LongitudinalSectionGenerator has already multiple datasets for W and Q. christian@4183: Both are added to the chart - both have an own range axis. christian@4183: christian@4183: 2011-05-01 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Use the cache for the wst value table if configured. christian@4183: christian@4183: * doc/conf/cache.xml: Choose a more precise name for the christian@4183: wst value table cache. christian@4183: christian@4183: 2011-04-29 Sascha L. Teichmann christian@4183: christian@4183: * pom.xml: Added dependency to Ehcache. Apache 2.0 license. christian@4183: christian@4183: * doc/conf/conf.xml: Added configuration of ehcache. christian@4183: christian@4183: * doc/conf/cache.xml: New. Cache configurations. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/cache/CacheFactory.java: christian@4183: New. Factory to access caches. christian@4183: christian@4183: 2011-04-29 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: christian@4183: Forgot to add. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java: christian@4183: New. Given a database connection and a XML template it generates christian@4183: an output with meta data about the database. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/CompiledStatement.java: christian@4183: New. Holds prepared statements optimized to be run in the stack of christian@4183: contextes. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/StackFrames.java: christian@4183: New. Model to hold a hierarchical scope of variables. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/meta/ResultData.java: christian@4183: New. Stores data set fetched from a sql select to be iterated in christian@4183: a context. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java, christian@4183: src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Removed superfluous imports. christian@4183: christian@4183: 2011-04-29 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/conf.xml: Added meta data service. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java: christian@4183: Stub for the meta data service. christian@4183: christian@4183: * src/main/resources/metadata/template.xml: Initial template for christian@4183: the meta data service. christian@4183: christian@4183: 2011-04-29 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Bugfix: Now, curves for Q values are drawn into a longitudinal section christian@4183: chart as well. Therefore, it was necessary to change the datastructure christian@4183: of the inner class ThemeList that stores all themes included in a chart christian@4183: in an ordered list (stored in a java.util.Vector now). christian@4183: christian@4183: 2011-04-29 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: New. An christian@4183: abstract base class for ChartGenerators that create XY charts. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: christian@4183: Sourced the generate() method out to the XYChartGenerator. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: Implemented the methods to add W and Q facets to the chart. christian@4183: christian@4183: 2011-04-29 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Improved christian@4183: the calculation of the step with for ranges. christian@4183: christian@4183: 2011-04-29 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: Added a christian@4183: method that returns the number of elements stored in the data pool. christian@4183: christian@4183: 2011-04-29 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: christian@4183: Added a get() method which takes destination array as an christian@4183: argument. christian@4183: christian@4183: 2011-04-29 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: Changed the christian@4183: data structure to store w, q and kms values from List to christian@4183: TDoubleArrayList which stores native double values instead of big christian@4183: Double values. christian@4183: christian@4183: * pom.xml: Added the GNU Trove dependency. christian@4183: christian@4183: 2011-04-29 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/OutGenerator.java: Added the christian@4183: name a the requested facet to doOut(). Concrete generators should just christian@4183: create output for this facet now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java, christian@4183: src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: christian@4183: Adapted the method signature of doOut(). christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Adapted the method call of OutGenerator.doOut(). christian@4183: christian@4183: 2011-04-29 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/themes.xml: Added mappings for the facets christian@4183: longitudinal.section.w and longitudinal.section.q. christian@4183: christian@4183: 2011-04-29 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added some christian@4183: methods to retrieve necessary information for computing the data of a christian@4183: waterlevel. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Added christian@4183: methods to compute and retrieve the data of a waterlevel computation. christian@4183: christian@4183: 2011-04-29 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WQKms.java: New. This christian@4183: model class represents a pool of data triples that consist of W, Q and christian@4183: Kms information. This class might be used to compute data for creating christian@4183: longitudinal section curves (which are based on those W, Q and Kms christian@4183: values). christian@4183: christian@4183: 2011-04-29 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Bugfix: Removed endless loop and a bug while iterating over Hibernate christian@4183: results. christian@4183: christian@4183: 2011-04-28 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: christian@4183: New. An OutGenerator that creates longitudinal section curves. christian@4183: christian@4183: NOTE: This is just the stub - the out creation needs to be implemented! christian@4183: christian@4183: * doc/conf/conf.xml: Added the LongitudinalSectionGenerator. christian@4183: christian@4183: 2011-04-28 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/conf.xml: Bugfix: Added missing section. christian@4183: christian@4183: 2011-04-28 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WaterlevelState.java: New. christian@4183: This state should be reached if the 'calc.surface.curve' calculation christian@4183: method has been chosen. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Modified a transition and added the christian@4183: WaterlevelState. This state is reached if the 'calc.surface.curve' christian@4183: calculation method has been chosen. It currently has 1 output - a christian@4183: longitudinal section that is not implemented yet! christian@4183: christian@4183: 2011-04-28 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/transitions/ValueCompareTransition.java: christian@4183: New. This transition is valid if the a data object of the current christian@4183: artifact equals/notequals a configured value in the transition model. christian@4183: christian@4183: 2011-04-28 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Bugfixes: christian@4183: - Adapted the parameters of the isStateReachable() call - added the christian@4183: artifact and the current state. christian@4183: - Append the outputs of a current state if the state is filled with christian@4183: valid data. christian@4183: christian@4183: 2011-04-28 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/transitions/DefaultTransition.java: christian@4183: Added the missing init() method that has been introduced in the christian@4183: interface some commits ealier. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/transitions/TransitionFactory.java: christian@4183: Call init() after a Transition has been created. christian@4183: christian@4183: 2011-04-28 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java: christian@4183: Bugfix: Introduced a node in the attribute document of a christian@4183: Collection that contains further nodes - instead of having christian@4183: multiple nodes at toplevel of the document. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Adapted the XPath to retrieve the outputs in the attribute document of a christian@4183: Collection. christian@4183: christian@4183: 2011-04-28 Sascha L. Teichmann christian@4183: christian@4183: * contrib/visualize-transitions.xsl: Added to create a christian@4183: Graphviz digraph out of the config.xml. Usage: christian@4183: christian@4183: $ xsltproc --stringparam base-dir ../doc/conf/ \ christian@4183: contrib/visualize-transitions.xsl \ christian@4183: doc/conf/conf.xml > transitions.dot christian@4183: christian@4183: $ dot -Tsvg -o transitions.svg transitions.dot christian@4183: christian@4183: 2011-04-28 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: christian@4183: If no data has been inserted so far, an IllegalArgumentException is christian@4183: thrown. christian@4183: christian@4183: 2011-04-28 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java:: christian@4183: A lot of new methods to retrieve the theme of a facet - used while christian@4183: creating the output of a facet/artifact. If a facet has no theme yet, it christian@4183: is initialized. christian@4183: christian@4183: 2011-04-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeParser.java, christian@4183: src/main/java/de/intevation/flys/collections/OutputParser.java: Removed christian@4183: useless imports. christian@4183: christian@4183: 2011-04-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartGenerator.java: New. An christian@4183: abstract OutGenerator that might be used to create chart output. Some christian@4183: basic things that are equal in all charts should be done here! christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: christian@4183: This OutGenerator no longer implements the OutGenerator directly, but it christian@4183: extends the ChartGenerator now. christian@4183: christian@4183: 2011-04-27 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Restructured the out() operation of a collection: Now, we collect a list christian@4183: of artifacts/facets and use this for the OutGenerator. Its doOut() christian@4183: method gets the attribute of an artifact - the position and the active christian@4183: state is managed by the Collection itself. christian@4183: christian@4183: 2011-04-26 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java: New. christian@4183: a specialized facet that stores information about its position and its christian@4183: state (active/inactive) in an output of a collection. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeParser.java: New. christian@4183: This parser takes the attributes (XML) of a collection and extracts the christian@4183: contained outputs with its facets. The result is a Map. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/OutputParser.java: New. christian@4183: This parser is used to query the artifact's DESCRIBE and to extract the christian@4183: supported outputs. The result is a Map. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/AttributeWriter.java: New. christian@4183: This writer merges the outputs contained in an attribute of a collection christian@4183: with the outputs of a collection's artifacts. christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: The attributes of a collection are written into its DESCRIBE document christian@4183: now. The OutputParser and AttributeParser are used to read the supported christian@4183: attributes by the collection and its artifacts - the AttributeWriter is christian@4183: used to merge both attributes and create a final attribute document. christian@4183: christian@4183: 2011-04-26 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java, christian@4183: src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: christian@4183: The facet-2-theme mappings are initialized at startup and stored in the christian@4183: FLYSContext. christian@4183: christian@4183: * src/main/java/de/intevation/flys/themes/ThemeFactory.java: Added a christian@4183: function that retrieves a theme from FLYSContext based on its name. christian@4183: christian@4183: 2011-04-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Corrected a silly c&p mistake. christian@4183: christian@4183: 2011-04-22 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java: christian@4183: christian@4183: Implementation of the "Ruecksprungkorrektur" to be done in christian@4183: "W fuer angepassten Abflusslaengschnitt". christian@4183: christian@4183: All tests show the expected results. In some corner cases the christian@4183: algorithm described in the "Anwenderhandbuch" chapter 3.3.4.3 "Korrektur" christian@4183: has some definition shortcomings: christian@4183: christian@4183: a - What should happend when you cannot find point 2 because christian@4183: you cannot step back one quarter from point 3 because there christian@4183: is no data there any more (river too short in this direction)? christian@4183: The implemented algorithm raises point 3' only to an christian@4183: according factor. E.g. If you can step back the whole quarter christian@4183: distance the elevation is the full quarter. If you can christian@4183: step back only the half of the quarter the elevation is christian@4183: only an eighth. christian@4183: christian@4183: b - If the water heights between point 2 and 3 are constant then christian@4183: the algorithm will produce a spline interpolation that christian@4183: lowers those values. Is this intended? christian@4183: christian@4183: For real data the back jumps are expected to be more in the middle christian@4183: of the distance ranges so the corner cases are maybe not so christian@4183: important. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: christian@4183: Removed superfluous import. christian@4183: christian@4183: 2011-04-21 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/themes/ThemeFactory.java: Removed debug christian@4183: code that has been commited by accident. christian@4183: christian@4183: 2011-04-21 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/themes.xml: New. A first small theme configuration. christian@4183: christian@4183: * doc/conf/conf.xml: Added a link to the theme configuration. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: christian@4183: Defined a key that is used to store a themes map in the FLYSContext. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: christian@4183: The theme configuration is read at startup and the themes are stores in christian@4183: the FLYSContext. christian@4183: christian@4183: 2011-04-21 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/themes/Theme.java, christian@4183: src/main/java/de/intevation/flys/themes/DefaultTheme.java: christian@4183: New. The interface and its default implementation that represents themes christian@4183: used to style charts and maps. christian@4183: christian@4183: * src/main/java/de/intevation/flys/themes/ThemeField.java, christian@4183: src/main/java/de/intevation/flys/themes/DefaultThemeField.java: christian@4183: New. The interface and its default implementation that represents fields christian@4183: in themes. A theme might be "Lines" and one of its field might be christian@4183: "Color" or "Size". christian@4183: christian@4183: * src/main/java/de/intevation/flys/themes/ThemeFactory.java: A factory christian@4183: that creates new themes based on a theme configuration. christian@4183: christian@4183: 2011-04-20 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Implementation of "Abflusskurve/Abflusstafel" calculation. christian@4183: christian@4183: Added method interpolateWQ() which takes an km and results in a christian@4183: tuple of two double arrays containing the w/q values interpolated christian@4183: between the surrounding w/q values of the table. christian@4183: w values are interpolated linear, q values with a cubic spline. christian@4183: christian@4183: Drawing w over q gives you the discharge table at the given km. christian@4183: christian@4183: !!! This code needs testing !!! christian@4183: christian@4183: 2011-04-20 Sascha L. Teichmann christian@4183: christian@4183: * pom.xml: Added dependency to Apache Commons Math 2.2 (Apache License 2.0) christian@4183: christian@4183: 2011-04-20 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: christian@4183: Fix problem when sorting by q (copied w instead of q). christian@4183: christian@4183: 2011-04-20 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: christian@4183: Fixed broken HQL statement. christian@4183: christian@4183: 2011-04-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: add a method interpolateW() which takes an array of christian@4183: q values and returns an equal sized array of w values. christian@4183: This is essentially the "Wasserstand/Wasserspiegellagen" calculation christian@4183: of desktop FLYS. christian@4183: christian@4183: If you want to do a calculation with given w values you have christian@4183: to convert the w values with DischargeTables.getQForW() first. christian@4183: christian@4183: !!! This code needs heavy testing !!! christian@4183: christian@4183: 2011-04-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: christian@4183: We need a getQForW() method and not getWForQ() because when christian@4183: doing a "Wasserstand/Wasserspiegellagen" calculation with given christian@4183: w values these values need to be translated to q values with christian@4183: the master discharge table. christian@4183: christian@4183: 2011-04-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: christian@4183: Sorting of q values was done wrong. christian@4183: christian@4183: 2011-04-19 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java: christian@4183: Ordered the list of annotations returned by this factory based on its christian@4183: range. christian@4183: christian@4183: 2011-04-19 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/MainValuesService.java: christian@4183: New. This service returns an XML document that includes the main values christian@4183: of a gauge based on a river name, a start and an end point. christian@4183: christian@4183: * doc/conf/conf.xml: Registered the MainValuesService. christian@4183: christian@4183: 2011-04-19 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/MainValuesFactory.java: christian@4183: A factory that provides methods to return MainValues. christian@4183: christian@4183: 2011-04-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: christian@4183: Added static method getWForQ() to interpolate a w value for christian@4183: a given q value based on a given discharge table. christian@4183: christian@4183: 2011-04-19 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: christian@4183: Added convenience constructors/methods to ease the access to the master christian@4183: discharge table of a gauge. christian@4183: christian@4183: 2011-04-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Moved the query complexity into view 'wst_value_table' and christian@4183: used this instead. christian@4183: christian@4183: 2011-04-18 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: christian@4183: Fetches w/q value tables from the backend. TODO: Move this christian@4183: to the backend and use a view. christian@4183: christian@4183: 2011-04-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Changed christian@4183: the error key that is thrown if no input data was found so that the key christian@4183: is usable for GWT's i18n mechanism. christian@4183: christian@4183: 2011-04-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: christian@4183: The inserted river is validated now (overrides validate() of christian@4183: DefaultState). christian@4183: christian@4183: 2011-04-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: christian@4183: The inserted calculation method is validated now (overrides validate() christian@4183: of DefaultState). christian@4183: christian@4183: 2011-04-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: The input data of feed() are validated using the DefaultStates christian@4183: validate() method. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: New method validate() that needs to be overidden by concrete subclasses. christian@4183: It should return true, if the data of the State is fine, otherwise it christian@4183: should raise an exception. christian@4183: christian@4183: NOTE: The exceptions are not translated in the server but in the client! christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/RangeState.java: New. christian@4183: This abstract class exists to provide some methods for handling ranges. christian@4183: Currently, there is a method that validates a given range based on christian@4183: min/max values. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: christian@4183: Implemented input data validation for ranges. christian@4183: christian@4183: NOTE: The input validation of concrete values has not been implemented christian@4183: yet! christian@4183: christian@4183: 2011-04-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Removed debug code that has been commited by accident :-/ christian@4183: christian@4183: 2011-04-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: The christian@4183: getGauge() method returns the first gauge based on the given start and christian@4183: end point of the river. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: christian@4183: Fixed potential bugs: if no gauge could be determined, the default christian@4183: values for W and Q are the minimum and maximum double values. christian@4183: christian@4183: 2011-04-15 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: Fills christian@4183: the DESCRIBE with default values for W and Q. christian@4183: christian@4183: 2011-04-15 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/WstFactory.java: christian@4183: New. Returns Wst object - based on a river. christian@4183: christian@4183: 2011-04-15 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Now christian@4183: provides some methods that return some basic objects inserted while christian@4183: parameterization: River, Gauge and so on. christian@4183: christian@4183: 2011-04-15 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java, christian@4183: src/main/java/de/intevation/flys/artifacts/services/RiverService.java: christian@4183: Bugfix: Repaired broken imports of the SessionHolder. christian@4183: christian@4183: 2011-04-15 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/SessionHolder.java: christian@4183: Moved this class to flys-backend. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/GaugesFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/context/SessionCallContextListener.java: christian@4183: Adapted imports of the SessionHolder. christian@4183: christian@4183: 2011-04-14 Sascha L. Teichmann christian@4183: christian@4183: * trunk/src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java, christian@4183: trunk/src/main/java/de/intevation/flys/artifacts/services/RiverService.java: christian@4183: Acquire/release sessions in services to avoid db connection leaks. christian@4183: christian@4183: 2011-04-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: Changed some method signatures - added a reference to the owner christian@4183: Artifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/WQSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: christian@4183: Modified method signatures based on the changes in DefaultState. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: christian@4183: Added default values to the dynamic part of DESCRIBE. christian@4183: christian@4183: 2011-04-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java: christian@4183: Added a function that returns a River object based on a given river christian@4183: name. christian@4183: christian@4183: 2011-04-14 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/GaugesFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java: christian@4183: Static methods are using the SessionHolder, too. christian@4183: christian@4183: 2011-04-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/SessionCallContextListener.java: christian@4183: Added the setup() method that has been added to the interface christian@4183: description in the last commits. christian@4183: christian@4183: * doc/conf/conf.xml: Registered the SessionCallContextListener as christian@4183: CallContext.Listener. christian@4183: christian@4183: 2011-04-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/SessionHolder.java: christian@4183: Bugfix: Call correct method to retrieve an instance of christian@4183: SessionFactoryProvider. christian@4183: christian@4183: 2011-04-14 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/SessionHolder.java: christian@4183: New. Contains thread local session holder for hibernate sessions. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java: christian@4183: Uses session from SessionHolder. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/SessionCallContextListener.java: christian@4183: Interacts with SessionHolder now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: christian@4183: Removed superfluous import. christian@4183: christian@4183: 2011-04-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/SessionCallContextListener.java: christian@4183: Implementation of a CallContext.Listener to open/close Hibernate christian@4183: Sessions for each request. christian@4183: christian@4183: 2011-04-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: Some modifications related to the last commit - modification of the christian@4183: describe() signature of a State. christian@4183: christian@4183: 2011-04-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/GaugeSelect.java: christian@4183: Removed. We do not need a state to select a gauge - the selection takes christian@4183: place by choosing a start and an end point. christian@4183: christian@4183: 2011-04-13 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: christian@4183: Bugfix: added missing label node to root node and a namespace to the christian@4183: data node. christian@4183: christian@4183: 2011-04-12 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: The name of the artifact 'winfo' is written into the DESCRIBE document christian@4183: now. We need this to have a proper way to distinguish between different christian@4183: artifacts in the UI. christian@4183: christian@4183: 2011-04-12 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Bugfix: christian@4183: States are filled with data before they describe themself. christian@4183: christian@4183: 2011-04-11 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java: christian@4183: New. A factory that returns the annotations of a specific river. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/DistanceInfoService.java: christian@4183: New. This service provides a document that contains information about christian@4183: distances of a river. christian@4183: christian@4183: * doc/conf/conf.xml: Registered the DistanceInfoService. christian@4183: christian@4183: 2011-04-06 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: This collection overrides the out() operation now. The incoming request christian@4183: document is read and the related OutGenerator is used to create the christian@4183: output. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Removed christian@4183: the code to create discharge curves. It has moved to the christian@4183: DischargeCurveGenerator which now does this work. christian@4183: christian@4183: 2011-04-06 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/OutGenerator.java: The christian@4183: generate() method throws an IOException now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: christian@4183: New. This OutGenerator creates discharge curves. christian@4183: christian@4183: 2011-04-06 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Changed christian@4183: the visibility of the getData() method. It's now public, because the christian@4183: OutGenerator needs an artifact's data. christian@4183: christian@4183: 2011-04-03 Sascha L. Teichmann christian@4183: christian@4183: * src/**/*.java: Removed trailing whitespace. christian@4183: christian@4183: 2011-04-03 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Make project compilable again by christian@4183: commenting out a not existing XMLDebug reference. christian@4183: christian@4183: 2011-03-31 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: christian@4183: Added code to parse the configured OutGenerators and to save them (in a christian@4183: map) in the FLYSContext. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: christian@4183: Added a key that is used to save the OutGenerators Map in the context. christian@4183: christian@4183: 2011-03-31 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/OutGenerator.java: christian@4183: New. This interface is used to generator different types of output. christian@4183: ArtifactCollections will make use of this interface to create a christian@4183: collected output of all its artifacts. christian@4183: christian@4183: 2011-03-30 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Removed the Backend from FLYSArtifactCollection - used ArtifactDatabase christian@4183: operations instead. christian@4183: christian@4183: * TODO: Removed 'remove Backend reference' TODO. christian@4183: christian@4183: 2011-03-30 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Enhanced the configuration of the christian@4183: discharge curve output mode. This output now provides three facets - W, christian@4183: Q and the curve itself. christian@4183: christian@4183: 2011-03-30 Ingo Weinzierl christian@4183: christian@4183: Tagged RELEASE 0.1 christian@4183: christian@4183: 2011-03-30 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Renamed an output mode in the WINFO christian@4183: artifact configuration. christian@4183: christian@4183: 2011-03-29 Ingo Weinzierl christian@4183: christian@4183: * src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_de.properties: Changed a german string. christian@4183: christian@4183: 2011-03-29 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: christian@4183: Modified the available calculation modes and its order in the DESCRIBE christian@4183: document. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_de_DE.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Adapted the names of christian@4183: calculation modes. christian@4183: christian@4183: 2011-03-28 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Added the hash code of an artifact to the artifact part of the christian@4183: collection's DESCRIBE document. christian@4183: christian@4183: 2011-03-28 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Changed christian@4183: the background color of discharge curves to white. christian@4183: christian@4183: 2011-03-28 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: christian@4183: Cache the scale, too. Otherwise two calls to getValues() with christian@4183: different arguments will result in the same output. christian@4183: christian@4183: 2011-03-28 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: christian@4183: Introduced a 'scale' parameter in the getValues() method. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Filled christian@4183: the out() operation with code that draws a discharge table of one or christian@4183: more gauges specified by the given range in entered in a previous state. christian@4183: christian@4183: 2011-03-28 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/exports/ChartExportHelper.java: christian@4183: New. A helper class to exports charts. christian@4183: christian@4183: * pom.xml: Added dependencies to iText, Batik and JFreeChart. christian@4183: christian@4183: 2011-03-28 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/importer/PegelGltParser.java: christian@4183: Fixed swap of operands. christian@4183: christian@4183: 2011-03-28 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/GaugesFactory.java: christian@4183: New. Load gauges for a river and filter them for given christian@4183: ranges. christian@4183: christian@4183: 2011-03-25 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: christian@4183: Store data in a double [][] instead of interleaved double [] christian@4183: to be compatible with org.jfree.data.xy.DefaultXYDataset. christian@4183: christian@4183: 2011-03-25 Ingo Weinzierl christian@4183: christian@4183: * TODO: Removed 'i18n' and 'step-back' TODOs and added an issue to remove christian@4183: the Backend reference from FLYSArtifactCollection. christian@4183: christian@4183: 2011-03-25 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: Added missing artifact namespace of an attribute in the DESCRIBE christian@4183: document. christian@4183: christian@4183: 2011-03-24 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: christian@4183: New. This ArtifactCollection overrides the DefaultArtifactCollection to christian@4183: implement FLYS specific describe() and out() operations. christian@4183: christian@4183: * doc/conf/conf.xml: Use the FLYSArtifactCollection instead of the christian@4183: DefaultArtifactCollection for this application. christian@4183: christian@4183: 2011-03-24 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java: christian@4183: New. Fetches values of discharge tables in form of packed christian@4183: w/q double arrays for given gauges. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java: christian@4183: Removed needless import. christian@4183: christian@4183: 2011-03-24 Ingo Weinzierl christian@4183: christian@4183: * src/main/resources/messages_de_DE.properties: Added a german resource christian@4183: bundle to avoid exceptions in the flys artifacts. Sometimes, the christian@4183: Resources class is not able to find a 'de_DE' bundle and throws an christian@4183: exception. This is really strange, because it should use the 'de' bundle christian@4183: in that case, but it doesn't. christian@4183: christian@4183: 2011-03-23 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Added christian@4183: some code to append the output modes of previous states to the DESCRIBE christian@4183: document. christian@4183: christian@4183: TODO: Determine if the current state is already filled with data and christian@4183: append its output modes as well! christian@4183: christian@4183: 2011-03-22 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Enhanced the location_distance state with christian@4183: an output mode 'discharge_table'. christian@4183: christian@4183: 2011-03-21 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: Write human readable strings as label attribute into the DESCRIBE christian@4183: output. Those labels are used to be displayed in the GUI. christian@4183: christian@4183: 2011-03-21 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: christian@4183: Added some further calculation types. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added i18n strings for the christian@4183: calculation types christian@4183: christian@4183: 2011-03-21 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Implemented the step-back part of the advance() operation. christian@4183: christian@4183: 2011-03-21 Ingo Weinzierl christian@4183: christian@4183: * src/main/resources/messages_de.properties: Fixed a german umlaut. christian@4183: christian@4183: 2011-03-18 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Added new states for entering a christian@4183: location/distance and w/q. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: New string for the christian@4183: location/distance and w/q input states. christian@4183: christian@4183: 2011-03-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/WQSelect.java: christian@4183: New. A state for the W/Q input of the WINFO parameterization. christian@4183: christian@4183: 2011-03-18 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: Append an attribute 'uiprovider' to the dynamic UI node. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java: christian@4183: New. A state for the location/distance selection of the WINFO christian@4183: parameterization. christian@4183: christian@4183: 2011-03-17 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: Added a new method getUIProvider() that might be overriden by concreted christian@4183: subclasses that should be rendered with a specific UIProvider. christian@4183: christian@4183: 2011-03-17 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: The static UI part is created by the previous states now. This makes it christian@4183: possible to group the data objects (which is necessary to group the christian@4183: objects in the ui). christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: Added a describeStatic() method that creates a node that contains the christian@4183: data of that state. christian@4183: christian@4183: 2011-03-17 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/RiverService.java: christian@4183: Removed TODO: the document contains the rivers provided by the backend christian@4183: now. christian@4183: christian@4183: 2011-03-17 Sascha L. Teichmann christian@4183: christian@4183: * pom.xml: Added dependency to flys backend. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/River.java: christian@4183: Removed. We are using the backend model now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java: christian@4183: Fetches the rivers from the backend. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: christian@4183: Import fixes. christian@4183: christian@4183: 2011-03-15 Sascha L. Teichmann christian@4183: christian@4183: * doc/conf/conf.xml: Added section for database backend configuration. christian@4183: christian@4183: 2011-03-15 Sascha L. Teichmann christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: christian@4183: Fixed build error coming from different import of XMLUtils. christian@4183: christian@4183: 2011-03-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: Appended the missing label node that contains the human readable name of christian@4183: the data item. christian@4183: christian@4183: 2011-03-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: I18N of strings for the DESCRIBE document. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: I18N strings for the christian@4183: calculcation mode state. christian@4183: christian@4183: 2011-03-14 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Modified the winfo states. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Adapted christian@4183: the artifact regarding the changes of the last commit. The states christian@4183: describe() method creates the dynamic UI node - the artifact needs to christian@4183: apply this node. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: christian@4183: New. The state for choosing the calculation mode. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Added i18n strings for the christian@4183: calculation mode state. christian@4183: christian@4183: 2011-03-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: christian@4183: New. This is the base state for the FLYS application. It provides a christian@4183: method that creates the dynamic ui node for the DESCRIBE. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/GaugeSelect.java: Both christian@4183: classes extend the abstract base class DefaultState. christian@4183: christian@4183: 2011-03-14 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/resources/Resources.java: christian@4183: New. This class retrieves the i18n strings from a ResourceBundle. christian@4183: christian@4183: * src/main/resources/messages.properties, christian@4183: src/main/resources/messages_en.properties, christian@4183: src/main/resources/messages_de.properties: Resource files for german and christian@4183: english translation. christian@4183: christian@4183: 2011-03-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Appended christian@4183: the data that have been inserted in former states into the static node christian@4183: of the DESCRIBE. christian@4183: christian@4183: 2011-03-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: The christian@4183: operations feed() and advance() return the description of the artifact christian@4183: using the describe() operation. This avoids additional server round trips christian@4183: in the client - the clients gets to know about the new state of the christian@4183: artifact immediately. christian@4183: christian@4183: 2011-03-10 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Implemented a part (step forward) of the advance operation. christian@4183: christian@4183: * TODO: Implement Step-Back in advance operation. christian@4183: christian@4183: 2011-03-09 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: christian@4183: Implemented the abstract method getName(). It returns the constant christian@4183: 'winfo' string. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: christian@4183: Implemented the feed action. The data of an incoming feed() operation is christian@4183: stored in StateData objects that are saved in a map in the artifact. christian@4183: christian@4183: NOTE: There is no input validation and no i18n of error messages (see christian@4183: TODO). christian@4183: christian@4183: 2011-03-09 Ingo Weinzierl christian@4183: christian@4183: * TODO: This file contains some open points that need to be done. christian@4183: christian@4183: 2011-03-09 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: New. This christian@4183: artifact serves as the default artifact for the FLYS application. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: This christian@4183: artifact now inherits from FLYSArtifact. Furthermore, there is one big christian@4183: change: we don't store the State objects itself in the artifact, but christian@4183: just the identifier of those. This makes the artifact smaller and more christian@4183: compatible agains previous versions of the software. christian@4183: christian@4183: 2011-03-08 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/services/RiverService.java: christian@4183: New. This service will retrieve a list of provided rivers. christian@4183: christian@4183: * doc/conf/conf.xml: Added a configuration for the RiverService. christian@4183: christian@4183: 2011-03-07 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/conf.xml: Added a section user-factory and collection-factory in christian@4183: the factories part of the configuration. christian@4183: christian@4183: 2011-03-01 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: christian@4183: Replaced the 'special' attribute from DESCRIBE with a 'uiprovider' christian@4183: attribute. christian@4183: christian@4183: 2011-02-08 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: The christian@4183: RiverSelect state is called to create the UI part of the describe christian@4183: document. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java: christian@4183: Implemented the dynamic UI part of describe(). The static part is not christian@4183: inserted into the describe document at the moment. We need a reference to christian@4183: the previous states for this. christian@4183: christian@4183: 2011-02-08 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/model/RiverFactory.java, christian@4183: src/main/java/de/intevation/flys/artifacts/model/River.java: New. A model christian@4183: class that represents a river and its factory to create concrete river christian@4183: instances. christian@4183: NOTE: Currently, this is just a mockup. The factory just returns two christian@4183: static rivers "Mosel" and "Saar" without a connection to a backend. christian@4183: christian@4183: 2011-02-07 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/StateFactory.java: The christian@4183: input data of a state is initialized with empty StateData objects after christian@4183: the State has been created. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Renamed the input data nodes of the states christian@4183: which now fits better to the class name of the implementation. christian@4183: christian@4183: 2011-02-07 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: The christian@4183: describe document returned by this artifact now contains the current state christian@4183: and the reachable states. christian@4183: christian@4183: 2011-02-07 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: christian@4183: The transitions are put into the TransitionEngine with the ID of the state christian@4183: - not longer with the artifact name. On this way, we are able to fetch christian@4183: just the transitions for a specific state, instead of all the transitions christian@4183: of an artifact. christian@4183: christian@4183: 2011-02-04 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Describe() christian@4183: returns the artifact's uuid and hash value. The whole implementation of christian@4183: describe() is still outstanding. christian@4183: christian@4183: 2011-02-04 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Removed useless config stuff. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: Removed christian@4183: useless methods, and improved the init process - the first state is set as christian@4183: the current state for this artifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/RiverSelect.java, christian@4183: src/main/java/de/intevation/flys/artifacts/states/GaugeSelect.java: New. christian@4183: The states are used in the first two steps of the WINFOArtifact. christian@4183: Currently, they just implement stubs of the necessary methods setup() and christian@4183: describe(). christian@4183: christian@4183: 2011-02-04 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/State.java, christian@4183: src/main/java/de/intevation/flys/artifacts/transitions/TransitionEngine.java, christian@4183: src/main/java/de/intevation/flys/artifacts/transitions/Transition.java: christian@4183: Removed. These classes are placed in the artifact-database now. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/transitions/DefaultTransition.java, christian@4183: src/main/java/de/intevation/flys/artifacts/transitions/TransitionFactory.java: christian@4183: Adapted imports of Transition. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/StateFactory.java: New. christian@4183: This factory should be used to create concrete State objects. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: Added christian@4183: a constant key to store the StateEngine in the context. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: christian@4183: New method that initializes the states at application start. christian@4183: christian@4183: 2011-02-03 Ingo Weinzierl christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/states/State.java: New. The christian@4183: interface description of a state. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/transitions/Transition.java, christian@4183: src/main/java/de/intevation/flys/artifacts/transitions/DefaultTransition.java: christian@4183: New. The interface description and a default implementation of a christian@4183: transition. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/transitions/TransitionEngine.java: christian@4183: New. The TransitionEngine stores all transitions for each artifact and christian@4183: should be used to determine, if an artifact can advance from one state to christian@4183: another. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/transitions/TransitionFactory.java: christian@4183: New. Transitions should be created by using this class. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/FLYSContext.java: New. christian@4183: The Flys context. It currently defines keys to store important components christian@4183: in the context. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java: christian@4183: New. The context factory initializes the basic components of the christian@4183: application. Currently, the TransitionEngine is created and all artifacts christian@4183: with its transitions are read from the global configuration and stored in christian@4183: the FLYSContext. christian@4183: christian@4183: * pom.xml: Added a dependency to the 'artifacts-common' package. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: Corrected the classname of the christian@4183: DefaultTransition. christian@4183: christian@4183: * doc/conf/conf.xml: Added FLYSContextFactory as context-factory. christian@4183: christian@4183: 2011-02-02 Ingo Weinzierl christian@4183: christian@4183: * doc/conf/conf.xml: An initial configuration file for the FLYS artifact christian@4183: server. christian@4183: christian@4183: * doc/conf/artifacts/winfo.xml: An initial transition configuration of an christian@4183: WINFO artifact. christian@4183: christian@4183: * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java: A stub of christian@4183: an artifact for a WINFO parameterization. christian@4183: christian@4183: * pom.xml: Set the source code version to 1.5. christian@4183: christian@4183: 2011-02-01 Sascha L. Teichmann christian@4183: christian@4183: * src/**, pom.xml: Added initial maven project. christian@4183: * ChangeLog: new.