Author: echatellier Date: 2013-12-20 17:00:44 +0100 (Fri, 20 Dec 2013) New Revision: 3878 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3878 Log: fixes #4054: Ajouter la distribution de recrutement par zone et de distribution de reproduction en facteur Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx trunk/src/main/resources/sensitivity.properties Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2013-12-12 14:00:40 UTC (rev 3877) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2013-12-20 16:00:44 UTC (rev 3878) @@ -117,7 +117,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static Version version = new Version(4, 2, 1, 2); + protected final static Version version = new Version(4, 2, 1, 3); protected final static Version majorVersion = new Version(version.getNumber(0)); protected final static Version databaseVersion = new Version( Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2013-12-12 14:00:40 UTC (rev 3877) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2013-12-20 16:00:44 UTC (rev 3878) @@ -192,7 +192,9 @@ <cell columns='3' fill='both' weightx='1.0' weighty='0.5'> <org.nuiton.math.matrix.gui.MatrixPanelEditor id='fieldPopulationMappingZoneReproZoneRecru' constructorParams='false' enabled='{isActive()}' - onMatrixChanged="populationMappingZoneReproZoneRecruMatrixChanged(event)" /> + onMatrixChanged="populationMappingZoneReproZoneRecruMatrixChanged(event)" + decorator='boxed' + _sensitivityBean='{fr.ifremer.isisfish.entities.Population.class}' _sensitivityMethod='"MappingZoneReproZoneRecru"' /> </cell> </row> </Table> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2013-12-12 14:00:40 UTC (rev 3877) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2013-12-20 16:00:44 UTC (rev 3878) @@ -43,6 +43,12 @@ getSaveVerifier().addCurrentPanel(popZones); }*/ + +@Override +public void setLayer(boolean active) { + super.setLayer(active); + popZones.setLayer(active); +} ]]> </script> <JPanel id='body'> @@ -50,8 +56,7 @@ <row> <cell columns="2" fill='both' weightx='1.0' weighty='1'> <PopulationZonesEditorUI id='popZones' constructorParams='this' - bean='{getBean()}' active='{isActive()}' decorator='boxed' - _sensitivityBean='{Population.class}' _sensitivityMethod='"MappingZoneReproZoneRecru"'/> + bean='{getBean()}' active='{isActive()}'/> </cell> </row> <row> Modified: trunk/src/main/resources/sensitivity.properties =================================================================== --- trunk/src/main/resources/sensitivity.properties 2013-12-12 14:00:40 UTC (rev 3877) +++ trunk/src/main/resources/sensitivity.properties 2013-12-20 16:00:44 UTC (rev 3878) @@ -42,6 +42,7 @@ Population.groupMin Population.growth Population.growthReverse +Population.mappingZoneReproZoneRecru Population.maturityOgiveEquation Population.meanWeight Population.monthGapBetweenReproRecrutement @@ -54,6 +55,7 @@ PopulationSeasonInfo.migrationEquation PopulationSeasonInfo.emigrationEquation PopulationSeasonInfo.immigrationEquation +PopulationSeasonInfo.reproductionDistribution Selectivity.equation SetOfVessels.fixedCosts SetOfVessels.numberOfVessels