Author: chatellier Date: 2010-12-02 16:50:48 +0000 (Thu, 02 Dec 2010) New Revision: 347 Log: Ajout d'infos dans le r?\195?\169sum?\195?\169 Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.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/CoserFrameHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-12-02 16:29:53 UTC (rev 346) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-12-02 16:50:48 UTC (rev 347) @@ -421,6 +421,15 @@ projectSummaryView.setHandler(this); projectSummaryView.setProject(project); + int selectionCount = 0; + int resultCount = 0; + for (Selection selection : project.getSelections().values()) { + selectionCount++; + resultCount += selection.getRsufiResults().size(); + } + projectSummaryView.getProjectSelectionCount().setText(String.valueOf(selectionCount)); + projectSummaryView.getProjectResultCount().setText(String.valueOf(resultCount)); + setMainComponent(projectSummaryView); } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx 2010-12-02 16:29:53 UTC (rev 346) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx 2010-12-02 16:50:48 UTC (rev 347) @@ -40,6 +40,38 @@ </row> <row> <cell anchor="west"> + <JLabel text="coser.ui.project.summary.catchFileName" /> + </cell> + <cell anchor="west"> + <JLabel text="{getProject().getCatchFileName()}" /> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.project.summary.haulFileName" /> + </cell> + <cell anchor="west"> + <JLabel text="{getProject().getHaulFileName()}" /> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.project.summary.strataFileName" /> + </cell> + <cell anchor="west"> + <JLabel text="{getProject().getStrataFileName()}" /> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.project.summary.lengthFileName" /> + </cell> + <cell anchor="west"> + <JLabel text="{getProject().getLengthFileName()}" /> + </cell> + </row> + <row> + <cell anchor="west"> <JLabel text="coser.ui.project.summary.validated" /> </cell> <cell anchor="west"> @@ -49,6 +81,22 @@ </JPanel> </cell> </row> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.project.summary.selectionCount" /> + </cell> + <cell anchor="west"> + <JLabel id="projectSelectionCount" /> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.project.summary.resultCount" /> + </cell> + <cell anchor="west"> + <JLabel id="projectResultCount" /> + </cell> + </row> </Table> </cell> </row> 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-02 16:29:53 UTC (rev 346) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-12-02 16:50:48 UTC (rev 347) @@ -83,7 +83,7 @@ coser.ui.mainframe.menu.openProject=Open project coser.ui.mainframe.menu.options=Options coser.ui.mainframe.menu.quit=Quit -coser.ui.mainframe.menu.validators=Validators +coser.ui.mainframe.menu.validators=Controls coser.ui.mainframe.menu.view=View coser.ui.mainframe.menu.view.lookandfeel=Look and feel coser.ui.mainview.title=Contr\u00F4le et S\u00E9lection RSufi @@ -107,7 +107,13 @@ coser.ui.project.projectname=Project name \: coser.ui.project.saveProject=Save project coser.ui.project.strataFile=Strata file \: +coser.ui.project.summary.catchFileName=Catch file name \: +coser.ui.project.summary.haulFileName=Haul file name \: +coser.ui.project.summary.lengthFileName=Length file name \: coser.ui.project.summary.path=Project path \: +coser.ui.project.summary.resultCount=Result count \: +coser.ui.project.summary.selectionCount=Selection count \: +coser.ui.project.summary.strataFileName=Strata file name \: coser.ui.project.summary.title=Project summary coser.ui.project.summary.validated=Control validated \: coser.ui.project.useCustomReferenceSpeciesFile=Use custom reference file @@ -123,8 +129,8 @@ coser.ui.result.extractDataTitle=Extract RSufi data coser.ui.result.newResult=New Result coser.ui.result.otherDataFile=Other files \: -coser.ui.result.requireddataFile1Path= -coser.ui.result.requireddataFile2Path= +coser.ui.result.requireddataFile1Path=ESTPOPind file is required +coser.ui.result.requireddataFile2Path=ESTCOMind file is required coser.ui.result.requiredname=Result name is required coser.ui.result.requiredrsufiVersion=Rsufi version is required coser.ui.result.resultName=Result name \: 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-02 16:29:53 UTC (rev 346) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-02 16:50:48 UTC (rev 347) @@ -107,7 +107,13 @@ coser.ui.project.projectname=Nom du projet \: coser.ui.project.saveProject=Sauver le projet coser.ui.project.strataFile=Fichier des strates \: +coser.ui.project.summary.catchFileName=Nom du fichier captures \: +coser.ui.project.summary.haulFileName=Nom du fichier traits \: +coser.ui.project.summary.lengthFileName=Nom du fichier tailles \: coser.ui.project.summary.path=Chemin du projet \: +coser.ui.project.summary.resultCount=Nombre de r\u00E9sultats \: +coser.ui.project.summary.selectionCount=Nombre de s\u00E9lections \: +coser.ui.project.summary.strataFileName=Nom du fichier strates \: coser.ui.project.summary.title=R\u00E9sum\u00E9 du projet coser.ui.project.summary.validated=Contr\u00F4le valid\u00E9 \: coser.ui.project.useCustomReferenceSpeciesFile=Utiliser un autre fichier de r\u00E9f\u00E9rence @@ -123,8 +129,8 @@ coser.ui.result.extractDataTitle=Extraction des donn\u00E9es RSufi coser.ui.result.newResult=Nouveau r\u00E9sultat coser.ui.result.otherDataFile=Autre fichiers \: -coser.ui.result.requireddataFile1Path= -coser.ui.result.requireddataFile2Path= +coser.ui.result.requireddataFile1Path=Le fichier ESTPOPind est requis +coser.ui.result.requireddataFile2Path=le fichier ESTCOMind est requis coser.ui.result.requiredname=Le nom du r\u00E9sultat est requis coser.ui.result.requiredrsufiVersion=Le champ 'rsufiVersion' est requis coser.ui.result.resultName=Nom du r\u00E9sultat \: