[tutti] branch develop updated (0fc43c7 -> cf6871e)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 0fc43c7 Merge branch 'feature/5175' into develop new cf6871e fixes #5127: [BIGFIN] si mesure au mm, les mesures du big fin sont importées en cm sur le tableau Tutti 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 cf6871e9c126957fb7cb78367f4f78f71237692b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 23 16:06:49 2014 +0200 fixes #5127: [BIGFIN] si mesure au mm, les mesures du big fin sont importées en cm sur le tableau Tutti Summary of changes: .../frequency/SpeciesFrequencyUIHandler.java | 33 ++++++++++++++++++---- .../species/frequency/SpeciesFrequencyUIModel.java | 8 ++++++ 2 files changed, 36 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit cf6871e9c126957fb7cb78367f4f78f71237692b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 23 16:06:49 2014 +0200 fixes #5127: [BIGFIN] si mesure au mm, les mesures du big fin sont importées en cm sur le tableau Tutti --- .../frequency/SpeciesFrequencyUIHandler.java | 33 ++++++++++++++++++---- .../species/frequency/SpeciesFrequencyUIModel.java | 8 ++++++ 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java index 84ea74a..f57585b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java @@ -25,9 +25,6 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import org.nuiton.jaxx.application.ApplicationBusinessException; -import org.nuiton.jaxx.application.swing.util.Cancelable; -import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ichtyometer.feed.FeedReaderEvent; import fr.ifremer.tutti.ichtyometer.feed.FeedReaderListener; import fr.ifremer.tutti.ichtyometer.feed.FeedReaderRecord; @@ -36,6 +33,7 @@ import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; @@ -54,6 +52,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; +import org.nuiton.jaxx.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.swing.util.Cancelable; import javax.swing.JComponent; import javax.swing.JOptionPane; @@ -771,8 +771,31 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci protected void consumeFeedRecord(FeedReaderRecord record) { if (record.isValid()) { - // We consider this as milimeters, but we use only cm here - float length = record.getLength() / 10; + String unit = getModel().getLengthStepCaracteristicUnit(); + + // board measurements are in mm + + float length; + + if ("mm".equals(unit)) { + + // measurement on mm asked + length = record.getLength(); + + } else { + + // measurement on cm asked + length = record.getLength() / 10; + + Float precision = getModel().getLengthStepCaracteristicPrecision(); + + if (precision != null) { + + //FIXME Should we consider the precision ? + + } + } + applyRafaleStep(length, true); } else { throw new ApplicationBusinessException( diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java index c5d046e..4b6ceb9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java @@ -217,6 +217,14 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa firePropertyChange(PROPERTY_CAN_GENERATE, null, isCanGenerate()); } + public String getLengthStepCaracteristicUnit() { + return lengthStepCaracteristic.getUnit(); + } + + public Float getLengthStepCaracteristicPrecision() { + return lengthStepCaracteristic.getPrecision(); + } + public Float getMinStep() { return minStep; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm