This is an automated email from the git hooks/post-receive script. New commit to branch feature/8245 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit e2b4392dca98d96754cd8ea3d290c63f889b335b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 16 07:56:39 2016 +0200 Correction de l'unité utilisée pour le graphique des poids moyens --- .../frequency/AverageWeightsHistogramHandler.java | 2 +- .../frequency/AverageWeightsHistogramModel.java | 21 ++++---- .../species/frequency/SpeciesFrequencyUIModel.java | 59 +--------------------- 3 files changed, 11 insertions(+), 71 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/AverageWeightsHistogramHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/AverageWeightsHistogramHandler.java index bf610c2..47fd529 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/AverageWeightsHistogramHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/AverageWeightsHistogramHandler.java @@ -46,7 +46,7 @@ public class AverageWeightsHistogramHandler implements Closeable { chart = ChartFactory.createXYLineChart(null, t("tutti.editSpeciesFrequencies.table.header.lengthStep"), - model.getIndividualObservationWeightUnit().decorateLabel(t("tutti.editSpeciesFrequencies.averageWeight.label")), + model.getFrequencyWeightUnit().decorateLabel(t("tutti.editSpeciesFrequencies.averageWeight.label")), model.getDataset()); chart.clearSubtitles(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/AverageWeightsHistogramModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/AverageWeightsHistogramModel.java index fdf1375..d71b1d0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/AverageWeightsHistogramModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/AverageWeightsHistogramModel.java @@ -1,7 +1,6 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency; import fr.ifremer.tutti.type.WeightUnit; -import fr.ifremer.tutti.util.Weights; import org.jdesktop.beans.AbstractSerializableBean; import org.jfree.data.xy.XYSeries; import org.jfree.data.xy.XYSeriesCollection; @@ -30,25 +29,24 @@ public class AverageWeightsHistogramModel extends AbstractSerializableBean { protected final XYSeries series; private final WeightUnit frequencyWeightUnit; - private final WeightUnit individualObservationWeightUnit; private String title; private String lengthStepLabelWithUnit; private Float step; - public AverageWeightsHistogramModel(WeightUnit frequencyWeightUnit, WeightUnit individualObservationWeightUnit) { + public AverageWeightsHistogramModel(WeightUnit frequencyWeightUnit) { + this.frequencyWeightUnit = frequencyWeightUnit; - this.individualObservationWeightUnit = individualObservationWeightUnit; - series = new XYSeries("", true, false); - dataset = new XYSeriesCollection(series); - dataset.setIntervalPositionFactor(0); - dataset.setIntervalWidth(0); + this.series = new XYSeries("", true, false); + this.dataset = new XYSeriesCollection(series); + this.dataset.setIntervalPositionFactor(0); + this.dataset.setIntervalWidth(0); } - public WeightUnit getIndividualObservationWeightUnit() { - return individualObservationWeightUnit; + public WeightUnit getFrequencyWeightUnit() { + return frequencyWeightUnit; } public XYSeriesCollection getDataset() { @@ -102,8 +100,7 @@ public class AverageWeightsHistogramModel extends AbstractSerializableBean { public void addOrUpdate(SpeciesFrequencyRowModel row) { - Float weight = Weights.convert(frequencyWeightUnit, individualObservationWeightUnit, row.computeAverageWeight()); - series.addOrUpdate(row.getLengthStep(), weight); + series.addOrUpdate(row.getLengthStep(), row.computeAverageWeight()); } 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 09f3fce..a8d9a58 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 @@ -269,20 +269,6 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa */ protected CopyIndividualObservationMode copyIndividualObservationMode = CopyIndividualObservationMode.NOTHING; -// /** -// * To store frequencies graph series. -// * -// * @since 3.11 -// */ -// protected final XYSeriesCollection frequenciesDataset; - -// /** -// * To store average weights graph series. -// * -// * @since 4.5 -// */ -// protected final XYSeriesCollection averageWeightsDataset; - /** * Default caracteristics coming from protocol. * @@ -360,21 +346,9 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa this.totalComputedOrNotWeight.addPropagateListener(PROPERTY_TOTAL_WEIGHT, this); setEmptyRows(new HashSet<>()); - this.averageWeightsHistogramModel = new AverageWeightsHistogramModel(weightUnit, individualObservationWeightUnit); + this.averageWeightsHistogramModel = new AverageWeightsHistogramModel(weightUnit); this.frequenciesHistogramModel = new FrequenciesHistogramModel(); -// XYSeries series = new XYSeries("", true, false); -// -// frequenciesDataset = new XYSeriesCollection(series); -// frequenciesDataset.setIntervalPositionFactor(0); -// frequenciesDataset.setIntervalWidth(0); - -// series = new XYSeries("", true, false); -// -// averageWeightsDataset = new XYSeriesCollection(series); -// averageWeightsDataset.setIntervalPositionFactor(0); -// averageWeightsDataset.setIntervalWidth(0); - this.defaultCaracteristic = defaultCaracteristic == null ? new ArrayList<>() : new ArrayList<>(defaultCaracteristic); setIndividualObservationRowsInError(new HashSet<>()); @@ -406,11 +380,6 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa setEmptyRows(new HashSet<>()); -// XYSeries frequenciesSeries = frequenciesDataset.getSeries(0); -// frequenciesSeries.clear(); -// XYSeries averageWeightsSeries = averageWeightsDataset.getSeries(0); -// averageWeightsSeries.clear(); - cache.loadCache(rows); recomputeRowsValidateState(); @@ -419,22 +388,6 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa frequenciesHistogramModel.reloadRows(rows); averageWeightsHistogramModel.reloadRows(rows); -// if (rows != null) { -// -// rows.stream().filter(SpeciesFrequencyRowModel::isValid).forEach(row -> { -// -// Float lengthStep = row.getLengthStep(); -// Integer number = row.getNumber(); - -// frequenciesSeries.addOrUpdate(lengthStep, number); - -// Float averageWeight = Weights.convert(weightUnit, individualObservationWeightUnit, row.computeAverageWeight()); -// if (averageWeight != null) { -// averageWeightsSeries.addOrUpdate(lengthStep, averageWeight); -// } -// }); -// } - recomputeTotalNumberAndWeight(); } @@ -525,10 +478,6 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa return lengthStepCaracteristic == null ? null : lengthStepCaracteristic.getUnit(); } -// public Float getLengthStepCaracteristicPrecision() { -// return lengthStepCaracteristic == null ? null : lengthStepCaracteristic.getPrecision(); -// } - public Float getMinStep() { return minStep; } @@ -1028,12 +977,6 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa } -// public boolean isIndividualObservationRowValid(IndividualObservationBatchRowModel row) { -// return copyIndividualObservationMode == CopyIndividualObservationMode.NOTHING -// || (copyIndividualObservationMode == CopyIndividualObservationMode.SIZE && row.withSize()) -// || (copyIndividualObservationMode == CopyIndividualObservationMode.ALL && row.withSize() && row.withWeight()); -// } - public List<Caracteristic> getDefaultCaracteristic() { return defaultCaracteristic; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.