Author: kmorin Date: 2013-04-29 18:22:40 +0200 (Mon, 29 Apr 2013) New Revision: 883 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/883 Log: fixes #2375 [Observation individuelles] R?\195?\169utiliser les donn?\195?\169es d?\195?\169j?\195?\160 pr?\195?\169sentes lors de la cr?\195?\169ation Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionHelper.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-04-29 12:31:29 UTC (rev 882) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-04-29 16:22:40 UTC (rev 883) @@ -25,6 +25,7 @@ */ import com.google.common.collect.Sets; +import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.TuttiCsvUtil; @@ -34,6 +35,8 @@ import java.util.Map; import java.util.Set; +import static org.nuiton.i18n.I18n._; + /** * Model to import / export {@link SpeciesRow}. * @@ -63,8 +66,7 @@ if (taxonIds.contains(referenceTaxonId)) { // duplicate reference taxon id used - throw new RuntimeException( - "Reference taxon Id [" + referenceTaxonId + "] already used before."); + throw new TuttiTechnicalException(_("tutti.service.protocol.import.taxonUsed.error")); } taxonIds.add(referenceTaxonId); return species; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java 2013-04-29 12:31:29 UTC (rev 882) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java 2013-04-29 16:22:40 UTC (rev 883) @@ -22,6 +22,7 @@ * #L% */ +import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; @@ -66,6 +67,14 @@ return result; } + public Caracteristic getLastLengthStepCaracteristicUsed() { + Caracteristic result = null; + if (!rows.isEmpty()) { + result = rows.get(rows.size() - 1).getLengthStepCaracteristic(); + } + return result; + } + //------------------------------------------------------------------------// //-- TabContentModel --// //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2013-04-29 12:31:29 UTC (rev 882) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2013-04-29 16:22:40 UTC (rev 883) @@ -179,6 +179,8 @@ model.setSpecies(batchModel.getLastSpeciesUsed()); + model.setLengthStepCaracteristic(batchModel.getLastLengthStepCaracteristicUsed()); + model.setAvailableSpecies(getDataContext().getReferentSpeciesWithSurveyCode()); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-04-29 12:31:29 UTC (rev 882) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-04-29 16:22:40 UTC (rev 883) @@ -196,12 +196,12 @@ Float endLatitude, Float endLongitude) { - double sLat = startLatitude * Math.PI / 180; - double sLong = startLongitude * Math.PI / 180; - double eLat = endLatitude * Math.PI / 180; - double eLong = endLongitude * Math.PI / 180; + double sLat = startLatitude * Math.PI / 180.0; + double sLong = startLongitude * Math.PI / 180.0; + double eLat = endLatitude * Math.PI / 180.0; + double eLong = endLongitude * Math.PI / 180.0; - Double d = 6378288 * + Double d = 6378288.0 * (Math.PI / 2 - Math.asin(Math.sin(eLat) * Math.sin(sLat) + Math.cos(eLong - sLong) * Math.cos(eLat) * Math.cos(sLat))); return d.intValue(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionHelper.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionHelper.java 2013-04-29 12:31:29 UTC (rev 882) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionHelper.java 2013-04-29 16:22:40 UTC (rev 883) @@ -105,7 +105,6 @@ return result; } catch (Exception e) { throw new TuttiTechnicalException(_("tutti.action.create.error", actionName), e); - //"Could not instanciate action " + actionName, e); } }