Author: chatellier Date: 2010-12-09 14:30:24 +0000 (Thu, 09 Dec 2010) New Revision: 383 Log: Fix graph frames Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlGraphFrame.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2010-12-09 14:06:27 UTC (rev 382) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2010-12-09 14:30:24 UTC (rev 383) @@ -67,7 +67,7 @@ coser.business.control.step.xworks=Line checks \: %s (%d%%) coser.business.line=Line coser.business.matrix.density=Density -coser.business.matrix.lengthstructure=Length structure +coser.business.matrix.lengthstructure=Length structures coser.business.matrix.occurrence=Occurrence coser.business.matrix.samplingeffort=Sampling effort coser.business.publication.errorexportlines=Lines Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2010-12-09 14:06:27 UTC (rev 382) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2010-12-09 14:30:24 UTC (rev 383) @@ -67,7 +67,7 @@ coser.business.control.step.xworks=Validation par lignes \: %s (%d%%) coser.business.line=Ligne coser.business.matrix.density=Densit\u00E9 -coser.business.matrix.lengthstructure=Structure en taille +coser.business.matrix.lengthstructure=Structures en taille coser.business.matrix.occurrence=Occurrence coser.business.matrix.samplingeffort=Effort d'\u00E9chantillonnage coser.business.publication.errorexportlines=Lignes Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlGraphFrame.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlGraphFrame.jaxx 2010-12-09 14:06:27 UTC (rev 382) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlGraphFrame.jaxx 2010-12-09 14:30:24 UTC (rev 383) @@ -22,7 +22,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JFrame title="coser.ui.control.graphtitle"> +<JFrame title="coser.ui.graph.compareNumberCatchSize" name="catchLengthCompareFrame"> <ControlHandler id="handler" javaBean="null" /> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-12-09 14:06:27 UTC (rev 382) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-12-09 14:30:24 UTC (rev 383) @@ -26,8 +26,6 @@ import static org.nuiton.i18n.I18n._; import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Desktop; import java.awt.GridBagConstraints; import java.awt.Insets; import java.awt.Point; @@ -37,7 +35,6 @@ import java.awt.event.MouseEvent; import java.beans.Introspector; import java.io.File; -import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -77,6 +74,7 @@ import org.nuiton.math.matrix.viewer.MatrixViewerPanel; import org.nuiton.math.matrix.viewer.renderer.MatrixChartRenderer; import org.nuiton.math.matrix.viewer.renderer.MatrixInfoTableRenderer; +import org.nuiton.widget.SwingSession; import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.CoserConstants.Category; @@ -836,20 +834,24 @@ final Project project = view.getContextValue(Project.class); final PublicationService publicationService = view.getContextValue(PublicationService.class); + final SwingSession session = view.getContextValue(SwingSession.class); SwingUtilities.invokeLater(new Runnable() { public void run() { try { setWaitCursor(view); + + // get matrix Map<String, JFreeChart> charts = publicationService.getCompareCatchLengthGraph(project, project.getControl(), null); List<String> species = new ArrayList<String>(charts.keySet()); - + ControlGraphFrame frame = new ControlGraphFrame(view); frame.setHandler(ControlHandler.this); frame.setContextValue(charts); frame.getSpecyComboModel().setSpecy(species); frame.pack(); frame.setLocationRelativeTo(view); + session.add(frame); // session restore frame.setVisible(true); } finally { @@ -868,6 +870,7 @@ public void displayLengthStructureGraph(final ControlView view) { final Project project = view.getContextValue(Project.class); final ProjectService projectService = view.getContextValue(ProjectService.class); + final SwingSession session = view.getContextValue(SwingSession.class); SwingUtilities.invokeLater(new Runnable() { public void run() { @@ -878,7 +881,8 @@ MatrixND matrix = projectService.getLengthStructure(project, project.getControl()); // display matrix viewer component - JFrame matrixViewerFrame = new JFrame(_("coser.ui.control.graph.lengthstructure")); + JFrame matrixViewerFrame = new JFrame(_("coser.ui.graph.lengthStructure")); + matrixViewerFrame.setName("lengthstructureframe"); MatrixViewerPanel panel = new MatrixViewerPanel(); panel.addMatrixRenderer(new MatrixInfoTableRenderer()); panel.addMatrixRenderer(new MatrixChartRenderer()); @@ -886,6 +890,7 @@ matrixViewerFrame.add(panel); matrixViewerFrame.pack(); matrixViewerFrame.setLocationRelativeTo(view); + session.add(matrixViewerFrame); // session restore matrixViewerFrame.setVisible(true); } finally { Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-12-09 14:06:27 UTC (rev 382) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-12-09 14:30:24 UTC (rev 383) @@ -39,9 +39,7 @@ coser.ui.control.globalErrorMenuGenerateHTML=Export as HTML coser.ui.control.globalErrorMenuLabel=Error menu coser.ui.control.globalErrorMenuSelectAll=Select all lines -coser.ui.control.graph.lengthstructure= coser.ui.control.graph.species=Species \: -coser.ui.control.graphtitle=Graph coser.ui.control.logreport=Modification report coser.ui.control.progressStep=Step %d/%d \: %s coser.ui.control.project.requiredauthor=Author field is required Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-09 14:06:27 UTC (rev 382) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-09 14:30:24 UTC (rev 383) @@ -39,9 +39,7 @@ coser.ui.control.globalErrorMenuGenerateHTML=Exporter en HTML coser.ui.control.globalErrorMenuLabel=Menu des erreurs coser.ui.control.globalErrorMenuSelectAll=S\u00E9lectionner toutes les lignes -coser.ui.control.graph.lengthstructure= coser.ui.control.graph.species=Esp\u00E8ces \: -coser.ui.control.graphtitle=Graphique coser.ui.control.logreport=Rapport des modifications coser.ui.control.progressStep=\u00C9tape %d/%d \: %s coser.ui.control.project.requiredauthor=Le champ 'auteur' est requis