Author: chatellier Date: 2010-11-04 11:26:50 +0000 (Thu, 04 Nov 2010) New Revision: 165 Log: Modification des icones save et graphes Added: trunk/coser-ui/src/main/resources/icons/chart_curve.png trunk/coser-ui/src/main/resources/icons/disk.png Removed: trunk/coser-ui/src/main/resources/icons/bullet_disk.png Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlGraphDialog.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlGraphDialog.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlGraphDialog.jaxx 2010-11-04 10:15:16 UTC (rev 164) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlGraphDialog.jaxx 2010-11-04 11:26:50 UTC (rev 165) @@ -33,7 +33,7 @@ </cell> <cell fill="horizontal"> <SpecyComboModel id="specyComboModel" /> - <JComboBox model="{specyComboModel}" onActionPerformed="getHandler().updateGraphSpecy(this)" /> + <JComboBox model="{specyComboModel}" onActionPerformed="getHandler().updateCompareNumberCatchGraph(this)" /> </cell> </row> <row fill="both" weightx="1" weighty="1" columns="2"> 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-11-04 10:15:16 UTC (rev 164) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-11-04 11:26:50 UTC (rev 165) @@ -742,7 +742,7 @@ * * @param view view */ - public void displayGraph(ControlView view) { + public void displayCompareNumberCatchGraph(ControlView view) { ProjectService projectService = view.getContextValue(ProjectService.class); Project project = view.getContextValue(Project.class); List<String> species = projectService.getProjectSpecies(project.getControl()); @@ -750,18 +750,28 @@ ControlGraphDialog dialog = new ControlGraphDialog(view); dialog.setHandler(this); dialog.getSpecyComboModel().setSpecy(species); - updateGraphSpecy(dialog); + updateCompareNumberCatchGraph(dialog); dialog.pack(); dialog.setLocationRelativeTo(view); dialog.setVisible(true); } /** + * Display data graph, initialized with graph for first specy + * selected in specyComboModel. + * + * @param view view + */ + public void displayLengthStructureGraph(ControlView view) { + + } + + /** * Met a jour le graphique lorsque la selection de l'espece change. * * @param view view */ - public void updateGraphSpecy(ControlGraphDialog view) { + public void updateCompareNumberCatchGraph(ControlGraphDialog view) { ChartService chartService = view.getContextValue(ChartService.class); Project project = view.getContextValue(Project.class); String specyName = (String)view.getSpecyComboModel().getSelectedItem(); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx 2010-11-04 10:15:16 UTC (rev 164) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx 2010-11-04 11:26:50 UTC (rev 165) @@ -39,7 +39,7 @@ <row> <cell fill="horizontal" insets="0" anchor="west" columns="2"> <JToolBar floatable="false"> - <JButton id="saveButton" icon="bullet_disk.png" + <JButton id="saveButton" icon="disk.png" text="coser.ui.control.save" enabled="false" onActionPerformed="getHandler().saveControl(this)" /> <JSeparator /> @@ -48,8 +48,10 @@ renderer="{new fr.ifremer.coser.ui.control.ControlCategoryListRenderer()}" onActionPerformed="getHandler().categoryChanged(this, event)"/> <JSeparator /> - <JButton icon="chart_bar.png" text="coser.ui.graph.compareNumberCatchSize" - onActionPerformed="getHandler().displayGraph(this)"/> + <JButton icon="chart_curve.png" text="coser.ui.graph.compareNumberCatchSize" + onActionPerformed="getHandler().displayCompareNumberCatchGraph(this)"/> + <JButton icon="chart_bar.png" text="coser.ui.graph.lengthStructure" + onActionPerformed="getHandler().displayLengthStructureGraph(this)"/> </JToolBar> </cell> </row> Deleted: trunk/coser-ui/src/main/resources/icons/bullet_disk.png =================================================================== (Binary files differ) Added: trunk/coser-ui/src/main/resources/icons/chart_curve.png =================================================================== (Binary files differ) Property changes on: trunk/coser-ui/src/main/resources/icons/chart_curve.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/coser-ui/src/main/resources/icons/disk.png =================================================================== (Binary files differ) Property changes on: trunk/coser-ui/src/main/resources/icons/disk.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream