Author: chatellier Date: 2010-11-04 11:27:22 +0000 (Thu, 04 Nov 2010) New Revision: 166 Log: Ajout d'action pour pouvoir afficher les bonnes informations de d?\195?\169cisions Added: trunk/coser-ui/src/main/resources/icons/map.png trunk/coser-ui/src/main/resources/icons/table.png Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.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-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-11-04 11:26:50 UTC (rev 165) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-11-04 11:27:22 UTC (rev 166) @@ -407,8 +407,7 @@ try { File file = new File("/home/chatellier/tmp/coser/zones.png"); - ImageIcon icon = new ImageIcon(file.toURI().toURL()); - selectionView.getSelectionDetailsTab().getZonesMap().setIcon(icon); + selectionView.getSelectionDetailsTab().getZonesMap().setImage(file); } catch(Exception e) { e.printStackTrace(); @@ -466,8 +465,7 @@ selectionView.setHandler(new SelectionHandler()); File file = new File("/home/chatellier/tmp/coser/zones.png"); - ImageIcon icon = new ImageIcon(file.toURI().toURL()); - selectionView.getSelectionDetailsTab().getZonesMap().setIcon(icon); + selectionView.getSelectionDetailsTab().getZonesMap().setImage(file); setMainComponent(selectionView); } catch (CoserBusinessException ex) { Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-11-04 11:26:50 UTC (rev 165) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-11-04 11:27:22 UTC (rev 166) @@ -74,9 +74,13 @@ </cell> </row> <row> - <cell fill="horizontal" columns="4"> + <cell fill="horizontal" columns="3"> <JLabel text="coser.ui.selection.details.zone" /> </cell> + <cell anchor="east"> + <JButton icon="map.png" toolTipText="coser.ui.selection.details.showMapTip" + onActionPerformed='getDetailDesisionPanelLayout().show(getDetailDesisionPanel(), "ZONEMAP");' /> + </cell> </row> <row> <cell weighty="2" fill="both" columns="4"> @@ -94,26 +98,22 @@ <Table border='{BorderFactory.createTitledBorder(_("coser.ui.selection.details.species"))}'> <row> <cell fill="horizontal"> - <JLabel text="coser.ui.selection.details.gender" /> + <JLabel text="coser.ui.selection.details.type" /> </cell> - <cell fill="horizontal"> - <JLabel text="coser.ui.selection.details.family" /> + <cell anchor="east"> + <JButton icon="table.png" toolTipText="coser.ui.selection.details.showSpreciesTip" + onActionPerformed='getDetailDesisionPanelLayout().show(getDetailDesisionPanel(), "SPECIESDATA");' /> </cell> </row> <row> - <cell fill="horizontal" weightx="1" weighty="1"> + <cell fill="horizontal" weightx="1" weighty="1" columns="2"> <JScrollPane> <JList /> </JScrollPane> </cell> - <cell fill="horizontal" weightx="1" weighty="1"> - <JScrollPane> - <JList /> - </JScrollPane> - </cell> </row> <row> - <cell weighty="2" fill="both" columns="5"> + <cell weighty="2" fill="both" columns="2"> <JScrollPane> <SpecyListTestModel id="specyListModel" /> <JList id="specyList" model="{specyListModel}" @@ -150,9 +150,16 @@ </Table> </cell> <cell weightx="4" weighty="1" fill="both" rows="2"> - <JScrollPane id="zonesScrollPane"> - <JLabel id="zonesMap" /> - </JScrollPane> + <CardLayout id="detailDesisionPanelLayout" /> + <JPanel id="detailDesisionPanel" layout="{detailDesisionPanelLayout}"> + <JScrollPane id="zonesScrollPane" constraints='"ZONEMAP"'> + <JXImageView id="zonesMap" /> + </JScrollPane> + <JScrollPane constraints='"SPECIESDATA"'> + <JTable> + </JTable> + </JScrollPane> + </JPanel> </cell> </row> </Table> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-11-04 11:26:50 UTC (rev 165) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-11-04 11:27:22 UTC (rev 166) @@ -112,19 +112,7 @@ } } - /** - * Mise à jour des autre liste qui dépendent de cette premiere liste. - * - * @param view - * @param event - */ - public void updateSpecySelection(SelectionDetailsView view, ListSelectionEvent event) { - JList source = (JList)event.getSource(); - - } - - /** * Affiche un menu contextuel lors du clic (droit) sur la liste des especes. * * @param view view 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-11-04 11:26:50 UTC (rev 165) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-11-04 11:27:22 UTC (rev 166) @@ -39,6 +39,7 @@ coser.ui.error.htmlmessage=An error occurs \: %s coser.ui.error.title=Global application error coser.ui.graph.compareNumberCatchSize= +coser.ui.graph.lengthStructure= coser.ui.mainframe.menu.configuration=Configuration coser.ui.mainframe.menu.file=File coser.ui.mainframe.menu.locale.fr=Fran\u00E7ais @@ -92,8 +93,11 @@ coser.ui.selection.details.name=Selection name \: coser.ui.selection.details.otherComment=Other comments coser.ui.selection.details.saveSelection=Save selection +coser.ui.selection.details.showMapTip= +coser.ui.selection.details.showSpreciesTip= coser.ui.selection.details.species=Species \: coser.ui.selection.details.technicalComment=Technical comment +coser.ui.selection.details.type= coser.ui.selection.details.zone=Zone \: coser.ui.selection.filter.density=Density \: coser.ui.selection.filter.filter=Filter 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-11-04 11:26:50 UTC (rev 165) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 2010-11-04 11:27:22 UTC (rev 166) @@ -39,6 +39,7 @@ coser.ui.error.htmlmessage=Une erreur s'est produite \: %s coser.ui.error.title=Erreur globale coser.ui.graph.compareNumberCatchSize=Comparaison Captures/Tailles +coser.ui.graph.lengthStructure=Structures en taille coser.ui.mainframe.menu.configuration=Configuration coser.ui.mainframe.menu.file=Fichier coser.ui.mainframe.menu.locale.fr=Fran\u00E7ais @@ -92,8 +93,11 @@ coser.ui.selection.details.name=Nom de la s\u00E9lection \: coser.ui.selection.details.otherComment=Autre commentaire coser.ui.selection.details.saveSelection=Sauvegarder la s\u00E9lection +coser.ui.selection.details.showMapTip=Afficher la carte des zones +coser.ui.selection.details.showSpreciesTip=Afficher la table des esp\u00E8ces coser.ui.selection.details.species=Esp\u00E8ces \: coser.ui.selection.details.technicalComment=Commentaire technique +coser.ui.selection.details.type=Type \: coser.ui.selection.details.zone=Zone \: coser.ui.selection.filter.density=Densit\u00E9 \: coser.ui.selection.filter.filter=Filtrer Added: trunk/coser-ui/src/main/resources/icons/map.png =================================================================== (Binary files differ) Property changes on: trunk/coser-ui/src/main/resources/icons/map.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/coser-ui/src/main/resources/icons/table.png =================================================================== (Binary files differ) Property changes on: trunk/coser-ui/src/main/resources/icons/table.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream