Author: echatellier Date: 2015-06-21 19:35:29 +0000 (Sun, 21 Jun 2015) New Revision: 4279 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4279 Log: refs #7224: Ajouter des champs dans la region pour changer la methode de calcul de F Added: trunk/src/main/java/fr/ifremer/isisfish/ui/models/misc/ trunk/src/main/java/fr/ifremer/isisfish/ui/models/misc/MonthComboModel.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableModel.java trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties trunk/src/main/xmi/isis-fish.zargo Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2015-06-21 17:32:27 UTC (rev 4278) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2015-06-21 19:35:29 UTC (rev 4279) @@ -109,6 +109,7 @@ // migration v 4.4 (mais necessaire de la faire avant sinon le from va planter) tx.executeSQL("alter table POPULATION add column IF NOT EXISTS RecruitmentEQUATION VARCHAR(255);"); + tx.executeSQL("alter table POPULATION add column IF NOT EXISTS representativeAbundanceMonth integer;"); // build new equation for maturity group for (Object[] maturityRow : maturityGroupResult) { Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java 2015-06-21 17:32:27 UTC (rev 4278) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java 2015-06-21 19:35:29 UTC (rev 4279) @@ -64,7 +64,8 @@ throws TopiaException { tx.executeSQL("alter table POPULATION add column IF NOT EXISTS RecruitmentEQUATION VARCHAR(255);"); - + tx.executeSQL("alter table POPULATION add column IF NOT EXISTS representativeAbundanceMonth integer;"); + // build new equation for maturity group and reproduction rate List<Population> pops = tx.findAll("from " + Population.class.getName()); for (Population pop : pops) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsHandler.java 2015-06-21 17:32:27 UTC (rev 4278) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsHandler.java 2015-06-21 19:35:29 UTC (rev 4279) @@ -26,6 +26,7 @@ import static org.nuiton.i18n.I18n.t; import java.awt.BorderLayout; +import java.awt.event.ItemEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; @@ -34,6 +35,8 @@ import javax.swing.JOptionPane; import javax.swing.table.DefaultTableModel; +import jaxx.runtime.JAXXUtil; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; @@ -45,9 +48,9 @@ import fr.ifremer.isisfish.entities.PopulationDAO; import fr.ifremer.isisfish.entities.PopulationGroup; import fr.ifremer.isisfish.entities.Species; +import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.ui.input.InputContentHandler; import fr.ifremer.isisfish.ui.input.InputUI; -import jaxx.runtime.JAXXUtil; /** * Population handler. @@ -57,6 +60,8 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(PopulationBasicsHandler.class); + protected boolean init; + protected PopulationBasicsHandler(PopulationBasicsUI inputContentUI) { super(inputContentUI); } @@ -64,16 +69,21 @@ protected void afterInit() { inputContentUI.addPropertyChangeListener(PopulationBasicsUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { + init = true; if (evt.getNewValue() == null) { inputContentUI.fieldPopulationBasicsName.setText(""); inputContentUI.fieldPopulationBasicsGeographicID.setText(""); inputContentUI.fieldPopulationBasicsNbClasses.setText(""); inputContentUI.fieldPopulationBasicsComment.setText(""); inputContentUI.tableAgeLength.setModel(new DefaultTableModel()); + inputContentUI.fieldPopulationMcacf.setSelectedItem(null); } if (evt.getNewValue() != null) { + Population bean = (Population)evt.getNewValue(); + inputContentUI.fieldPopulationMcacf.setSelectedItem(bean.getRepresentativeAbundanceMonth()); setTableAgeLengthModel(); } + init = false; } }); } @@ -168,4 +178,11 @@ } return pop; } + + public void onRepresentativeAbundanceMonthChanged() { + if (!init) { + Month month = (Month)inputContentUI.fieldPopulationMcacf.getSelectedItem(); + inputContentUI.getBean().setRepresentativeAbundanceMonth(month); + } + } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsUI.jaxx 2015-06-21 17:32:27 UTC (rev 4278) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsUI.jaxx 2015-06-21 19:35:29 UTC (rev 4279) @@ -111,6 +111,15 @@ onKeyReleased='getBean().setGroupMax(Integer.parseInt(fieldPopulationGroupMax.getText()))' enabled='{isActive()}' decorator='boxed' _sensitivityBean='{Population.class}' _sensitivityMethod='"MaxAge"'/> </cell> + <cell> + <JLabel text="isisfish.populationBasics.mcacf" toolTipText="isisfish.populationBasics.mcacf.tip" enabled='{isActive()}'/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldPopulationMcacf" + model="{new fr.ifremer.isisfish.ui.models.misc.MonthComboModel()}" + onActionPerformed="handler.onRepresentativeAbundanceMonthChanged()" + enabled='{isActive()}' decorator='boxed' /> + </cell> </row> </Table> </cell> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableModel.java 2015-06-21 17:32:27 UTC (rev 4278) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableModel.java 2015-06-21 19:35:29 UTC (rev 4279) @@ -98,7 +98,7 @@ public void setScript(Object script) { this.script = script; //TODO map may be sorted - scriptParametersNames = new ArrayList<String>(); + scriptParametersNames = new ArrayList<>(); if (script != null) { Map<String, Class<?>> ruleParametersNamesAndTypes = JavaSourceStorage .getParameterNames(script); Added: trunk/src/main/java/fr/ifremer/isisfish/ui/models/misc/MonthComboModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/misc/MonthComboModel.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/misc/MonthComboModel.java 2015-06-21 19:35:29 UTC (rev 4279) @@ -0,0 +1,58 @@ +/* + * #%L + * IsisFish + * + * $Id: ScriptParametersTableCellEditor.java 4156 2014-12-09 11:27:18Z echatellier $ + * $HeadURL: https://svn.codelutin.com/isis-fish/trunk/src/main/java/fr/ifremer/isisfish/... $ + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, 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.models.misc; + +import javax.swing.DefaultComboBoxModel; + +import fr.ifremer.isisfish.types.Month; + +/** + * Month combo box model. + */ +public class MonthComboModel extends DefaultComboBoxModel<Month> { + + /** serialVersionUID. */ + private static final long serialVersionUID = -2458250929660180160L; + + /* + * @see javax.swing.ListModel#getElementAt(int) + */ + @Override + public Month getElementAt(int index) { + Month result = null; + if (index > 0) { + result = Month.MONTH[index - 1]; + } + return result; + } + + /* + * @see javax.swing.ListModel#getSize() + */ + @Override + public int getSize() { + return Month.MONTH.length + 1; + } +} Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2015-06-21 17:32:27 UTC (rev 4278) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2015-06-21 19:35:29 UTC (rev 4279) @@ -667,10 +667,12 @@ isisfish.population.zones=Zones isisfish.populationBasics.confirmCreateGroups=Warning, running groups creation wizard will delete all existing groups and objects which depend on it.\nDo you want to re-create groups ? isisfish.populationBasics.geographicID=Geographic identifier -isisfish.populationBasics.groupMax=Max group -isisfish.populationBasics.groupMin=Min group +isisfish.populationBasics.groupMax=Fbar max group +isisfish.populationBasics.groupMin=Fbar min group isisfish.populationBasics.growth=Growth isisfish.populationBasics.growthReverse=Reverse growth +isisfish.populationBasics.mcacf=Rmacf +isisfish.populationBasics.mcacf.tip=Representative month for abundance to compute F isisfish.populationBasics.name=Name isisfish.populationBasics.numberGroup=Number of group isisfish.populationBasics.plusGroup=Plus group Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-06-21 17:32:27 UTC (rev 4278) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-06-21 19:35:29 UTC (rev 4279) @@ -667,10 +667,12 @@ isisfish.population.zones=Zones isisfish.populationBasics.confirmCreateGroups=Attention, la re-création des groupes supprimera les groupes existants et tous les objets qui en dépendent.\nÊtes vous sur de vouloir re-créer les groupes ? isisfish.populationBasics.geographicID=Identifiant géographique -isisfish.populationBasics.groupMax=Group max -isisfish.populationBasics.groupMin=Group min +isisfish.populationBasics.groupMax=Fbar group max +isisfish.populationBasics.groupMin=Fbar group min isisfish.populationBasics.growth=Croissance isisfish.populationBasics.growthReverse=Croissance inverse +isisfish.populationBasics.mcacf=Mcacf +isisfish.populationBasics.mcacf.tip=Mois de considération de l abondance pour le calcul de F isisfish.populationBasics.name=Nom isisfish.populationBasics.numberGroup=Nombre de groupes isisfish.populationBasics.plusGroup=Groupe plus Modified: trunk/src/main/xmi/isis-fish.zargo =================================================================== (Binary files differ)