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 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) new 26cfd5f Bien fermer la connection au pied à coulisse lorsque l'on ferme le contexte applicatif new faa62fe Livrable #7459 Merge branch 'feature/7459' 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 faa62fe9a1a86e1252782acbe9183d5b22c807c6 Merge: c47e59e 26cfd5f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 22 14:56:40 2016 +0200 Livrable #7459 Merge branch 'feature/7459' into develop commit 26cfd5f57e3f1d9369734a80e2c8b6fbac99e57f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 22 14:20:46 2016 +0200 Bien fermer la connection au pied à coulisse lorsque l'on ferme le contexte applicatif 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 ++-- .../i18n/tutti-persistence_en_GB.properties | 8 + .../i18n/tutti-persistence_fr_FR.properties | 13 +- tutti-ui-swing/pom.xml | 5 + .../filtered-resources/tutti-help-fr.properties | 28 +-- .../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 +- .../swing/content/config/TuttiConfigUIHandler.java | 58 +++--- .../frequency/SpeciesFrequencyUIHandler.java | 105 +++++++++-- .../actions/ApplySpeciesFrequencyRafaleAction.java | 2 +- .../ifremer/tutti/ui/swing/util/SoundEngine.java | 18 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 23 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 33 +++- .../main/resources/icons/action-caliper-down.png | Bin 0 -> 426 bytes .../src/main/resources/icons/action-caliper-up.png | Bin 0 -> 436 bytes 42 files changed, 791 insertions(+), 301 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-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/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@codelutin.com>.