Author: chatellier Date: 2010-11-10 17:31:28 +0000 (Wed, 10 Nov 2010) New Revision: 206 Log: Ajout d'une configuration pour les ecarts tol?\195?\169r?\195?\169 lors du control entre les captures et les tailles Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java 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/CoserFrameHandler.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java 2010-11-10 17:07:31 UTC (rev 205) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java 2010-11-10 17:31:28 UTC (rev 206) @@ -76,7 +76,7 @@ String result = getOption(CoserBusinessOption.REFERENCE_SPECIES.key); return result; } - + public String getReferenceTypeEspecesPath() { String result = getOption(CoserBusinessOption.REFERENCE_TYPE_ESPECES.key); return result; @@ -87,6 +87,11 @@ return result; } + public double getControlDiffCatchLength() { + double result = getOptionAsDouble(CoserBusinessOption.CONTROL_DIFF_CACTH_LENGTH.key); + return result; + } + public static enum CoserBusinessOption implements OptionDef { DATABASE_DIRECTORY("coser.database.directory", _("coser.config.database.directory.description"), "${user.home}" + File.separator + "coser", String.class, false, false), @@ -96,7 +101,8 @@ REFERENCE_SPECIES("coser.reference.species", _("coser.config.reference.species.description"), "", String.class, false, false), REFERENCE_TYPE_ESPECES("coser.reference.typeEspeces", _("coser.config.reference.typeEspeces.description"), "", String.class, false, false), - OBSERVATION_NOBSMIN("coser.observation.nobsmin", _("coser.config.observation.nobsmin.description"), "1.0", Double.class, false, false); + OBSERVATION_NOBSMIN("coser.observation.nobsmin", _("coser.config.observation.nobsmin.description"), "1.0", Double.class, false, false), + CONTROL_DIFF_CACTH_LENGTH("coser.control.diffcatchlength", _("coser.config.control.diffcatchlength.description"), "5.0", Double.class, false, false); protected String key; protected String description; 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-11-10 17:07:31 UTC (rev 205) +++ trunk/coser-business/src/main/resources/i18n/coser-business-en_GB.properties 2010-11-10 17:31:28 UTC (rev 206) @@ -19,8 +19,6 @@ Weight\ attribute\ is\ not\ a\ valid\ double= Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s= Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s\ or\ %s= -Wrong\ header\ detected\ in\ file.\ Find\ \:\ %s,\ expected\ %s= -Wrong\ header\ detected\ in\ file.\ Find\ \:\ %s,\ expected\ %s\ or\ %s= You\ must\ enter\ a\ campagne\ name.= You\ must\ enter\ a\ espece\ name.= You\ must\ enter\ a\ haul\ name.= @@ -41,18 +39,17 @@ coser.business.control.error.duplicatedLine= coser.business.control.error.minObservationCount= coser.business.control.error.minObservationCountDetail= -coser.business.control.error.noCatchNumberWithWeight= coser.business.control.noerrorfound=No error found coser.business.control.step.observation= coser.business.control.step.xworks= coser.business.line=Line coser.business.selection.noControlForSelection= +coser.config.control.diffcatchlength.description= coser.config.database.directory.description= coser.config.observation.nobsmin.description= coser.config.projects.directory.description= coser.config.reference.species.description= coser.config.reference.typeEspeces.description= -coser.config.reference.zones.description= coser.config.validator.directory.description= lat\ attribute\ is\ not\ a\ valid\ double= lat\ must\ contains\ at\ least\ 5\ decimal= 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-11-10 17:07:31 UTC (rev 205) +++ trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties 2010-11-10 17:31:28 UTC (rev 206) @@ -39,18 +39,17 @@ coser.business.control.error.duplicatedLine=Ligne en doublon coser.business.control.error.minObservationCount=Nombre minimal d'observation non atteint coser.business.control.error.minObservationCountDetail=Nombre minimal d'observation non atteint (%s) \: %.2f -coser.business.control.error.noCatchNumberWithWeight=Poids renseign\u00E9, mais capture non pr\u00E9sente coser.business.control.noerrorfound=Aucune erreur d\u00E9tect\u00E9e coser.business.control.step.observation=V\u00E9rification du nombre d'observation (%d%%) coser.business.control.step.xworks=Validation par lignes (%d%%) coser.business.line=Ligne coser.business.selection.noControlForSelection=Impossible de creer une s\u00E9lection sans donn\u00E9es control\u00E9es. +coser.config.control.diffcatchlength.description=Pourcentage d'\u00E9cart tol\u00E9r\u00E9 entre les captures et les tailles coser.config.database.directory.description=Emplacement de la base de campagnes de coser coser.config.observation.nobsmin.description=Nombre minimal d'observation coser.config.projects.directory.description=Emplacement des projets Coser coser.config.reference.species.description=Emplacement du fichier de r\u00E9f\u00E9rence des esp\u00E8ces coser.config.reference.typeEspeces.description=Emplacement du fichier de code type des esp\u00E8ces -coser.config.reference.zones.description=Emplacement du fichier de r\u00E9f\u00E9rence des zones coser.config.validator.directory.description=Emplacement des fichiers de validations lat\ attribute\ is\ not\ a\ valid\ double= lat\ must\ contains\ at\ least\ 5\ decimal= 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-10 17:07:31 UTC (rev 205) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-11-10 17:31:28 UTC (rev 206) @@ -162,6 +162,7 @@ modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.REFERENCE_SPECIES); modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.REFERENCE_TYPE_ESPECES); modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.OBSERVATION_NOBSMIN); + modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.CONTROL_DIFF_CACTH_LENGTH); ConfigUI configUI = modelBuilder.buildUI(view, _("coser.config.category.main")); JDialog dialogUI = new JDialog(view, _("coser.ui.config.title"));