April 2016 - Tutti-commits - mailman.cloud.codelutin.com

branch feature/8278 updated (d1f4877 -> d8cb976)
by codelutin.com scm April 26, 2016

April 26, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8278 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from d1f4877 génération des mensurations quand on est en mode de recopie taille ou tout (refs #8278) new d8cb976 on fait un check pour vérifier que le poids est là (fixes #8278) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d8cb97667bb266ea7065d964059082bef47aea1e Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Apr 26 14:30:34 2016 +0200 on fait un check pour vérifier que le poids est là (fixes #8278) Summary of changes: .../tutti/service/catches/multipost/MultiPostImportService.java | 9 +++++---- .../src/main/resources/i18n/tutti-service_en_GB.properties | 1 + .../src/main/resources/i18n/tutti-service_fr_FR.properties | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8278 updated (efa8f8c -> d1f4877)
by codelutin.com scm April 26, 2016

April 26, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8278 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from efa8f8c Nettoyage de code et début de mise ne place de la génération des mensurations lors d'un import multi-poste espèces - observation seulement (See #8278) new d1f4877 génération des mensurations quand on est en mode de recopie taille ou tout (refs #8278) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d1f4877a3a289772d9ccf352b6c405a083cf18e6 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Apr 26 14:05:41 2016 +0200 génération des mensurations quand on est en mode de recopie taille ou tout (refs #8278) Summary of changes: .../catches/multipost/MultiPostImportService.java | 104 ++++++++++++++++----- 1 file changed, 83 insertions(+), 21 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (e8d3dca -> 66382fd)
by codelutin.com scm April 26, 2016

April 26, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from e8d3dca Livrable #8277 Merge branch 'feature/8277' into develop new fe4f48b Toujours utiliser la même colonne pour la maturité (See #8273) new 66382fd Livrable #8273 Merge branch 'feature/8273' into develop The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 66382fd1216782884be7b7fc149f27de8492f1da Merge: e8d3dca fe4f48b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 26 13:17:05 2016 +0200 Livrable #8273 Merge branch 'feature/8273' into develop commit fe4f48b73dec212087c14259671f45b27408f266 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 26 13:16:35 2016 +0200 Toujours utiliser la même colonne pour la maturité (See #8273) Summary of changes: .../IndividualObservationBatchTableHandler.java | 85 +++++++++++----------- .../IndividualObservationBatchTableModel.java | 23 +++--- .../frequency/MaturityColumnIdentifier.java | 45 ++++++++++++ .../frequency/SpeciesFrequencyUIHandler.java | 15 ++-- .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 + 6 files changed, 110 insertions(+), 62 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/MaturityColumnIdentifier.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/8278 created (now efa8f8c)
by codelutin.com scm April 26, 2016

April 26, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8278 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at efa8f8c Nettoyage de code et début de mise ne place de la génération des mensurations lors d'un import multi-poste espèces - observation seulement (See #8278) This branch includes the following new commits: new efa8f8c Nettoyage de code et début de mise ne place de la génération des mensurations lors d'un import multi-poste espèces - observation seulement (See #8278) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit efa8f8c8033ebeb4d677ee63881ced1df18f0775 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 26 11:01:25 2016 +0200 Nettoyage de code et début de mise ne place de la génération des mensurations lors d'un import multi-poste espèces - observation seulement (See #8278) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (667a7fc -> e8d3dca)
by codelutin.com scm April 26, 2016

April 26, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 667a7fc Livrable #8237 Merge branch 'feature/8237' into develop new 0435df0 Lors d'un import multipost au niveau des espèces, bien regénéré le cache des échantillons (See #8277) new e8d3dca Livrable #8277 Merge branch 'feature/8277' into develop The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit e8d3dca259e4990c202d228d4f8a71c997013175 Merge: 667a7fc 0435df0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 26 09:13:37 2016 +0200 Livrable #8277 Merge branch 'feature/8277' into develop commit 0435df041130749808b8e41ee84c48cec5ea10b4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 26 09:12:55 2016 +0200 Lors d'un import multipost au niveau des espèces, bien regénéré le cache des échantillons (See #8277) Summary of changes: .../ifremer/tutti/service/PersistenceService.java | 36 +++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (d43093c -> 667a7fc)
by codelutin.com scm April 25, 2016

April 25, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from d43093c Livrable #8276 Merge branch 'feature/8276' into develop new 9fdc931 Amélioration du chargement d'un trait new 5f39136 On valide aussi les observations en recopie taille seulement (see #8237) new 5a62813 Amélioration code new 19c1e50 Amélioration du code d'interaction des modèles, mais il resterait tellement à revoire :) (See #8237) new 667a7fc Livrable #8237 Merge branch 'feature/8237' into develop The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 667a7fc746bf1ace38c86bfa02aa915e5dc6d3ee Merge: d43093c 19c1e50 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 25 20:18:29 2016 +0200 Livrable #8237 Merge branch 'feature/8237' into develop commit 19c1e50226b3b75ed81798f70b8c55504a78142a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 25 20:18:27 2016 +0200 Amélioration du code d'interaction des modèles, mais il resterait tellement à revoire :) (See #8237) commit 5a628130f5e81de342e45f8699d56d9cad28672a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 25 20:16:17 2016 +0200 Amélioration code commit 5f391369a150ed3df9bdfb84dc670894531620b6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 25 20:14:17 2016 +0200 On valide aussi les observations en recopie taille seulement (see #8237) commit 9fdc931c65314cca5e81716b866c872ceed86728 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 25 20:13:46 2016 +0200 Amélioration du chargement d'un trait Summary of changes: .../content/actions/EditCatchesSupportAction.java | 3 +- .../IndividualObservationBatchTableHandler.java | 123 +++++++++++---------- .../IndividualObservationBatchUIModel.java | 49 ++++++-- .../frequency/SpeciesFrequencyTableModel.java | 25 +++++ .../frequency/SpeciesFrequencyUIHandler.java | 7 +- .../species/frequency/SpeciesFrequencyUIModel.java | 49 ++++---- .../SpeciesFrequencyUIModel-error-validation.xml | 2 +- 7 files changed, 162 insertions(+), 96 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch feature/8238 updated (41f51b7 -> 7868450)
by codelutin.com scm April 25, 2016

April 25, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8238 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 41f51b7 - Quand on supprime des lignes d'espece ou benthos du protocole, on enlève leur maturité des maturités utilisées. - On met à jour l'état des boutons de la double liste de maturité quand on arrive sur l'onglet des caractéristiques. Sinon, si la maturité sélectionné a été ajoutée ou supprimée, le bouton n'est plus dans le bon état. fixes #8238 new 7868450 idem pour les classes de taille (fixes #8238) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 78684501f3f2beac7b9c6f01eeb77514e9ebe63a Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Apr 25 18:43:59 2016 +0200 idem pour les classes de taille (fixes #8238) Summary of changes: .../protocol/EditProtocolSpeciesTableModel.java | 69 +++++++++++++++++----- .../content/protocol/EditProtocolUIHandler.java | 65 +++++++++++++++----- .../actions/RemoveBenthosProtocolAction.java | 8 ++- .../actions/RemoveSpeciesProtocolAction.java | 7 ++- 4 files changed, 115 insertions(+), 34 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8238 updated (eb69d62 -> 41f51b7)
by codelutin.com scm April 25, 2016

April 25, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8238 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git omits eb69d62 - passage à jaxx 2.29 - désactivation de la suppresion des maturités sélectionnées si elles sont utilisées (RAF : gérer la suppression des lignes d'espèce ou de benthos) (refs #8238) adds e2b2a0e Clean code adds 29ac08e Compacter la table des observations individuelles à l'ouverture de l'écran (See #8202) adds 03a5c31 Livrable #8202 Merge branch 'feature/8202' into develop adds c47e59e Revue du changement de mode de recopie adds 2b893cc renommage des classes de l'ichtyometre en vue de l'ajout de module du pied à coulisse, pour eviter les confusions (refs #7459) adds 70c6707 creation du module pour le pied à coulisse (caliper) (refs #7459) adds 5c79f17 implem de la réception des données du pied a coulisse (refs #7459) adds fa669e5 ajout de la conf du port série du pied a coulisse (refs #7459) adds 0ad86dc ajout de la connexion au pied à coulisse depuis l'appli (refs #7459) adds 1961579 lecture des données reçues sur le pied à coulisse (refs #7459) adds 6607ccd modif de la conif de port série : nombre au lieu de faire une liste des ports dispo (refs #7459) adds 6500c3c affichage du port série écouté dans la barre de statut (refs #7459) adds b8e1fa0 modif de l'icone du pied à coulisse (fixes #7459) adds 151e005 Fix import from merge adds 593e87e Meilleur gestion des dépendences adds 9e61304 Pouvoir éditer des int dans l'éditeur de configuration adds c8b8e53 Reformat code adds 01a9569 Meilleure gestion de l'erreur de connection au pied à coulisse (See #7459) adds 26cfd5f Bien fermer la connection au pied à coulisse lorsque l'on ferme le contexte applicatif adds faa62fe Livrable #7459 Merge branch 'feature/7459' into develop adds f1d0845 libération de listeners quand on quitte l'écran adds b780b8e Le sexe a changé... adds 820b1e5 il se peut que ni la taille, ni le poids n'ai changé adds 02f97ea Gestion de la nullité du quota dans l'algorithme adds 342d5b9 Bien recalculer le cache des échantillons lors d'un import multi-poste adds 068770c Corrections et améliorations diverses sur l'écran des observations individuelles adds 5e7552f Suppression des bons lots adds 6e821cb Correction de la suppression d'une opération de pêche dans le cache des échantillons adds fba0a6a Mieux recharger l'opération dans le contexte de données adds 0b290b1 Ajout de plus de logs suite à la suppression d'une opération dans le cache adds 5dbc8d1 Ajout d'une méthode pour nettoyer les caches (supprimer les clefs vides) + afficher les caches adds 95043cf A la sauvegarde d'une opération, on doit rafraîchir le contexte de données adds 8a3df5d Envoyer un signal quand l'opération est rechargée adds 1f4faad Bien recharger l'opération de pêche lorsqu'elle change dans le contexte de données adds 30b65be Intrudcion PmfmId2 et renommahe de certainnes méthodes (See #8270) adds 06aefae Livrable #8270 Merge branch 'feature/8270' into develop adds c46a071 Amélioration du démarrage d'un chargement d'un trait adds 8feb4a7 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds f73378a [jgitflow-maven-plugin]updating poms for 4.5-rc-5 branch with snapshot versions adds b918c8a Ajout entete de licenses adds 7b4b579 [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-5' with non-snapshot versions adds e228463 [jgitflow-maven-plugin]merging 'release/4.5-rc-5' into 'master' adds f0a2e7d [jgitflow-maven-plugin]merging 'master' into 'develop' adds 84f2b2d [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 9a9ad6f Ne pas supprimer-ajouter le sampling si on fait cela déjà au niveau des observations (See #8274) adds 06d4652 Livrable #8274 Merge branch 'feature/8274' into develop adds a3aa8bc Suppression exception inutile adds 3e4a1e8 Ajout d'une méthode pour bloquer la sortie de l'écran des mensurations s'il y a des modifications (See #8272) adds c4910c8 Bloquer la sortie de l'écran des mensurations si modification pour aller vers l'onglet capture (See #8272) adds 9149fbc femrer l'écran des mensuration dès que l'on quitte son onglet (See #8272) adds f7eb183 Livrable #8272 Merge branch 'feature/8272' into develop new 71cab34 - passage à jaxx 2.29 - désactivation de la suppresion des maturités sélectionnées si elles sont utilisées (RAF : gérer la suppression des lignes d'espèce ou de benthos) (refs #8238) new 41f51b7 - Quand on supprime des lignes d'espece ou benthos du protocole, on enlève leur maturité des maturités utilisées. - On met à jour l'état des boutons de la double liste de maturité quand on arrive sur l'onglet des caractéristiques. Sinon, si la maturité sélectionné a été ajoutée ou supprimée, le bouton n'est plus dans le bon état. fixes #8238 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (eb69d62) \ N -- N -- N refs/heads/feature/8238 (41f51b7) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 41f51b7935fa9ab05d539a47b90eb6cdcceaa75c Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Apr 25 17:48:36 2016 +0200 - Quand on supprime des lignes d'espece ou benthos du protocole, on enlève leur maturité des maturités utilisées. - On met à jour l'état des boutons de la double liste de maturité quand on arrive sur l'onglet des caractéristiques. Sinon, si la maturité sélectionné a été ajoutée ou supprimée, le bouton n'est plus dans le bon état. fixes #8238 commit 71cab34afe5d43e608e8e5c997fe41fc416a980b Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Apr 22 15:44:36 2016 +0200 - passage à jaxx 2.29 - désactivation de la suppresion des maturités sélectionnées si elles sont utilisées (RAF : gérer la suppression des lignes d'espèce ou de benthos) (refs #8238) Summary of changes: pom.xml | 8 + {tutti-ui-swing => tutti-caliper}/LICENSE.txt | 0 {tutti-ui-swing => tutti-caliper}/README.md | 0 {tutti-ui-swing-updater => tutti-caliper}/pom.xml | 78 ++-- .../caliper/feed/CaliperConnectionException.java | 14 +- .../tutti/caliper/feed/CaliperFeedReader.java | 206 +++++++++ .../caliper/feed/event/CaliperFeedReaderEvent.java | 24 +- .../feed/event/CaliperFeedReaderListener.java | 14 +- .../record/CaliperFeedReaderMeasureRecord.java | 19 +- .../record/CaliperFeedReaderRecordFactory.java | 42 +- .../record/CaliperFeedReaderRecordSupport.java | 13 +- ...{FeedReader.java => IchtyometerFeedReader.java} | 46 +- ...rEvent.java => IchtyometerFeedReaderEvent.java} | 16 +- ...ner.java => IchtyometerFeedReaderListener.java} | 4 +- ...ava => IchtyometerFeedReaderMeasureRecord.java} | 4 +- ...ava => IchtyometerFeedReaderRecordFactory.java} | 26 +- ...ava => IchtyometerFeedReaderRecordSupport.java} | 4 +- ...> IchtyometerFeedReaderStylusMotionRecord.java} | 4 +- .../tutti/ichtyometer/tool/FeedReaderTool.java | 8 +- ...derTest.java => IchtyometerFeedReaderTest.java} | 10 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 28 +- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 31 +- .../tutti/persistence/TuttiPersistenceImpl.java | 4 +- .../persistence/TuttiPersistenceNoDbImpl.java | 2 +- .../persistence/dao/referential/pmfm/PmfmId2.java | 192 ++++++++ .../CaracteristicPersistenceService.java | 10 +- .../CaracteristicPersistenceServiceImpl.java | 15 +- .../main/java/fr/ifremer/tutti/util/Numbers.java | 14 +- .../src/main/java/fr/ifremer/tutti/util/Units.java | 24 + .../i18n/tutti-persistence_en_GB.properties | 11 + .../i18n/tutti-persistence_fr_FR.properties | 16 +- .../ifremer/tutti/service/PersistenceService.java | 12 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 8 +- .../ifremer/tutti/service/cruise/CruiseCache.java | 24 + .../tutti/service/cruise/CruiseCacheAble.java | 24 + ...cesSamplingAlgorithmEntryNotFoundException.java | 24 + .../service/sampling/CruiseSamplingCache.java | 106 +++-- .../sampling/CruiseSamplingInternalCache.java | 78 ++-- .../IndividualObservationSamplingCacheRequest.java | 48 ++ .../IndividualObservationSamplingContext.java | 24 + .../IndividualObservationSamplingStatus.java | 93 +++- ...lObservationSamplingStatusExceptionSupport.java | 24 + .../tutti/service/sampling/SamplingCodeCache.java | 24 + ...NotDefinedOnIndividualObservationException.java | 24 + .../ZoneNotDefinedOnFishingOperationException.java | 24 + .../resources/i18n/tutti-service_en_GB.properties | 127 ------ tutti-ui-swing/pom.xml | 5 + .../filtered-resources/tutti-help-fr.properties | 5 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 36 +- .../fr/ifremer/tutti/ui/swing/content/MainUI.jaxx | 3 + .../fr/ifremer/tutti/ui/swing/content/MainUI.jcss | 30 ++ .../tutti/ui/swing/content/MainUIHandler.java | 25 +- .../content/actions/ConnectCaliperAction.java | 74 ++++ .../content/actions/ConnectIchtyometerAction.java | 6 +- ...terAction.java => DisconnectCaliperAction.java} | 22 +- .../actions/DisconnectIchtyometerAction.java | 4 +- .../content/actions/EditCatchesSupportAction.java | 42 +- .../swing/content/config/TuttiConfigUIHandler.java | 58 ++- .../operation/catches/EditCatchesUIHandler.java | 419 ++++-------------- .../SamplingCodeCellEditor.java | 36 +- .../catches/species/BenthosBatchUISupportImpl.java | 10 + .../catches/species/SpeciesBatchUISupportImpl.java | 9 + .../species/SpeciesOrBenthosBatchUISupport.java | 3 + .../edit/actions/RemoveSpeciesBatchAction.java | 6 +- .../edit/actions/RemoveSpeciesSubBatchAction.java | 6 +- .../frequency/AverageWeightsHistogramHandler.java | 24 + .../frequency/AverageWeightsHistogramModel.java | 24 + .../frequency/FrequenciesHistogramHandler.java | 24 + .../frequency/FrequenciesHistogramModel.java | 24 + .../IndividualObservationBatchRowModel.java | 28 +- .../IndividualObservationBatchRowState.java | 24 + .../IndividualObservationBatchTableHandler.java | 387 +++++++--------- .../IndividualObservationBatchTableModel.java | 46 +- .../IndividualObservationBatchUIModel.java | 86 +++- .../IndividualObservationToFrequencyEngine.java | 200 ++++----- ...IndividualObservationToSamplingCacheEngine.java | 137 ++++++ ...dividualObservationToSamplingCacheResolver.java | 147 ------- .../frequency/IndividualObservationUICache.java | 202 +++------ .../species/frequency/SamplingCodeUICache.java | 254 +++++++++++ .../frequency/SamplingNotificationZoneHandler.java | 218 ++++++--- .../frequency/SamplingNotificationZoneModel.java | 54 ++- .../frequency/SamplingNotificationZoneStatus.java | 26 ++ .../frequency/SpeciesFrequencyTableModel.java | 82 +++- .../species/frequency/SpeciesFrequencyUI.jaxx | 9 +- .../frequency/SpeciesFrequencyUIHandler.java | 489 +++++++++++++-------- .../species/frequency/SpeciesFrequencyUIModel.java | 176 +++++--- .../actions/ApplySpeciesFrequencyRafaleAction.java | 15 +- .../actions/CancelEditSpeciesFrequencyAction.java | 15 +- .../frequency/actions/EditSampleCodeAction.java | 29 +- .../ImportMultiPostSpeciesSupportAction.java | 11 +- .../frequency/actions/RemoveObservationAction.java | 2 +- .../actions/ResetSpeciesFrequencyAction.java | 8 +- .../actions/SaveFishingOperationAction.java | 102 +++-- .../protocol/EditProtocolSpeciesTableModel.java | 42 +- .../content/protocol/EditProtocolUIHandler.java | 16 +- .../actions/RemoveBenthosProtocolAction.java | 5 + .../actions/RemoveSpeciesProtocolAction.java | 5 + .../ifremer/tutti/ui/swing/util/SoundEngine.java | 18 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 60 ++- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 49 ++- .../main/resources/icons/action-caliper-down.png | Bin 0 -> 426 bytes .../src/main/resources/icons/action-caliper-up.png | Bin 0 -> 436 bytes .../fr/ifremer/tutti/ui/swing/SoundUtilTest.java | 19 +- 103 files changed, 3454 insertions(+), 1953 deletions(-) copy {tutti-ui-swing => tutti-caliper}/LICENSE.txt (100%) copy {tutti-ui-swing => tutti-caliper}/README.md (100%) copy {tutti-ui-swing-updater => tutti-caliper}/pom.xml (52%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/BatchSavedListener.java => tutti-caliper/src/main/java/fr/ifremer/tutti/caliper/feed/CaliperConnectionException.java (77%) create mode 100644 tutti-caliper/src/main/java/fr/ifremer/tutti/caliper/feed/CaliperFeedReader.java copy tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/FeedReaderEvent.java => tutti-caliper/src/main/java/fr/ifremer/tutti/caliper/feed/event/CaliperFeedReaderEvent.java (61%) copy tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/FeedReaderListener.java => tutti-caliper/src/main/java/fr/ifremer/tutti/caliper/feed/event/CaliperFeedReaderListener.java (76%) copy tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderMeasureRecord.java => tutti-caliper/src/main/java/fr/ifremer/tutti/caliper/feed/record/CaliperFeedReaderMeasureRecord.java (78%) copy tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordFactory.java => tutti-caliper/src/main/java/fr/ifremer/tutti/caliper/feed/record/CaliperFeedReaderRecordFactory.java (51%) copy tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordSupport.java => tutti-caliper/src/main/java/fr/ifremer/tutti/caliper/feed/record/CaliperFeedReaderRecordSupport.java (82%) rename tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/{FeedReader.java => IchtyometerFeedReader.java} (73%) rename tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/{FeedReaderEvent.java => IchtyometerFeedReaderEvent.java} (66%) rename tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/{FeedReaderListener.java => IchtyometerFeedReaderListener.java} (89%) rename tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/{FeedReaderMeasureRecord.java => IchtyometerFeedReaderMeasureRecord.java} (93%) rename tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/{FeedReaderRecordFactory.java => IchtyometerFeedReaderRecordFactory.java} (65%) rename tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/{FeedReaderRecordSupport.java => IchtyometerFeedReaderRecordSupport.java} (91%) rename tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/{FeedReaderStylusMotionRecord.java => IchtyometerFeedReaderStylusMotionRecord.java} (92%) rename tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/{FeedReaderTest.java => IchtyometerFeedReaderTest.java} (81%) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/dao/referential/pmfm/PmfmId2.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectCaliperAction.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/{DisconnectIchtyometerAction.java => DisconnectCaliperAction.java} (65%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationToSamplingCacheEngine.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationToSamplingCacheResolver.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SamplingCodeUICache.java create mode 100644 tutti-ui-swing/src/main/resources/icons/action-caliper-down.png create mode 100644 tutti-ui-swing/src/main/resources/icons/action-caliper-up.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (f7eb183 -> d43093c)
by codelutin.com scm April 25, 2016

April 25, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from f7eb183 Livrable #8272 Merge branch 'feature/8272' into develop new 8574475 Meilleure gestion du tableau des mensurations lors de la génération depuis les observations individuelles new 9607b38 correction log new 78cc4c3 génération des mensurations lors d'un import multiposte sur uniquement les observations individuelles (See #8276) new d43093c Livrable #8276 Merge branch 'feature/8276' into develop The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d43093c8329a6fabcb9b40c76720f6fe50ee6b24 Merge: f7eb183 78cc4c3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 25 16:58:09 2016 +0200 Livrable #8276 Merge branch 'feature/8276' into develop commit 78cc4c321c372390b6734846cbf045926cbb349f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 25 16:58:07 2016 +0200 génération des mensurations lors d'un import multiposte sur uniquement les observations individuelles (See #8276) commit 9607b38ffd96d17f03398cba468c80a08c4c9adc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 25 16:56:48 2016 +0200 correction log commit 85744752230d699df9a971a1b0647060264dedf0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 25 16:56:36 2016 +0200 Meilleure gestion du tableau des mensurations lors de la génération depuis les observations individuelles Summary of changes: .../IndividualObservationToFrequencyEngine.java | 2 +- .../species/frequency/SpeciesFrequencyTableModel.java | 16 +++++++++++----- .../actions/ImportMultiPostSpeciesSupportAction.java | 10 +++++++++- 3 files changed, 21 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch develop updated (06d4652 -> f7eb183)
by codelutin.com scm April 25, 2016

April 25, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 06d4652 Livrable #8274 Merge branch 'feature/8274' into develop new a3aa8bc Suppression exception inutile new 3e4a1e8 Ajout d'une méthode pour bloquer la sortie de l'écran des mensurations s'il y a des modifications (See #8272) new c4910c8 Bloquer la sortie de l'écran des mensurations si modification pour aller vers l'onglet capture (See #8272) new 9149fbc femrer l'écran des mensuration dès que l'on quitte son onglet (See #8272) new f7eb183 Livrable #8272 Merge branch 'feature/8272' into develop The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit f7eb1832658071934a1e8e1e7d634c524f5ba362 Merge: 06d4652 9149fbc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 25 15:25:27 2016 +0200 Livrable #8272 Merge branch 'feature/8272' into develop commit 9149fbce4ea03f2fc03043b36318e57326db2696 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 25 15:25:17 2016 +0200 femrer l'écran des mensuration dès que l'on quitte son onglet (See #8272) commit c4910c8a98d93aea45e641b601e3d97646649bd1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 25 14:46:13 2016 +0200 Bloquer la sortie de l'écran des mensurations si modification pour aller vers l'onglet capture (See #8272) commit 3e4a1e80e649ceae6b9f6fd09b070f20c4eb08bb Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 25 14:40:38 2016 +0200 Ajout d'une méthode pour bloquer la sortie de l'écran des mensurations s'il y a des modifications (See #8272) commit a3aa8bce05c2f7d5f08fbd80d348e71911875bce Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 25 14:22:25 2016 +0200 Suppression exception inutile Summary of changes: .../operation/catches/EditCatchesUIHandler.java | 419 +++++---------------- .../species/frequency/SpeciesFrequencyUI.jaxx | 3 + .../frequency/SpeciesFrequencyUIHandler.java | 24 ++ .../actions/CancelEditSpeciesFrequencyAction.java | 2 +- 4 files changed, 120 insertions(+), 328 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5