Author: echatellier Date: 2012-01-04 18:39:18 +0100 (Wed, 04 Jan 2012) New Revision: 3583 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3583 Log: #392 : labels erron?\195?\169s lors de l'affichage des r?\195?\169sultats somm?\195?\169s par an Added: trunk/src/main/java/fr/ifremer/isisfish/ui/result/SumByYearMatrixFilter.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2012-01-04 17:26:45 UTC (rev 3582) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2012-01-04 17:39:18 UTC (rev 3583) @@ -196,6 +196,7 @@ matrixViewerPanel.addMatrixRenderer(new MatrixMapRenderer(fisheryRegion)); matrixViewerPanel.addMatrixRenderer(new MatrixPanelRenderer()); matrixViewerPanel.addMatrixFilter(new ResultMatrixFilter(resultStorage)); + matrixViewerPanel.addMatrixFilter(new SumByYearMatrixFilter()); // init available results list StringComboModel model = new StringComboModel(resultStorage.getResultName()); Added: trunk/src/main/java/fr/ifremer/isisfish/ui/result/SumByYearMatrixFilter.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/SumByYearMatrixFilter.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/SumByYearMatrixFilter.java 2012-01-04 17:39:18 UTC (rev 3583) @@ -0,0 +1,70 @@ +/* + * #%L + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer, Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.ui.result; + +import static org.nuiton.i18n.I18n._; + +import java.util.ArrayList; +import java.util.List; + +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.math.matrix.viewer.MatrixFilter; + +/** + * Filtre qui change le nom des semantiques dans le cas d'une somme + * par années. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class SumByYearMatrixFilter implements MatrixFilter { + + /* + * @see org.nuiton.math.matrix.viewer.MatrixFilter#filter(org.nuiton.math.matrix.MatrixND) + */ + @Override + public MatrixND filter(MatrixND matrix) { + return matrix; + } + + /* + * @see org.nuiton.math.matrix.viewer.MatrixFilter#filterDimension(org.nuiton.math.matrix.MatrixND, int, int) + */ + @Override + public MatrixND filterDimension(MatrixND matrix, int dim, int sumStep) { + + if (dim == 0) { // in isis 0 = time step + int semCount = matrix.getSemantic(0).size(); + List<String> newSems = new ArrayList<String>(semCount); + for (int i = 0; i < semCount ; i++) { + newSems.add(_("isisfish.result.matrix.sumbyyearlabel", i)); + } + matrix.setSemantic(0, newSems); + } + return matrix; + } +} Property changes on: trunk/src/main/java/fr/ifremer/isisfish/ui/result/SumByYearMatrixFilter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2012-01-04 17:26:45 UTC (rev 3582) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2012-01-04 17:39:18 UTC (rev 3583) @@ -760,6 +760,7 @@ isisfish.result.export=Export isisfish.result.export.file=Export text file isisfish.result.map=Map +isisfish.result.matrix.sumbyyearlabel=Year %d isisfish.result.new.window=Open isisfish.result.remove.simulation=Remove isisfish.result.selectResult=Result \: Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2012-01-04 17:26:45 UTC (rev 3582) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2012-01-04 17:39:18 UTC (rev 3583) @@ -760,6 +760,7 @@ isisfish.result.export=Export isisfish.result.export.file=Exporter un fichier texte isisfish.result.map=Carte +isisfish.result.matrix.sumbyyearlabel=Année %d isisfish.result.new.window=Ouvrir isisfish.result.remove.simulation=Supprimer isisfish.result.selectResult=Résultat \: