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

r545 - tags
by maven-release＠users.forge.codelutin.com Sept. 6, 2012

Sept. 6, 2012

Author: maven-release Date: 2012-09-06 12:06:49 +0200 (Thu, 06 Sep 2012) New Revision: 545 Url: http://forge.codelutin.com/repositories/revision/sammoa/545 Log: [maven-release-plugin] copy for tag sammoa-1.0-rc1 Added: tags/sammoa-1.0-rc1/

1 0

r544 - in trunk: . sammoa-application sammoa-persistence sammoa-ui-swing
by maven-release＠users.forge.codelutin.com Sept. 6, 2012

Sept. 6, 2012

Author: maven-release Date: 2012-09-06 12:06:42 +0200 (Thu, 06 Sep 2012) New Revision: 544 Url: http://forge.codelutin.com/repositories/revision/sammoa/544 Log: [maven-release-plugin] prepare release sammoa-1.0-rc1 Modified: trunk/pom.xml trunk/sammoa-application/pom.xml trunk/sammoa-persistence/pom.xml trunk/sammoa-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-06 10:04:09 UTC (rev 543) +++ trunk/pom.xml 2012-09-06 10:06:42 UTC (rev 544) @@ -15,7 +15,7 @@ <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>0.8-SNAPSHOT</version> + <version>1.0-rc1</version> <modules> <module>sammoa-persistence</module> @@ -81,12 +81,12 @@  <scm> - <url>http://svn.forge.codelutin.com/svn/sammoa/trunk</url> + <url>http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-1.0-rc1</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/sammoa/trunk + scm:svn:http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-1.0-rc1 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/sammoa/trunk + scm:svn:http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-1.0-rc1 </developerConnection> </scm> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2012-09-06 10:04:09 UTC (rev 543) +++ trunk/sammoa-application/pom.xml 2012-09-06 10:06:42 UTC (rev 544) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>0.8-SNAPSHOT</version> + <version>1.0-rc1</version> </parent> <artifactId>sammoa-application</artifactId> Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2012-09-06 10:04:09 UTC (rev 543) +++ trunk/sammoa-persistence/pom.xml 2012-09-06 10:06:42 UTC (rev 544) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>0.8-SNAPSHOT</version> + <version>1.0-rc1</version> </parent> <artifactId>sammoa-persistence</artifactId> Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2012-09-06 10:04:09 UTC (rev 543) +++ trunk/sammoa-ui-swing/pom.xml 2012-09-06 10:06:42 UTC (rev 544) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>0.8-SNAPSHOT</version> + <version>1.0-rc1</version> </parent> <artifactId>sammoa-ui-swing</artifactId>

1 0

r543 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar
by maven-release＠users.forge.codelutin.com Sept. 6, 2012

Sept. 6, 2012

Author: maven-release Date: 2012-09-06 12:04:09 +0200 (Thu, 06 Sep 2012) New Revision: 543 Url: http://forge.codelutin.com/repositories/revision/sammoa/543 Log: add missing headers Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioPositionListener.java 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-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioPositionListener.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioPositionListener.java 2012-09-06 09:51:36 UTC (rev 542) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioPositionListener.java 2012-09-06 10:04:09 UTC (rev 543) @@ -1,5 +1,29 @@ package fr.ulr.sammoa.application.device.audio; +/* + * #%L + * SAMMOA :: Application + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 UMS 3462, Code Lutin + * %% + * 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% + */ + /** * Permet de se mettre listener sur l'avancement de la lecture du fichier * <p/> 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-06 09:51:36 UTC (rev 542) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/AudioCheck.java 2012-09-06 10:04:09 UTC (rev 543) @@ -1,5 +1,29 @@ package fr.ulr.sammoa.ui.swing; +/* + * #%L + * SAMMOA :: UI Swing + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 UMS 3462, Code Lutin + * %% + * 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% + */ + import com.google.common.base.Throwables; import fr.ulr.sammoa.application.device.audio.SammoaAudioReader; import fr.ulr.sammoa.application.device.audio.SammoaAudioRecorder; 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:51:36 UTC (rev 542) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java 2012-09-06 10:04:09 UTC (rev 543) @@ -1,5 +1,29 @@ package fr.ulr.sammoa.ui.swing.flight.bar; +/* + * #%L + * SAMMOA :: UI Swing + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 UMS 3462, Code Lutin + * %% + * 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% + */ + import fr.ulr.sammoa.application.device.DeviceState; import fr.ulr.sammoa.application.device.DeviceStateEvent; import fr.ulr.sammoa.application.device.DeviceStateListener;

1 0

r542 - trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps
by bpoussin＠users.forge.codelutin.com Sept. 6, 2012

Sept. 6, 2012

Author: bpoussin Date: 2012-09-06 11:51:36 +0200 (Thu, 06 Sep 2012) New Revision: 542 Url: http://forge.codelutin.com/repositories/revision/sammoa/542 Log: interception du mauvais chargement de lib native 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:46:34 UTC (rev 541) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/GpsHandlerGpsylon.java 2012-09-06 09:51:36 UTC (rev 542) @@ -121,7 +121,7 @@ logAvailablePorts("openedSuccessful"); - } catch (Exception ex) { + } catch (Throwable ex) { // necessaire si on arrive pas a charger la lib native setState(DeviceState.UNAVAILABLE, null);

1 0

r541 - trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps
by fdesbois＠users.forge.codelutin.com Sept. 6, 2012

Sept. 6, 2012

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 Sept. 6, 2012

Sept. 6, 2012

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 Sept. 6, 2012

Sept. 6, 2012

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 Sept. 6, 2012

Sept. 6, 2012

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 Sept. 6, 2012

Sept. 6, 2012

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 Sept. 6, 2012

Sept. 6, 2012

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