r4203 - in trunk/src/main: java/fr/ifremer/isisfish/ui/result resources/i18n
Author: echatellier Date: 2015-04-21 14:06:30 +0000 (Tue, 21 Apr 2015) New Revision: 4203 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4203 Log: Some fix in result ui Added: trunk/src/main/java/fr/ifremer/isisfish/ui/result/package-info.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/LegendGraphic.java trunk/src/main/java/fr/ifremer/isisfish/ui/result/LegendModel.java trunk/src/main/java/fr/ifremer/isisfish/ui/result/LegendPanel.java trunk/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixSummaryRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultMatrixFilter.java trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultSimulationFrame.jaxx 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/LegendGraphic.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/LegendGraphic.java 2015-04-21 12:44:28 UTC (rev 4202) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/LegendGraphic.java 2015-04-21 14:06:30 UTC (rev 4203) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2011 - 2015 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 @@ -47,7 +47,9 @@ protected LegendModel model; /** - * Constructeur + * Constructeur. + * + * @param m model */ public LegendGraphic(LegendModel m) { setModel(m); @@ -59,7 +61,9 @@ } /** - * Dessine sur le graphique la legende courante + * Dessine sur le graphique la legende courante. + * + * @param g graphics */ protected void redraw(Graphics g) { //double coef = (double)getSize().width / (double)(model.getMax()-model.getMin()); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/LegendModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/LegendModel.java 2015-04-21 12:44:28 UTC (rev 4202) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/LegendModel.java 2015-04-21 14:06:30 UTC (rev 4203) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2011 Ifremer, CodeLutin, Chatellier Eric + * Copyright (C) 2002 - 2015 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 Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/LegendPanel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/LegendPanel.java 2015-04-21 12:44:28 UTC (rev 4202) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/LegendPanel.java 2015-04-21 14:06:30 UTC (rev 4203) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2011 Ifremer, CodeLutin, Chatellier Eric + * Copyright (C) 2002 - 2015 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 @@ -73,9 +73,6 @@ graph = new LegendGraphic(this.model); labelMin = new JLabel(Double.toString(model.getMin())); labelMax = new JLabel(Double.toString(model.getMax())); - labelMin.setVisible(true); - labelMax.setVisible(true); - graph.setVisible(true); GridBagConstraints c = null; Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx 2015-04-21 12:44:28 UTC (rev 4202) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx 2015-04-21 14:06:30 UTC (rev 4203) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2011 - 2015 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 @@ -24,11 +24,10 @@ --> <Table> <import> - static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ protected void $afterCompleteSetup() { - //isisMapBean.init(informationDelegator); + } ]]></script> <!-- <row> @@ -44,12 +43,6 @@ </row> <row> <cell fill="horizontal"> - <com.bbn.openmap.InformationDelegator id="informationDelegator" - showLights="false" /> - </cell> - </row> - <row> - <cell fill="horizontal"> <LegendPanel id="legendPanel" /> </cell> </row> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java 2015-04-21 12:44:28 UTC (rev 4202) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java 2015-04-21 14:06:30 UTC (rev 4203) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2011 - 2015 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 @@ -50,25 +50,11 @@ public MatrixMapRenderer(FisheryRegion fisheryRegion) { mapRendererUI = new MapRendererUI(); - - // Create the directional and zoom control tool - //OMToolSet resultatMapOMTS = new OMToolSet(); - // Associate the tool with the map - //resultatMapOMTS.setupListeners(mapRendererUI.getIsisMapBean()); - // Add the tool to the map toolbar - //mapRendererUI.getToolPanel().add((Tool)resultatMapOMTS); - //mapRendererUI.getInformationDelegator().setMap(getIsisMapBean()); - //mapRendererUI.getInformationDelegator().setShowLights(false); - //mapRendererUI.getInformationDelegator().setLabel(t("isisfish.simpleResult.more.information")); - // set fishery region mapRendererUI.getIsisMapBean().setFisheryRegion(fisheryRegion); } - /* - * @see org.nuiton.math.matrix.viewer.MatrixRenderer#getComponent(org.nuiton.math.matrix.MatrixND) - */ @Override public Component getComponent(MatrixND matrix) { @@ -78,23 +64,15 @@ mapRendererUI.getIsisMapBean().addResultatLayer(matrix.getName(), layer); mapRendererUI.getLegendPanel().setModel(new LegendModel(0,Math.round(layer.getDataMapList().getMaxDataMapValue()))); - // poussin 20060822 FIXME: migration vers v3, je ne sais pas comment ca merchait avant, la methode n'existe pas :( - // getInformationDelegator().addLayer(layer); return mapRendererUI; } - /* - * @see org.nuiton.math.matrix.viewer.MatrixRenderer#getIcon() - */ @Override public Icon getIcon() { return null; } - /* - * @see org.nuiton.math.matrix.viewer.MatrixRenderer#getName() - */ @Override public String getName() { return t("isisfish.result.map"); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixSummaryRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixSummaryRenderer.java 2015-04-21 12:44:28 UTC (rev 4202) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixSummaryRenderer.java 2015-04-21 14:06:30 UTC (rev 4203) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2011 - 2015 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 @@ -55,8 +55,8 @@ public class MatrixSummaryRenderer implements MatrixRenderer { protected static final String ABONDANCE_STRING = n("matrixAbundance"); - protected static final String CAPTUREPARMETIER_STRING = t("matrixCatchPerStrategyMetPerZoneMet"); - protected static final String REJETPARMETIER_STRING = t("matrixDiscardsPerStrMetPerZonePop"); + protected static final String CAPTUREPARMETIER_STRING = n("matrixCatchPerStrategyMetPerZoneMet"); + protected static final String REJETPARMETIER_STRING = n("matrixDiscardsPerStrMetPerZonePop"); protected SimulationStorage simulationStorage; @@ -72,9 +72,6 @@ this.topiaContext = topiaContext; } - /* - * @see org.nuiton.math.matrix.viewer.MatrixRenderer#getComponent(org.nuiton.math.matrix.MatrixND) - */ @Override public Component getComponent(MatrixND matrix) { if (cachedComponent == null) { @@ -85,10 +82,8 @@ StringBuilder resume = new StringBuilder(params); resume.append("\n"); - for(String name : resultStorage.getResultName()) { + for (String name : resultStorage.getResultName()) { try { - - // TODO EC20090717 ca marche plus ca if (name.startsWith(ABONDANCE_STRING)){ MatrixND mat1 = resultStorage.getMatrix(new TimeStep(0), name, topiaContext); mat1 = mat1.sumOverDim(0); @@ -102,8 +97,6 @@ mat1 = mat1.reduce(); resume.append(t("isisfish.result.end.simulation")).append(mat1.getName()).append(": ").append(mat1.getValue(0)).append("\n"); } - /* - un peu long else if(name.startsWith(REJETPARMETIER_STRING)){ MatrixND mat1 = resultStorage.getMatrix(name, topiaContext); mat1 = mat1.sumOverDim(0); @@ -112,7 +105,7 @@ mat1 = mat1.sumOverDim(3); mat1 = mat1.reduce(); - resume.append(t("isisfish.common.sum")).append(mat1.getName()).append(": ").append(mat1.getValue(0)).append("\n"); + resume.append(t("isisfish.common.sum")).append(" ").append(mat1.getName()).append(": ").append(mat1.getValue(0)).append("\n"); } else if (!name.startsWith(CAPTUREPARMETIER_STRING)){ MatrixND mat1 = resultStorage.getMatrix(name, topiaContext); @@ -121,10 +114,10 @@ mat1 = mat1.sumOverDim(2); mat1 = mat1.reduce(); - resume.append(t("isisfish.common.sum")).append(mat1.getName()).append(": ").append(mat1.getValue(0)).append("\n"); - }*/ + resume.append(t("isisfish.common.sum")).append(" ").append(mat1.getName()).append(": ").append(mat1.getValue(0)).append("\n"); + } } catch (Exception eee) { - resume.append(t("isisfish.error.no.matrix", name)); + resume.append(t("isisfish.error.no.matrix", name)).append("\n"); } } @@ -137,17 +130,11 @@ return cachedComponent; } - /* - * @see org.nuiton.math.matrix.viewer.MatrixRenderer#getIcon() - */ @Override public Icon getIcon() { return null; } - /* - * @see org.nuiton.math.matrix.viewer.MatrixRenderer#getName() - */ @Override public String getName() { return t("isisfish.result.summary"); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2015-04-21 12:44:28 UTC (rev 4202) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2015-04-21 14:06:30 UTC (rev 4203) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2011 - 2015 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 @@ -23,8 +23,6 @@ package fr.ifremer.isisfish.ui.result; -import fr.ifremer.isisfish.IsisConfig; - import static org.nuiton.i18n.I18n.t; import java.awt.BorderLayout; @@ -33,15 +31,11 @@ import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.beans.PropertyVetoException; -import java.io.BufferedWriter; import java.io.File; -import java.io.Writer; import java.util.List; import javax.swing.JMenuItem; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixND; @@ -57,20 +51,13 @@ import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.datastore.StorageException; import fr.ifremer.isisfish.entities.FisheryRegion; -import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.export.ExportHelper; -import fr.ifremer.isisfish.export.ExportInfo; -import fr.ifremer.isisfish.export.ExportStep; import fr.ifremer.isisfish.logging.SimulationLoggerUtil; import fr.ifremer.isisfish.simulator.launcher.SimulationJob; import fr.ifremer.isisfish.simulator.launcher.SimulationService; import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; -import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.ui.CommonHandler; import fr.ifremer.isisfish.ui.models.common.GenericComboModel; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.util.zip.GZIPOutputStream; /** * Handler for result UIs. Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultMatrixFilter.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultMatrixFilter.java 2015-04-21 12:44:28 UTC (rev 4202) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultMatrixFilter.java 2015-04-21 14:06:30 UTC (rev 4203) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2011 - 2015 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 Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultSimulationFrame.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultSimulationFrame.jaxx 2015-04-21 12:44:28 UTC (rev 4202) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultSimulationFrame.jaxx 2015-04-21 14:06:30 UTC (rev 4203) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2011 - 2015 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 Added: trunk/src/main/java/fr/ifremer/isisfish/ui/result/package-info.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/package-info.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/package-info.java 2015-04-21 14:06:30 UTC (rev 4203) @@ -0,0 +1,28 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2015 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% + */ +/** + * Result view. + */ +package fr.ifremer.isisfish.ui.result; Property changes on: trunk/src/main/java/fr/ifremer/isisfish/ui/result/package-info.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2015-04-21 12:44:28 UTC (rev 4202) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2015-04-21 14:06:30 UTC (rev 4203) @@ -836,7 +836,7 @@ isisfish.result.choose.simulation=Simulation \: isisfish.result.end.simulation=Simuation end \: isisfish.result.export=Export -isisfish.result.export.file=Export text file +isisfish.result.export.file=Export CSV file isisfish.result.map=Map isisfish.result.matrix.sumbyyearlabel=Year %d isisfish.result.new.window=Open Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-04-21 12:44:28 UTC (rev 4202) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-04-21 14:06:30 UTC (rev 4203) @@ -832,9 +832,9 @@ isisfish.queue.title=Queue isisfish.result.begin.simulation=En début de simulation \: isisfish.result.choose.simulation=Simulation \: -isisfish.result.end.simulation=En fin de Simulation\: +isisfish.result.end.simulation=En fin de simulation \: isisfish.result.export=Export -isisfish.result.export.file=Exporter un fichier texte +isisfish.result.export.file=Exporter un fichier CSV isisfish.result.map=Carte isisfish.result.matrix.sumbyyearlabel=Année %d isisfish.result.new.window=Ouvrir
participants (1)
-
echatellier＠users.forge.codelutin.com