# HG changeset patch # User Tim Englich # Date 1255616380 0 # Node ID 9bcf315f57e40d2b0e1ad02b8c1f4ee1195e0394 # Parent 08b8b79b30ff1b1c98ab02eb452ab2cf87ac541f Added Name of FIS to the Title of Charts gnv-artifacts/trunk@222 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 08b8b79b30ff -r 9bcf315f57e4 gnv-artifacts/ChangeLog --- a/gnv-artifacts/ChangeLog Thu Oct 15 12:43:46 2009 +0000 +++ b/gnv-artifacts/ChangeLog Thu Oct 15 14:19:40 2009 +0000 @@ -1,5 +1,13 @@ 2009-10-15 Tim Englich + * src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java (getFisName): + Added Method for lookup FIS Names + * src/main/resources/lang/artifactMessages*.properties: + Added further Key-Value-Pairs for FIS + * src/test/ressources/conf.xml: + Changed Configuratioon to get the ID of an FIS to the Chartgeneration + +2009-10-15 Tim Englich * src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCase.java (testHorizontalProfileMeshPointArtifact): Activate Tests for CSV and Statistics on HorizontalProfiles * src/main/java/de/intevation/gnv/transition/profile/horizontal/HorizontalProfileOutputTransition.java (createCSV): diff -r 08b8b79b30ff -r 9bcf315f57e4 gnv-artifacts/src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java Thu Oct 15 12:43:46 2009 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java Thu Oct 15 14:19:40 2009 +0000 @@ -29,6 +29,8 @@ import de.intevation.artifactdatabase.Config; import de.intevation.artifactdatabase.XMLUtils; import de.intevation.artifacts.CallMeta; +import de.intevation.artifacts.PreferredLocale; +import de.intevation.gnv.artifacts.ressource.RessourceFactory; import de.intevation.gnv.chart.ChartFactory; import de.intevation.gnv.chart.ChartLabels; import de.intevation.gnv.chart.ChartStyle; @@ -122,7 +124,7 @@ .getMeasurements(); ChartStyle chartStyle = this .creatStyle(chartWidth, chartHeight); - ChartLabels chartLables = new ChartLabels(this + ChartLabels chartLables = new ChartLabels(this.getFisName(callMeta.getLanguages())+" "+this .getSelectedFeatureName(), this.domainLable); this.createChart(outputStream, parameters, measurements, chartStyle, chartLables, uuid); @@ -278,6 +280,18 @@ return new ChartStyle(Color.white, new Color(230, 230, 230), Color.white, Color.white, true, true, lInsets, lChartSize); } + + protected String getFisName(PreferredLocale[] preferredLocales){ + String returnValue = ""; + InputData inputData = this.inputData.get("fisname"); + if (inputData != null){ + returnValue = RessourceFactory.getInstance() + .getRessource(preferredLocales, + inputData.getValue(), + inputData.getValue()); + } + return returnValue; + } protected Collection getParameters() { return this.getCollection(parameterValuesName); diff -r 08b8b79b30ff -r 9bcf315f57e4 gnv-artifacts/src/main/resources/lang/artifactMessages.properties --- a/gnv-artifacts/src/main/resources/lang/artifactMessages.properties Thu Oct 15 12:43:46 2009 +0000 +++ b/gnv-artifacts/src/main/resources/lang/artifactMessages.properties Thu Oct 15 14:19:40 2009 +0000 @@ -5,6 +5,10 @@ fis_delphin = Delphin fis_thermosalinograph = Thermosalinograph fis_chemusurvey = Chemusurvey +fis_gts = GTS +fis_bsh_ctd = CTD +fis_bsh_cbt = CBT + meshid= Mesh product= Product timeSeries= Timeseries diff -r 08b8b79b30ff -r 9bcf315f57e4 gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties --- a/gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties Thu Oct 15 12:43:46 2009 +0000 +++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties Thu Oct 15 14:19:40 2009 +0000 @@ -5,6 +5,9 @@ fis_delphin = Delphin fis_thermosalinograph = Thermosalinograph fis_chemusurvey = Chemusurvey +fis_gts = GTS +fis_bsh_ctd = CTD +fis_bsh_cbt = CBT product= Produkt timeSeries= Zeitserie diff -r 08b8b79b30ff -r 9bcf315f57e4 gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties --- a/gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties Thu Oct 15 12:43:46 2009 +0000 +++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties Thu Oct 15 14:19:40 2009 +0000 @@ -5,6 +5,10 @@ fis_delphin = Delphin fis_thermosalinograph = Thermosalinograph fis_chemusurvey = Chemusurvey +fis_gts = GTS +fis_bsh_ctd = CTD +fis_bsh_cbt = CBT + product= Produkt timeSeries= Zeitserie diff -r 08b8b79b30ff -r 9bcf315f57e4 gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties --- a/gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties Thu Oct 15 12:43:46 2009 +0000 +++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties Thu Oct 15 14:19:40 2009 +0000 @@ -5,6 +5,10 @@ fis_delphin = Delphin fis_thermosalinograph = Thermosalinograph fis_chemusurvey = Chemusurvey +fis_gts = GTS +fis_bsh_ctd = CTD +fis_bsh_cbt = CBT + meshid= Mesh product= Product timeSeries= Timeseries diff -r 08b8b79b30ff -r 9bcf315f57e4 gnv-artifacts/src/test/ressources/conf.xml --- a/gnv-artifacts/src/test/ressources/conf.xml Thu Oct 15 12:43:46 2009 +0000 +++ b/gnv-artifacts/src/test/ressources/conf.xml Thu Oct 15 14:19:40 2009 +0000 @@ -32,6 +32,7 @@ ttl="300000" artifact="de.intevation.gnv.timeseries.TimeSeriesArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory + @@ -39,6 +40,7 @@ ttl="300000" artifact="de.intevation.gnv.profile.vertical.VerticalProfileArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory + @@ -50,6 +52,7 @@ ttl="300000" artifact="de.intevation.gnv.timeseries.TimeSeriesArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory + @@ -57,6 +60,7 @@ ttl="300000" artifact="de.intevation.gnv.profile.vertical.VerticalProfileArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory + @@ -68,6 +72,7 @@ ttl="300000" artifact="de.intevation.gnv.timeseries.TimeSeriesArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory + @@ -75,6 +80,7 @@ ttl="300000" artifact="de.intevation.gnv.profile.vertical.VerticalProfileArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory + @@ -84,17 +90,23 @@ de.intevation.artifactdatabase.DefaultArtifactFactory - + + + de.intevation.artifactdatabase.DefaultArtifactFactory - + + + de.intevation.artifactdatabase.DefaultArtifactFactory - + + + @@ -105,6 +117,7 @@ ttl="300000" artifact="de.intevation.gnv.profile.horizontal.HorizontalProfileInstantaneousPointArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory + @@ -117,6 +130,7 @@ ttl="300000" artifact="de.intevation.gnv.profile.horizontal.HorizontalProfileInstantaneousPointArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory + @@ -129,6 +143,7 @@ ttl="300000" artifact="de.intevation.gnv.profile.horizontal.HorizontalProfileInstantaneousPointArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory + @@ -141,6 +156,7 @@ ttl="300000" artifact="de.intevation.gnv.profile.vertical.VerticalProfileInstantaneousPointArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory + @@ -152,6 +168,7 @@ ttl="300000" artifact="de.intevation.gnv.profile.vertical.VerticalProfileInstantaneousPointArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory + @@ -163,6 +180,7 @@ ttl="300000" artifact="de.intevation.gnv.profile.vertical.VerticalProfileInstantaneousPointArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory + @@ -178,6 +196,7 @@ timeseries_mesh_coordinate + @@ -189,6 +208,7 @@ + @@ -202,6 +222,7 @@ + @@ -215,6 +236,7 @@ + @@ -229,6 +251,7 @@ + @@ -244,6 +267,7 @@ + @@ -256,6 +280,7 @@ + @@ -289,6 +314,7 @@ + @@ -301,6 +327,7 @@ + @@ -317,6 +344,7 @@ + @@ -330,6 +358,7 @@ + @@ -340,6 +369,7 @@ + @@ -367,6 +397,7 @@ + @@ -379,6 +410,7 @@ + @@ -392,6 +424,7 @@ + @@ -400,7 +433,8 @@ - + + @@ -431,6 +465,7 @@ verticalprofile_mesh_coordinate + @@ -442,6 +477,7 @@ + @@ -455,6 +491,7 @@ + @@ -468,6 +505,7 @@ + @@ -482,6 +520,7 @@ + @@ -492,9 +531,10 @@ + - + @@ -523,6 +563,7 @@ + @@ -535,6 +576,7 @@ + @@ -547,6 +589,7 @@ + @@ -555,9 +598,10 @@ + - + @@ -586,6 +630,7 @@ + @@ -598,6 +643,7 @@ + @@ -609,6 +655,7 @@ + @@ -621,6 +668,7 @@ + @@ -634,6 +682,7 @@ + @@ -648,6 +697,7 @@ + @@ -658,6 +708,7 @@ + @@ -688,6 +739,7 @@ horizontalprofile_mesh_coordinate + @@ -699,6 +751,7 @@ + @@ -712,6 +765,7 @@ + @@ -723,6 +777,7 @@ + @@ -736,6 +791,7 @@ + @@ -752,6 +808,7 @@ + @@ -768,6 +825,7 @@ + @@ -780,6 +838,7 @@ +