branch feature/8038 updated (faac797 -> f5eb28e)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8038 in repository tutti. See http://git.codelutin.com/tutti.git discards faac797 transformation du graph en line chart (refs #8038) adds b6bce86 - ajout du listener de modif sur les lignes existantes - reajout du listener de modif des lignes d'obs indiv pour que le reset fonctionne fixes #8060 adds 07b9a79 Fixes #8060 Merge branch 'feature/8060' into develop adds 1bfceae on vérifie qu'il y a des lignes non vides dans le tableau des observations (refs #8059) adds 5e7fece on vérifie que les caractéristiques n'ont pas de valeurs (fixes #8059) adds 7fcb7ae Use java 8 Objects API adds 0f4067f Fixes #8059 Merge branch 'feature/8059' into develop adds 463351f force le mode rafale et l'ajout de la mensuration en obs indiv quand on passe en mode de recopie (fixes #8074) adds 3263747 Fixes #8074 Merge branch 'feature/8074' into develop adds c26e4fb on calcule les tailles et poids de toutes les lignes valides (refs #8065) adds 9037717 filtre des observations vides avant de sauver (refs #8065) adds 00e74af filtre des lignes vides (fixes #8065) adds f82aee1 on calcule les tailles et poids de toutes les lignes valides (refs #8065) adds f619e61 bullshit... adds a496bb1 on vérifie qu'on n'est pas en train de recalculer les lignes (fixes #8065) adds 6bcebaa Use a try-finally to be sure to change back state adds d55670e Fixes #8065 Merge branch 'feature/8065' into develop adds 20fcb78 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds ce98818 [jgitflow-maven-plugin]updating poms for 4.5-alpha-3 branch with snapshot versions adds 2297f20 Fix m-source-p configuration adds 9713d49 [jgitflow-maven-plugin]updating poms for branch'release/4.5-alpha-3' with non-snapshot versions adds 307bb66 [jgitflow-maven-plugin]merging 'release/4.5-alpha-3' into 'master' adds 2e32317 [jgitflow-maven-plugin]merging 'master' into 'develop' adds d9b926e [jgitflow-maven-plugin]Updating develop poms back to pre merge state new ef11826 transformation du graph en line chart (refs #8038) new f5eb28e ajout des points sur la ligne (refs #8038) 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 (faac797) \ N -- N -- N refs/heads/feature/8038 (f5eb28e) 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 f5eb28e218870626a63177682f37ca1c99b64a04 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 8 12:04:50 2016 +0100 ajout des points sur la ligne (refs #8038) commit ef11826485dd7197d12c02977e351fd2e058ed80 Author: Kevin Morin <morin@codelutin.com> Date: Mon Mar 7 11:51:29 2016 +0100 transformation du graph en line chart (refs #8038) Summary of changes: pom.xml | 1 + .../persistence/entities/CaracteristicMap.java | 5 + .../IndividualObservationBatchRowModel.java | 9 ++ .../IndividualObservationBatchTableModel.java | 6 +- .../catches/species/SpeciesBatchUIHandler.java | 6 +- .../species/frequency/SpeciesFrequencyUI.jcss | 3 + .../frequency/SpeciesFrequencyUIHandler.java | 144 +++++++++++++-------- .../species/frequency/SpeciesFrequencyUIModel.java | 50 +++++-- 8 files changed, 152 insertions(+), 72 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 feature/8038 in repository tutti. See http://git.codelutin.com/tutti.git commit ef11826485dd7197d12c02977e351fd2e058ed80 Author: Kevin Morin <morin@codelutin.com> Date: Mon Mar 7 11:51:29 2016 +0100 transformation du graph en line chart (refs #8038) --- .../species/frequency/SpeciesFrequencyUIHandler.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 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 485a7f8..f67c3c8 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 @@ -83,8 +83,10 @@ import org.jdesktop.swingx.table.TableColumnExt; import org.jfree.chart.ChartFactory; import org.jfree.chart.ChartPanel; import org.jfree.chart.JFreeChart; +import org.jfree.chart.axis.CategoryAxis; import org.jfree.chart.axis.NumberTickUnitSource; import org.jfree.chart.axis.ValueAxis; +import org.jfree.chart.plot.CategoryPlot; import org.nuiton.decorator.Decorator; import org.nuiton.jaxx.application.ApplicationBusinessException; @@ -443,7 +445,8 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci model.setStep(step1); model.setDataSetIntervalWidth(step1); frequenciesChart.getXYPlot().getDomainAxis().setStandardTickUnits(new TuttiNumberTickUnitSource(step1 == 1f)); - averageWeightsChart.getXYPlot().getDomainAxis().setStandardTickUnits(new TuttiNumberTickUnitSource(step1 == 1f)); + //FIXME +// ((CategoryPlot) averageWeightsChart.getPlot()).getDomainAxis().setStandardTickUnits(new TuttiNumberTickUnitSource(step1 == 1f)); if (CollectionUtils.isNotEmpty(getModel().getRows())) { for (SpeciesFrequencyRowModel rowModel : getModel().getRows()) { rowModel.setLengthStepCaracteristic(newValue); @@ -1070,11 +1073,10 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci } protected void initAverageWeightsHistogram() { - averageWeightsChart = ChartFactory.createXYBarChart(null, - t("tutti.editSpeciesFrequencies.table.header.lengthStep"), - false, - weightUnit.decorateLabel(t("tutti.editSpeciesFrequencies.averageWeight.label")), - getModel().averageWeightsDataset); + averageWeightsChart = ChartFactory.createXYLineChart(null, + t("tutti.editSpeciesFrequencies.table.header.lengthStep"), + weightUnit.decorateLabel(t("tutti.editSpeciesFrequencies.averageWeight.label")), + getModel().averageWeightsDataset); averageWeightsChart.clearSubtitles(); ValueAxis rangeAxis = averageWeightsChart.getXYPlot().getRangeAxis(); -- 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 feature/8038 in repository tutti. See http://git.codelutin.com/tutti.git commit f5eb28e218870626a63177682f37ca1c99b64a04 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 8 12:04:50 2016 +0100 ajout des points sur la ligne (refs #8038) --- .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 10 +++++----- 1 file changed, 5 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 f67c3c8..b503616 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 @@ -83,10 +83,9 @@ import org.jdesktop.swingx.table.TableColumnExt; import org.jfree.chart.ChartFactory; import org.jfree.chart.ChartPanel; import org.jfree.chart.JFreeChart; -import org.jfree.chart.axis.CategoryAxis; import org.jfree.chart.axis.NumberTickUnitSource; import org.jfree.chart.axis.ValueAxis; -import org.jfree.chart.plot.CategoryPlot; +import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer; import org.nuiton.decorator.Decorator; import org.nuiton.jaxx.application.ApplicationBusinessException; @@ -445,8 +444,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci model.setStep(step1); model.setDataSetIntervalWidth(step1); frequenciesChart.getXYPlot().getDomainAxis().setStandardTickUnits(new TuttiNumberTickUnitSource(step1 == 1f)); - //FIXME -// ((CategoryPlot) averageWeightsChart.getPlot()).getDomainAxis().setStandardTickUnits(new TuttiNumberTickUnitSource(step1 == 1f)); + averageWeightsChart.getXYPlot().getDomainAxis().setStandardTickUnits(new TuttiNumberTickUnitSource(step1 == 1f)); if (CollectionUtils.isNotEmpty(getModel().getRows())) { for (SpeciesFrequencyRowModel rowModel : getModel().getRows()) { rowModel.setLengthStepCaracteristic(newValue); @@ -1089,7 +1087,9 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci domainAxis.setStandardTickUnits(new TuttiNumberTickUnitSource(true)); domainAxis.setMinorTickMarksVisible(true); - averageWeightsChart.getXYPlot().getRenderer().setSeriesPaint(0, getConfig().getColorComputedWeights()); + XYLineAndShapeRenderer plotRenderer = (XYLineAndShapeRenderer) averageWeightsChart.getXYPlot().getRenderer(); + plotRenderer.setSeriesPaint(0, getConfig().getColorComputedWeights()); + plotRenderer.setBaseShapesVisible(true); final ChartPanel chartPanel = new ChartPanel(averageWeightsChart); chartPanel.setDomainZoomable(false); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm