December 2010 - Nuiton-matrix-commits - mailman.cloud.codelutin.com

r311 - trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix
by echatellier＠users.nuiton.org 16 Dec '10

16 Dec '10

Author: echatellier Date: 2010-12-16 10:30:38 +0100 (Thu, 16 Dec 2010) New Revision: 311 Url: http://nuiton.org/repositories/revision/nuiton-matrix/311 Log: set getMaxOccurence deprecated Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixNDImpl.java Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixNDImpl.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixNDImpl.java 2010-12-15 18:06:36 UTC (rev 310) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixNDImpl.java 2010-12-16 09:30:38 UTC (rev 311) @@ -102,11 +102,17 @@ } @Override + @Deprecated public double getMaxOccurence() { - return matrix.getMaxOccurence(); + return getMaxOccurrence(); } @Override + public double getMaxOccurrence() { + return matrix.getMaxOccurrence(); + } + + @Override public String toString() { return getName() + " " + matrix.toString(); }

1 0

r310 - in trunk: . nuiton-matrix nuiton-matrix-gui nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart
by echatellier＠users.nuiton.org 15 Dec '10

15 Dec '10

Author: echatellier Date: 2010-12-15 19:06:36 +0100 (Wed, 15 Dec 2010) New Revision: 310 Url: http://nuiton.org/repositories/revision/nuiton-matrix/310 Log: Relocate to org.nuiton.matrix Modified: trunk/nuiton-matrix-gui/pom.xml trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphComboRenderer.java trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphMatrixNDDataset.java trunk/nuiton-matrix/pom.xml trunk/pom.xml Modified: trunk/nuiton-matrix/pom.xml =================================================================== --- trunk/nuiton-matrix/pom.xml 2010-12-10 10:01:28 UTC (rev 309) +++ trunk/nuiton-matrix/pom.xml 2010-12-15 18:06:36 UTC (rev 310) @@ -9,11 +9,11 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>nuiton-matrix</artifactId> + <artifactId>matrix</artifactId> <version>2.1-SNAPSHOT</version> </parent> - <groupId>org.nuiton.nuiton-matrix</groupId> + <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> <dependencies> Modified: trunk/nuiton-matrix-gui/pom.xml =================================================================== --- trunk/nuiton-matrix-gui/pom.xml 2010-12-10 10:01:28 UTC (rev 309) +++ trunk/nuiton-matrix-gui/pom.xml 2010-12-15 18:06:36 UTC (rev 310) @@ -9,11 +9,11 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>nuiton-matrix</artifactId> + <artifactId>matrix</artifactId> <version>2.1-SNAPSHOT</version> </parent> - <groupId>org.nuiton.nuiton-matrix</groupId> + <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> <dependencies> Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphComboRenderer.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphComboRenderer.java 2010-12-10 10:01:28 UTC (rev 309) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphComboRenderer.java 2010-12-15 18:06:36 UTC (rev 310) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2002 - 2010 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU General Lesser Public License for more details. * - * You should have received a copy of the GNU General Public + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphMatrixNDDataset.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphMatrixNDDataset.java 2010-12-10 10:01:28 UTC (rev 309) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphMatrixNDDataset.java 2010-12-15 18:06:36 UTC (rev 310) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2002 - 2010 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU General Lesser Public License for more details. * - * You should have received a copy of the GNU General Public + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-10 10:01:28 UTC (rev 309) +++ trunk/pom.xml 2010-12-15 18:06:36 UTC (rev 310) @@ -14,7 +14,7 @@ <version>2.4.1</version> </parent> - <artifactId>nuiton-matrix</artifactId> + <artifactId>matrix</artifactId> <version>2.1-SNAPSHOT</version> <modules> @@ -95,6 +95,8 @@ <properties> + <projectId>nuiton-matrix</projectId> + <jaxxVersion>2.2.3</jaxxVersion> <nuitonUtilsVersion>1.5</nuitonUtilsVersion> <nuitonI18nVersion>2.0</nuitonI18nVersion>

1 0

r309 - trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer
by echatellier＠users.nuiton.org 10 Dec '10

10 Dec '10

Author: echatellier Date: 2010-12-10 11:01:28 +0100 (Fri, 10 Dec 2010) New Revision: 309 Url: http://nuiton.org/repositories/revision/nuiton-matrix/309 Log: Auto select first renderer Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java 2010-12-09 15:15:08 UTC (rev 308) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java 2010-12-10 10:01:28 UTC (rev 309) @@ -308,6 +308,12 @@ JToggleButton radioButton = new JToggleButton(renderer.getIcon()); radioButton.addActionListener(this); radioButton.setModel(new RendererButtonModel(renderer)); + + // auto select first matrix renderer + if (index == 1) { + radioButton.setSelected(true); + } + buttonGroup.add(radioButton); add(radioButton, new GridBagConstraints(0, index, 1, 1, 1, 0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); @@ -396,6 +402,12 @@ radioButton.addActionListener(this); radioButton.setModel(new RendererButtonModel(renderer)); buttonGroup.add(radioButton); + + // auto select first matrix renderer + if (index == 0) { + radioButton.setSelected(true); + } + add(radioButton, new GridBagConstraints(index, 0, 1, 1, 1, 1, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); index++;

1 0

r308 - trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer
by echatellier＠users.nuiton.org 09 Dec '10

09 Dec '10

Author: echatellier Date: 2010-12-09 16:15:08 +0100 (Thu, 09 Dec 2010) New Revision: 308 Url: http://nuiton.org/repositories/revision/nuiton-matrix/308 Log: Fix matrix panel renderer with matrix panel editor Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixPanelRenderer.java Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixPanelRenderer.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixPanelRenderer.java 2010-12-09 15:09:49 UTC (rev 307) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixPanelRenderer.java 2010-12-09 15:15:08 UTC (rev 308) @@ -30,10 +30,9 @@ import java.awt.Component; import javax.swing.Icon; -import javax.swing.JScrollPane; -import javax.swing.JTable; import org.nuiton.math.matrix.MatrixND; +import org.nuiton.math.matrix.gui.MatrixPanelEditor; import org.nuiton.math.matrix.viewer.MatrixRenderer; import org.nuiton.util.Resource; @@ -54,9 +53,9 @@ @Override public Component getComponent(MatrixND matrix) { - JTable table = new JTable(); - table.setModel(new MatrixInfoTableModel(matrix)); - return new JScrollPane(table); + MatrixPanelEditor panel = new MatrixPanelEditor(); + panel.setMatrix(matrix); + return panel; } /*

1 0

r307 - trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer
by echatellier＠users.nuiton.org 09 Dec '10

09 Dec '10

Author: echatellier Date: 2010-12-09 16:09:49 +0100 (Thu, 09 Dec 2010) New Revision: 307 Url: http://nuiton.org/repositories/revision/nuiton-matrix/307 Log: Add icon list rendering solution Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java 2010-12-09 10:47:55 UTC (rev 306) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java 2010-12-09 15:09:49 UTC (rev 307) @@ -29,7 +29,9 @@ import java.awt.BorderLayout; import java.awt.Component; -import java.awt.GridLayout; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; @@ -51,6 +53,7 @@ import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.JSplitPane; +import javax.swing.JToggleButton; import javax.swing.JToggleButton.ToggleButtonModel; import org.nuiton.math.matrix.MatrixND; @@ -65,7 +68,7 @@ * Last update : $Date$ * By : $Author$ */ -public class MatrixViewerPanel extends JPanel implements ActionListener { +public class MatrixViewerPanel extends JPanel { /** serialVersionUID. */ private static final long serialVersionUID = -5447856858278176837L; @@ -97,6 +100,8 @@ protected RadioButtonRenderingPanel radioPanel; + protected IconButtonRenderingPanel iconPanel; + protected JPanel renderingComponentContainer; /** @@ -258,6 +263,103 @@ } } + /** + * Icon button rendering panel. + * Also contains main render action button (arrow). + */ + protected class IconButtonRenderingPanel extends JPanel implements PropertyChangeListener, ActionListener { + + /** serialVersionUID. */ + private static final long serialVersionUID = 2591696695747738619L; + + protected ButtonGroup buttonGroup; + + public IconButtonRenderingPanel() { + super(new GridBagLayout()); + } + + /* + * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent) + */ + @Override + public void propertyChange(PropertyChangeEvent evt) { + rebuildPanel(); + validate(); + repaint(); + } + + /** + * Rebuild radio button lists. + */ + protected void rebuildPanel() { + removeAll(); + + JButton renderButton = new JButton(Resource.getIcon("/icons/1rightarrow.png")); + renderButton.setActionCommand("render"); + renderButton.addActionListener(this); + add(renderButton, new GridBagConstraints(0, 0, 1, 1, 1, 1, + GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); + + if (matrixRendererSolution == MatrixRendererSolution.ICON) { + + int index = 1; + buttonGroup = new ButtonGroup(); + for (MatrixRenderer renderer : matrixRenderers) { + JToggleButton radioButton = new JToggleButton(renderer.getIcon()); + radioButton.addActionListener(this); + radioButton.setModel(new RendererButtonModel(renderer)); + buttonGroup.add(radioButton); + add(radioButton, new GridBagConstraints(0, index, 1, 1, 1, 0, + GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); + index++; + } + } + } + + public MatrixRenderer getSelectedRender() { + MatrixRenderer renderer = null; + RendererButtonModel model = (RendererButtonModel)buttonGroup.getSelection(); + if (model != null) { + renderer = model.getRenderer(); + } + return renderer; + } + + /* + * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) + */ + @Override + public void actionPerformed(ActionEvent e) { + + String actionCommand = e.getActionCommand(); + + if ("render".equals(actionCommand)) { + // get matrix to display + MatrixND matrix = dimensionPanel.getModifiedMatrix(); + + // matrice superieur a 2 dimensions non geree!! + if (matrix.getDimCount() > 2) { + JOptionPane.showMessageDialog(this, _("nuitonmatrix.viewer.matrix.more.2d"), + _("nuitonmatrix.error"), JOptionPane.ERROR_MESSAGE); + } + else { + // get all display component for each renderer + componentForRenderers.clear(); + for (MatrixRenderer matrixRenderer : matrixRenderers) { + Component component = matrixRenderer.getComponent(matrix); + componentForRenderers.put(matrixRenderer, component); + } + + updateSelectedRenderingComponent(); + } + } + else { + // clic on render button + updateSelectedRenderingComponent(); + } + } + } + /** Radio button rendering panel. */ protected class RadioButtonRenderingPanel extends JPanel implements PropertyChangeListener, ActionListener { @@ -267,7 +369,7 @@ protected ButtonGroup buttonGroup; public RadioButtonRenderingPanel() { - super(new GridLayout(1, 0)); + super(new GridBagLayout()); } /* @@ -287,13 +389,16 @@ removeAll(); if (matrixRendererSolution == MatrixRendererSolution.RADIO_BUTTON) { + int index = 0; buttonGroup = new ButtonGroup(); for (MatrixRenderer renderer : matrixRenderers) { JRadioButton radioButton = new JRadioButton(renderer.getName()); radioButton.addActionListener(this); radioButton.setModel(new RendererButtonModel(renderer)); buttonGroup.add(radioButton); - add(radioButton); + add(radioButton, new GridBagConstraints(index, 0, 1, 1, 1, 1, + GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); + index++; } setVisible(true); @@ -340,6 +445,7 @@ MatrixComboBoxModel matrixListComboBoxModel = new MatrixComboBoxModel(); matrixComboBox.setModel(matrixListComboBoxModel); matrixComboBox.setRenderer(new MatrixComboRenderer()); + matrixComboBox.setVisible(matrixComboVisible); addPropertyChangeListener(PROPERTY_MATRIX_COMBO_VISIBLE, matrixComboBox); addPropertyChangeListener(PROPERTY_MATRICES, matrixListComboBoxModel); editionSidePanel.add(matrixComboBox, BorderLayout.NORTH); @@ -349,13 +455,11 @@ editionSidePanel.add(dimensionPanel, BorderLayout.CENTER); // fleche de d'action de rendu - JButton renderButton = new JButton(Resource.getIcon("/icons/1rightarrow.png")); - renderButton.setActionCommand("render"); - renderButton.addActionListener(this); - - editionSidePanel.add(renderButton, BorderLayout.EAST); - // render type : icon + iconPanel = new IconButtonRenderingPanel(); + editionSidePanel.add(iconPanel, BorderLayout.EAST); + addPropertyChangeListener(PROPERTY_MATRIX_RENDERER_SOLUTION, iconPanel); + addPropertyChangeListener(PROPERTY_MATRIX_RENDERERS, iconPanel); // render type : combo box @@ -370,46 +474,22 @@ addPropertyChangeListener(PROPERTY_MATRIX_RENDERERS, radioPanel); } - - /* - * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) - */ - @Override - public void actionPerformed(ActionEvent e) { - - String actionCommand = e.getActionCommand(); - - if ("render".equalsIgnoreCase(actionCommand)) { - - // get matrix to display - MatrixND matrix = dimensionPanel.getModifiedMatrix(); - - // matrice superieur a 2 dimensions non geree!! - if (matrix.getDimCount() > 2) { - JOptionPane.showMessageDialog(this, _("nuitonmatrix.viewer.matrix.more.2d"), - _("nuitonmatrix.error"), JOptionPane.ERROR_MESSAGE); - } - else { - // get all display component for each renderer - componentForRenderers.clear(); - for (MatrixRenderer matrixRenderer : matrixRenderers) { - Component component = matrixRenderer.getComponent(matrix); - componentForRenderers.put(matrixRenderer, component); - } - - updateSelectedRenderingComponent(); - } - } - - } - /** * Set rendering component in rendering container. */ protected void updateSelectedRenderingComponent() { renderingComponentContainer.removeAll(); - MatrixRenderer matrixRenderer = radioPanel.getSelectedRender(); + MatrixRenderer matrixRenderer = null; + switch (matrixRendererSolution) { + case ICON: + matrixRenderer = iconPanel.getSelectedRender(); + break; + case RADIO_BUTTON: + matrixRenderer = radioPanel.getSelectedRender(); + break; + } + if (matrixRenderer != null) { Component component = componentForRenderers.get(matrixRenderer); if (component != null) {

1 0

r306 - trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer
by echatellier＠users.nuiton.org 09 Dec '10

09 Dec '10

Author: echatellier Date: 2010-12-09 11:47:55 +0100 (Thu, 09 Dec 2010) New Revision: 306 Url: http://nuiton.org/repositories/revision/nuiton-matrix/306 Log: Add doc Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixChartRenderer.java Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixChartRenderer.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixChartRenderer.java 2010-12-09 10:46:40 UTC (rev 305) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixChartRenderer.java 2010-12-09 10:47:55 UTC (rev 306) @@ -182,6 +182,12 @@ return chart; } + /** + * Build jfreechart panel. + * + * @param chart chart to render + * @return chart panel + */ protected ChartPanel getChartPanel(JFreeChart chart) { ChartPanel chartPanel = new ChartPanel(chart); return chartPanel;

1 0

r305 - in trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer: . jfreechart
by echatellier＠users.nuiton.org 09 Dec '10

09 Dec '10

Author: echatellier Date: 2010-12-09 11:46:40 +0100 (Thu, 09 Dec 2010) New Revision: 305 Url: http://nuiton.org/repositories/revision/nuiton-matrix/305 Log: Modify chart panel construction with overidable methods Removed: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/JFreeChartPanel.java Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixChartRenderer.java Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixChartRenderer.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixChartRenderer.java 2010-12-09 10:25:35 UTC (rev 304) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixChartRenderer.java 2010-12-09 10:46:40 UTC (rev 305) @@ -27,13 +27,29 @@ import static org.nuiton.i18n.I18n._; +import java.awt.BorderLayout; import java.awt.Component; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; import javax.swing.Icon; +import javax.swing.JComboBox; +import javax.swing.JPanel; +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.ValueAxis; +import org.jfree.chart.plot.CategoryPlot; +import org.jfree.chart.renderer.category.CategoryItemRenderer; +import org.jfree.data.category.CategoryDataset; import org.nuiton.math.matrix.MatrixND; import org.nuiton.math.matrix.viewer.MatrixRenderer; -import org.nuiton.math.matrix.viewer.renderer.jfreechart.JFreeChartPanel; +import org.nuiton.math.matrix.viewer.renderer.jfreechart.GraphComboRenderer; +import org.nuiton.math.matrix.viewer.renderer.jfreechart.GraphMatrixNDDataset; +import org.nuiton.math.matrix.viewer.renderer.jfreechart.GraphRendererComboBoxModel; import org.nuiton.util.Resource; /** @@ -47,14 +63,18 @@ */ public class MatrixChartRenderer implements MatrixRenderer { + protected JComboBox chartRendererComboBox; + protected JFreeChart chart; + /* * @see org.nuiton.math.matrix.viewer.MatrixRenderer#getPanel(org.nuiton.math.matrix.MatrixND) */ @Override public Component getComponent(MatrixND matrix) { - JFreeChartPanel panel = new JFreeChartPanel(matrix); + JPanel panel = getJFreeChartPanel(matrix); return panel; } + /* * @see org.nuiton.math.matrix.viewer.MatrixRenderer#getIcon() */ @@ -71,4 +91,99 @@ return _("nuitonmatrix.viewer.renderer.chart"); } + protected JPanel getJFreeChartPanel(MatrixND matrix) { + JPanel panel = new JPanel(new BorderLayout()); + chartRendererComboBox = getChartRendererComboBox(); + panel.add(chartRendererComboBox, BorderLayout.NORTH); + + chart = getJFreeChart(matrix); + panel.add(getChartPanel(chart), BorderLayout.CENTER); + return panel; + } + + /** + * Chart renderer combo box. + * + * @return + */ + protected JComboBox getChartRendererComboBox() { + JComboBox rendererComboBox = new JComboBox(); + GraphRendererComboBoxModel rendererComboBoxModel = new GraphRendererComboBoxModel(); + rendererComboBox.setModel(rendererComboBoxModel); + rendererComboBox.setRenderer(new GraphComboRenderer()); + + // add listener combobox > chart + rendererComboBox.addItemListener(new ItemListener() { + @Override + public void itemStateChanged(ItemEvent e) { + CategoryItemRenderer renderer = (CategoryItemRenderer)e.getItem(); + chart.getCategoryPlot().setRenderer(renderer); + } + }); + + return rendererComboBox; + } + + /** + * Data model. + * + * @param matrix + * @return + */ + protected CategoryDataset getCategoryDataset(MatrixND matrix) { + CategoryDataset categoryDataset = new GraphMatrixNDDataset(matrix); + return categoryDataset; + } + + /** + * Abscisse (nom + valeur à la verticale). + * + * @param matrix + * @return + */ + protected CategoryAxis getCategoryAxis(MatrixND matrix) { + CategoryAxis horizontalAxis = new CategoryAxis(); + horizontalAxis.setCategoryLabelPositions(CategoryLabelPositions.UP_90); + horizontalAxis.setLabel(_(matrix.getDimensionName(0))); + return horizontalAxis; + } + + /** + * Ordonnées (valeur seule). + * + * @param matrix + * @return + */ + protected ValueAxis getValueAxis(MatrixND matrix) { + ValueAxis verticalAxis = new NumberAxis3D(); + return verticalAxis; + } + + /** + * Plot. + * + * @param matrix + * @return + */ + protected CategoryPlot getCategoryPlot(MatrixND matrix) { + CategoryPlot categoryPlot = new CategoryPlot(getCategoryDataset(matrix), + getCategoryAxis(matrix), getValueAxis(matrix), + (CategoryItemRenderer)chartRendererComboBox.getSelectedItem()); + return categoryPlot; + } + + /** + * Build chart. + * + * @return + */ + protected JFreeChart getJFreeChart(MatrixND matrix) { + JFreeChart chart = new JFreeChart(_(matrix.getName()), JFreeChart.DEFAULT_TITLE_FONT, getCategoryPlot(matrix), true); + return chart; + } + + protected ChartPanel getChartPanel(JFreeChart chart) { + ChartPanel chartPanel = new ChartPanel(chart); + return chartPanel; + } } Deleted: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/JFreeChartPanel.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/JFreeChartPanel.java 2010-12-09 10:25:35 UTC (rev 304) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/JFreeChartPanel.java 2010-12-09 10:46:40 UTC (rev 305) @@ -1,108 +0,0 @@ -/* - * #%L - * - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 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 - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package org.nuiton.math.matrix.viewer.renderer.jfreechart; - -import static org.nuiton.i18n.I18n._; - -import java.awt.BorderLayout; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; - -import javax.swing.JComboBox; -import javax.swing.JPanel; - -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.ValueAxis; -import org.jfree.chart.plot.CategoryPlot; -import org.jfree.chart.renderer.category.CategoryItemRenderer; -import org.jfree.data.category.CategoryDataset; -import org.nuiton.math.matrix.MatrixND; - -/** - * Jfreechart rendering panel. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class JFreeChartPanel extends JPanel { - - /** serialVersionUID. */ - private static final long serialVersionUID = 97401315671737565L; - - protected MatrixND matrix; - - protected JFreeChart chart; - - public JFreeChartPanel(MatrixND matrix) { - super(new BorderLayout()); - this.matrix = matrix; - - buildPanel(); - } - - protected void buildPanel() { - - // renderer combo box - JComboBox rendererComboBox = new JComboBox(); - GraphRendererComboBoxModel rendererComboBoxModel = new GraphRendererComboBoxModel(); - rendererComboBox.setModel(rendererComboBoxModel); - rendererComboBox.setRenderer(new GraphComboRenderer()); - add(rendererComboBox, BorderLayout.NORTH); - - // data model - CategoryDataset categoryDataset = new GraphMatrixNDDataset(matrix); - - // abscisse (nom + valeur à la verticale) - CategoryAxis horizontalAxis = new CategoryAxis(); - horizontalAxis.setCategoryLabelPositions(CategoryLabelPositions.UP_90); - horizontalAxis.setLabel(_(matrix.getDimensionName(0))); - - // ordonnées (valeur seule) - ValueAxis verticalAxis = new NumberAxis3D(); - - // plot - CategoryPlot categoryPlot = new CategoryPlot(categoryDataset, horizontalAxis, verticalAxis, (CategoryItemRenderer)rendererComboBox.getSelectedItem()); - chart = new JFreeChart(_(matrix.getName()), JFreeChart.DEFAULT_TITLE_FONT, categoryPlot, true); - ChartPanel chartPanel = new ChartPanel(chart); - add(chartPanel, BorderLayout.CENTER); - - // add listener combobox > chart - rendererComboBox.addItemListener(new ItemListener() { - @Override - public void itemStateChanged(ItemEvent e) { - CategoryItemRenderer renderer = (CategoryItemRenderer)e.getItem(); - chart.getCategoryPlot().setRenderer(renderer); - } - }); - } -}

1 0

r304 - in trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer: . renderer
by echatellier＠users.nuiton.org 09 Dec '10

09 Dec '10

Author: echatellier Date: 2010-12-09 11:25:35 +0100 (Thu, 09 Dec 2010) New Revision: 304 Url: http://nuiton.org/repositories/revision/nuiton-matrix/304 Log: Rename getPanel to getComponent Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixRenderer.java trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixChartRenderer.java trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixInfoTableRenderer.java trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixPanelRenderer.java Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixRenderer.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixRenderer.java 2010-12-08 17:42:25 UTC (rev 303) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixRenderer.java 2010-12-09 10:25:35 UTC (rev 304) @@ -48,7 +48,7 @@ * @param matrix matrix to display * @return component */ - Component getPanel(MatrixND matrix); + Component getComponent(MatrixND matrix); /** * Renderer icon (used in {@link MatrixRendererSolution#ICON} rendering). Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java 2010-12-08 17:42:25 UTC (rev 303) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java 2010-12-09 10:25:35 UTC (rev 304) @@ -393,7 +393,7 @@ // get all display component for each renderer componentForRenderers.clear(); for (MatrixRenderer matrixRenderer : matrixRenderers) { - Component component = matrixRenderer.getPanel(matrix); + Component component = matrixRenderer.getComponent(matrix); componentForRenderers.put(matrixRenderer, component); } Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixChartRenderer.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixChartRenderer.java 2010-12-08 17:42:25 UTC (rev 303) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixChartRenderer.java 2010-12-09 10:25:35 UTC (rev 304) @@ -51,7 +51,7 @@ * @see org.nuiton.math.matrix.viewer.MatrixRenderer#getPanel(org.nuiton.math.matrix.MatrixND) */ @Override - public Component getPanel(MatrixND matrix) { + public Component getComponent(MatrixND matrix) { JFreeChartPanel panel = new JFreeChartPanel(matrix); return panel; } Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixInfoTableRenderer.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixInfoTableRenderer.java 2010-12-08 17:42:25 UTC (rev 303) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixInfoTableRenderer.java 2010-12-09 10:25:35 UTC (rev 304) @@ -52,7 +52,7 @@ * @see org.nuiton.math.matrix.viewer.MatrixRenderer#getPanel(org.nuiton.math.matrix.MatrixND) */ @Override - public Component getPanel(MatrixND matrix) { + public Component getComponent(MatrixND matrix) { JTable table = new JTable(); table.setModel(new MatrixInfoTableModel(matrix)); Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixPanelRenderer.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixPanelRenderer.java 2010-12-08 17:42:25 UTC (rev 303) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixPanelRenderer.java 2010-12-09 10:25:35 UTC (rev 304) @@ -52,7 +52,7 @@ * @see org.nuiton.math.matrix.viewer.MatrixRenderer#getPanel(org.nuiton.math.matrix.MatrixND) */ @Override - public Component getPanel(MatrixND matrix) { + public Component getComponent(MatrixND matrix) { JTable table = new JTable(); table.setModel(new MatrixInfoTableModel(matrix));

1 0

r303 - trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer
by echatellier＠users.nuiton.org 08 Dec '10

08 Dec '10

Author: echatellier Date: 2010-12-08 18:42:25 +0100 (Wed, 08 Dec 2010) New Revision: 303 Url: http://nuiton.org/repositories/revision/nuiton-matrix/303 Log: Calcul de tous les rendus pendant l'action de rendu, et affichage au choix du renderer Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java 2010-12-08 16:39:25 UTC (rev 302) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java 2010-12-08 17:42:25 UTC (rev 303) @@ -37,7 +37,9 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.swing.ButtonGroup; import javax.swing.DefaultComboBoxModel; @@ -94,12 +96,19 @@ protected MatrixDimensionPanel dimensionPanel; protected RadioButtonRenderingPanel radioPanel; - + protected JPanel renderingComponentContainer; + /** + * Map entre les renderers et les composants (valorisé par bouton de + * rendu) et utilisé par le choix du renderer. + */ + protected Map<MatrixRenderer, Component> componentForRenderers; + public MatrixViewerPanel() { matrixRenderers = new ArrayList<MatrixRenderer>(); matrices = new ArrayList<MatrixND>(); + componentForRenderers = new HashMap<MatrixRenderer, Component>(); buildPanel(); } @@ -250,7 +259,7 @@ } /** Radio button rendering panel. */ - protected class RadioButtonRenderingPanel extends JPanel implements PropertyChangeListener{ + protected class RadioButtonRenderingPanel extends JPanel implements PropertyChangeListener, ActionListener { /** serialVersionUID. */ private static final long serialVersionUID = -6312518069621077533L; @@ -277,26 +286,39 @@ protected void rebuildPanel() { removeAll(); if (matrixRendererSolution == MatrixRendererSolution.RADIO_BUTTON) { - + buttonGroup = new ButtonGroup(); for (MatrixRenderer renderer : matrixRenderers) { JRadioButton radioButton = new JRadioButton(renderer.getName()); + radioButton.addActionListener(this); radioButton.setModel(new RendererButtonModel(renderer)); buttonGroup.add(radioButton); add(radioButton); } - + setVisible(true); } else { setVisible(false); } } - + public MatrixRenderer getSelectedRender() { - MatrixRenderer renderer = ((RendererButtonModel)buttonGroup.getSelection()).getRenderer(); + MatrixRenderer renderer = null; + RendererButtonModel model = (RendererButtonModel)buttonGroup.getSelection(); + if (model != null) { + renderer = model.getRenderer(); + } return renderer; } + + /* + * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) + */ + @Override + public void actionPerformed(ActionEvent e) { + updateSelectedRenderingComponent(); + } } /** @@ -358,29 +380,24 @@ String actionCommand = e.getActionCommand(); if ("render".equalsIgnoreCase(actionCommand)) { - - // get selected renderer - MatrixRenderer renderer = null; - switch (matrixRendererSolution) { - case RADIO_BUTTON: - renderer = radioPanel.getSelectedRender(); - break; - default : - - } - + // get matrix to display MatrixND matrix = dimensionPanel.getModifiedMatrix(); + // matrice superieur a 2 dimensions non geree!! if (matrix.getDimCount() > 2) { - // matrice superieur a 2 dimensions non geree!! JOptionPane.showMessageDialog(this, _("nuitonmatrix.viewer.matrix.more.2d"), _("nuitonmatrix.error"), JOptionPane.ERROR_MESSAGE); } else { - // renderer matrix - Component component = renderer.getPanel(matrix); - setRenderingComponent(component); + // get all display component for each renderer + componentForRenderers.clear(); + for (MatrixRenderer matrixRenderer : matrixRenderers) { + Component component = matrixRenderer.getPanel(matrix); + componentForRenderers.put(matrixRenderer, component); + } + + updateSelectedRenderingComponent(); } } @@ -388,12 +405,18 @@ /** * Set rendering component in rendering container. - * - * @param component component to install */ - protected void setRenderingComponent(Component component) { + protected void updateSelectedRenderingComponent() { renderingComponentContainer.removeAll(); - renderingComponentContainer.add(component, BorderLayout.CENTER); + + MatrixRenderer matrixRenderer = radioPanel.getSelectedRender(); + if (matrixRenderer != null) { + Component component = componentForRenderers.get(matrixRenderer); + if (component != null) { + renderingComponentContainer.add(component, BorderLayout.CENTER); + } + } + renderingComponentContainer.validate(); renderingComponentContainer.repaint(); }

1 0

r302 - trunk/nuiton-matrix-gui
by echatellier＠users.nuiton.org 08 Dec '10

08 Dec '10

Author: echatellier Date: 2010-12-08 17:39:25 +0100 (Wed, 08 Dec 2010) New Revision: 302 Url: http://nuiton.org/repositories/revision/nuiton-matrix/302 Log: Fix dependency Modified: trunk/nuiton-matrix-gui/pom.xml Modified: trunk/nuiton-matrix-gui/pom.xml =================================================================== --- trunk/nuiton-matrix-gui/pom.xml 2010-12-08 16:13:52 UTC (rev 301) +++ trunk/nuiton-matrix-gui/pom.xml 2010-12-08 16:39:25 UTC (rev 302) @@ -19,7 +19,7 @@ <dependencies> <dependency> - <groupId>org.nuiton.matrix</groupId> + <groupId>org.nuiton.nuiton-matrix</groupId> <artifactId>nuiton-matrix</artifactId> <version>${project.version}</version> <scope>compile</scope>

1 0