September 2012 - Sammoa-commits - mailman.cloud.codelutin.com

r541 - trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps
by fdesbois＠users.forge.codelutin.com 06 Sep '12

06 Sep '12

Author: fdesbois Date: 2012-09-06 11:46:34 +0200 (Thu, 06 Sep 2012) New Revision: 541 Url: http://forge.codelutin.com/repositories/revision/sammoa/541 Log: Catch all exceptions there is an issue when no system lib is available Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsHandlerGpsylon.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsHandlerGpsylon.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsHandlerGpsylon.java 2012-09-06 09:39:40 UTC (rev 540) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsHandlerGpsylon.java 2012-09-06 09:46:34 UTC (rev 541) @@ -121,7 +121,7 @@ logAvailablePorts("openedSuccessful"); - } catch (GPSException ex) { + } catch (Exception ex) { setState(DeviceState.UNAVAILABLE, null);

1 0

r540 - trunk/sammoa-ui-swing/src/main/resources/i18n
by fdesbois＠users.forge.codelutin.com 06 Sep '12

06 Sep '12

Author: fdesbois Date: 2012-09-06 11:39:40 +0200 (Thu, 06 Sep 2012) New Revision: 540 Url: http://forge.codelutin.com/repositories/revision/sammoa/540 Log: Add missing translation Modified: trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties Modified: trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-09-06 09:35:17 UTC (rev 539) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-09-06 09:39:40 UTC (rev 540) @@ -4,8 +4,8 @@ sammoa.action.about=About sammoa.action.about.tip=About sammoa.action.add.tip=ADD \: create a new LEG route for the current Transect (the observation conditions have changed) -sammoa.action.audioCheck= -sammoa.action.audioCheck.tip= +sammoa.action.audioCheck=Audio test +sammoa.action.audioCheck.tip=Audio test sammoa.action.begin=Begin sammoa.action.begin.tip=BEGIN \: begin effort to create a new LEG route for the next selected Transect sammoa.action.cancel=Cancel

1 0

r539 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar
by fdesbois＠users.forge.codelutin.com 06 Sep '12

06 Sep '12

Author: fdesbois Date: 2012-09-06 11:35:17 +0200 (Thu, 06 Sep 2012) New Revision: 539 Url: http://forge.codelutin.com/repositories/revision/sammoa/539 Log: resolve NPE Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java 2012-09-06 09:24:51 UTC (rev 538) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java 2012-09-06 09:35:17 UTC (rev 539) @@ -188,7 +188,7 @@ */ protected void changeSliderInfo() { Date date = getAudioReader().getStartDate(); - long start = date.getTime(); + long start = date == null ? 0 : date.getTime(); long audioLength = getAudioReader().getLength(); int max = (int)audioLength;

1 0

r538 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util
by fdesbois＠users.forge.codelutin.com 06 Sep '12

06 Sep '12

Author: fdesbois Date: 2012-09-06 11:24:51 +0200 (Thu, 06 Sep 2012) New Revision: 538 Url: http://forge.codelutin.com/repositories/revision/sammoa/538 Log: refs #1412 : add positionDate management in AudioReader + resolve issue with TRANSIT route Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReader.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReaderMock.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioReader.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerValidation.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java 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/util/SammoaUtil.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReader.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReader.java 2012-09-06 09:23:15 UTC (rev 537) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReader.java 2012-09-06 09:24:51 UTC (rev 538) @@ -53,10 +53,10 @@ long getLength(); /** - * @return the recording date of the loaded file or null if not provided or + * @return the start date of the loaded file or null if not provided or * no file is loaded */ - Date getRecordingDate(); + Date getStartDate(); /** @param position current audio position in milliseconds to set */ void setPosition(long position); @@ -64,6 +64,10 @@ /** @return current audio position in milliseconds */ long getPosition(); + void setPositionDate(Date date); + + Date getPositionDate(); + void addAudioPositionListener(AudioPositionListener listener); void removeAudioPositionListener(AudioPositionListener listener); Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReaderMock.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReaderMock.java 2012-09-06 09:23:15 UTC (rev 537) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReaderMock.java 2012-09-06 09:24:51 UTC (rev 538) @@ -81,7 +81,7 @@ } @Override - public Date getRecordingDate() { + public Date getStartDate() { return null; } @@ -96,6 +96,15 @@ } @Override + public void setPositionDate(Date date) { + } + + @Override + public Date getPositionDate() { + return null; + } + + @Override public void open() throws DeviceTechnicalException { // no state set here, only open device and throw error } Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioReader.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioReader.java 2012-09-06 09:23:15 UTC (rev 537) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioReader.java 2012-09-06 09:24:51 UTC (rev 538) @@ -28,6 +28,7 @@ import fr.ulr.sammoa.application.device.DeviceStateEvent; import fr.ulr.sammoa.application.device.DeviceStateListener; import fr.ulr.sammoa.application.device.DeviceTechnicalException; +import fr.ulr.sammoa.persistence.Dates; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -68,7 +69,7 @@ protected long audioLength; // Length of the sound. protected long audioPosition = 0; // Current position within the sound - protected Date recordingDate; + protected Date startDate; protected DeviceState state = DeviceState.UNAVAILABLE; @@ -184,7 +185,7 @@ for (AudioPositionListener l : audioPositionListener) { l.audioChanged(this, audioLength); } - this.recordingDate = recordingDate; + this.startDate = recordingDate; setState(DeviceState.READY); logger.debug(String.format("Sound file '%s' loaded", file)); @@ -202,7 +203,9 @@ clip.close(); clip = null; } - recordingDate = null; + startDate = null; + audioLength = 0; + audioPosition = 0; setState(DeviceState.UNAVAILABLE); } @@ -212,8 +215,8 @@ } @Override - public Date getRecordingDate() { - return recordingDate; + public Date getStartDate() { + return startDate; } @Override @@ -240,6 +243,41 @@ } @Override + public void setPositionDate(Date date) { + Preconditions.checkNotNull(date); + + if (startDate != null) { + long duration = Dates + .toInterval(startDate, date) + .toDuration() + .getMillis(); + + setPosition(duration); + + } else { + if (logger.isWarnEnabled()) { + logger.warn("StartDate is not defined, you can't set the " + + "position date {}", date); + } + } + } + + @Override + public Date getPositionDate() { + Date result; + if (startDate == null) { + result = null; + + } else { + result = Dates + .toDateTime(startDate) + .plus(audioPosition) + .toDate(); + } + return result; + } + + @Override public void open() throws DeviceTechnicalException { // no state set here, only open device and throw error } Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerValidation.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerValidation.java 2012-09-06 09:23:15 UTC (rev 537) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerValidation.java 2012-09-06 09:24:51 UTC (rev 538) @@ -82,24 +82,28 @@ @Override protected GeoPoint getLocation(TopiaContext tx) throws TopiaException { - Preconditions.checkNotNull(currentTransect, "You must set the current transect to retrieve location"); + Preconditions.checkNotNull(currentRoute, "You must set the current route to retrieve location"); Preconditions.checkState(!geoPoints.isEmpty(), "No geoPoints available"); GeoPoint result; - DateTime startTime = Dates.toDateTime(getAudioReader().getRecordingDate()); - - long position = getAudioReader().getPosition(); - if (logger.isDebugEnabled()) { logger.debug(String.format("Get location after startTime %1$tH:%1$tM:%1$tS.%1$tL (audio position = %2$d)", - startTime.toDate(), - position) + getAudioReader().getStartDate(), + getAudioReader().getPosition()) ); } - DateTime newTime = startTime.plus(position).withMillisOfSecond(0); + Date positionDate = getAudioReader().getPositionDate(); + DateTime newTime; + if (positionDate == null) { + newTime = Dates.toDateTime(currentRoute.getBeginTime()); + + } else { + newTime = Dates.toDateTime(positionDate).withMillisOfSecond(0); + } + if (logger.isDebugEnabled()) { logger.debug(String.format("Get location at newTime %1$tH:%1$tM:%1$tS.%1$tL", newTime.toDate()) Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 2012-09-06 09:23:15 UTC (rev 537) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 2012-09-06 09:24:51 UTC (rev 538) @@ -488,6 +488,10 @@ int index = TransectFlightModel.indexOfTransectFlight( getModel().getTransectFlights(), route.getTransectFlight()); SammoaUtil.selectTableRow(ui.getTransectTable(), index); + + // for TRANSIT/CIRCLE_BACK route, we unselect all the table + } else { + SammoaUtil.unselectAll(ui.getTransectTable()); } transectFlightSelectionIsAdjusting = false; Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java 2012-09-06 09:23:15 UTC (rev 537) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java 2012-09-06 09:24:51 UTC (rev 538) @@ -6,6 +6,8 @@ import fr.ulr.sammoa.application.device.audio.AudioPositionListener; import fr.ulr.sammoa.application.device.audio.AudioReader; import fr.ulr.sammoa.application.device.audio.SammoaAudioReader; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.FastDateFormat; import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.UnsupportedAudioFileException; @@ -26,9 +28,6 @@ import java.io.IOException; import java.util.Date; import java.util.Hashtable; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.time.DateUtils; -import org.apache.commons.lang3.time.FastDateFormat; /** * Composant qui permet de charge un fichier audio et de le jouer. On peut se @@ -188,7 +187,7 @@ * On met a la seconde dans le slider */ protected void changeSliderInfo() { - Date date = getAudioReader().getRecordingDate(); + Date date = getAudioReader().getStartDate(); long start = date.getTime(); long audioLength = getAudioReader().getLength(); 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-06 09:23:15 UTC (rev 537) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java 2012-09-06 09:24:51 UTC (rev 538) @@ -31,6 +31,7 @@ import fr.ulr.sammoa.application.device.DeviceState; import fr.ulr.sammoa.application.device.DeviceStateEvent; import fr.ulr.sammoa.application.device.DeviceStateListener; +import fr.ulr.sammoa.application.device.audio.AudioReader; import fr.ulr.sammoa.application.device.audio.AudioRecorder; import fr.ulr.sammoa.application.device.gps.GpsHandler; import fr.ulr.sammoa.application.flightController.FlightController; @@ -371,6 +372,11 @@ // no unselect but ensure valid button (a select will cause a loop) getModel().setObservationEditBean(null); + + // Set audio position + if (route != null) { + setAudioReaderPositionDate(route.getBeginTime()); + } } } ); @@ -573,6 +579,9 @@ observationTimeChangeListener); selectRouteByObservation(newValue); + + // Set audio position + setAudioReaderPositionDate(newValue.getObservationTime()); } } }); @@ -790,6 +799,14 @@ return getModel().isValidationMode() ? "validation" : "onBoard"; } + protected void setAudioReaderPositionDate(Date date) { + FlightController flightController = getParentUI().getHandler().getFlightController(); + AudioReader audioReader = flightController.getDeviceManager(AudioReader.class); + if (audioReader.getState() == DeviceState.READY) { + audioReader.setPositionDate(date); + } + } + protected void fireObservationsUpdated(Route route, boolean scrollToFirst) { Iterable<Observation> observations = Observations.filterInRoute( Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SammoaUtil.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SammoaUtil.java 2012-09-06 09:23:15 UTC (rev 537) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SammoaUtil.java 2012-09-06 09:24:51 UTC (rev 538) @@ -110,6 +110,13 @@ table.setRowSelectionInterval(viewIndex, viewIndex); } + public static void unselectAll(JTable table) { + int size = table.getRowCount(); + if (size > 0) { + table.removeRowSelectionInterval(0, size - 1); + } + } + public static int getLastSelectedTableRow(JTable table) { int result; int nbRows = table.getSelectedRows().length;

1 0

r537 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar
by bpoussin＠users.forge.codelutin.com 06 Sep '12

06 Sep '12

Author: bpoussin Date: 2012-09-06 11:23:15 +0200 (Thu, 06 Sep 2012) New Revision: 537 Url: http://forge.codelutin.com/repositories/revision/sammoa/537 Log: disable de la progress si erreur ou unavailable Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java 2012-09-06 08:52:38 UTC (rev 536) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java 2012-09-06 09:23:15 UTC (rev 537) @@ -49,7 +49,7 @@ */ public class SoundPlayer extends JComponent implements DeviceStateListener, AudioPositionListener { protected AudioReader reader; -// protected boolean playing = false; // whether the sound is currently playing + // le fichier charge acutellement au niveau de l'ui (config du slider protected File currentFile; @@ -79,11 +79,13 @@ stop.setEnabled(false); progress = new JSlider(0, 0, 0); + progress.setMajorTickSpacing(60000); // toutes les 60s + progress.setMinorTickSpacing(10000); // toutes les 10s progress.setPaintTicks(true); progress.setPaintLabels(true); - time = new JLabel("0"); // Shows position as a # - maxTime = new JLabel("/0"); // Shows position as a # + time = new JLabel("0.0"); // Shows position as a # + maxTime = new JLabel("/0.0"); // Shows position as a # // put those controls in a row Box row = Box.createHorizontalBox( ); @@ -159,19 +161,25 @@ case READY: // on vient de charger un fichier, ou arrete la lecture du fichier play.setEnabled(true); stop.setEnabled(false); + progress.setEnabled(true); changeSliderInfo(); break; case RUNNING: // un fichier est en cours de lecture play.setEnabled(false); stop.setEnabled(true); + progress.setEnabled(true); break; case UNAVAILABLE: // aucun fichier charge play.setEnabled(false); stop.setEnabled(false); + progress.setEnabled(false); + changeSliderInfo(); break; case ERROR: // erreur sur le lecture audio (erreur I/O) play.setEnabled(false); stop.setEnabled(false); + progress.setEnabled(false); + changeSliderInfo(); break; } } @@ -187,17 +195,14 @@ int max = (int)audioLength; // si la longueur du morceau change, on change l'info affichee if (progress.getMaximum() != max) { + progress.setValue((int)getAudioReader().getPosition()); progress.setMaximum(max); // Affichage du temps String maxTimeString = (max/1000) + "." + (audioLength % 1000) / 100; maxTime.setText("/" + maxTimeString); timePad = maxTimeString.length(); - time.setText(StringUtils.leftPad("0.0", timePad, '0')); - progress.setMajorTickSpacing(60000); // toutes les 60s - progress.setMinorTickSpacing(10000); // toutes les 10s - // calcul de l'espace entre chaque affichage de l'heure en fonction de la longueur du slider double width = progress.getSize().getWidth(); long step = audioLength * 100 / (long)width; // on minimum tous les 100px

1 0

r536 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort
by tchemit＠users.forge.codelutin.com 06 Sep '12

06 Sep '12

Author: tchemit Date: 2012-09-06 10:52:38 +0200 (Thu, 06 Sep 2012) New Revision: 536 Url: http://forge.codelutin.com/repositories/revision/sammoa/536 Log: fix decoration of validated bean Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java 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-06 08:33:03 UTC (rev 535) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java 2012-09-06 08:52:38 UTC (rev 536) @@ -161,19 +161,22 @@ JTable errorTable = ui.getErrorTable(); // prepare error table ui - SwingValidatorUtil.installUI( - errorTable, - new SwingListValidatorMessageTableRenderer() { + SwingListValidatorMessageTableRenderer render = new SwingListValidatorMessageTableRenderer() { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - @Override - protected String decorateBean(Object bean) { - return decoratorService.getDecorator(bean).toString(bean); - } + @Override + protected String decorateBean(Object bean) { + return decoratorService.getDecorator(bean).toString(bean); + } - } + }; + SwingValidatorUtil.installUI( + errorTable, + render ); + //FIXME: this should be done in JAXX (http://nuiton.org/issues/2303) + errorTable.getColumnModel().getColumn(1).setCellRenderer(render); initRouteTable();

1 0

r535 - in trunk: sammoa-application/src/main/resources/i18n sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence
by fdesbois＠users.forge.codelutin.com 06 Sep '12

06 Sep '12

Author: fdesbois Date: 2012-09-06 10:33:03 +0200 (Thu, 06 Sep 2012) New Revision: 535 Url: http://forge.codelutin.com/repositories/revision/sammoa/535 Log: repair broken test Modified: trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPoints.java trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/GeoPointsTest.java Modified: trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties =================================================================== --- trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties 2012-09-06 08:05:18 UTC (rev 534) +++ trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties 2012-09-06 08:33:03 UTC (rev 535) @@ -1,6 +1,7 @@ sammoa.config.admin.email=Administrator's email sammoa.config.application.site.url=Website URL of the application sammoa.config.application.version=Version of the application +sammoa.config.audio.compression= sammoa.config.audio.recordDelayInSeconds=Delay in seconds between each audio record. This will record multiple files at the same time to avoid too sudden stops. (Warning \: this is not supported by all sound systems) sammoa.config.audio.sampleRate=Rate for the audio sampling (possible values \: 8000, 11025, 16000, 22050, 44100) sammoa.config.audio.sampleSizeInBits=Size of bits for the audio sampling (possible values \: 8, 16) Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPoints.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPoints.java 2012-09-06 08:05:18 UTC (rev 534) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPoints.java 2012-09-06 08:33:03 UTC (rev 535) @@ -25,11 +25,13 @@ import com.google.common.base.Function; import com.google.common.base.Objects; +import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.FluentIterable; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; +import org.joda.time.DateTime; import org.joda.time.Interval; import java.util.Comparator; @@ -49,6 +51,12 @@ // static class do not have instanciation } + public static GeoPoint newEmptyGeoPoint(Date recordTime) { + GeoPointImpl result = new GeoPointImpl(EMPTY_COORDINATE, EMPTY_COORDINATE); + result.setRecordTime(recordTime); + return result; + } + public static boolean equal(GeoPoint geoPoint1, GeoPoint geoPoint2) { boolean result = geoPoint1 == null && geoPoint2 == null; @@ -104,7 +112,11 @@ // We continue starting from the previous index to avoid loop on all the date list index = getBeforeDateIndex(index > 0 ? index - 1 : 0, geoPointDates, date); - result.add(geoPoints.get(index)); + if (index != -1) { + result.add(geoPoints.get(index)); + } else { + result.add(newEmptyGeoPoint(date)); + } } } return result; @@ -122,13 +134,26 @@ List<Date> geoPointDates = Lists.transform(source, toDate()); int index = getBeforeDateIndex(0, geoPointDates, date); - result = geoPoints.get(index); + if (index != -1) { + result = geoPoints.get(index); + } else { + result = newEmptyGeoPoint(date); + } } return result; } protected static int getBeforeDateIndex(int startIndex, List<Date> source, Date date) { int size = source.size(); + Preconditions.checkElementIndex(startIndex, size); + DateTime dateTime = Dates.toDateTime(date); + + // If the first date is after the argument date we return -1, no date + // is available before + if (Dates.toDateTime(source.get(0)).isAfter(dateTime)) { + return -1; + } + for (int index = startIndex; index < size; index++) { int nextIndex = index + 1; @@ -138,7 +163,7 @@ Date end = source.get(nextIndex); Interval interval = Dates.toInterval(begin, end); - if (interval.contains(Dates.toDateTime(date))) { + if (interval.contains(dateTime)) { return index; } Modified: trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/GeoPointsTest.java =================================================================== --- trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/GeoPointsTest.java 2012-09-06 08:05:18 UTC (rev 534) +++ trunk/sammoa-persistence/src/test/java/fr/ulr/sammoa/persistence/GeoPointsTest.java 2012-09-06 08:33:03 UTC (rev 535) @@ -79,7 +79,9 @@ List<GeoPoint> result = GeoPoints.getClosestPoints(geoPoints, dates); Assert.assertEquals(3, result.size()); - Assert.assertEquals(8000, result.get(0).getRecordTime().getTime()); + Assert.assertEquals(4178, result.get(0).getRecordTime().getTime()); + Assert.assertEquals(GeoPoints.EMPTY_COORDINATE, result.get(0).getLatitude()); + Assert.assertEquals(GeoPoints.EMPTY_COORDINATE, result.get(0).getLongitude()); Assert.assertEquals(8000, result.get(1).getRecordTime().getTime()); Assert.assertEquals(15000, result.get(2).getRecordTime().getTime()); }

1 0

r534 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing
by bpoussin＠users.forge.codelutin.com 06 Sep '12

06 Sep '12

Author: bpoussin Date: 2012-09-06 10:05:18 +0200 (Thu, 06 Sep 2012) New Revision: 534 Url: http://forge.codelutin.com/repositories/revision/sammoa/534 Log: ajout du support de la compression dans la config Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioConfig.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioRecorder.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/AudioCheck.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioConfig.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioConfig.java 2012-09-05 16:32:30 UTC (rev 533) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioConfig.java 2012-09-06 08:05:18 UTC (rev 534) @@ -43,6 +43,12 @@ } /** @return {@link AudioConfigOption#SAMPLE_RATE} value */ + public String getCompression() { + String result = applicationConfig.getOption(AudioConfigOption.COMPRESSION.key); + return result; + } + + /** @return {@link AudioConfigOption#SAMPLE_RATE} value */ public float getSampleRate() { float result = applicationConfig.getOptionAsFloat(AudioConfigOption.SAMPLE_RATE.key); return result; @@ -63,6 +69,13 @@ public enum AudioConfigOption implements ApplicationConfig.OptionDef { /** Sampel rate to record audio */ + COMPRESSION( + "sammoa.audio.compression", + n_("sammoa.config.audio.compression"), + "ULAW", + String.class + ), + /** Sampel rate to record audio */ SAMPLE_RATE( "sammoa.audio.sampleRate", n_("sammoa.config.audio.sampleRate"), Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioRecorder.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioRecorder.java 2012-09-05 16:32:30 UTC (rev 533) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioRecorder.java 2012-09-06 08:05:18 UTC (rev 534) @@ -43,6 +43,7 @@ import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.TargetDataLine; import org.apache.commons.io.FilenameUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -72,6 +73,8 @@ protected AudioFormat audioFormat; + protected AudioFormat.Encoding encoding; + protected AudioFileFormat.Type outputType; protected DeviceState state; @@ -85,7 +88,7 @@ public SammoaAudioRecorder(AudioConfig config) { this.config = config; init(config.getSampleRate(), config.getSampleSizeInBits(), - config.getRecordDelayInSeconds()); + config.getCompression(), config.getRecordDelayInSeconds()); } /** @@ -95,11 +98,12 @@ * @param delay le delai avant de reellement coupe un enregistrement (tous * les PC ne le supporte pas) */ - public SammoaAudioRecorder(float sampleRate, int sampleSizeInBits, int delay) { - init(sampleRate, sampleSizeInBits, delay); + public SammoaAudioRecorder( + float sampleRate, int sampleSizeInBits, String compression, int delay) { + init(sampleRate, sampleSizeInBits, compression, delay); } - protected void init(float sampleRate, int sampleSizeInBits, int delay) { + protected void init(float sampleRate, int sampleSizeInBits, String compression, int delay) { this.delay = delay; int channels = 1; // 1,2 @@ -113,6 +117,12 @@ signed, bigEndian); + if (StringUtils.isNotBlank(compression)) { + encoding = new AudioFormat.Encoding(compression); + } else { + encoding = AudioFormat.Encoding.PCM_SIGNED; + } + outputType = AudioFileFormat.Type.WAVE; listeners = Sets.newHashSet(); } @@ -216,7 +226,7 @@ stop(); // start new recorder thread currentRecorder = new AudioRecorderThread( - audioFormat, outputType, outputFile, delay, this); + audioFormat, encoding, outputType, outputFile, delay, this); currentRecorder.start(); setState(DeviceState.RUNNING, null); @@ -260,11 +270,10 @@ protected AudioInputStream stream; protected SammoaAudioRecorder audioRecorder; - public AudioRecorderThread(AudioFormat audioFormat, - AudioFileFormat.Type fileType, - File file, - long delayToClose, - SammoaAudioRecorder audioRecorder) + public AudioRecorderThread( + AudioFormat audioFormat, AudioFormat.Encoding encoding, + AudioFileFormat.Type fileType, File file, long delayToClose, + SammoaAudioRecorder audioRecorder) throws LineUnavailableException { this.fileType = fileType; @@ -277,12 +286,10 @@ targetDataLine = (TargetDataLine) AudioSystem.getLine(dataLineInfo); - AudioFormat.Encoding targetEncoding = AudioFormat.Encoding.PCM_SIGNED; //ULAW; - targetDataLine.open(audioFormat); targetDataLine.start(); stream = new AudioInputStream(targetDataLine); - stream = AudioSystem.getAudioInputStream(targetEncoding, stream); + stream = AudioSystem.getAudioInputStream(encoding, stream); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/AudioCheck.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/AudioCheck.java 2012-09-05 16:32:30 UTC (rev 533) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/AudioCheck.java 2012-09-06 08:05:18 UTC (rev 534) @@ -10,16 +10,24 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; import java.io.File; import java.io.IOException; import java.util.Date; +import javax.sound.sampled.AudioSystem; +import javax.sound.sampled.Control; +import javax.sound.sampled.Line; import javax.sound.sampled.LineUnavailableException; +import javax.sound.sampled.Mixer; +import javax.sound.sampled.Port; import javax.sound.sampled.UnsupportedAudioFileException; import javax.swing.BorderFactory; import javax.swing.Box; import javax.swing.ButtonGroup; import javax.swing.JButton; import javax.swing.JFrame; +import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.JTextArea; @@ -63,6 +71,9 @@ protected JButton loadBtn = new JButton("Load"); protected SoundPlayer playerPanel = new SoundPlayer(new SammoaAudioReader()); + protected JLabel compressionLabel = new JLabel("Compression"); + protected JTextField compression = new JTextField("ULAW"); + protected JPanel btnPanelSampleRate = new JPanel(); protected ButtonGroup btnGroupSampleRate = new ButtonGroup(); JRadioButton[] btnSampleRate = new JRadioButton[]{ @@ -94,6 +105,11 @@ box.add(filenameField); box.add(buttons); + Box compressionBox = Box.createHorizontalBox(); + compressionBox.add(compressionLabel); + compressionBox.add(compression); + box.add(compressionBox); + for (JRadioButton b : btnSampleRate) { //Include the radio buttons in a group btnGroupSampleRate.add(b); @@ -145,6 +161,14 @@ // ADD LISTENER + compression.addKeyListener( + new KeyAdapter(){ + @Override + public void keyReleased(KeyEvent e) { + updateConfigInfo(); + } + }); + //Register anonymous listeners captureBtn.addActionListener( new ActionListener(){ @@ -179,13 +203,18 @@ protected void captureAudio(){ try{ File file = new File(filenameField.getText()); - recorder = new SammoaAudioRecorder(getSampleRate(), getSampleSizeInBits(), 0); + recorder = new SammoaAudioRecorder( + getSampleRate(), getSampleSizeInBits(), getCompression(), 0); recorder.record(file, true); }catch (Exception eee) { logger.error("Can't capture audio", eee); } } + protected String getCompression() { + return compression.getText(); + } + protected float getSampleRate() { float result = 44100; for (JRadioButton b : btnSampleRate) { @@ -210,13 +239,14 @@ informationArea.setText(String.format( "sammoa.audio.recordDelayInSeconds=%s\n" + "sammoa.audio.sampleRate=%s\n" - + "sammoa.audio.sampleSizeInBits=%s\n", - delay, getSampleRate(), getSampleSizeInBits())); + + "sammoa.audio.sampleSizeInBits=%s\n" + + "sammoa.audio.compression=%s\n", + delay, getSampleRate(), getSampleSizeInBits(), getCompression())); } protected void checkMultiRecord() { - SammoaAudioRecorder r1 = new SammoaAudioRecorder(8000, 16, 2); - SammoaAudioRecorder r2 = new SammoaAudioRecorder(8000, 16, 2); + SammoaAudioRecorder r1 = new SammoaAudioRecorder(8000, 16, "", 2); + SammoaAudioRecorder r2 = new SammoaAudioRecorder(8000, 16, "", 2); try { File f1 = File.createTempFile("sammoa-audioCheck-", ".wav"); f1.deleteOnExit();

1 0

r533 - in trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing: . flight/bar
by bpoussin＠users.forge.codelutin.com 05 Sep '12

05 Sep '12

Author: bpoussin Date: 2012-09-05 18:32:30 +0200 (Wed, 05 Sep 2012) New Revision: 533 Url: http://forge.codelutin.com/repositories/revision/sammoa/533 Log: ajout des heures sur le slide du reader audio Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/AudioCheck.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/AudioCheck.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/AudioCheck.java 2012-09-05 16:25:45 UTC (rev 532) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/AudioCheck.java 2012-09-05 16:32:30 UTC (rev 533) @@ -12,6 +12,7 @@ import java.awt.event.ActionListener; import java.io.File; import java.io.IOException; +import java.util.Date; import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.UnsupportedAudioFileException; import javax.swing.BorderFactory; @@ -170,7 +171,7 @@ public void actionPerformed( ActionEvent e){ File file = new File(filenameField.getText()); - playerPanel.loadFile(file); + playerPanel.getAudioReader().load(file, new Date()); } }); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java 2012-09-05 16:25:45 UTC (rev 532) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java 2012-09-05 16:32:30 UTC (rev 533) @@ -24,6 +24,11 @@ import java.awt.event.MouseEvent; import java.io.File; import java.io.IOException; +import java.util.Date; +import java.util.Hashtable; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; +import org.apache.commons.lang3.time.FastDateFormat; /** * Composant qui permet de charge un fichier audio et de le jouer. On peut se @@ -44,13 +49,17 @@ */ public class SoundPlayer extends JComponent implements DeviceStateListener, AudioPositionListener { protected AudioReader reader; - protected boolean playing = false; // whether the sound is currently playing +// protected boolean playing = false; // whether the sound is currently playing + // le fichier charge acutellement au niveau de l'ui (config du slider + protected File currentFile; // The following fields are for the GUI - protected JButton play; // The Play/Stop button + protected JButton play; // The Play button + protected JButton stop; // The Stop button protected JSlider progress; // Shows and sets current position in sound protected JLabel time; // Displays audioPosition as a number protected JLabel maxTime; + protected int timePad; // le nombre de caratere a ajouter pour le temps // Create a SoundPlayer component for the specified file. public SoundPlayer() { @@ -64,19 +73,22 @@ protected void initUI() { // Now create the basic GUI - play = new JButton("Play"); // Play/stop button - progress = new JSlider(0, 0, 0); // Shows position in sound - progress.setMajorTickSpacing(60000); - progress.setMinorTickSpacing(10000); + play = new JButton("Play"); + play.setEnabled(false); + stop = new JButton("Stop"); + stop.setEnabled(false); + + progress = new JSlider(0, 0, 0); progress.setPaintTicks(true); progress.setPaintLabels(true); - + time = new JLabel("0"); // Shows position as a # maxTime = new JLabel("/0"); // Shows position as a # // put those controls in a row Box row = Box.createHorizontalBox( ); row.add(play); + row.add(stop); row.add(progress); row.add(time); row.add(maxTime); @@ -90,20 +102,23 @@ // When clicked, start or stop playing the sound play.addActionListener(new ActionListener( ) { public void actionPerformed(ActionEvent e) { - if (playing) { - stop( ); - } else { - play( ); - } + play(); } }); + // When clicked, start or stop playing the sound + stop.addActionListener(new ActionListener( ) { + public void actionPerformed(ActionEvent e) { + stop(); + } + }); + progress.addMouseListener(new MouseAdapter() { boolean inPlay = false; @Override public void mousePressed(MouseEvent e) { - inPlay= playing; + inPlay= getAudioReader().getState() == DeviceState.RUNNING; if (inPlay) { reader.stop(); } @@ -113,7 +128,7 @@ public void mouseReleased(MouseEvent e) { int value = progress.getValue( ); // Update the time label - time.setText(value/1000 + "." + (value%1000)/100); +// time.setText(value/1000 + "." + (value%1000)/100); // If we're not already there, skip there. if (value >= 0 && value <= reader.getLength()) { reader.setPosition(value); @@ -128,8 +143,11 @@ // Whenever the slider value changes, update the time label. progress.addChangeListener(new ChangeListener( ) { public void stateChanged(ChangeEvent e) { + // changement du text de position int value = progress.getValue( ); - time.setText(value/1000 + "." + (value%1000)/100); + String timeString = value/1000 + "." + (value%1000)/100; + timeString = StringUtils.leftPad(timeString, timePad, '0'); + time.setText(timeString); } }); } @@ -137,41 +155,87 @@ @Override public void stateChanged(DeviceStateEvent event) { DeviceState state = event.getNewValue(); - if (state == DeviceState.RUNNING) { - this.playing = true; - play.setText("Stop"); - } else { - this.playing = false; - play.setText("Play"); + switch (state) { + case READY: // on vient de charger un fichier, ou arrete la lecture du fichier + play.setEnabled(true); + stop.setEnabled(false); + changeSliderInfo(); + break; + case RUNNING: // un fichier est en cours de lecture + play.setEnabled(false); + stop.setEnabled(true); + break; + case UNAVAILABLE: // aucun fichier charge + play.setEnabled(false); + stop.setEnabled(false); + break; + case ERROR: // erreur sur le lecture audio (erreur I/O) + play.setEnabled(false); + stop.setEnabled(false); + break; } } + FastDateFormat dateFormat = FastDateFormat.getInstance("HH:mm"); + /** + * On met a la seconde dans le slider + */ + protected void changeSliderInfo() { + Date date = getAudioReader().getRecordingDate(); + long start = date.getTime(); - @Override - public void positionChanged(AudioReader source, long audioPosition) { - progress.setValue((int) audioPosition); + long audioLength = getAudioReader().getLength(); + int max = (int)audioLength; + // si la longueur du morceau change, on change l'info affichee + if (progress.getMaximum() != max) { + progress.setMaximum(max); + + // Affichage du temps + String maxTimeString = (max/1000) + "." + (audioLength % 1000) / 100; + maxTime.setText("/" + maxTimeString); + timePad = maxTimeString.length(); + time.setText(StringUtils.leftPad("0.0", timePad, '0')); + + progress.setMajorTickSpacing(60000); // toutes les 60s + progress.setMinorTickSpacing(10000); // toutes les 10s + + // calcul de l'espace entre chaque affichage de l'heure en fonction de la longueur du slider + double width = progress.getSize().getWidth(); + long step = audioLength * 100 / (long)width; // on minimum tous les 100px + step = Math.max(step, 60000); // on prend pas en dessous de la minute + + //Create the label table + Hashtable<Integer, JLabel> labelTable = new Hashtable<Integer, JLabel>(); + labelTable.put( 0, new JLabel(dateFormat.format(start)) ); + for (int i = (int)step; i+step<max; i+=step) { // on ne met pas l'avant dernier vu qu'on met max ensuite + labelTable.put( i, new JLabel(dateFormat.format(start + i)) ); + } + labelTable.put( max, new JLabel(dateFormat.format(start + audioLength)) ); + progress.setLabelTable( labelTable ); + } } - @Override - public void audioChanged(AudioReader source, long audioLength) { - progress.setMaximum((int) audioLength); - maxTime.setText("/" + audioLength / 1000 + "." + (audioLength % 1000) / 100); + public JButton getPlayButton() { + return play; } - /** - * Charge un nouveau fichier - * @param f le fichier a charger - */ - public void loadFile(File f) { - getAudioReader().load(f, null); + public JButton getStopButton() { + return stop; } + @Override + public void positionChanged(AudioReader source, long audioPosition) { + // changement de la position du slider + int pos = (int)audioPosition; + progress.setValue(pos); + } + public void setReader(AudioReader reader) { if (this.reader != null) { this.reader.removeAudioPositionListener(this); this.reader.removeDeviceStateListener(this); } this.reader = reader; - if (reader != null) { + if (this.reader != null) { reader.addDeviceStateListener(this); reader.addAudioPositionListener(this); } @@ -186,23 +250,31 @@ return reader; } - /** - * Donne la position actuelle de la lecture en milliseconde - * @return - */ - public long getPosition() { - return getAudioReader().getPosition(); - } +// /** +// * Charge un nouveau fichier +// * @param f le fichier a charger +// */ +// public void loadFile(File f) { +// getAudioReader().load(f); +// } +// +// /** +// * Donne la position actuelle de la lecture en milliseconde +// * @return +// */ +// public long getPosition() { +// return getAudioReader().getPosition(); +// } +// +// /** +// * Donne la longueur total du fichier en milliseconde +// * @return +// */ +// public long getLength() { +// return getAudioReader().getLength(); +// } /** - * Donne la longueur total du fichier en milliseconde - * @return - */ - public long getLength() { - return getAudioReader().getLength(); - } - - /** * Start playing the sound at the current position */ public void play() { @@ -232,7 +304,7 @@ player = new SoundPlayer(); AudioReader reader = new SammoaAudioReader(); player.setReader(reader); - player.loadFile(file); + reader.load(file, new Date()); // Put it in a window and play it JFrame f = new JFrame("SoundPlayer"); @@ -241,4 +313,8 @@ f.pack(); f.setVisible(true); } + + public void audioChanged(AudioReader source, long audioLength) { + // A SUPPRIMER + } } \ No newline at end of file

1 0

r532 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence
by fdesbois＠users.forge.codelutin.com 05 Sep '12

05 Sep '12

Author: fdesbois Date: 2012-09-05 18:25:45 +0200 (Wed, 05 Sep 2012) New Revision: 532 Url: http://forge.codelutin.com/repositories/revision/sammoa/532 Log: refs #1412 : little improvement for location time on audio reading Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerValidation.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlights.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerValidation.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerValidation.java 2012-09-05 16:05:45 UTC (rev 531) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerValidation.java 2012-09-05 16:25:45 UTC (rev 532) @@ -44,6 +44,7 @@ import org.slf4j.LoggerFactory; import java.io.File; +import java.util.Date; import java.util.List; /** @@ -86,25 +87,19 @@ GeoPoint result; - DateTime previousTime = TransectFlights.getStartTime(currentTransect, routes); + DateTime startTime = Dates.toDateTime(getAudioReader().getRecordingDate()); - int position = (int) getAudioReader().getPosition() / 1000; + long position = getAudioReader().getPosition(); if (logger.isDebugEnabled()) { - logger.debug(String.format("Get location after previousTime %1$tH:%1$tM:%1$tS.%1$tL (audio position = %2$d)", - previousTime.toDate(), + logger.debug(String.format("Get location after startTime %1$tH:%1$tM:%1$tS.%1$tL (audio position = %2$d)", + startTime.toDate(), position) ); } - DateTime newTime; - if (position > 0) { - newTime = previousTime.plusSeconds(position); + DateTime newTime = startTime.plus(position).withMillisOfSecond(0); - } else { - newTime = new DateTime(previousTime); - } - if (logger.isDebugEnabled()) { logger.debug(String.format("Get location at newTime %1$tH:%1$tM:%1$tS.%1$tL", newTime.toDate()) @@ -185,8 +180,8 @@ if (file.exists()) { - DateTime startTime = TransectFlights.getStartTime(currentTransect, routes); - audioReader.load(file, startTime.toDate()); + Date startTime = TransectFlights.getStartTime(currentTransect, routes); + audioReader.load(file, startTime); } } } Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlights.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlights.java 2012-09-05 16:05:45 UTC (rev 531) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlights.java 2012-09-05 16:25:45 UTC (rev 532) @@ -27,7 +27,6 @@ import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; import com.google.common.collect.Sets; -import org.joda.time.DateTime; import org.nuiton.validator.bean.list.BeanListValidator; import java.util.Date; @@ -53,14 +52,14 @@ * @param routes Collection of routes * @return the transectFlight start time */ - public static DateTime getStartTime(TransectFlight transectFlight, Iterable<Route> routes) { + public static Date getStartTime(TransectFlight transectFlight, Iterable<Route> routes) { Date result = FluentIterable .from(routes) .filter(Routes.withTransectFlight(transectFlight)) .first() .transform(Routes.toDate()) .get(); - return Dates.toDateTime(result); + return result; } public static Set<ObserverPosition> toObserverPositions(Iterable<TransectFlight> transectFlights) {

1 0