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

r707 - in trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application: . io/input/csv io/input/map
by sbavencoff＠users.forge.codelutin.com 06 Jun '14

06 Jun '14

Author: sbavencoff Date: 2014-06-06 10:41:08 +0200 (Fri, 06 Jun 2014) New Revision: 707 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/707 Log: fixes #5190 : Erreur ?\195?\160 l'import des fichiers .sammoa Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/FlightService.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/csv/ImportCsvService.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/ImportMapService.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/FlightService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/FlightService.java 2014-06-05 08:52:41 UTC (rev 706) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/FlightService.java 2014-06-06 08:41:08 UTC (rev 707) @@ -169,7 +169,7 @@ long start = TimeLog.getTime(); FlightTopiaDao dao = transaction.getFlightDao(); - Flight result = (Flight) dao.forTopiaIdEquals(flightId).findUniqueOrNull(); + Flight result = dao.forTopiaIdEquals(flightId).findUniqueOrNull(); Preconditions.checkNotNull( result, String.format("%s doesn't exist", flightId)); @@ -341,7 +341,7 @@ try { FlightTopiaDao dao = tx.getFlightDao(); - Flight flight = (Flight) dao.forTopiaIdEquals(flightId).findUnique(); + Flight flight = dao.forTopiaIdEquals(flightId).findUnique(); // delete geoPoints List<GeoPoint> geoPoints = getFlightGeoPoints(tx, flight); @@ -1141,7 +1141,7 @@ SammoaTopiaPersistenceContext tx = beginTransaction(); try { FlightTopiaDao dao = tx.getFlightDao(); - Flight result = (Flight)dao.forProperties(naturalId).findAnyOrNull(); + Flight result = dao.forProperties(naturalId).findAnyOrNull(); return result; } catch (TopiaException e) { throw new SammoaTechnicalException(e); Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java 2014-06-05 08:52:41 UTC (rev 706) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java 2014-06-06 08:41:08 UTC (rev 707) @@ -105,8 +105,7 @@ String result; if (region.getTopiaId() == null) { - Region existRegion = dao.findByNaturalId(region.getCode()); - Preconditions.checkArgument(existRegion == null); + Preconditions.checkArgument(!dao.existByNaturalId(region.getCode())); Region newRegion = dao.createByNaturalId(region.getCode()); newRegion.setName(region.getName()); @@ -202,8 +201,6 @@ CampaignTopiaDao dao = transaction.getCampaignDao(); Campaign result = dao.findByTopiaId(topiaId); return result; - } catch (TopiaException e) { - throw new TopiaException(e); } finally { endTransaction(transaction); } @@ -229,9 +226,7 @@ if (createCampaign) { - Campaign existCampaign = dao.findByNaturalId( - campaign.getCode(), campaign.getRegion()); - Preconditions.checkArgument(existCampaign == null); + Preconditions.checkArgument(!dao.existByNaturalId(campaign.getCode(), campaign.getRegion())); Campaign newCampaign = dao.createByNaturalId( campaign.getCode(), campaign.getRegion()); @@ -266,8 +261,6 @@ } return result; - } catch (TopiaException e) { - throw new TopiaException(e); } finally { endTransaction(transaction); } @@ -394,9 +387,7 @@ TransectTopiaDao dao = transaction.getTransectDao(); - Transect existTransect = dao.findByNaturalId(transect.getName(), - transect.getStrate()); - Preconditions.checkArgument(existTransect == null); + Preconditions.checkArgument(! dao.existByNaturalId(transect.getName(),transect.getStrate())); Transect newTransect = dao.createByNaturalId(transect.getName(), transect.getStrate()); Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/csv/ImportCsvService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/csv/ImportCsvService.java 2014-06-05 08:52:41 UTC (rev 706) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/csv/ImportCsvService.java 2014-06-06 08:41:08 UTC (rev 707) @@ -23,7 +23,6 @@ * #L% */ -import com.google.common.base.Preconditions; import com.google.common.io.Files; import fr.ulr.sammoa.application.SammoaServiceSupport; import fr.ulr.sammoa.persistence.Campaign; @@ -68,7 +67,6 @@ RegionTopiaDao regionDAO = transaction.getRegionDao(); Region region = regionDAO.findByTopiaId(regionId); - Preconditions.checkNotNull(region); String regionCode = region.getCode(); SpeciesTopiaDao dao = transaction.getSpeciesDao(); @@ -112,7 +110,6 @@ CampaignTopiaDao campaignDAO = transaction.getCampaignDao(); Campaign campaign = campaignDAO.findByTopiaId(campaignId); - Preconditions.checkNotNull(campaign); String campaignCode = campaign.getCode(); ObserverTopiaDao dao = transaction.getObserverDao(); @@ -148,12 +145,8 @@ // while importing a species, it does become valid species.setLocalCreation(false); - Species speciesExists = - dao.findByNaturalId(species.getCode(), - species.getRegion()); - boolean newSpecies = false; - if (speciesExists == null) { + if (dao.existByNaturalId(species.getCode(), species.getRegion())) { dao.create(species); @@ -167,6 +160,10 @@ } else { + Species speciesExists = + dao.findByNaturalId(species.getCode(), + species.getRegion()); + speciesExists.setCommonName(species.getCommonName()); speciesExists.setLatinName(species.getLatinName()); speciesExists.setGroupName(species.getGroupName()); Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/ImportMapService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/ImportMapService.java 2014-06-05 08:52:41 UTC (rev 706) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/ImportMapService.java 2014-06-06 08:41:08 UTC (rev 707) @@ -23,7 +23,6 @@ * #L% */ -import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import fr.ulr.sammoa.application.SammoaServiceSupport; import fr.ulr.sammoa.persistence.Campaign; @@ -66,9 +65,6 @@ CampaignTopiaDao campaignDAO = transaction.getCampaignDao(); Campaign campaign = campaignDAO.findByTopiaId(campaignId); - Preconditions.checkArgument(campaign != null, - "The topiaId : " + campaignId + - " doesn't match any existing campaign"); StrateTopiaDao strateDAO = transaction.getStrateDao(); TransectTopiaDao transectDAO = transaction.getTransectDao(); @@ -110,9 +106,6 @@ CampaignTopiaDao campaignDAO = transaction.getCampaignDao(); Campaign campaign = campaignDAO.findByTopiaId(campaignId); - Preconditions.checkArgument(campaign != null, - "The topiaId : " + campaignId + - " doesn't match any existing campaign"); StrateTopiaDao strateDAO = transaction.getStrateDao(); SectorTopiaDao sectorDAO = transaction.getSectorDao(); @@ -169,10 +162,10 @@ ); } - Transect existTransect = dao.findByNaturalId(transect.getName(), existStrate); + // If the existing strate is null, create it otherwise ignore - if (existTransect == null) { + if (!dao.existByNaturalId(transect.getName(), existStrate)) { Transect newTransect = dao.createByNaturalId(transect.getName(), existStrate); newTransect.setLength(transect.getLength()); @@ -195,6 +188,8 @@ } else { + Transect existTransect = dao.findByNaturalId(transect.getName(), existStrate); + existTransect.setGraphicIndex(graphicIndex); if (logger.isWarnEnabled()) { @@ -221,7 +216,7 @@ Sector sector = strate.getSector(); int sectorNumber = sector.getSectorNumber(); - Strate existStrate; + boolean existStrate; // Create sector if necessary Sector existSector = sectors.get(sectorNumber); @@ -231,16 +226,16 @@ existSector.setName(sector.getName()); sectors.put(sectorNumber, existSector); - existStrate = null; + existStrate = false; } else { // Find existing strate only if sector is not created - existStrate = strateDAO.findByNaturalId(strateType, existSector); + existStrate = strateDAO.existByNaturalId(strateType, existSector); } // If the existing strate is null, create it otherwise ignore - if (existStrate == null) { + if (!existStrate) { Strate newStrate = strateDAO.createByNaturalId(strateType, existSector); newStrate.setCode(Strates.getCode(newStrate)); @@ -259,7 +254,7 @@ if (logger.isWarnEnabled()) { logger.warn("The strate {} already " + "exists and will be ignored", - existStrate.getCode()); + "" + strateType.getCode() + existSector.getSectorNumber()); } } return result;

1 0

[ANN] - SAMMOA 1.0.4-RC1 released
by codelutin.com Release Notification 05 Jun '14

05 Jun '14

The SAMMOA team is pleased to announce the sammoa-1.0.4-RC1 release! SAMMOA est un système permettant l’acquisition des données d’observations de faune marine lors de campagnes d’observations aériennes pour l'UMS 3462 Pélagis, anciennement baptisé CRMM et situé à l'université de La Rochelle. Documentation of the project can be found here: http://forge.codelutin.com/projects/sammoa Changes ------- Changes in this version include: New features: o calage d'observation lors manque de coordonnées GPS Issue: 4791. Thanks to Ghislain Doremus. Resolved by sbavencoff. o Obtenir une meilleure qualité de fichiers audio Issue: 4762. Thanks to Ghislain Doremus. Resolved by sbavencoff. Fixed Bugs: o Déconnection du GPS en vol Issue: 4755. Thanks to Ghislain Doremus. Resolved by sbavencoff. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/sammoa/files * sammoa-ui-swing-1.0.4-RC1-bin.zip - http://forge.codelutin.com/attachments/download/1902 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -SAMMOA team

1 0

r706 - in trunk: . sammoa-application sammoa-persistence sammoa-ui-swing
by maven-release＠users.forge.codelutin.com 05 Jun '14

05 Jun '14

Author: maven-release Date: 2014-06-05 10:52:41 +0200 (Thu, 05 Jun 2014) New Revision: 706 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/706 Log: [maven-release-plugin] prepare for next development iteration 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 2014-06-05 08:52:35 UTC (rev 705) +++ trunk/pom.xml 2014-06-05 08:52:41 UTC (rev 706) @@ -10,7 +10,7 @@ <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-RC1</version> + <version>1.0.4-SNAPSHOT</version> <packaging>pom</packaging> @@ -64,12 +64,12 @@ </modules> <scm> - <url>http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC1</url> + <url>http://svn.codelutin.com/sammoa/trunk</url> <connection> - scm:svn:http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC1 + scm:svn:http://svn.codelutin.com/sammoa/trunk </connection> <developerConnection> - scm:svn:http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC1 + scm:svn:http://svn.codelutin.com/sammoa/trunk </developerConnection> </scm> <distributionManagement> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2014-06-05 08:52:35 UTC (rev 705) +++ trunk/sammoa-application/pom.xml 2014-06-05 08:52:41 UTC (rev 706) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-RC1</version> + <version>1.0.4-SNAPSHOT</version> </parent> <artifactId>sammoa-application</artifactId> Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2014-06-05 08:52:35 UTC (rev 705) +++ trunk/sammoa-persistence/pom.xml 2014-06-05 08:52:41 UTC (rev 706) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-RC1</version> + <version>1.0.4-SNAPSHOT</version> </parent> <artifactId>sammoa-persistence</artifactId> Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2014-06-05 08:52:35 UTC (rev 705) +++ trunk/sammoa-ui-swing/pom.xml 2014-06-05 08:52:41 UTC (rev 706) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-RC1</version> + <version>1.0.4-SNAPSHOT</version> </parent> <artifactId>sammoa-ui-swing</artifactId>

1 0

r705 - tags
by maven-release＠users.forge.codelutin.com 05 Jun '14

05 Jun '14

Author: maven-release Date: 2014-06-05 10:52:35 +0200 (Thu, 05 Jun 2014) New Revision: 705 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/705 Log: [maven-release-plugin] copy for tag sammoa-1.0.4-RC1 Added: tags/sammoa-1.0.4-RC1/

1 0

r704 - in trunk: . sammoa-application sammoa-persistence sammoa-ui-swing
by maven-release＠users.forge.codelutin.com 05 Jun '14

05 Jun '14

Author: maven-release Date: 2014-06-05 10:52:30 +0200 (Thu, 05 Jun 2014) New Revision: 704 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/704 Log: [maven-release-plugin] prepare release sammoa-1.0.4-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 2014-06-05 08:22:57 UTC (rev 703) +++ trunk/pom.xml 2014-06-05 08:52:30 UTC (rev 704) @@ -10,7 +10,7 @@ <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.4-RC1</version> <packaging>pom</packaging> @@ -64,12 +64,12 @@ </modules> <scm> - <url>http://svn.codelutin.com/sammoa/trunk</url> + <url>http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC1</url> <connection> - scm:svn:http://svn.codelutin.com/sammoa/trunk + scm:svn:http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC1 </connection> <developerConnection> - scm:svn:http://svn.codelutin.com/sammoa/trunk + scm:svn:http://svn.codelutin.com/sammoa/tags/sammoa-1.0.4-RC1 </developerConnection> </scm> <distributionManagement> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2014-06-05 08:22:57 UTC (rev 703) +++ trunk/sammoa-application/pom.xml 2014-06-05 08:52:30 UTC (rev 704) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.4-RC1</version> </parent> <artifactId>sammoa-application</artifactId> Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2014-06-05 08:22:57 UTC (rev 703) +++ trunk/sammoa-persistence/pom.xml 2014-06-05 08:52:30 UTC (rev 704) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.4-RC1</version> </parent> <artifactId>sammoa-persistence</artifactId> Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2014-06-05 08:22:57 UTC (rev 703) +++ trunk/sammoa-ui-swing/pom.xml 2014-06-05 08:52:30 UTC (rev 704) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.4-RC1</version> </parent> <artifactId>sammoa-ui-swing</artifactId>

1 0

r703 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util
by sbavencoff＠users.forge.codelutin.com 05 Jun '14

05 Jun '14

Author: sbavencoff Date: 2014-06-05 10:22:57 +0200 (Thu, 05 Jun 2014) New Revision: 703 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/703 Log: release Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/ValidationControl.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/ValidationControl.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/ValidationControl.java 2014-06-05 08:17:23 UTC (rev 702) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/ValidationControl.java 2014-06-05 08:22:57 UTC (rev 703) @@ -1,5 +1,27 @@ package fr.ulr.sammoa.ui.swing.util; +/* + * #%L + * SAMMOA :: UI Swing + * %% + * Copyright (C) 2012 - 2014 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.Function; import com.google.common.collect.Collections2; import com.google.common.collect.Sets; Property changes on: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/ValidationControl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r702 - trunk
by sbavencoff＠users.forge.codelutin.com 05 Jun '14

05 Jun '14

Author: sbavencoff Date: 2014-06-05 10:17:23 +0200 (Thu, 05 Jun 2014) New Revision: 702 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/702 Log: use final version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-05 08:01:34 UTC (rev 701) +++ trunk/pom.xml 2014-06-05 08:17:23 UTC (rev 702) @@ -100,7 +100,7 @@ <h2Version>1.3.176</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <jaxxVersion>2.8.6-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.8.6</jaxxVersion> <swingXVersion>1.6.5-1</swingXVersion> <xworkVersion>2.3.16.3</xworkVersion>

1 0

r701 - 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/util sammoa-ui-swing/src/main/resources/i18n
by sbavencoff＠users.forge.codelutin.com 05 Jun '14

05 Jun '14

Author: sbavencoff Date: 2014-06-05 10:01:34 +0200 (Thu, 05 Jun 2014) New Revision: 701 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/701 Log: fixes #4762 : disable soumd meter if system does not support, and show error message Modified: 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 trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SoundMeter.java trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 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 2014-06-03 16:02:35 UTC (rev 700) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioRecorder.java 2014-06-05 08:01:34 UTC (rev 701) @@ -71,6 +71,86 @@ private static final Logger logger = LoggerFactory.getLogger(SammoaAudioRecorder.class); + public static boolean isMultiRecord() { + boolean multiRecord = true; + + AudioFormat audioFormat = new AudioFormat(8000.0f, 8, 1, true, true); + + DataLine.Info dataLineInfo = new DataLine.Info( + TargetDataLine.class, audioFormat); + + TargetDataLine line1 = null; + TargetDataLine line2 = null; + + try { + line1 = (TargetDataLine) AudioSystem.getLine(dataLineInfo); + line1.open(audioFormat); + line1.start(); + + line2 = (TargetDataLine) AudioSystem.getLine(dataLineInfo); + line2.open(audioFormat); + line2.start(); + + } catch (LineUnavailableException e) { + + multiRecord = false; + if (logger.isDebugEnabled()) { + logger.debug("Can't record multiple file at the same time", e); + } + if (logger.isInfoEnabled()) { + logger.info("Can't record multiple file at the same time, 0 " + + "second delay between recording must be used"); + } + + + } finally { + if (line1 != null) { + line1.stop(); + line1.close(); + } + if (line2 != null) { + line2.stop(); + line2.close(); + } + } + + return multiRecord; + + } + + public static boolean isCanAddRecord() { + boolean canAddRecord = true; + + AudioFormat audioFormat = new AudioFormat(8000.0f, 8, 1, true, true); + + DataLine.Info dataLineInfo = new DataLine.Info( + TargetDataLine.class, audioFormat); + + TargetDataLine line1 = null; + + try { + line1 = (TargetDataLine) AudioSystem.getLine(dataLineInfo); + line1.open(audioFormat); + line1.start(); + + } catch (LineUnavailableException e) { + canAddRecord = false; + + if (logger.isDebugEnabled()) { + logger.debug("Can't add new record", e); + } + + } finally { + if (line1 != null) { + line1.stop(); + line1.close(); + } + } + + return canAddRecord; + + } + protected AudioConfig config; protected AudioFormat audioFormat; 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 2014-06-03 16:02:35 UTC (rev 700) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/AudioCheck.java 2014-06-05 08:01:34 UTC (rev 701) @@ -32,17 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.sound.sampled.LineUnavailableException; -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; -import javax.swing.JTextField; +import javax.swing.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyAdapter; @@ -50,7 +40,6 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.File; -import java.io.IOException; import java.util.Date; //import javax.media.CannotRealizeException; @@ -293,47 +282,27 @@ } protected void checkMultiRecord() { - SammoaAudioRecorder r1 = new SammoaAudioRecorder(8000, 16, "", 2); - SammoaAudioRecorder r2 = new SammoaAudioRecorder(8000, 16, "", 2); - try { - File f1 = File.createTempFile("sammoa-audioCheck-", ".wav"); - f1.deleteOnExit(); - File f2 = File.createTempFile("sammoa-audioCheck-", ".wav"); - f2.deleteOnExit(); + if (SammoaAudioRecorder.isMultiRecord()) { - r1.record(f1, true); - - r2.record(f2, true); - - r1.stop(); - r2.stop(); delay = 5; + if (logger.isInfoEnabled()) { logger.info("The recording delay is set to 5 seconds between " + - "each recording, you can update this value from" + - " configuration interface"); + "each recording, you can update this value from" + + " configuration interface"); } - } catch(IOException ex) { - if (logger.isErrorEnabled()) { - logger.error("Can't check audio line", ex); - } - SammoaUtil.showErrorMessage(this, "Can't check audio line : " + ex.getMessage()); + } else { - } catch(LineUnavailableException ex) { delay = 0; - if (logger.isDebugEnabled()) { - logger.debug("Can't record multiple file at the same time", ex); - } + if (logger.isInfoEnabled()) { logger.info("Can't record multiple file at the same time, 0 " + - "second delay between recording must be used"); + "second delay between recording must be used"); } - } finally { - r1.close(); - r2.close(); } + updateConfigInfo(); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2014-06-03 16:02:35 UTC (rev 700) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2014-06-05 08:01:34 UTC (rev 701) @@ -32,6 +32,7 @@ import fr.ulr.sammoa.application.device.audio.AudioConfig; import fr.ulr.sammoa.application.device.audio.AudioReader; import fr.ulr.sammoa.application.device.audio.AudioRecorder; +import fr.ulr.sammoa.application.device.audio.SammoaAudioRecorder; import fr.ulr.sammoa.application.device.gps.GpsConfig; import fr.ulr.sammoa.application.device.gps.GpsHandler; import fr.ulr.sammoa.application.flightController.FlightController; @@ -57,9 +58,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.swing.*; +import javax.swing.JComponent; +import javax.swing.JOptionPane; +import javax.swing.UIManager; import javax.swing.plaf.BorderUIResource; -import java.awt.*; +import java.awt.Color; +import java.awt.Desktop; import java.io.File; import java.net.URL; import java.util.Calendar; @@ -125,7 +129,7 @@ //SwingUtil.getLayer(ui.getBody()).setUI(new BetaLayerUI()); UIManager.put("Table.focusCellHighlightBorder", - new BorderUIResource.LineBorderUIResource(Color.BLACK)); + new BorderUIResource.LineBorderUIResource(Color.BLACK)); setScreen(SammoaScreen.HOME); } @@ -391,8 +395,12 @@ } public void showAudioCheck() { - AudioCheck frame = new AudioCheck(); - frame.setVisible(true); + if (SammoaAudioRecorder.isCanAddRecord()) { + AudioCheck frame = new AudioCheck(); + frame.setVisible(true); + } else { + JOptionPane.showMessageDialog(ui, t("sammoa.audioCheck.unavailable"), t("sammoa.audioCheck.error"), JOptionPane.ERROR_MESSAGE); + } } protected void closeCurrentBody() { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SoundMeter.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SoundMeter.java 2014-06-03 16:02:35 UTC (rev 700) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SoundMeter.java 2014-06-05 08:01:34 UTC (rev 701) @@ -24,6 +24,7 @@ import fr.ulr.sammoa.application.SammoaTechnicalException; import fr.ulr.sammoa.application.device.audio.AudioLevel; +import fr.ulr.sammoa.application.device.audio.SammoaAudioRecorder; import javax.sound.sampled.LineUnavailableException; import javax.swing.*; @@ -31,6 +32,8 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import static org.nuiton.i18n.I18n.t; + /** * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> */ @@ -55,31 +58,45 @@ protected Timer timer; public SoundMeter() { - try { - audioLevel = new AudioLevel(); - } catch (LineUnavailableException e) { - throw new SammoaTechnicalException(e); - } - timer = new Timer (REFRESH_TIME, new ActionListener(){ - public void actionPerformed (ActionEvent e) { - if (audioLevel != null) { - level = audioLevel.getLevel(); - } - repaint(); + if (SammoaAudioRecorder.isMultiRecord()) { + try { + audioLevel = new AudioLevel(); + } catch (LineUnavailableException e) { + throw new SammoaTechnicalException(e); } - }); + timer = new Timer(REFRESH_TIME, new ActionListener() { + public void actionPerformed(ActionEvent e) { + if (audioLevel != null) { + level = audioLevel.getLevel(); + } + repaint(); + } + }); + } else { + setToolTipText(t("sammoa.toolTip.soundMeter.unavailable")); + setEnabled(false); + } + setBorder(BorderFactory.createLoweredBevelBorder()); } public void start() { - timer.start(); + if (timer != null) { + timer.start(); + } } public void stop() { - audioLevel.stop(); - timer.stop(); + if (audioLevel != null) { + audioLevel.stop(); + } + + if (timer != null) { + timer.stop(); + } + level = 0; repaint(); } @@ -87,40 +104,42 @@ public void paint (Graphics g) { super.paint(g); - Dimension d = getSize(); + if (isEnabled()) { + Dimension d = getSize(); - int borderThickness = 2; + int borderThickness = 2; - int height = d.height - (borderThickness * 2); - int width = d.width - (borderThickness * 2); + int height = d.height - (borderThickness * 2); + int width = d.width - (borderThickness * 2); - if (level > 0) { - if (level >= SATURATE_LEVEL) { - g.setColor(SATURATE_COLOR); - } else if (level >= WARNING_LEVEL) { - g.setColor(WARNING_COLOR); - } else { - g.setColor(LEVEL_COLOR); + if (level > 0) { + if (level >= SATURATE_LEVEL) { + g.setColor(SATURATE_COLOR); + } else if (level >= WARNING_LEVEL) { + g.setColor(WARNING_COLOR); + } else { + g.setColor(LEVEL_COLOR); + } + + int widthLevel = (int) (level * (float) width); + g.fillRect(borderThickness, borderThickness, widthLevel, height); } - int widthLevel = (int) (level * (float) width); - g.fillRect(borderThickness, borderThickness, widthLevel, height); - } + // echele + g.setColor(Color.black); + for (int step = 1; step < 10; step++) { + int x = borderThickness + step * width / 10; + g.drawLine(x, borderThickness + height * 3 / 4, x, borderThickness + height); + } - // echele - g.setColor(Color.black); - for (int step = 1; step < 10; step++) { - int x = borderThickness + step * width / 10; - g.drawLine(x, borderThickness + height * 3 / 4, x, borderThickness + height); + g.setColor(WARNING_COLOR); + int x = borderThickness + (int) (WARNING_LEVEL * width); + g.drawLine(x, borderThickness, x, borderThickness + height); + + g.setColor(SATURATE_COLOR); + x = borderThickness + (int) (SATURATE_LEVEL * width); + g.drawLine(x, borderThickness, x, borderThickness + height); } - - g.setColor(WARNING_COLOR); - int x = borderThickness + (int) (WARNING_LEVEL * width); - g.drawLine(x, borderThickness, x, borderThickness + height); - - g.setColor(SATURATE_COLOR); - x = borderThickness + (int) (SATURATE_LEVEL * width); - g.drawLine(x, borderThickness, x, borderThickness + height); } } 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 2014-06-03 16:02:35 UTC (rev 700) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2014-06-05 08:01:34 UTC (rev 701) @@ -64,6 +64,8 @@ sammoa.action.validTransect=Transect sammoa.action.validTransect.tip=Validate the selected transect and all its routes and sightings sammoa.action.validation=Validation +sammoa.audioCheck.error=Audio check Error +sammoa.audioCheck.unavailable=Your system does not support multiple audio recording sammoa.config.category.applications=Application sammoa.config.category.applications.description=Application sammoa.config.category.audio=Audio @@ -287,6 +289,7 @@ sammoa.title.flight=System %1$s - Campaign %2$s - Region %3$s - Flight n°%4$d sammoa.title.home=Home sammoa.title.importApplication=Application import +sammoa.toolTip.soundMeter.unavailable=Your system does not support sound meter sammoa.validable.flight=flight sammoa.validable.observation=sighting sammoa.validable.route=route

1 0

r700 - in trunk/sammoa-ui-swing/src/main: java/fr/ulr/sammoa/ui/swing java/fr/ulr/sammoa/ui/swing/flight/effort java/fr/ulr/sammoa/ui/swing/util resources/fr/ulr/sammoa/persistence resources/i18n
by sbavencoff＠users.forge.codelutin.com 03 Jun '14

03 Jun '14

Author: sbavencoff Date: 2014-06-03 18:02:35 +0200 (Tue, 03 Jun 2014) New Revision: 700 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/700 Log: refs #4791 : check if a last geopoint after a observation should not be older than five seconds Added: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/ValidationControl.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-validation-error-validation.xml trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2014-06-03 13:59:35 UTC (rev 699) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2014-06-03 16:02:35 UTC (rev 700) @@ -24,6 +24,7 @@ */ package fr.ulr.sammoa.ui.swing; +import com.opensymphony.xwork2.util.ValueStack; import fr.ulr.sammoa.application.SammoaConfig; import fr.ulr.sammoa.application.SammoaContext; import fr.ulr.sammoa.application.device.DeviceManager; @@ -45,11 +46,13 @@ import fr.ulr.sammoa.ui.swing.io.output.application.ExportApplicationUI; import fr.ulr.sammoa.ui.swing.io.output.map.ExportMapUI; import fr.ulr.sammoa.ui.swing.util.SammoaUtil; +import fr.ulr.sammoa.ui.swing.util.ValidationControl; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.AboutPanel; import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.swing.config.ConfigUIHelper; import org.nuiton.config.ApplicationConfig; +import org.nuiton.validator.xwork2.XWork2ValidatorUtil; import org.nuiton.widget.SwingSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -100,7 +103,11 @@ @Override public void beforeInitUI() { - // nothing to do + // init validator value stack + ValueStack valueStack = XWork2ValidatorUtil.getSharedValueStack(); + + valueStack.push(ValidationControl.getInstance()); + } @Override 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 2014-06-03 13:59:35 UTC (rev 699) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java 2014-06-03 16:02:35 UTC (rev 700) @@ -69,6 +69,7 @@ import fr.ulr.sammoa.ui.swing.util.TextCellEditor; import fr.ulr.sammoa.ui.swing.util.TimeCellEditor; import fr.ulr.sammoa.ui.swing.util.ValidRowHighlightPredicate; +import fr.ulr.sammoa.ui.swing.util.ValidationControl; import jaxx.runtime.JAXXUtil; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.JAXXDatePicker; @@ -557,6 +558,8 @@ } } + ValidationControl.getInstance().setGeoPoints(getModel().getGeoPoints()); + BeanListValidator<Observation> validator = ui.getObservationValidator(); ObservationValidatorDataLocator dataLocator = new ObservationValidatorDataLocator(); Added: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/ValidationControl.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/ValidationControl.java (rev 0) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/ValidationControl.java 2014-06-03 16:02:35 UTC (rev 700) @@ -0,0 +1,41 @@ +package fr.ulr.sammoa.ui.swing.util; + +import com.google.common.base.Function; +import com.google.common.collect.Collections2; +import com.google.common.collect.Sets; +import fr.ulr.sammoa.persistence.GeoPoint; + +import java.util.Collection; +import java.util.Date; +import java.util.SortedSet; + +/** + * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> + */ +public class ValidationControl { + + protected static ValidationControl INSTANCE = new ValidationControl(); + + public static ValidationControl getInstance() { + return INSTANCE; + } + + private ValidationControl() {} + + protected SortedSet<Date> geoPointDates; + + public boolean validateLastGeoPointIsNotOlder(Date date) { + return geoPointDates.contains(date) || date.getTime() - geoPointDates.headSet(date).last().getTime() < 5000 ; + } + + public void setGeoPoints(Collection<GeoPoint> geoPoints) { + geoPointDates = Sets.newTreeSet(); + geoPointDates.addAll(Collections2.transform(geoPoints, new Function<GeoPoint, Date>() { + @Override + public Date apply(GeoPoint input) { + return input.getRecordTime(); + } + })); + } + +} Modified: trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-validation-error-validation.xml =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-validation-error-validation.xml 2014-06-03 13:59:35 UTC (rev 699) +++ trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Observation-validation-error-validation.xml 2014-06-03 16:02:35 UTC (rev 700) @@ -29,6 +29,14 @@ "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> + <field name="observationTime"> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ validateLastGeoPointIsNotOlder(observationTime) ]]></param> + <message>sammoa.validator.observation.podSize.geoPointOlder</message> + </field-validator> + </field> + <field name="podSize"> <field-validator type="int" short-circuit="true"> 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 2014-06-03 13:59:35 UTC (rev 699) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2014-06-03 16:02:35 UTC (rev 700) @@ -302,6 +302,7 @@ sammoa.validator.observation.behaviour.unkownValue=The behaviour must be one of this value \: SW (normal), MI (milling), BR (breaching), LO (logging), FE (feeding), FA (feeding aggregation), SB (following boat), OT (other) sammoa.validator.observation.cue.unkownValue=The cue must be between 2 and 9 or U for underwater and A for surface sammoa.validator.observation.decAngle.invalidRange=The angle must be between %1$s and %2$s degrees or for the band \: 1 (in the band), 2 (outside the band), 3 (put in the band) +sammoa.validator.observation.podSize.geoPointOlder=The previous geopoint should not be older than five seconds sammoa.validator.observation.podSize.invalidMin=The pod size must be higher than %1$s sammoa.validator.observation.position.outOfDate=capture delay is out of date sammoa.validator.observation.species.required=The species is mandatory

1 0

r699 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort
by sbavencoff＠users.forge.codelutin.com 03 Jun '14

03 Jun '14

Author: sbavencoff Date: 2014-06-03 15:59:35 +0200 (Tue, 03 Jun 2014) New Revision: 699 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/699 Log: refs #4791 : read only geo point Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/GeoPointTableModel.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/GeoPointTableModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/GeoPointTableModel.java 2014-06-03 13:45:52 UTC (rev 698) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/GeoPointTableModel.java 2014-06-03 13:59:35 UTC (rev 699) @@ -123,11 +123,11 @@ public enum GeoPointColumn { RECORD_TIME(false, Date.class, GeoPoint.PROPERTY_RECORD_TIME), - LATITUDE(true, double.class, GeoPoint.PROPERTY_LATITUDE), - LONGITUDE(true, double.class, GeoPoint.PROPERTY_LONGITUDE), - ALTITUDE(true, double.class, GeoPoint.PROPERTY_ALTITUDE), - SPEED(true, double.class, GeoPoint.PROPERTY_SPEED), - CAPTURE_DELAY(true, int.class, GeoPoint.PROPERTY_CAPTURE_DELAY); + LATITUDE(false, double.class, GeoPoint.PROPERTY_LATITUDE), + LONGITUDE(false, double.class, GeoPoint.PROPERTY_LONGITUDE), + ALTITUDE(false, double.class, GeoPoint.PROPERTY_ALTITUDE), + SPEED(false, double.class, GeoPoint.PROPERTY_SPEED), + CAPTURE_DELAY(false, int.class, GeoPoint.PROPERTY_CAPTURE_DELAY); private boolean editable;

1 0