branch develop updated (2d1d3f9 -> d0b2092)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository nuiton-matrix. See https://gitlab.nuiton.org/nuiton/nuiton-matrix.git from 2d1d3f9 Update libs new d0b2092 #57: Update to jfreechart 1.5.0 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 d0b209231383d23b1e209d506cde32ef29ffeb00 Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Jan 9 11:30:09 2020 +0100 #57: Update to jfreechart 1.5.0 Summary of changes: .../viewer/renderer/MatrixChartRenderer.java | 6 ++--- .../viewer/renderer/MatrixPanelRenderer.java | 2 +- .../renderer/jfreechart/GraphComboRenderer.java | 8 +------ .../renderer/jfreechart/GraphMatrixNDDataset.java | 2 +- .../jfreechart/GraphRendererComboBoxModel.java | 26 ++++++---------------- .../viewer/renderer/jfreechart/package-info.java | 2 +- .../math/matrix/viewer/renderer/package-info.java | 2 +- 7 files changed, 15 insertions(+), 33 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-matrix. See https://gitlab.nuiton.org/nuiton/nuiton-matrix.git commit d0b209231383d23b1e209d506cde32ef29ffeb00 Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Jan 9 11:30:09 2020 +0100 #57: Update to jfreechart 1.5.0 --- .../viewer/renderer/MatrixChartRenderer.java | 6 ++--- .../viewer/renderer/MatrixPanelRenderer.java | 2 +- .../renderer/jfreechart/GraphComboRenderer.java | 8 +------ .../renderer/jfreechart/GraphMatrixNDDataset.java | 2 +- .../jfreechart/GraphRendererComboBoxModel.java | 26 ++++++---------------- .../viewer/renderer/jfreechart/package-info.java | 2 +- .../math/matrix/viewer/renderer/package-info.java | 2 +- 7 files changed, 15 insertions(+), 33 deletions(-) diff --git a/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixChartRenderer.java b/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixChartRenderer.java index ee9393c..ad05275 100644 --- a/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixChartRenderer.java +++ b/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixChartRenderer.java @@ -2,7 +2,7 @@ * #%L * Nuiton Matrix :: GUI * %% - * Copyright (C) 2010 Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2020 Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -37,7 +37,7 @@ import org.jfree.chart.ChartPanel; import org.jfree.chart.JFreeChart; import org.jfree.chart.axis.CategoryAxis; import org.jfree.chart.axis.CategoryLabelPositions; -import org.jfree.chart.axis.NumberAxis3D; +import org.jfree.chart.axis.NumberAxis; import org.jfree.chart.axis.ValueAxis; import org.jfree.chart.plot.CategoryPlot; import org.jfree.chart.renderer.category.CategoryItemRenderer; @@ -154,7 +154,7 @@ public class MatrixChartRenderer implements MatrixRenderer { * @return value axis */ protected ValueAxis getValueAxis(MatrixND matrix) { - ValueAxis verticalAxis = new NumberAxis3D(); + ValueAxis verticalAxis = new NumberAxis(); return verticalAxis; } diff --git a/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixPanelRenderer.java b/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixPanelRenderer.java index 1b5357a..3500031 100644 --- a/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixPanelRenderer.java +++ b/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixPanelRenderer.java @@ -2,7 +2,7 @@ * #%L * Nuiton Matrix :: GUI * %% - * Copyright (C) 2010 Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2020 Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as diff --git a/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphComboRenderer.java b/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphComboRenderer.java index 2d3dfec..1c88a7c 100644 --- a/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphComboRenderer.java +++ b/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphComboRenderer.java @@ -2,7 +2,7 @@ * #%L * Nuiton Matrix :: GUI * %% - * Copyright (C) 2002 - 2010 Ifremer, CodeLutin, Chatellier Eric + * Copyright (C) 2002 - 2020 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -31,9 +31,7 @@ import javax.swing.JList; import org.jfree.chart.renderer.category.AreaRenderer; import org.jfree.chart.renderer.category.BarRenderer; -import org.jfree.chart.renderer.category.BarRenderer3D; import org.jfree.chart.renderer.category.LineAndShapeRenderer; -import org.jfree.chart.renderer.category.LineRenderer3D; import org.jfree.chart.renderer.category.MinMaxCategoryRenderer; import org.jfree.chart.renderer.category.StackedAreaRenderer; import org.jfree.chart.renderer.category.StackedBarRenderer; @@ -57,16 +55,12 @@ public class GraphComboRenderer extends DefaultListCellRenderer { isSelected, hasFocus); if (o instanceof StackedBarRenderer) { setText(t("nuitonmatrix.viewer.graphcomborender.bar.stacked")); - } else if (o instanceof BarRenderer3D) { - setText(t("nuitonmatrix.viewer.graphcomborender.bar.3d")); } else if (o instanceof BarRenderer) { setText(t("nuitonmatrix.viewer.graphcomborender.bar")); } else if (o instanceof StackedAreaRenderer) { setText(t("nuitonmatrix.viewer.graphcomborender.surface.stacked")); } else if (o instanceof AreaRenderer) { setText(t("nuitonmatrix.viewer.graphcomborender.surface")); - } else if (o instanceof LineRenderer3D) { - setText(t("nuitonmatrix.viewer.graphcomborender.line.3d")); } else if (o instanceof LineAndShapeRenderer) { setText(t("nuitonmatrix.viewer.graphcomborender.line")); } else if (o instanceof MinMaxCategoryRenderer) { diff --git a/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphMatrixNDDataset.java b/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphMatrixNDDataset.java index 28ed4f2..6048071 100644 --- a/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphMatrixNDDataset.java +++ b/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphMatrixNDDataset.java @@ -2,7 +2,7 @@ * #%L * Nuiton Matrix :: GUI * %% - * Copyright (C) 2002 - 2012 Ifremer, CodeLutin, Chatellier Eric + * Copyright (C) 2002 - 2020 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as diff --git a/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphRendererComboBoxModel.java b/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphRendererComboBoxModel.java index 1747def..f945e0a 100644 --- a/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphRendererComboBoxModel.java +++ b/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphRendererComboBoxModel.java @@ -2,7 +2,7 @@ * #%L * Nuiton Matrix :: GUI * %% - * Copyright (C) 2010 Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2020 Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -30,10 +30,8 @@ import javax.swing.DefaultComboBoxModel; import org.jfree.chart.labels.StandardCategoryToolTipGenerator; import org.jfree.chart.renderer.category.AreaRenderer; import org.jfree.chart.renderer.category.BarRenderer; -import org.jfree.chart.renderer.category.BarRenderer3D; import org.jfree.chart.renderer.category.CategoryItemRenderer; import org.jfree.chart.renderer.category.LineAndShapeRenderer; -import org.jfree.chart.renderer.category.LineRenderer3D; import org.jfree.chart.renderer.category.MinMaxCategoryRenderer; import org.jfree.chart.renderer.category.StackedAreaRenderer; import org.jfree.chart.renderer.category.StackedBarRenderer; @@ -63,42 +61,32 @@ public class GraphRendererComboBoxModel extends DefaultComboBoxModel { // rendu : vertical bar BarRenderer barRenderer = new BarRenderer(); - barRenderer.setBaseToolTipGenerator(new StandardCategoryToolTipGenerator()); + barRenderer.setDefaultToolTipGenerator(new StandardCategoryToolTipGenerator()); rendererList.add(barRenderer); - // rendu : vertical bar 3d - BarRenderer3D barRenderer3D = new BarRenderer3D(); - barRenderer3D.setBaseToolTipGenerator(new StandardCategoryToolTipGenerator()); - rendererList.add(barRenderer3D); - // rendu stacked bar StackedBarRenderer stackedBarRenderer = new StackedBarRenderer(); - stackedBarRenderer.setBaseToolTipGenerator(new StandardCategoryToolTipGenerator()); + stackedBarRenderer.setDefaultToolTipGenerator(new StandardCategoryToolTipGenerator()); rendererList.add(stackedBarRenderer); // rendu aire AreaRenderer areaRenderer = new AreaRenderer(); - areaRenderer.setBaseToolTipGenerator(new StandardCategoryToolTipGenerator()); + areaRenderer.setDefaultToolTipGenerator(new StandardCategoryToolTipGenerator()); rendererList.add(areaRenderer); // rendu aire empilée StackedAreaRenderer stackedAreaRenderer = new StackedAreaRenderer(); - stackedAreaRenderer.setBaseToolTipGenerator(new StandardCategoryToolTipGenerator()); + stackedAreaRenderer.setDefaultToolTipGenerator(new StandardCategoryToolTipGenerator()); rendererList.add(stackedAreaRenderer); // rendu line aire LineAndShapeRenderer lineAndShapeRenderer = new LineAndShapeRenderer(); - lineAndShapeRenderer.setBaseToolTipGenerator(new StandardCategoryToolTipGenerator()); + lineAndShapeRenderer.setDefaultToolTipGenerator(new StandardCategoryToolTipGenerator()); rendererList.add(lineAndShapeRenderer); - // rendu ligne 3d - LineRenderer3D lineRenderer3D = new LineRenderer3D(); - lineRenderer3D.setBaseToolTipGenerator(new StandardCategoryToolTipGenerator()); - rendererList.add(lineRenderer3D); - // rendu mix/max MinMaxCategoryRenderer minMaxCategoryRenderer = new MinMaxCategoryRenderer(); - minMaxCategoryRenderer.setBaseToolTipGenerator(new StandardCategoryToolTipGenerator()); + minMaxCategoryRenderer.setDefaultToolTipGenerator(new StandardCategoryToolTipGenerator()); rendererList.add(minMaxCategoryRenderer); // auto select first diff --git a/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/package-info.java b/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/package-info.java index 4a9d2ac..c24ec01 100644 --- a/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/package-info.java +++ b/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/package-info.java @@ -2,7 +2,7 @@ * #%L * Nuiton Matrix :: GUI * %% - * Copyright (C) 2004 - 2010 CodeLutin, Chatellier Eric + * Copyright (C) 2004 - 2020 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as diff --git a/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/package-info.java b/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/package-info.java index b7109aa..f6e20fc 100644 --- a/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/package-info.java +++ b/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/package-info.java @@ -2,7 +2,7 @@ * #%L * Nuiton Matrix :: GUI * %% - * Copyright (C) 2004 - 2010 CodeLutin, Chatellier Eric + * Copyright (C) 2004 - 2020 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm