Author: fdesbois Date: 2012-09-12 16:38:09 +0200 (Wed, 12 Sep 2012) New Revision: 575 Url: http://forge.codelutin.com/repositories/revision/sammoa/575 Log: refs #1426 : - add listener for observation species even during onBoard - add GPS_DELAY instead of GPS_TIME in export maps Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java trunk/src/site/rst/import-export.rst Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java 2012-09-12 14:37:52 UTC (rev 574) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java 2012-09-12 14:38:09 UTC (rev 575) @@ -131,7 +131,7 @@ .doubleColumn("LON", 19, 11) // (geoPoint.longitude) .doubleColumn("SPEED", 19, 11) // (geoPoint.speed) .doubleColumn("ALTITUDE", 19, 11) // (geoPoint.altitude) - .stringColumn("GPS_TIME") // (format(geoPoint.recordTime, "HHmmss")) + .integerColumn("GPS_DELAY") // (geoPoint.captureDelay) .stringColumn("AIRCRAFT") // (route.flight.immatriculation) .stringColumn("COMMENT") // (route.comment) .build(); @@ -357,7 +357,7 @@ .doubleColumn("LON", 19, 11) // (geoPoint.longitude) .doubleColumn("SPEED", 19, 11) // (geoPoint.speed) .doubleColumn("ALTITUDE", 19, 11) // (geoPoint.altitude) - .stringColumn("GPS_TIME") // (format(geoPoint.recordTime, "HHmmss")) + .integerColumn("GPS_DELAY") // (geoPoint.captureDelay) .stringColumn("AIRCRAFT") // (flight.immatriculation) .stringColumn("COMMENT") // (observation.comment) .build(); @@ -594,6 +594,7 @@ .doubleColumn("LON", 19, 11) .doubleColumn("SPEED", 19, 11) .doubleColumn("ALTITUDE", 19, 11) + .integerColumn("GPS_DELAY") // (geoPoint.captureDelay) .build(); Campaign campaign = dataModel.getCampaign(); @@ -678,6 +679,7 @@ record.put("LON", geoPoint.getLongitude()); record.put("SPEED", geoPoint.getSpeed()); record.put("ALTITUDE", geoPoint.getAltitude()); + record.put("GPS_DELAY", geoPoint.getCaptureDelay()); builder.addValues(record); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java 2012-09-12 14:37:52 UTC (rev 574) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java 2012-09-12 14:38:09 UTC (rev 575) @@ -557,6 +557,18 @@ } }); + // Used to update map for each Species change, Note that this could be + // a heavy coast for onBoard screen + getModel().addPropertyChangeListener( + FlightUIModel.PROPERTY_OBSERVATION_EDIT_BEAN, new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + onObservationChanged((Observation) evt.getOldValue(), + (Observation) evt.getNewValue()); + } + }); + if (getModel().isValidationMode()) { getModel().addPropertyChangeListener( @@ -824,6 +836,20 @@ } } + private void onObservationChanged(Observation oldValue, + Observation newValue) { + + if (oldValue != null) { + oldValue.removePropertyChangeListener( + Observation.PROPERTY_SPECIES, observationSpeciesChangeListener); + } + + if (newValue != null) { + newValue.addPropertyChangeListener( + Observation.PROPERTY_SPECIES, observationSpeciesChangeListener); + } + } + private void onTransectFlightChangedForValidation(TransectFlightModel oldValue, TransectFlightModel newValue) { if (oldValue != null) { @@ -873,15 +899,11 @@ if (oldValue != null) { oldValue.removePropertyChangeListener( Observation.PROPERTY_OBSERVATION_TIME, observationTimeChangeListener); - oldValue.removePropertyChangeListener( - Observation.PROPERTY_SPECIES, observationSpeciesChangeListener); } if (newValue != null) { newValue.addPropertyChangeListener( Observation.PROPERTY_OBSERVATION_TIME, observationTimeChangeListener); - newValue.addPropertyChangeListener( - Observation.PROPERTY_SPECIES, observationSpeciesChangeListener); selectRouteByObservation(newValue); Modified: trunk/src/site/rst/import-export.rst =================================================================== --- trunk/src/site/rst/import-export.rst 2012-09-12 14:37:52 UTC (rev 574) +++ trunk/src/site/rst/import-export.rst 2012-09-12 14:38:09 UTC (rev 575) @@ -201,6 +201,8 @@ geoPoint.speed - ALTITUDE : Altitude de l'avion à ce point GPS geoPoint.altitude +- GPS_DELAY : Délai en secondes depuis la capture GPS + geoPoint.captureDelay Effort ~~~~~~ @@ -361,9 +363,9 @@ * geoPoint.altitude -- GPS_TIME : Heure d'enregistrement du point (rarement différente de celle du parcours) +- GPS_DELAY : Délai en secondes depuis la capture GPS (N) - * format(geoPoint.recordTime, "HHmmss") + * geoPoint.captureDelay - AIRCRAFT : Immatriculation de l'avion @@ -540,9 +542,9 @@ * geoPoint.altitude -- GPS_TIME : Heure d'enregistrement du point (rarement différente de celle du parcours) +- GPS_DELAY : Délai en secondes depuis la capture GPS (N) - * format(geoPoint.recordTime, "HHmmss") + * geoPoint.captureDelay - AIRCRAFT : Immatriculation de l'avion