Author: chatellier Date: 2009-07-17 12:27:53 +0000 (Fri, 17 Jul 2009) New Revision: 2503 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEdit.java isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Improve simulation summary Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-07-17 09:20:39 UTC (rev 2502) +++ isis-fish/trunk/changelog.txt 2009-07-17 12:27:53 UTC (rev 2503) @@ -1,6 +1,9 @@ isis-fish (3.2.0.5) stable; urgency=low + * Improve simulation summary + * #1905 : nom des labels pour somme par année + isis-fish (3.2.0.5-rc1) stable; urgency=low * Remove inprocess launcher (due to memory consumption) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-07-17 09:20:39 UTC (rev 2502) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-07-17 12:27:53 UTC (rev 2503) @@ -1328,6 +1328,7 @@ } } result.append(_("isisfish.params.toString.rule", name)); + result.append('\n'); result.append(param); result.append("\n"); @@ -1344,6 +1345,7 @@ } } result.append(_("isisfish.params.toString.plan", name)); + result.append('\n'); result.append(param); result.append('\n'); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEdit.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEdit.java 2009-07-17 09:20:39 UTC (rev 2502) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEdit.java 2009-07-17 12:27:53 UTC (rev 2503) @@ -256,6 +256,8 @@ StringBuffer resume = new StringBuffer(sp.toString()); resume.append("\n"); + // TODO EC20090717 ca marche plus ca + // les results name ne commence plus par ABONDANCE_STRING... for(Iterator i=resultManager.getResultName().iterator(); i.hasNext();){ String name = (String)i.next(); try { Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-07-17 09:20:39 UTC (rev 2502) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-07-17 12:27:53 UTC (rev 2503) @@ -673,17 +673,17 @@ isisfish.params.simulationName=Simulation name isisfish.params.title=Parameters isisfish.params.toString.fishery=P\u00EAcherie\: %1$s\n\n -isisfish.params.toString.lib.logger.level=Level of libraries' logger %1$s +isisfish.params.toString.lib.logger.level=Level of libraries' logger \: %1$s isisfish.params.toString.number.years=Number of years\: %1$s\n\n isisfish.params.toString.plan=Plan\: %1$s isisfish.params.toString.plan.number=Analyse plan sequence number\: %1$s\n\n -isisfish.params.toString.populations=Populations\: +isisfish.params.toString.populations=Populations \: isisfish.params.toString.rule=Rule\: %1$s -isisfish.params.toString.script.logger.level=Level of scripts' logger %1$s +isisfish.params.toString.script.logger.level=Level of scripts' logger \: %1$s isisfish.params.toString.script.presimulation=Script de presimulation -isisfish.params.toString.simul.logger.level=Level of simulator's logger %1$s -isisfish.params.toString.simulation.done=Simulation done with %1$s\: -isisfish.params.toString.strategies=Strat\u00E9gies d'exploitation\: +isisfish.params.toString.simul.logger.level=Level of simulator's logger \: %1$s +isisfish.params.toString.simulation.done=Simulation done with \: %1$s +isisfish.params.toString.strategies=Strat\u00E9gies \: isisfish.params.useAnalysePlan=Use simulation plan isisfish.params.usePreSimulationScript=Use pre simulation script isisfish.population.capturability=Capturability Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-07-17 09:20:39 UTC (rev 2502) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-07-17 12:27:53 UTC (rev 2503) @@ -673,17 +673,17 @@ isisfish.params.simulationName=Nom de la simulation isisfish.params.title=Param\u00E8tres isisfish.params.toString.fishery=P\u00EAcherie\: %1$s\n\n -isisfish.params.toString.lib.logger.level=niveau du logger de librairies %1$s -isisfish.params.toString.number.years=Nombre d'ann\u00E9s \: %1$s\n\n +isisfish.params.toString.lib.logger.level=niveau du logger de librairies \: %1$s +isisfish.params.toString.number.years=Nombre d'ann\u00E9es \: %1$s\n\n isisfish.params.toString.plan=Plan\: %1$s -isisfish.params.toString.plan.number=Analyse plan sequence number\: %1$s\n\n -isisfish.params.toString.populations=Populations\: -isisfish.params.toString.rule=Rule\: %1$s -isisfish.params.toString.script.logger.level=niveau du logger de scripts %1$s +isisfish.params.toString.plan.number=Num\u00e9ro de s\u00e9quence dans le plan \: %1$s\n\n +isisfish.params.toString.populations=Populations \: +isisfish.params.toString.rule=R\u00e8gle\: %1$s +isisfish.params.toString.script.logger.level=niveau du logger de scripts \: %1$s isisfish.params.toString.script.presimulation=Script de presimulation -isisfish.params.toString.simul.logger.level=niveau du logger de simulateur %1$s -isisfish.params.toString.simulation.done=Simulation r\u00E9alis\u00E9e avec %1$s\: -isisfish.params.toString.strategies=Strat\u00E9gies d'exploitation\: +isisfish.params.toString.simul.logger.level=niveau du logger de simulateur \: %1$s +isisfish.params.toString.simulation.done=Simulation r\u00E9alis\u00E9e avec \: %1$s +isisfish.params.toString.strategies=Strat\u00E9gies d'exploitation \: isisfish.params.useAnalysePlan=Utiliser le plan de simulation isisfish.params.usePreSimulationScript=Utiliser un script de pr\u00E9-simulation isisfish.population.capturability=Capturabilit\u0E009e