Author: chatellier Date: 2010-10-29 17:14:40 +0000 (Fri, 29 Oct 2010) New Revision: 139 Log: Add form to add new rsufi result Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableModel.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionResultView.jaxx 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/result/ResultTableModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableModel.java 2010-10-29 16:36:04 UTC (rev 138) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableModel.java 2010-10-29 17:14:40 UTC (rev 139) @@ -50,26 +50,14 @@ header = new ArrayList<String>(); header.add("Nom du r\u00E9sultat :"); header.add("Version RSufi"); - header.add("Fichier data captures"); - header.add("Fichier graph captures"); - header.add("Fichier data taille"); - header.add("Fichier graph taille"); - header.add("Fichier data strates"); - header.add("Fichier graph strates"); - header.add("Fichier data traits"); - header.add("Fichier graph traits"); + header.add("Fichier données 1"); + header.add("Fichier données 2"); data = new ArrayList<String>(); data.add("R\u00E9sultat de test"); data.add("1.0.0"); - data.add("ListEspecesEVHOE_TOT_occ5_dens5.txt"); - data.add("NombEspeceGroupL2EVHOE_TOT.wmf"); - data.add("ListEspecesEVHOE_TOT_occ5_dens5.txt"); - data.add("NombEspeceGroupL2EVHOE_TOT.wmf"); - data.add("ListEspecesEVHOE_TOT_occ5_dens5.txt"); - data.add("NombEspeceGroupL2EVHOE_TOT.wmf"); - data.add("ListEspecesEVHOE_TOT_occ5_dens5.txt"); - data.add("NombEspeceGroupL2EVHOE_TOT.wmf"); + data.add("EstComInd_IBTS.txt"); + data.add("EstPopInd_IBTS.txt"); } /* Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionResultView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionResultView.jaxx 2010-10-29 16:36:04 UTC (rev 138) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionResultView.jaxx 2010-10-29 17:14:40 UTC (rev 139) @@ -57,8 +57,75 @@ </cell> </row> <row> - <cell> - + <cell weighty="1" fill="both"> + <Table border='{BorderFactory.createTitledBorder(_("coser.ui.result.newDataTitle"))}'> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.result.resultName" /> + </cell> + <cell fill="horizontal" columns="2"> + <JTextField /> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.result.rsufiVersion" /> + </cell> + <cell fill="horizontal" columns="2"> + <JTextField /> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.result.rsufiVersion" /> + </cell> + <cell fill="horizontal" columns="2"> + <JTextField /> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.result.dataFile1" /> + </cell> + <cell weightx="1" fill="horizontal"> + <JTextField /> + </cell> + <cell fill="horizontal"> + <JButton text="coser.ui.common.selectFile" /> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.result.dataFile2" /> + </cell> + <cell fill="horizontal"> + <JTextField /> + </cell> + <cell fill="horizontal"> + <JButton text="coser.ui.common.selectFile" /> + </cell> + </row> + <row> + <cell anchor="west" columns="3"> + <JLabel text="coser.ui.result.otherDataFile" /> + </cell> + </row> + <row> + <cell columns="3" weighty="1" fill="both"> + <JScrollPane> + <JList /> + </JScrollPane> + </cell> + </row> + <row> + <cell weightx="1" columns="2" anchor="east"> + <JButton text="coser.ui.result.addOtherDataFile" /> + </cell> + <cell anchor="east"> + <JButton text="coser.ui.result.addNewResult" /> + </cell> + </row> + </Table> </cell> </row> </Table> 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-10-29 16:36:04 UTC (rev 138) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-10-29 17:14:40 UTC (rev 139) @@ -61,10 +61,18 @@ coser.ui.project.traitsFile=Traits file \: coser.ui.project.useCustomReferenceSpeciesFile=Use custom reference file coser.ui.project.usedReferenceSpeciesFile=Current reference file \: +coser.ui.result.addNewResult=Save result +coser.ui.result.addOtherDataFile=Add file coser.ui.result.availableDataTitle=Available results \: +coser.ui.result.dataFile1=Data file 1 \: +coser.ui.result.dataFile2=Data file 2 \: coser.ui.result.extractDataButton=Extract coser.ui.result.extractDataLabel=Extraction directory coser.ui.result.extractDataTitle=Extract RSufi data +coser.ui.result.newDataTitle=New result +coser.ui.result.otherDataFile=Other files \: +coser.ui.result.resultName=Result name \: +coser.ui.result.rsufiVersion=RSufi version coser.ui.selection.allSpecies=All species coser.ui.selection.createError=Creation error coser.ui.selection.details.beginDate=Begin date \: 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-10-29 16:36:04 UTC (rev 138) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 2010-10-29 17:14:40 UTC (rev 139) @@ -61,10 +61,18 @@ coser.ui.project.traitsFile=Fichiers des traits \: coser.ui.project.useCustomReferenceSpeciesFile=Utiliser un autre fichier de r\u00E9f\u00E9rence coser.ui.project.usedReferenceSpeciesFile=Fichier de r\u00E9f\u00E9rence utilis\u00E9 \: +coser.ui.result.addNewResult=Enregistrer le r\u00E9sultat +coser.ui.result.addOtherDataFile=Ajouter un fichier coser.ui.result.availableDataTitle=R\u00E9sultats disponibles \: +coser.ui.result.dataFile1=Fichier r\u00E9sultat 1 \: +coser.ui.result.dataFile2=Fichier r\u00E9sultat 2 \: coser.ui.result.extractDataButton=Extraire coser.ui.result.extractDataLabel=Dossier d'extraction \: coser.ui.result.extractDataTitle=Extraction des donn\u00E9es d'entr\u00E9e de RSufi +coser.ui.result.newDataTitle=Nouveau r\u00E9sultat +coser.ui.result.otherDataFile=Autre fichiers \: +coser.ui.result.resultName=Nom du r\u00E9sultat \: +coser.ui.result.rsufiVersion=Version de RSufi \: coser.ui.selection.allSpecies=Toutes les esp\u00E8ces coser.ui.selection.createError=Erreur de cr\u00E9action coser.ui.selection.details.beginDate=Date de d\u00E9but \: