fudaa-svn-commit Mailing List for Fudaa (Page 28)

https://gitlab.com/fudaa

Brought to you by: bmarchan, deniger, gpoissonnier, hadouxad

fudaa-svn-commit — svn commit with diffs

You can subscribe to this list here.

2008	Jan	Feb	Mar	Apr	May	Jun (46)	Jul (37)	Aug (154)	Sep (140)	Oct (132)	Nov (104)	Dec (67)
2009	Jan (113)	Feb (73)	Mar (102)	Apr (106)	May (114)	Jun (67)	Jul (116)	Aug (48)	Sep (108)	Oct (296)	Nov (56)	Dec (53)
2010	Jan (95)	Feb (31)	Mar (40)	Apr (12)	May (10)	Jun (27)	Jul (19)	Aug (81)	Sep (48)	Oct (45)	Nov (40)	Dec (7)
2011	Jan (16)	Feb (32)	Mar (55)	Apr (38)	May (24)	Jun (37)	Jul (12)	Aug (16)	Sep (97)	Oct (90)	Nov (101)	Dec (89)
2012	Jan (18)	Feb (2)	Mar (54)	Apr (69)	May (97)	Jun (131)	Jul (70)	Aug (48)	Sep (48)	Oct (119)	Nov (194)	Dec (60)
2013	Jan (73)	Feb (35)	Mar (42)	Apr (28)	May (7)	Jun (17)	Jul (27)	Aug (10)	Sep (38)	Oct (12)	Nov (4)	Dec (16)
2014	Jan (33)	Feb (37)	Mar (19)	Apr (3)	May (47)	Jun (26)	Jul (22)	Aug	Sep (10)	Oct (30)	Nov (24)	Dec (19)
2015	Jan (13)	Feb (16)	Mar (36)	Apr (19)	May (5)	Jun (5)	Jul (3)	Aug (11)	Sep (22)	Oct (7)	Nov (14)	Dec
2016	Jan	Feb (26)	Mar (13)	Apr (61)	May	Jun	Jul (4)	Aug	Sep	Oct (27)	Nov (14)	Dec (21)
2017	Jan (30)	Feb (4)	Mar (3)	Apr (5)	May (69)	Jun (29)	Jul (1)	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 26 27 28 29 30 .. 198 > >> (Page 28 of 198)

[Fudaa-svn-commit] SF.net SVN: fudaa:[8624] trunk/soft/fudaa-crue/ui-report/src/test/java/org/ fudaa/fudaa/crue/report/view/transformer/ ReportRunVariableTimeKeyMultiToStringTransformerTest.java

From: <de...@us...> - 2014-02-14 21:16:53

Revision: 8624
          http://sourceforge.net/p/fudaa/svn/8624
Author:   deniger
Date:     2014-02-14 21:16:50 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
CRUE-618

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/transformer/ReportRunVariableTimeKeyMultiToStringTransformerTest.java

Modified: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/transformer/ReportRunVariableTimeKeyMultiToStringTransformerTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/transformer/ReportRunVariableTimeKeyMultiToStringTransformerTest.java	2014-02-14 21:12:43 UTC (rev 8623)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/transformer/ReportRunVariableTimeKeyMultiToStringTransformerTest.java	2014-02-14 21:16:50 UTC (rev 8624)
@@ -28,11 +28,16 @@
     AbstractPropertyToStringTransformer<ReportRunVariableTimeKey> transformer = converter.getReportRunVariableTimeKeyConverter();
     ReportRunVariableTimeKey key = new ReportRunVariableTimeKey(current, ReportVariableTypeEnum.READ, "variable", currentKey);
     String toString = transformer.toString(key);
-    assertEquals("CURRENT|variable;read|calcul;1234", toString);
+    assertEquals("CURRENT|variable;read|calcul;1234;NO_DAY", toString);
     ReportRunVariableTimeKey fromKey = transformer.fromString(toString);
     assertNotNull(fromKey);
     assertTrue(current == fromKey.getReportRunKey().getReportRunKey());
     assertEquals(key, fromKey);
+    //sans le NO_DAY
+    fromKey = transformer.fromString("CURRENT|variable;read|calcul;1234");
+    assertNotNull(fromKey);
+    assertTrue(current == fromKey.getReportRunKey().getReportRunKey());
+    assertEquals(key, fromKey);
     ReportRunKey reportRunKeyAlternatif = new ReportRunKey("manager", "run");
     key = new ReportRunVariableTimeKey(reportRunKeyAlternatif, ReportVariableTypeEnum.READ, "variable", currentKey);
     toString = transformer.toString(key);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8623] trunk/soft/fudaa-crue

From: <de...@us...> - 2014-02-14 21:12:46

Revision: 8623
          http://sourceforge.net/p/fudaa/svn/8623
Author:   deniger
Date:     2014-02-14 21:12:43 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
CRUE-618

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
    trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/common/CrueConverterCommonParameter.java
    trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/common/CrueDaoStructureOptions.java
    trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneItem.java
    trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneLine.java
    trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaContentValidator.java
    trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
    trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/otfa/TestCrueOTFA.java
    trunk/soft/fudaa-crue/crue-otfa/src/test/resources/otfa/campagne.otfa.xml
    trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu41.java

Modified: trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties	2014-02-14 21:05:26 UTC (rev 8622)
+++ trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties	2014-02-14 21:12:43 UTC (rev 8623)
@@ -558,6 +558,7 @@
 otfa.validator.referenceScenarioNoSet=le sc\u00e9nario de r\u00e9f\u00e9rence n'est pas renseign\u00e9
 otfa.validator.referenceCoeurNoSet=Le coeur de r\u00e9f\u00e9rence n'est pas renseign\u00e9
 otfa.validator.cibleCoeurNoSet=Le coeur cible n'est pas renseign\u00e9
+otfa.validator.cibleCoeurEmptyButNotScenarioEtude=Si Le coeur cible est vide toute la demi-ligne cible doit \u00eatre vide
 otfa.validator.cibleConversionMisconfigured=La cible est mal d\u00e9finie. Pour repr\u00e9senter une conversion, l'\u00e9tude et le sc\u00e9nario doivent \u00eatre tous les 2 vides.
 otfa.deleteRunBefore.logs=Effacement des runs avant
 otfa.deleteRunAfter.logs=Effacement des runs apr\u00e8s

Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/common/CrueConverterCommonParameter.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/common/CrueConverterCommonParameter.java	2014-02-14 21:05:26 UTC (rev 8622)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/common/CrueConverterCommonParameter.java	2014-02-14 21:12:43 UTC (rev 8623)
@@ -63,6 +63,11 @@
     OtfaCampagneLine metier = new OtfaCampagneLine();
     metier.setCommentaire(dao.Commentaire);
     metier.setIndice(dao.Numero);
+    if (dao.LancerComparaison != null) {
+      metier.setLancerComparaison(Boolean.valueOf(dao.LancerComparaison));
+    } else {
+      metier.setLancerComparaison(true);
+    }
     metier.setReference(CrueConverterCommonParameter.convertRunParametersDaoToMetier(dao.Reference));
     metier.setCible(CrueConverterCommonParameter.convertRunParametersDaoToMetier(dao.Cible));
     return metier;
@@ -72,6 +77,7 @@
     CrueDaoStructureOptions.LigneCampagne dao = new CrueDaoStructureOptions.LigneCampagne();
     dao.Commentaire = metier.getCommentaire();
     dao.Numero = metier.getIndice();
+    dao.LancerComparaison = Boolean.valueOf(metier.isLancerComparaison());
     dao.Reference = CrueConverterCommonParameter.convertRunParametersMetierToDao(metier.getReference());
     dao.Cible = CrueConverterCommonParameter.convertRunParametersMetierToDao(metier.getCible());
     return dao;

Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/common/CrueDaoStructureOptions.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/common/CrueDaoStructureOptions.java	2014-02-14 21:05:26 UTC (rev 8622)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/common/CrueDaoStructureOptions.java	2014-02-14 21:12:43 UTC (rev 8623)
@@ -32,6 +32,7 @@
 
     public int Numero;
     public String Commentaire;
+    public Boolean LancerComparaison;
     public RunParameters Reference;
     public RunParameters Cible;
   }

Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneItem.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneItem.java	2014-02-14 21:05:26 UTC (rev 8622)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneItem.java	2014-02-14 21:12:43 UTC (rev 8623)
@@ -30,6 +30,10 @@
     }
   }
 
+  public boolean isEmpty() {
+    return StringUtils.isBlank(coeurName) && StringUtils.isBlank(scenarioNom) && StringUtils.isBlank(etuFile);
+  }
+
   /**
    * 
    * @return true si la version utilisee est Crue9.

Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneLine.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneLine.java	2014-02-14 21:05:26 UTC (rev 8622)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneLine.java	2014-02-14 21:12:43 UTC (rev 8623)
@@ -6,7 +6,7 @@
 
 /**
  * Correspond a une ligne d'une campagne.
- * 
+ *
  * @author deniger
  */
 public class OtfaCampagneLine {
@@ -14,6 +14,8 @@
   private OtfaCampagneItem reference;
   private OtfaCampagneItem cible;
   private String commentaire;
+  private boolean lancerComparaison = true;
+
   /**
    * correspond à l'indice de la ligne dans la liste de {@link OtfaCampagne}
    */
@@ -22,6 +24,14 @@
   public OtfaCampagneLine() {
   }
 
+  public boolean isLancerComparaison() {
+    return lancerComparaison;
+  }
+
+  public void setLancerComparaison(boolean lancerComparaison) {
+    this.lancerComparaison = lancerComparaison;
+  }
+
   public OtfaCampagneLine(OtfaCampagneLine toCopy) {
     if (toCopy != null) {
       if (toCopy.reference != null) {
@@ -30,8 +40,8 @@
       if (toCopy.cible != null) {
         cible = new OtfaCampagneItem(toCopy.cible);
       }
-      this.commentaire=toCopy.commentaire;
-      this.indice=toCopy.indice;
+      this.commentaire = toCopy.commentaire;
+      this.indice = toCopy.indice;
     }
   }
 
@@ -51,7 +61,8 @@
 
   /**
    * TODO a verifer:
-   * @return 
+   *
+   * @return
    */
   public boolean isCibleAConversion() {
     return (StringUtils.isBlank(cible.getScenarioNom()) && StringUtils.isBlank(cible.getEtuPath()));
@@ -132,6 +143,9 @@
     result = prime * result + ((commentaire == null) ? 0 : commentaire.hashCode());
     result = prime * result + indice;
     result = prime * result + ((reference == null) ? 0 : reference.hashCode());
+    if (lancerComparaison) {
+      result++;
+    }
     return result;
   }
 
@@ -167,6 +181,9 @@
     if (indice != other.indice) {
       return false;
     }
+    if (lancerComparaison != other.lancerComparaison) {
+      return false;
+    }
     if (reference == null) {
       if (other.reference != null) {
         return false;

Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaContentValidator.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaContentValidator.java	2014-02-14 21:05:26 UTC (rev 8622)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaContentValidator.java	2014-02-14 21:12:43 UTC (rev 8623)
@@ -110,14 +110,18 @@
       }
       boolean cibleEtuEmpty = StringUtils.isEmpty(line.getCible().getEtuPath());
       boolean cibleScenarioEmpty = StringUtils.isEmpty(line.getCible().getScenarioNom());
-      if ((cibleEtuEmpty && !cibleScenarioEmpty) || (!cibleEtuEmpty && cibleScenarioEmpty)) {
-        log.addSevereError("otfa.validator.cibleConversionMisconfigured");
+      final boolean coeurEmpty = StringUtils.isEmpty(line.getCible().getCoeurName());
+      if (line.isLancerComparaison() || !coeurEmpty) {
+        if ((cibleEtuEmpty && !cibleScenarioEmpty) || (!cibleEtuEmpty && cibleScenarioEmpty)) {
+          log.addSevereError("otfa.validator.cibleConversionMisconfigured");
+        }
       }
-
-
-      if (StringUtils.isEmpty(line.getCible().getCoeurName())) {
+      if (line.isLancerComparaison() && coeurEmpty) {
         log.addSevereError("otfa.validator.cibleCoeurNoSet");
       }
+      if (!line.isLancerComparaison() && coeurEmpty && (!cibleEtuEmpty || !cibleScenarioEmpty)) {
+        log.addSevereError("otfa.validator.cibleCoeurEmptyButNotScenarioEtude");
+      }
 
     }
   }
@@ -165,7 +169,6 @@
         }
       }
 
-
     }
 
   }
@@ -197,7 +200,6 @@
         }
       }
 
-
     }
 
   }
@@ -220,7 +222,7 @@
   }
 
   private void validateXsdCompatible(OtfaCampagne campagne, OtfaCampagneItem item, Map<File, String> xsdVersionByEtuFile,
-                                     CtuluLog log, boolean isRef) {
+          CtuluLog log, boolean isRef) {
     if (item.isCrue9()) {
       return;
     }
@@ -241,7 +243,7 @@
         } else if (!StringUtils.equals(xsdVersion, findVersion.getVersion())) {
 
           log.addSevereError(isRef ? "otfa.validator.referenceXsdNotCompatible" : "otfa.validator.cibleXsdNotCompatible",
-                             xsdVersion, findVersion.getVersion());
+                  xsdVersion, findVersion.getVersion());
         }
       }
 
@@ -266,7 +268,7 @@
         final Map<String, CrueVersionType> scenarios = scenariosByEtudes.get(reference.getEtuPath());
         if (scenarios != null) {
           scenarios.put(line.getFinalCible().getScenarioNom(),
-                        line.getCible().isCrue9() ? CrueVersionType.CRUE9 : CrueVersionType.CRUE10);
+                  line.getCible().isCrue9() ? CrueVersionType.CRUE9 : CrueVersionType.CRUE10);
         }
       } else {
         this.validScenarioExist(campagne, cible, scenariosByEtudes, log);
@@ -276,7 +278,7 @@
   }
 
   private void validScenarioExist(OtfaCampagne campagne, OtfaCampagneItem item,
-                                  final Map<String, Map<String, CrueVersionType>> scenariosByEtudes, CtuluLog log) {
+          final Map<String, Map<String, CrueVersionType>> scenariosByEtudes, CtuluLog log) {
     File etuFile = item.getEtuFile(campagne.getOtfaDir());
     //validation effectuée auparavant:
     if (etuFile == null || !etuFile.exists()) {
@@ -314,15 +316,14 @@
           //erreur relevée par ailleurs: il faut eviter les remontées multiples
           if (versionItem.equals(CrueVersionType.CRUE10) && !coeurExist(item.getCoeurName())) {
             Logger.getLogger(OtfaContentValidator.class.getName()).log(Level.INFO,
-                                                                       "pas d'erreur le scenario {0} car deja remonté dans un test precedent",
-                                                                       scenarioVersion);
+                    "pas d'erreur le scenario {0} car deja remonté dans un test precedent",
+                    scenarioVersion);
           } else {
             log.addSevereError("otfa.validator.crueVersionNonCompatible", name, scenarioVersion.getDisplayName(),
-                               versionItem.getDisplayName());
+                    versionItem.getDisplayName());
           }
         }
 
-
       }
     }
   }

Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java	2014-02-14 21:05:26 UTC (rev 8622)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java	2014-02-14 21:12:43 UTC (rev 8623)
@@ -57,7 +57,7 @@
  *
  */
 public class OtfaExecutor {
-  
+
   private final CoeurManager coeurManager;
   private final ConnexionInformation user;
   private final CalculCrueRunnerManager calculRunner;
@@ -75,7 +75,7 @@
     this.calculRunner = calculRunner;
     this.lineSaver = lineSaver;
   }
-  
+
   public RTFAResultLines launch(OtfaCampagne in, ProgressionInterface progress) {
     RTFAResultLines result = null;
     OutOfMemoryError oomError = null;
@@ -87,7 +87,7 @@
         lineSaver.start(false);
       }
       result = lineSaver.getLines();
-      
+
       result.getHeader().setCommentaire(in.getCommentaire());
       result.getHeader().setDate(new LocalDateTime());
       updater.majProgessionStateOnly(BusinessMessages.getString("otfa.avancement.validation"));
@@ -98,20 +98,20 @@
       if (preloadSelector != null && preloadSelector.containsSomething()) {
         campagneLogs.addGroup(preloadSelector);
       }
-      
+
       if (campagneLogs.containsFatalError()) {
         return result;
       }
       if (stoppedAskedByUser()) {
         return result;
       }
-      
+
       List<OtfaCampagneLine> lines = in.getLines();
       final int size = lines.size();
       updater.setValue(size, size);
       updater.majProgessionStateOnly(BusinessMessages.getString("otfa.avancement.lock"));
       for (OtfaCampagneLine line : lines) {
-        
+
         allEtu.add(line.getReference().getEtuFile(in.getOtfaDir()));
         if (!line.isCibleAConversion()) {
           allEtu.add(line.getFinalCible().getEtuFile(in.getOtfaDir()));
@@ -157,7 +157,7 @@
     }
     return result;
   }
-  
+
   private void processAllLines(OtfaCampagne in, CtuluLogGroup campagneLogs, ProgressionUpdater updater) {
     if (in.getReferenceOptions().isEffacerRunAvant() || in.getCibleOptions().isEffacerRunAvant()) {
       CtuluLogGroup logsBefore = campagneLogs.createGroup("otfa.deleteRunBefore.logs");
@@ -179,13 +179,13 @@
       deleteRuns(in, in.getReferenceOptions().isEffacerRunApres(), in.getCibleOptions().isEffacerRunApres(), logsAfter);
     }
   }
-  
+
   private OtfaCampagneLineResult launch(OtfaCampagne campagne, OtfaCampagneLine line) {
     final OtfaCampagneLineResult result = new OtfaCampagneLineResult();
     final CtuluLogGroup logs = new CtuluLogGroup(BusinessMessages.RESOURCE_BUNDLE);
     logs.setDescription("otfa.launchLine");
     logs.setDescriptionArgs(Integer.toString(line.getIndice()));
-    
+
     result.setInitialLine(line);
     result.setLogs(logs);
 
@@ -202,21 +202,22 @@
     if (stoppedAskedByUser()) {
       return result;
     }
-    
-    final CoeurConfigContrat coeurForItem = getCoeurForItem(campagne, line.getReference());
+    if (line.isLancerComparaison()) {
+      final CoeurConfigContrat coeurForItem = getCoeurForItem(campagne, line.getReference());
 
-    //la config est celle de la référence.
-    CrueConfigMetier config = coeurForItem.getCrueConfigMetier();
-    final EMHScenario refScenario = referenceResult == null ? null : referenceResult.getResult();
-    final EMHScenario cibleScenario = cibleResult == null ? null : cibleResult.getResult();
-    
-    if ((refScenario != null) && (cibleScenario != null)) {
-      result.setComparisonResult(executor.compare(config, refScenario, cibleScenario, getSelectorType(line)));
+      //la config est celle de la référence.
+      CrueConfigMetier config = coeurForItem.getCrueConfigMetier();
+      final EMHScenario refScenario = referenceResult == null ? null : referenceResult.getResult();
+      final EMHScenario cibleScenario = cibleResult == null ? null : cibleResult.getResult();
+
+      if ((refScenario != null) && (cibleScenario != null)) {
+        result.setComparisonResult(executor.compare(config, refScenario, cibleScenario, getSelectorType(line)));
+      }
     }
-    
+
     return result;
   }
-  
+
   protected ComparaisonSelectorEnum getSelectorType(OtfaCampagneLine line) {
     if (line.getReference().isCrue9() && line.getFinalCible().isCrue9()) {
       return ComparaisonSelectorEnum.C9_C9;
@@ -226,7 +227,7 @@
     }
     return ComparaisonSelectorEnum.C9_C10;
   }
-  
+
   public CoeurConfigContrat getCoeurForItem(OtfaCampagne campagne, OtfaCampagneItem item) {
     File etuFile = item.getEtuFile(campagne.getOtfaDir());
     final CoeurConfigContrat coeur;
@@ -240,11 +241,11 @@
   }
   CalculCrueContrat currentRunner;
   boolean batch;
-  
+
   public boolean isBatch() {
     return batch;
   }
-  
+
   public void setBatch(boolean batch) {
     this.batch = batch;
   }
@@ -258,6 +259,9 @@
    */
   private CrueOperationResult<EMHScenario> launchItem(OtfaCampagne campagne, OtfaCampagneItem item, OtfaCampagneItem ref) {
     final CtuluLogGroup logs = new CtuluLogGroup(BusinessMessages.RESOURCE_BUNDLE);
+    if (item.isEmpty()) {
+      return new CrueOperationResult<>(null, logs.createCleanGroup());
+    }
 
     // Chargement du projet.
     final File etuFile = item.getEtuFile(campagne.getOtfaDir());
@@ -273,10 +277,10 @@
     if (projetResult.getResult() == null || stoppedAskedByUser()) {
       return new CrueOperationResult<EMHScenario>(null, logs.createCleanGroup());
     }
-    
+
     EMHProjet projet = projetResult.getResult();
     EMHProjetController controller = new EMHProjetController(projet, user);
-    
+
     ManagerEMHScenario managerScenario = projet.getScenario(item.getScenarioNom());
     // Conversion
     if (ref != null) {
@@ -286,12 +290,12 @@
       final CrueOperationResult<EMHScenarioContainer> conversionResult = controller.convertScenario(ref.getScenarioNom(), infos,
               ref.getEtuFile(
                       campagne.getOtfaDir()));
-      
+
       logs.addGroup(conversionResult.getLogs().createCleanGroup());
       EMHProjetController.writeProjet(etuFile, projet, logs, user);
       projetResult = this.loadProjet(etuFile, getCoeurForItem(campagne, item));
       final CtuluLogGroup cleanLogGroup = projetResult.getLogs().createCleanGroup();
-      
+
       logs.addGroup(cleanLogGroup);
       if (projetResult.getResult() == null || cleanLogGroup.containsFatalError()) {
         return new CrueOperationResult<EMHScenario>(null, (CtuluLog) null);
@@ -305,7 +309,7 @@
       logs.createNewLog("otfa.scenarioNotFound").addError("otfa.scenarionNotFound.detail", item.getScenarioNom());
       return new CrueOperationResult<EMHScenario>(null, logs.createCleanGroup());
     }
-    
+
     if (item.isLaunchCompute()) {
       // Création du run et sauvegarde dans l'étude
       //pour créer le runs on utilise des options sans run afin de forcer le lancement complet des calculs.
@@ -331,7 +335,7 @@
       }
     }
     ScenarioLoader loader = new ScenarioLoader(managerScenario, projet, projet.getCoeurConfig());
-    
+
     ScenarioLoaderOperation load = loader.load(managerScenario.getRunCourant());//on charge le run courant:
 
     logs.addGroup(load.getLogs().createCleanGroup());
@@ -361,14 +365,14 @@
         }
       }
     }
-    
+
     return new CrueOperationResult<EMHScenario>(emhScenario, logs.createCleanGroup());
   }
-  
+
   private CrueOperationResult<EMHProjet> loadProjet(File etuFile, CoeurConfigContrat version) {
     return EMHProjetController.readProjet(etuFile, version);
   }
-  
+
   public void deleteRuns(OtfaCampagne in, boolean reference, boolean cible, CtuluLogGroup logs) {
     //rien a faire:
     if (!reference && !cible) {
@@ -390,7 +394,7 @@
       }
     }
   }
-  
+
   private void deleteRuns(File referenceFile, String scenarioNom, OtfaCampagne campagne,
           OtfaCampagneItem item, CtuluLogGroup logs) {
     CrueOperationResult<EMHProjet> projetResult = this.loadProjet(referenceFile, getCoeurForItem(campagne, item));
@@ -425,9 +429,9 @@
         }
         controller.saveProjet(referenceFile, logs);
       }
-      
+
     }
-    
+
   }
   private volatile boolean stoppedByUser;
 
@@ -440,7 +444,7 @@
       currentRunner.stop();
     }
   }
-  
+
   private boolean stoppedAskedByUser() {
     return Thread.currentThread().isInterrupted() || stoppedByUser;
   }

Modified: trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/otfa/TestCrueOTFA.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/otfa/TestCrueOTFA.java	2014-02-14 21:05:26 UTC (rev 8622)
+++ trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/otfa/TestCrueOTFA.java	2014-02-14 21:12:43 UTC (rev 8623)
@@ -112,7 +112,7 @@
 
     line.setIndice(1);
     line.setCommentaire("Commentaire de la LigneCampagne ");
-
+    line.setLancerComparaison(true);
     OtfaCampagneItem item = new OtfaCampagneItem();
     // /v10.1 est un path absolu:
     item.setEtuPath("/v10.1/Etu3-0");
@@ -139,7 +139,7 @@
 
     line.setIndice(2);
     line.setCommentaire("Commentaire de la LigneCampagne ");
-
+    line.setLancerComparaison(false);
     OtfaCampagneItem item = new OtfaCampagneItem();
 
     item.setEtuPath("/v10.1/Etu3-0");

Modified: trunk/soft/fudaa-crue/crue-otfa/src/test/resources/otfa/campagne.otfa.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/test/resources/otfa/campagne.otfa.xml	2014-02-14 21:05:26 UTC (rev 8622)
+++ trunk/soft/fudaa-crue/crue-otfa/src/test/resources/otfa/campagne.otfa.xml	2014-02-14 21:12:43 UTC (rev 8623)
@@ -40,6 +40,7 @@
 		</LigneCampagne>
 		<LigneCampagne Numero="2">
 			<Commentaire>Commentaire de la LigneCampagne </Commentaire>
+      <LancerComparaison>False</LancerComparaison>
 			<Reference>
 				<Etude>/v10.1/Etu3-0</Etude>
 				<Scenario>Sc_M3-0_c9c10</Scenario>

Modified: trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu41.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu41.java	2014-02-14 21:05:26 UTC (rev 8622)
+++ trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu41.java	2014-02-14 21:12:43 UTC (rev 8623)
@@ -45,7 +45,7 @@
   @Test
   public void testSc_M41_c9c9() {
     IntegrationHelper.exportToCrue9(getEtuFile().getParentFile(), projet, "Sc_M4-1_c9", "Sc_M4-1_c9c9", "M4-1_c9c9", true, 0);
-    IntegrationHelper.testScenario(projet, "Sc_M4-1_c9c9", new ErrorBilanTester(0, 0, 6, 2));
+    IntegrationHelper.testScenario(projet, "Sc_M4-1_c9c9", new ErrorBilanTester(0, 0, 5, 2));
   }
 
   @Test
@@ -58,13 +58,13 @@
   public void testSc_M41_c10c9() {
     IntegrationHelper.exportToCrue9(getEtuFile().getParentFile(), projet, "Sc_M4-1_c10", "Sc_M4-1_c10c9", "M4-1_c10c9",
             Arrays.asList("COM5", "COM1", "COM3", "PNUM1", "OPTR1"));
-    IntegrationHelper.testScenario(projet, "Sc_M4-1_c10c9", new ErrorBilanTester(0, 0, 6, 2));
+    IntegrationHelper.testScenario(projet, "Sc_M4-1_c10c9", new ErrorBilanTester(0, 0, 5, 2));
   }
 
   @Test
   public void testSc_M41_c10c10() {
     IntegrationHelper.exportToCrue10(getEtuFile().getParentFile(), projet, "Sc_M4-1_c10", "Sc_M4-1_c10c10", "M4-1_c10c10", true, 0);
-    IntegrationHelper.testScenario(projet, "Sc_M4-1_c10c10", new ErrorBilanTester(0, 0, 5, 2));
+    IntegrationHelper.testScenario(projet, "Sc_M4-1_c10c10", new ErrorBilanTester(0, 0, 4, 2));
   }
 
   @Test
@@ -73,17 +73,17 @@
             "COM5", "OCAL4",
             "OPTI6", "OPTG4",
             "OPTR1"));// différences
-    IntegrationHelper.testScenario(projet, "Sc_M4-1_c9c10", new ErrorBilanTester(0, 0, 5, 2));
+    IntegrationHelper.testScenario(projet, "Sc_M4-1_c9c10", new ErrorBilanTester(0, 0, 4, 2));
   }
 
   @Test
   public void testSc_M41_c9() {
-    IntegrationHelper.testScenario(projet, "Sc_M4-1_c9", new ErrorBilanTester(0, 0, 6, 2));
+    IntegrationHelper.testScenario(projet, "Sc_M4-1_c9", new ErrorBilanTester(0, 0, 5, 2));
   }
 
   @Test
   public void testSc_M41_c10() {
-    IntegrationHelper.testScenario(projet, "Sc_M4-1_c10", new ErrorBilanTester(0, 0, 5, 2));
+    IntegrationHelper.testScenario(projet, "Sc_M4-1_c10", new ErrorBilanTester(0, 0, 4, 2));
   }
 
   private File getEtuFile() {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8622] trunk/framework

From: <de...@us...> - 2014-02-14 21:05:29

Revision: 8622
          http://sourceforge.net/p/fudaa/svn/8622
Author:   deniger
Date:     2014-02-14 21:05:26 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------


Modified Paths:
--------------
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BVueCalque.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueCatchInteraction.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueGeometry.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalquePoint.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueRepereInteraction.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZEbliCalquePanelController.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZEbliCalquesPanel.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZModelPointAbstract.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZModeleStatiqueImageRaster.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZModeleStatiquePoint.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZScene.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/SceneShowDistanceAction.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/SelectionMoveInteraction.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalqueDistanceInteraction.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModelePointEditable.java
    trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt

Added Paths:
-----------
    trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/curseur_accroche_move.png

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BVueCalque.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BVueCalque.java	2014-02-14 12:12:28 UTC (rev 8621)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BVueCalque.java	2014-02-14 21:05:26 UTC (rev 8622)
@@ -90,6 +90,11 @@
     addMouseListener(this);
   }
 
+  @Override
+  public void setCursor(Cursor cursor) {
+    super.setCursor(cursor);
+  }
+
   private boolean checkBoite(final GrBoite _nouvBoite, final boolean _checkX, final boolean _checkY) {
     final GrBoite bVue = getCalque().getDomaine();
     if (bVue == null) {

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java	2014-02-14 12:12:28 UTC (rev 8621)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java	2014-02-14 21:05:26 UTC (rev 8622)
@@ -130,6 +130,11 @@
     return modeleDonnees() != null;
   }
 
+  @Override
+  public boolean canBeUsedForAccroche() {
+    return true;
+  }
+
   protected Color getColorWithAttenuAlpha(Color init) {
     if (isAttenue()) {
       return EbliLib.getAlphaColor(attenueCouleur(init), alpha_);

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java	2014-02-14 12:12:28 UTC (rev 8621)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java	2014-02-14 21:05:26 UTC (rev 8622)
@@ -83,7 +83,7 @@
    * @return true : Si le calque peut \xEAtre rendu selectionnable
    */
   public boolean canSetSelectable();
-  
+
   /**
    * @return la boite zoomant sur la selection. Cette boite est la boite englobante
    * augment\xE9e d'une marge.
@@ -250,4 +250,9 @@
   boolean setLineModel(int _idx, final TraceLigneModel _model);
 
   TraceLigneModel getLineModel(int _idx);
+
+  /**
+   * @return true si peut \xEAtre utilis\xE9 dans les accroche.
+   */
+  boolean canBeUsedForAccroche();
 }

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueCatchInteraction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueCatchInteraction.java	2014-02-14 12:12:28 UTC (rev 8621)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueCatchInteraction.java	2014-02-14 21:05:26 UTC (rev 8622)
@@ -8,6 +8,7 @@
  */
 package org.fudaa.ebli.calque;
 
+import com.memoire.fu.FuEmptyArrays;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.awt.event.MouseEvent;
@@ -15,6 +16,7 @@
 import java.awt.event.MouseMotionListener;
 import java.util.Arrays;
 import java.util.HashSet;
+import org.fudaa.ctulu.CtuluLibArray;
 import org.fudaa.ebli.geometrie.GrPoint;
 
 /**
@@ -146,6 +148,10 @@
     }
   }
 
+  public boolean isSomethingCatched() {
+    return !CtuluLibArray.isEmpty(idxGeoms_);
+  }
+
   /**
    * Recherche les points a accrocher. Propose par defaut le plus en avant.
    *
@@ -163,7 +169,7 @@
       idxVertexOld = idxVertices_[iidxVertex_];
     }
 
-    selAccroch_ = scene_.selection(_pt.applique(getVersReel()), tolerancePixel_);
+    selAccroch_ = scene_.selectionForAccroche(_pt.applique(getVersReel()), tolerancePixel_);
     idxGeoms_ = selAccroch_.getIdxSelected();
     Arrays.sort(idxGeoms_);
 
@@ -290,6 +296,18 @@
     }
   }
 
+  @Override
+  public void setGele(boolean _gele) {
+    super.setGele(_gele);
+    if (_gele) {
+//      bcatch_ = false;
+      fireCatchEvent(ZCatchEvent.UNCAUGHT, 0, 0);
+      idxGeoms_ = FuEmptyArrays.INT0;
+      idxVertices_ = FuEmptyArrays.INT0;
+      iidxGeom_ = -1;
+    }
+  }
+
   /**
    * Gere le SHIFT.<p>
    * SHIFT : pour reactiver le mode d'accrochage

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueGeometry.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueGeometry.java	2014-02-14 12:12:28 UTC (rev 8621)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueGeometry.java	2014-02-14 21:05:26 UTC (rev 8622)
@@ -1280,7 +1280,7 @@
         if (_mode == SelectionMode.ATOMIC) {
           for (int j = modele_.getNbPointForGeometry(i) - 1; j >= 0; j--) {
             modele_.point(p, i, j);
-            if (bClip.contientXY(p) && (p.distanceXY(_ptReel) < distanceReel)) {
+            if (bClip.contientXY(p) && (p.distanceXY(_ptReel) <= distanceReel)) {
               if (sel == null) {
                 sel = new EbliListeSelectionMulti(1);
               }

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalquePoint.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalquePoint.java	2014-02-14 12:12:28 UTC (rev 8621)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalquePoint.java	2014-02-14 21:05:26 UTC (rev 8622)
@@ -25,6 +25,7 @@
 import org.fudaa.ctulu.gis.GISGeometryFactory;
 import org.fudaa.ctulu.gis.GISLib;
 import org.fudaa.ebli.commun.EbliLib;
+import org.fudaa.ebli.commun.EbliListeSelectionMulti;
 import org.fudaa.ebli.commun.EbliSelectionState;
 import org.fudaa.ebli.geometrie.GrBoite;
 import org.fudaa.ebli.geometrie.GrMorphisme;
@@ -310,12 +311,7 @@
 
   protected void paintLabels(final Graphics2D g2d, int idx, GrPoint pEcran) {
   }
- 
 
- 
-
-  
-
   protected TraceIcon getTraceIcon() {
     final TraceIcon icone = iconModel_.buildCopy();
     return icone;
@@ -534,6 +530,25 @@
   }
 
   @Override
+  public EbliListeSelectionMulti selectVertices(final GrPoint _ptReel, final int _tolerancePixel, boolean _inDepth) {
+    final CtuluListSelection selection = selection(_ptReel, _tolerancePixel);
+    if (selection == null || selection.isEmpty()) {
+      return null;
+    }
+    EbliListeSelectionMulti res = new EbliListeSelectionMulti(modele_.getNombre());
+    int nb = selection.getMaxIndex();
+    for (int i = selection.getMinIndex(); i <= nb; i++) {
+      if (selection.isSelected(i)) {
+        CtuluListSelection unitSelection = new CtuluListSelection(1);
+        unitSelection.add(0);
+        res.set(i, unitSelection);
+      }
+    }
+
+    return res;
+  }
+
+  @Override
   public CtuluListSelection selection(final GrPoint _pt, final int _tolerance) {
     return selectionBasic(_pt, _tolerance);
   }

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueRepereInteraction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueRepereInteraction.java	2014-02-14 12:12:28 UTC (rev 8621)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueRepereInteraction.java	2014-02-14 21:05:26 UTC (rev 8622)
@@ -1,8 +1,8 @@
 /**
- *  @creation     1 oct. 2003
- *  @modification $Date: 2006-09-19 14:55:48 $
- *  @license      GNU General Public License 2
- *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @creation 1 oct. 2003
+ * @modification $Date: 2006-09-19 14:55:48 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
  */
 package org.fudaa.ebli.calque;
 
@@ -26,25 +26,45 @@
  * @version $Id: ZCalqueRepereInteraction.java,v 1.18 2006-09-19 14:55:48 deniger Exp $
  */
 public class ZCalqueRepereInteraction extends BCalqueInteraction implements MouseListener, MouseMotionListener,
-    KeyListener {
+        KeyListener, ZCatchListener {
+
   private Point pointDeb_, pointFinPrec_;
   private final BVueCalque vc_;
   private double coefZoomClick_ = 1.5; // Coefficient de zoom (AVANT/ARRIERE)
   private final BGroupeCalque gcDonnees_;
+  private GrPoint ptAccroch_;
 
-  public ZCalqueRepereInteraction(final BVueCalque _vc,BGroupeCalque _gcDonnees) {
+  public ZCalqueRepereInteraction(final BVueCalque _vc, BGroupeCalque _gcDonnees) {
     super();
     vc_ = _vc;
     pointDeb_ = null;
     pointFinPrec_ = null;
     _vc.addKeyListener(this);
-    gcDonnees_=_gcDonnees;
+    gcDonnees_ = _gcDonnees;
     /*
      * addMouseListener(this); addMouseMotionListener(this); addMouseWheelListener(this);
      */
   }
-  
+
   @Override
+  public void catchChanged(ZCatchEvent _evt) {
+    if (isGele()) {
+      return;
+    }
+
+    if (_evt.type == ZCatchEvent.CAUGHT) {
+      ptAccroch_ = _evt.selection.getScene().getVertex(_evt.idxGeom, _evt.idxVertex);
+    } else {
+      ptAccroch_ = null;
+    }
+  }
+
+  @Override
+  public boolean isCachingEnabled() {
+    return !isGele();
+  }
+
+  @Override
   public boolean alwaysPaint() {
     return true;
   }
@@ -53,7 +73,7 @@
   public Cursor getSpecificCursor() {
     return EbliResource.EBLI.getCursor("loupe-etendue", -1, new Point(8, 8));
   }
-  
+
   @Override
   public String getDescription() {
     return EbliLib.getS("Zoom") + (zoomMoins_ ? " -" : " +");
@@ -61,9 +81,8 @@
 
   /**
    * Dessin de l'icone.
-   * 
-   * @param _c composant dont l'icone peut deriver des proprietes (couleur, ...). Ce parametre peut etre <I>null</I>. Il
-   *          est ignore ici.
+   *
+   * @param _c composant dont l'icone peut deriver des proprietes (couleur, ...). Ce parametre peut etre <I>null</I>. Il est ignore ici.
    * @param _g le graphics sur lequel dessiner l'icone
    * @param _x lieu cible de l'icone (x)
    * @param _y lieu cible de l'icone (y)
@@ -83,7 +102,7 @@
    * Affectation du coefficient de zoom avant/arriere.
    * <p>
    * Ce coefficient est utilis\xE9 dans le zoom par simple clic.
-   * 
+   *
    * @param _coef Le coefficient multiplicateur du zoom autre que 0. Si 0, il est d\xE9fini par d\xE9faut.
    */
   public void setCoefficientZoom(final double _coef) {
@@ -96,7 +115,7 @@
 
   /**
    * Retour du coefficient de zoom avant/arriere.
-   * 
+   *
    * @return La valeur du coefficient. <I>1.5</I> par d\xE9faut.
    */
   public double getCoefficientZoom() {
@@ -105,7 +124,8 @@
 
   // EVENEMENTS
   @Override
-  public void mouseClicked(final MouseEvent _evt) {}
+  public void mouseClicked(final MouseEvent _evt) {
+  }
 
   @Override
   public void mouseEntered(final MouseEvent _evt) {
@@ -119,31 +139,48 @@
 
   @Override
   public void mousePressed(final MouseEvent _evt) {
-    if (!isOkLeftEvent(_evt)) { return; }
+    if (!isOkLeftEvent(_evt)) {
+      return;
+    }
     gcDonnees_.setUseCache(true);
-    pointDeb_ = _evt.getPoint();
+    if (ptAccroch_ != null) {
+      ptAccroch_ = ptAccroch_.applique(getVersEcran());
+      pointDeb_ = new Point((int) ptAccroch_.x_, (int) ptAccroch_.y_);
+      ptAccroch_ = null;
+    } else {
+      pointDeb_ = _evt.getPoint();
+    }
   }
 
   @Override
   public void mouseReleased(final MouseEvent _evt) {
     gcDonnees_.setUseCache(false);
-    if (!isOkLeftEvent(_evt)) { return; }
+    if (!isOkLeftEvent(_evt)) {
+      return;
+    }
 
-    if (pointDeb_ == null) { return; }
+    if (pointDeb_ == null) {
+      return;
+    }
 
     GrPoint pointO;
     GrPoint pointE;
 
     if (pointDeb_.distance(_evt.getPoint()) > 7) {
       final Point pointFin = _evt.getPoint();
+      if (ptAccroch_ != null) {
+        ptAccroch_ = ptAccroch_.applique(getVersEcran());
+        pointFin.x = (int) ptAccroch_.x_;
+        pointFin.y = (int) ptAccroch_.y_;
+        ptAccroch_ = null;
+      }
       pointE = new GrPoint(Math.min(pointDeb_.x, pointFin.x), Math.max(pointDeb_.y, pointFin.y), 0.);
       pointO = new GrPoint(Math.max(pointDeb_.x, pointFin.x), Math.min(pointDeb_.y, pointFin.y), 0.);
       pointE.autoApplique(getVersReel());
       pointO.autoApplique(getVersReel());
       final GrBoite boite = new GrBoite(pointO, pointE);
       vc_.changeRepere(this, boite);
-    }
-    // Zoom suivant le coefZoomClick_ et recentrage sur le point cliqu\xE9.
+    } // Zoom suivant le coefZoomClick_ et recentrage sur le point cliqu\xE9.
     else {
       vc_.zoomOnMouse(_evt);
     }
@@ -176,10 +213,12 @@
     pointFinPrec_ = pointFin;
     repaint();
   }
-  
+
   @Override
   public void paintComponent(Graphics _g) {
-    if (pointDeb_ == null|| pointFinPrec_==null) { return; }
+    if (pointDeb_ == null || pointFinPrec_ == null) {
+      return;
+    }
     _g.setXORMode(getBackground());
     _g.setColor(Color.black);
     _g.drawLine(pointDeb_.x, pointDeb_.y, pointFinPrec_.x, pointDeb_.y);
@@ -189,7 +228,8 @@
   }
 
   @Override
-  public void mouseMoved(final MouseEvent _evt) {}
+  public void mouseMoved(final MouseEvent _evt) {
+  }
 
   private boolean zoomMoins_;
 
@@ -215,5 +255,6 @@
   }
 
   @Override
-  public void keyTyped(final KeyEvent _e) {}
+  public void keyTyped(final KeyEvent _e) {
+  }
 }

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZEbliCalquePanelController.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZEbliCalquePanelController.java	2014-02-14 12:12:28 UTC (rev 8621)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZEbliCalquePanelController.java	2014-02-14 21:05:26 UTC (rev 8622)
@@ -53,13 +53,17 @@
 
 /**
  * Un controleur des actions du panneau d'affichage 2D des calques. Il gere en particulier les actions de navigation, de selection. Il g\xE8re \xE9galement
- * les actions exclusives. Une action est exclusive lorsqu'elle d\xE9sactive une autre action en cours. <p> Exemple : une action s\xE9lection d\xE9sactivera
- * une action zoom en cours. <p> Ce controleur peut \xE9galement g\xE9rer des actions exclusives sp\xE9cifiques.
+ * les actions exclusives. Une action est exclusive lorsqu'elle d\xE9sactive une autre action en cours.
+ * <p>
+ * Exemple : une action s\xE9lection d\xE9sactivera une action zoom en cours.
+ * <p>
+ * Ce controleur peut \xE9galement g\xE9rer des actions exclusives sp\xE9cifiques.
  *
  * @author Fred Deniger
  * @version $Id$
  */
 public class ZEbliCalquePanelController implements TreeSelectionListener, PropertyChangeListener {
+
   /**
    * Identifiant pour les propri\xE9t\xE9s concernant l'\xE9tat d'un calque d'interaction.
    */
@@ -181,13 +185,13 @@
     final EbliActionPaletteAbstract plAction = new EbliActionPaletteAbstract(EbliLib.getS("Rep\xE8re"),
             EbliResource.EBLI.getIcon("repere"),
             "CHANGE_REFERENCE") {
-      @Override
-      public JComponent buildContentPane() {
-        final BControleRepereTexte crt = new BControleRepereTexte(pn_.getVueCalque());
-        crt.addRepereEventListener(pn_.getVueCalque());
-        return crt;
-      }
-    };
+              @Override
+              public JComponent buildContentPane() {
+                final BControleRepereTexte crt = new BControleRepereTexte(pn_.getVueCalque());
+                crt.addRepereEventListener(pn_.getVueCalque());
+                return crt;
+              }
+            };
     plAction.setParent(pn_);
     plAction.putValue(Action.SHORT_DESCRIPTION, EbliLib.getS("Transformations du rep\xE8re"));
     return plAction;
@@ -205,11 +209,11 @@
     // RESTORE ACTION
     final EbliActionSimple restore = new EbliActionSimple(EbliLib.getS("Restaurer"), EbliResource.EBLI.getIcon("restore"),
             "RESTORE") {
-      @Override
-      public void actionPerformed(ActionEvent _arg) {
-        pn_.restaurer();
-      }
-    };
+              @Override
+              public void actionPerformed(ActionEvent _arg) {
+                pn_.restaurer();
+              }
+            };
     restore.putValue(Action.SHORT_DESCRIPTION, EbliLib.getS("Restaurer la vue globale"));
     restore.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('r'));
     restore.putValue(EbliActionInterface.SECOND_KEYSTROKE, KeyStroke.getKeyStroke(KeyEvent.VK_F5, 0));
@@ -227,11 +231,11 @@
 
     navigationActionGroup_[i] = new EbliActionSimple(EbliLib.getS("Derni\xE8re vue"), EbliResource.EBLI.getIcon("zoom-previous"),
             "LAST_VIEW") {
-      @Override
-      public void actionPerformed(final ActionEvent _arg) {
-        pn_.getVueCalque().undoRepere();
-      }
-    };
+              @Override
+              public void actionPerformed(final ActionEvent _arg) {
+                pn_.getVueCalque().undoRepere();
+              }
+            };
     navigationActionGroup_[i].putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('y'));
     navigationActionGroup_[i++].setDefaultToolTip(EbliLib.getS("Retourner \xE0 la derni\xE8re vue"));
     // action.putValue(Action.MNEMONIC_KEY, new Int);
@@ -248,11 +252,11 @@
     // NAVIGATION
     final EbliActionPaletteAbstract plAction = new EbliActionPaletteAbstract(EbliLib.getS("Navigation"),
             EbliResource.EBLI.getIcon("navigation"), "NAVIGATE") {
-      @Override
-      public JComponent buildContentPane() {
-        return new ZTransformationDomaine(pn_.getVueCalque());
-      }
-    };
+              @Override
+              public JComponent buildContentPane() {
+                return new ZTransformationDomaine(pn_.getVueCalque());
+              }
+            };
     plAction.setParent(pn_);
     plAction.setResizable(true);
     plAction.putValue(Action.SHORT_DESCRIPTION, EbliLib.getS("Outil de navigation"));
@@ -307,11 +311,11 @@
     EbliActionPaletteAbstract ebliActionPaletteAbstract = new EbliActionPaletteAbstract(EbliLib.getS("L\xE9gende"),
             EbliResource.EBLI.getToolIcon("legend"),
             "EDIT_LEGEND", true) {
-      @Override
-      public JComponent buildContentPane() {
-        return new BCalqueLegendeCustomizer(getView().getCqLegend());
-      }
-    };
+              @Override
+              public JComponent buildContentPane() {
+                return new BCalqueLegendeCustomizer(getView().getCqLegend());
+              }
+            };
     ebliActionPaletteAbstract.setParent(pn_);
     l.add(ebliActionPaletteAbstract);
     l.add(new BConfigurePaletteAction(getView().getArbreCalqueModel().getTreeSelectionModel()));
@@ -384,8 +388,7 @@
   }
 
   /**
-   * Modifie la propriete
-   * <code>enable</code> de tous les boutons du groupe selection.
+   * Modifie la propriete <code>enable</code> de tous les boutons du groupe selection.
    *
    * @param _enable
    */
@@ -837,9 +840,9 @@
   }
 
   /**
-   * TreeSelection (mise a jour des etats des boutons de Selection en fonction du calque). Affecte le calque actif (
-   * <code>getCalqueActif</code>) de cette classe, modifie les calque actifs du calque de selection ( un seul calque actif) et met a jour l'etat des
-   * specific tools (si option validee).
+   * TreeSelection (mise a jour des etats des boutons de Selection en fonction du calque). Affecte le calque actif ( <code>getCalqueActif</code>) de
+   * cette classe, modifie les calque actifs du calque de selection ( un seul calque actif) et met a jour l'etat des specific tools (si option
+   * validee).
    *
    * @param _evt
    */
@@ -863,6 +866,7 @@
   public ZEbliCalquesPanel getPn() {
     return pn_;
   }
+
   public List<EbliActionInterface> getSelectedNavigationAndStandardActionGroup() {
     final List<EbliActionInterface> actions = new ArrayList<EbliActionInterface>();
     if (this.selectedActionGroup_ == null) {
@@ -986,47 +990,12 @@
       if (isCachingDisable()) {
         return;
       }
-
       pn_.getVueCalque().setCursor(_evt.type == ZCatchEvent.CAUGHT ? CURSOR_ACC : cqInteractionActif_.getSpecificCursor());
 
       if (_evt.type == ZCatchEvent.CAUGHT) {
-        GrPoint pt = _evt.selection.getScene().getVertex(_evt.idxGeom, _evt.idxVertex);
-
-        String idxGeom = "" + (_evt.selection.getScene().sceneId2LayerId(_evt.idxGeom) + 1);
-        String idxVertex = "" + (_evt.idxVertex + 1);
-        String cqName = _evt.selection.getScene().getLayerForId(_evt.idxGeom).getTitle();
-        String x;
-        String y;
-        String z;
-        String xname;
-        String yname;
-        String zname;
-        EbliCoordinateDefinition[] defs = getCoordinateDefinitions();
-        if (defs != null) {
-          x = defs[0].getFormatter().getXYFormatter().format(pt.x_);
-          y = defs[1].getFormatter().getXYFormatter().format(pt.y_);
-          z = defs[2].getFormatter().getXYFormatter().format(pt.z_);
-
-          xname = defs[0].getName();
-          yname = defs[1].getName();
-          zname = defs[2].getName();
-        } else {
-          x = "" + pt.x_;
-          y = "" + pt.y_;
-          z = "" + pt.z_;
-
-          xname = "X";
-          yname = "Y";
-          zname = "Z";
-        }
-
-        String[] vars = {cqName, idxGeom, idxVertex, xname, x, yname, y, zname, z};
-        String text =
-                EbliResource.EBLI.getString(
-                "Accroche : Calque={0} Geom={1} Sommet={2} {3}={4} {5}={6} {7}={8} (n:Suivant, u:D\xE9crocher)", vars);
-        pn_.setInfoText(text);
+        pn_.setAccrocheText(_evt);
       } else {
-        pn_.unsetInfoText();
+        pn_.unsetAcrrocheText();
       }
     }
 

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZEbliCalquesPanel.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZEbliCalquesPanel.java	2014-02-14 12:12:28 UTC (rev 8621)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZEbliCalquesPanel.java	2014-02-14 21:05:26 UTC (rev 8622)
@@ -508,7 +508,54 @@
     infoTextSelectionUpdated();
   }
 
+  public void setAccrocheText(ZCatchEvent _evt) {
+    GrPoint pt = _evt.selection.getScene().getVertex(_evt.idxGeom, _evt.idxVertex);
+
+    String idxGeom = "" + (_evt.selection.getScene().sceneId2LayerId(_evt.idxGeom) + 1);
+    String idxVertex = "" + (_evt.idxVertex + 1);
+    String cqName = _evt.selection.getScene().getLayerForId(_evt.idxGeom).getTitle();
+    String x;
+    String y;
+    String z;
+    String xname;
+    String yname;
+    String zname;
+    EbliCoordinateDefinition[] defs = getCoordinateDefinitions();
+    if (defs != null) {
+      x = defs[0].getFormatter().getXYFormatter().format(pt.x_);
+      y = defs[1].getFormatter().getXYFormatter().format(pt.y_);
+      z = defs[2].getFormatter().getXYFormatter().format(pt.z_);
+
+      xname = defs[0].getName();
+      yname = defs[1].getName();
+      zname = defs[2].getName();
+    } else {
+      x = "" + pt.x_;
+      y = "" + pt.y_;
+      z = "" + pt.z_;
+
+      xname = "X";
+      yname = "Y";
+      zname = "Z";
+    }
+
+    String[] vars = {cqName, idxGeom, idxVertex, xname, x, yname, y, zname, z};
+    setAccrocheText(vars);
+  }
+
+  public void setAccrocheText(String[] vars) {
+    String text
+            = EbliResource.EBLI.getString(
+                    "Accroche : Calque={0} Geom={1} Sommet={2} {3}={4} {5}={6} {7}={8} (n:Suivant, u:D\xE9crocher)", vars);
+    setInfoText(text);
+  }
+
+  public void unsetAcrrocheText() {
+    unsetInfoText();
+  }
+
   public void setInfoText(final String _s) {
+
     if (CtuluLibString.isEmpty(_s)) {
       unsetInfoText();
     } else {

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZModelPointAbstract.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZModelPointAbstract.java	2014-02-14 12:12:28 UTC (rev 8621)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZModelPointAbstract.java	2014-02-14 21:05:26 UTC (rev 8622)
@@ -29,6 +29,13 @@
   }
 
   @Override
+  public GrPoint getVertexForObject(int _ind, int vertex) {
+    GrPoint p = new GrPoint();
+    point(p, _ind, true);
+    return p;
+  }
+
+  @Override
   public BuTable createValuesTable(final ZCalqueAffichageDonneesInterface _layer){
     final BuTable res = new BuTable();
     res.setModel(new ZCalquePoint.DefaultTableModel(this));

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZModeleStatiqueImageRaster.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZModeleStatiqueImageRaster.java	2014-02-14 12:12:28 UTC (rev 8621)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZModeleStatiqueImageRaster.java	2014-02-14 21:05:26 UTC (rev 8622)
@@ -176,6 +176,13 @@
   }
 
   @Override
+  public GrPoint getVertexForObject(int _ind, int vertex) {
+    GrPoint p = new GrPoint();
+    point(p, _ind, true);
+    return p;
+  }
+
+  @Override
   protected ZModeleStatiqueImageRaster clone() {
     try {
       ZModeleStatiqueImageRaster cloned = (ZModeleStatiqueImageRaster) super.clone();

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZModeleStatiquePoint.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZModeleStatiquePoint.java	2014-02-14 12:12:28 UTC (rev 8621)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZModeleStatiquePoint.java	2014-02-14 21:05:26 UTC (rev 8622)
@@ -41,6 +41,13 @@
   }
 
   @Override
+  public GrPoint getVertexForObject(int _ind, int vertex) {
+    GrPoint p = new GrPoint();
+    point(p, _ind, true);
+    return p;
+  }
+
+  @Override
   public double getX(final int _i){
     return points_[_i].x_;
   }
@@ -160,8 +167,4 @@
   }
   //  public final boolean contourSelectionnable(int _i)  { return true;  }
 
-  @Override
-  public GrPoint getVertexForObject(int _ind, int vertex) {
-    return point(_ind);
-  }
 }

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZScene.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZScene.java	2014-02-14 12:12:28 UTC (rev 8621)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZScene.java	2014-02-14 21:05:26 UTC (rev 8622)
@@ -686,6 +686,19 @@
     return selTmp_;
   }
 
+  public ZSceneSelection selectionForAccroche(final GrPoint _pt, final int _tolerance) {
+    selTmp_.clear();
+    for (ZCalqueAffichageDonneesInterface cq : getTargetLayers()) {
+      if (cq.canBeUsedForAccroche()) {
+        EbliListeSelectionMulti sel = (EbliListeSelectionMulti) cq.selectVertices(_pt, _tolerance, true);
+        if (sel != null) {
+          selTmp_.addLayerListSelectionMulti(cq, sel);
+        }
+      }
+    }
+    return selTmp_;
+  }
+
   /**
    * Retourne le sommet 3D correspondant a l'indice de geometrie _idScene et l'indice de sommet _idVertex.
    *

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/SceneShowDistanceAction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/SceneShowDistanceAction.java	2014-02-14 12:12:28 UTC (rev 8621)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/SceneShowDistanceAction.java	2014-02-14 21:05:26 UTC (rev 8622)
@@ -22,9 +22,8 @@
 import org.fudaa.ebli.ressource.EbliResource;
 
 /**
- * Une action pour afficher une palette indiquant la distance entre une s\xE9rie de
- * points.
- * 
+ * Une action pour afficher une palette indiquant la distance entre une s\xE9rie de points.
+ *
  * @author Emmanuel MARTIN
  * @version $Id$
  */
@@ -32,20 +31,22 @@
 
   private ZEbliCalquesPanel calquesPanel_;
   // Calque ne fermant pas l'edition \\
-  private BCalqueInteraction calqueZoom_; 
+  private BCalqueInteraction calqueZoom_;
   private BCalqueInteraction calqueDeplacementVue_;
-  /** Le calque contenant les informations de distance. */
+  /**
+   * Le calque contenant les informations de distance.
+   */
   private ZCalqueDistanceInteraction calqueDistance_;
   protected EbliFormatterInterface formatter_;
 
-  public SceneShowDistanceAction(final ZEditorDefault _editor,  EbliFormatterInterface _formatter) {
+  public SceneShowDistanceAction(final ZEditorDefault _editor, EbliFormatterInterface _formatter) {
     super(EbliLib.getS("Distance"), EbliResource.EBLI.getToolIcon("bu_scrollpane_corner"), "PALETTE_DISTANCE");
-    formatter_=_formatter;
-    calquesPanel_=_editor.getPanel();
+    formatter_ = _formatter;
+    calquesPanel_ = _editor.getPanel();
     calquesPanel_.getController().addPropertyChangeListener("gele", this);
-    calqueZoom_=calquesPanel_.getController().getCalqueInteraction("cqAGRANDIR");
-    calqueDeplacementVue_=calquesPanel_.getController().getCalqueInteraction("cqDEPLACEMENT_VUE-I");
-    calqueDistance_=new ZCalqueDistanceInteraction();
+    calqueZoom_ = calquesPanel_.getController().getCalqueInteraction("cqAGRANDIR");
+    calqueDeplacementVue_ = calquesPanel_.getController().getCalqueInteraction("cqDEPLACEMENT_VUE-I");
+    calqueDistance_ = new ZCalqueDistanceInteraction();
     calqueDistance_.setGele(true);
     calquesPanel_.addCalqueInteraction(calqueDistance_);
     calqueDistance_.addPropertyChangeListener("gele", this);
@@ -56,13 +57,15 @@
   @Override
   public void changeAction() {
     super.changeAction();
-    if (isSelected())
+    if (isSelected()) {
       calquesPanel_.setCalqueInteractionActif(calqueDistance_);
-    else{
+      calquesPanel_.getVueCalque().requestFocus();
+    } else {
       calqueDistance_.cancelEdition();
       calquesPanel_.unsetCalqueInteractionActif(calqueDistance_);
-      if (calquesPanel_.getController().getCqSelectionI()!=null)
+      if (calquesPanel_.getController().getCqSelectionI() != null) {
         calquesPanel_.getController().getCqSelectionI().setGele(false);
+      }
     }
   }
 
@@ -75,8 +78,8 @@
   public void propertyChange(PropertyChangeEvent _evt) {
     // Cas un autre calque que celui du zoom, du deplacement de vue et d'edition
     // est d\xE9gel\xE9 donc on ferme le pannel d'edition si il \xE9tait ouvert.
-    if (_evt.getSource()!=calqueZoom_&&_evt.getSource()!=calqueDeplacementVue_&&_evt.getSource()!=calqueDistance_
-        &&!((Boolean)_evt.getNewValue()).booleanValue()&&isSelected()) {
+    if (_evt.getSource() != calqueZoom_ && _evt.getSource() != calqueDeplacementVue_ && _evt.getSource() != calqueDistance_
+            && !((Boolean) _evt.getNewValue()).booleanValue() && isSelected()) {
       calqueDistance_.cancelEdition();
       setSelected(false);
       super.changeAction();
@@ -86,7 +89,8 @@
   @Override
   public void internalFrameClosing(InternalFrameEvent e) {
     calqueDistance_.cancelEdition();
-    if (calquesPanel_.getController().getCqSelectionI()!=null)
+    if (calquesPanel_.getController().getCqSelectionI() != null) {
       calquesPanel_.getController().getCqSelectionI().setGele(false);
+    }
   }
-}
\ No newline at end of file
+}

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/SelectionMoveInteraction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/SelectionMoveInteraction.java	2014-02-14 12:12:28 UTC (rev 8621)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/SelectionMoveInteraction.java	2014-02-14 21:05:26 UTC (rev 8622)
@@ -4,26 +4,33 @@
 package org.fudaa.ebli.calque.edition;
 
 import java.awt.Cursor;
+import java.awt.Point;
 import java.awt.event.MouseEvent;
 import org.fudaa.ctulu.CtuluListSelection;
 import org.fudaa.ctulu.gis.GISZoneCollection;
 import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
 import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
 import org.fudaa.ebli.calque.ZCalqueSelectionInteractionSimple;
+import org.fudaa.ebli.calque.ZCatchEvent;
+import org.fudaa.ebli.calque.ZCatchListener;
+import org.fudaa.ebli.calque.ZEbliCalquePanelController;
 import org.fudaa.ebli.calque.ZEbliCalquesPanel;
 import org.fudaa.ebli.commun.EbliListeSelectionMulti;
 import org.fudaa.ebli.commun.EbliListeSelectionMultiInterface;
 import org.fudaa.ebli.geometrie.GrPoint;
+import org.fudaa.ebli.ressource.EbliResource;
 
 /**
  *
  * @author Frederic Deniger
  */
-public class SelectionMoveInteraction extends ZCalqueSelectionInteractionSimple {
+public class SelectionMoveInteraction extends ZCalqueSelectionInteractionSimple implements ZCatchListener {
 
   private final ZEbliCalquesPanel pn;
   ZCalqueDeplacementInteraction deplacement;
 
+  public static final Cursor CURSOR_ACC_MOVE = EbliResource.EBLI.getCursor("curseur_accroche_move", -1, new Point(1, 1));
+
   public SelectionMoveInteraction(ZEbliCalquesPanel panel) {
     super(panel.getGcDonnees());
     this.pn = panel;
@@ -44,6 +51,17 @@
   }
 
   @Override
+  public boolean isCachingEnabled() {
+    return !isGele();
+  }
+
+  @Override
+  public void catchChanged(ZCatchEvent _evt) {
+    super.catchChanged(_evt);
+    deplacement.catchChanged(_evt);
+  }
+
+  @Override
   public void setEditor(ZEditorDefault _editor) {
     super.setEditor(_editor);
     deplacement.setTarget(_editor);
@@ -164,6 +182,18 @@
       return;
     }
     movable = isMovable(e.getX(), e.getY());
-    pn.getVueCalque().setCursor(movable ? deplacement.getSpecificCursor() : getSpecificCursor());
+//    pn.getVueCalque().setCursor(deplacement.getSpecificCursor());
+    pn.getVueCalque().setCursor(getAccrocheSpecificCursor());
   }
+
+//  @Override
+  public Cursor getAccrocheSpecificCursor() {
+    if (idxGeomAccroch_ == null) {
+      return movable ? deplacement.getSpecificCursor() : getSpecificCursor();
+    }
+    if (movable) {
+      return CURSOR_ACC_MOVE;
+    }
+    return ZEbliCalquePanelController.CURSOR_ACC;
+  }
 }

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalqueDistanceInteraction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalqueDistanceInteraction.java	2014-02-14 12:12:28 UTC (rev 8621)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalqueDistanceInteraction.java	2014-02-14 21:05:26 UTC (rev 8622)
@@ -262,7 +262,7 @@
     if (isGele()) return;
     
     if (_evt.type==ZCatchEvent.CAUGHT) {
-      ptAccroch_=_evt.selection.getScene().getVertex(_evt.idxGeom,_evt.idxVertex);
+      ptAccroch_ = _evt.selection.getScene().getVertex(_evt.idxGeom, _evt.idxVertex);
     }
     else {
       ptAccroch_=null;

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModelePointEditable.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModelePointEditable.java	2014-02-14 12:12:28 UTC (rev 8621)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModelePointEditable.java	2014-02-14 21:05:26 UTC (rev 8622)
@@ -96,6 +96,13 @@
   }
 
   @Override
+  public GrPoint getVertexForObject(int _ind, int vertex) {
+    GrPoint p = new GrPoint();
+    point(p, _ind, true);
+    return p;
+  }
+
+  @Override
   public boolean isDataValid(CoordinateSequence _seq, ZEditionAttributesDataI _data, CtuluAnalyze _ana) {
     return true;
   }

Added: trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/curseur_accroche_move.png
===================================================================
(Binary files differ)

Index: trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/curseur_accroche_move.png
===================================================================
--- trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/curseur_accroche_move.png	2014-02-14 12:12:28 UTC (rev 8621)
+++ trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/curseur_accroche_move.png	2014-02-14 21:05:26 UTC (rev 8622)

Property changes on: trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/curseur_accroche_move.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt
===================================================================
--- trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt	2014-02-14 12:12:28 UTC (rev 8621)
+++ trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt	2014-02-14 21:05:26 UTC (rev 8622)
@@ -39,6 +39,7 @@
 Accrochage=Hanging
 Accroche \: Calque\={0} Geom\={1} Sommet\={2} {3}\={4} {5}\={6} {7}\={8} (n\:Suivant, u\:D\xE9crocher)=Hang \: Layer\={0} Geom\={1} Vertex\={2} {3}\={4} {5}\={6} {7}\={8} (n\:Next, u\:Unhang)
 Accroche suivant Z=Hang for Z
+Accroche \: Calque={0} Geom\={1} Sommet\={2}
 Actif=Active
 Action=Action
 Activer la grille r\xE9guli\xE8re=Enable regular grid

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8621] trunk/soft/fudaa-crue/ui-application/pom.xml

From: <de...@us...> - 2014-02-14 12:12:32

Revision: 8621
          http://sourceforge.net/p/fudaa/svn/8621
Author:   deniger
Date:     2014-02-14 12:12:28 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-application/pom.xml

Modified: trunk/soft/fudaa-crue/ui-application/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-application/pom.xml	2014-02-14 11:14:03 UTC (rev 8620)
+++ trunk/soft/fudaa-crue/ui-application/pom.xml	2014-02-14 12:12:28 UTC (rev 8621)
@@ -137,7 +137,7 @@
           <exists>${wine.bottle}\drive_c\${resourcehacker.installdir}\ResHacker.exe</exists>
         </file>                     
       </activation>
-      <build>
+<!--      <build>
         <plugins>
           <plugin>
             <artifactId>maven-antrun-plugin</artifactId> 
@@ -152,11 +152,11 @@
                   <target> 
 
                     <echo message ="Replacing icon of Windows launcher executable" /> 
-                    <!-- replace executable with ResHacker.exe path on windows -->
+                     replace executable with ResHacker.exe path on windows 
                     <exec executable="wine" resolveexecutable="true" logerror="true">
-                      <!-- replace value with location of installation bottle, or remove on windows -->
+                       replace value with location of installation bottle, or remove on windows 
                       <env key="WINEPREFIX" value="${wine.bottle}" />
-                      <!-- remove this argument when running on windows -->
+                       remove this argument when running on windows 
                       <arg value="${resourcehacker.installdir}\ResHacker.exe"/>
                       <arg value="-addoverwrite"/>
                       <arg value="${project.build.directory}/${brandingToken}/bin/${brandingToken}.exe,"/>
@@ -176,7 +176,7 @@
             </executions>
           </plugin>  
         </plugins>
-      </build>
+      </build>-->
     </profile>                    
     <profile>
       <id>release</id>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8620] trunk/soft/fudaa-crue/pom.xml

From: <de...@us...> - 2014-02-14 11:14:07

Revision: 8620
          http://sourceforge.net/p/fudaa/svn/8620
Author:   deniger
Date:     2014-02-14 11:14:03 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-crue/pom.xml

Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml	2014-02-14 09:50:02 UTC (rev 8619)
+++ trunk/soft/fudaa-crue/pom.xml	2014-02-14 11:14:03 UTC (rev 8620)
@@ -23,6 +23,7 @@
     <fudaa-sig.version>1.4-SNAPSHOT</fudaa-sig.version>
     <netbeans.run.params.ide/>
     <netbeans.run.params>${netbeans.run.params.ide}</netbeans.run.params>
+    <!--<netbeans.version>RELEASE731</netbeans.version>-->
     <netbeans.version>RELEASE712</netbeans.version>
     <brandingToken>fudaacrue</brandingToken>
   </properties>
@@ -310,33 +311,11 @@
       <dependency>
         <groupId>jgraphx</groupId>
         <artifactId>jgraphx</artifactId>
-        <!--<version>1.10.0.5</version>-->
         <version>2.1.1.2</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
   <dependencies>
-    <!--a enlever mais pour la première installation...-->
-<!--    <dependency>
-      <groupId>org.apache.maven.reporting</groupId>
-      <artifactId>maven-reporting-api</artifactId>
-      <version>2.2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-      <version>1.5.15</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.5.6</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-      <version>1.2</version>
-    </dependency>-->
   </dependencies>
   <build>
     <pluginManagement>
@@ -351,8 +330,8 @@
           <artifactId>maven-compiler-plugin</artifactId>
           <version>2.5.1</version>
           <configuration>
-            <source>1.6</source>
-            <target>1.6</target>
+            <source>${javaCompiler}</source>
+            <target>${targetJdk}</target>
             <encoding>${project.build.sourceEncoding}</encoding>
           </configuration>
         </plugin>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8619] trunk/framework/ebli-common/src/main

From: <de...@us...> - 2014-02-14 09:50:07

Revision: 8619
          http://sourceforge.net/p/fudaa/svn/8619
Author:   deniger
Date:     2014-02-14 09:50:02 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------


Modified Paths:
--------------
    trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BSelecteurCheckBox.java
    trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/repere/RepereMouseKeyController.java
    trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt

Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BSelecteurCheckBox.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BSelecteurCheckBox.java	2014-02-14 08:34:06 UTC (rev 8618)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BSelecteurCheckBox.java	2014-02-14 09:50:02 UTC (rev 8619)
@@ -25,6 +25,7 @@
 
   JToggleButton cb_;
   public static final String PROP_VISIBLE = "visible";
+  public static final String PROP_USER_VISIBLE = "userVisible";
 
   private boolean inverseResult_;
 

Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/repere/RepereMouseKeyController.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/repere/RepereMouseKeyController.java	2014-02-14 08:34:06 UTC (rev 8618)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/repere/RepereMouseKeyController.java	2014-02-14 09:50:02 UTC (rev 8619)
@@ -90,9 +90,9 @@
     }
     if (_e.isControlDown()) {
       if (_e.getWheelRotation() > 0) {
-        target_.zoomOut();
+        target_.zoomOnMouse(_e, true);
       } else {
-        target_.zoomIn();
+        target_.zoomOnMouse(_e, false);
       }
     } else {
       if (_e.getWheelRotation() < 0) {

Modified: trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt
===================================================================
--- trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt	2014-02-14 08:34:06 UTC (rev 8618)
+++ trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt	2014-02-14 09:50:02 UTC (rev 8619)
@@ -227,6 +227,7 @@
 D\xE9placer s\xE9lection=Move selection
 D\xE9placer un point=Move a point
 D\xE9truire=Destroy
+Supprimer=Delete
 Ecart minimal entre 2 graduations successives=Minimal increment between 2 scale marks
 Ecart=Variation
 Echelle des vecteurs=Vectors scale
@@ -887,4 +888,5 @@
 Raffinement\: {0} point(s) ajout\xE9(s)=Refinement\: {0} points{s) added
 D\xE9cimation\: {0} point(s) enlev\xE9(s)=Decimation\: {0} point(s) removed
 {0} objet(s) d\xE9plac\xE9(s)={0} object{s) moved
-Ajouter un sommet=Add a vertex
\ No newline at end of file
+Ajouter un sommet=Add a vertex
+{0} obj. s\xE9lect.={0} selected obj.
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8618] trunk/soft/fudaa-crue

From: <de...@us...> - 2014-02-14 08:34:11

Revision: 8618
          http://sourceforge.net/p/fudaa/svn/8618
Author:   deniger
Date:     2014-02-14 08:34:06 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerBrancheController.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerCasierController.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerNodeController.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerSectionController.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerTraceController.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheLayer.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCasierLayer.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryNodeLayer.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetrySectionLayer.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryTraceLayer.java
    trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportLayersTreeComponent.java
    trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponent.java

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerBrancheController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerBrancheController.java	2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerBrancheController.java	2014-02-14 08:34:06 UTC (rev 8618)
@@ -190,9 +190,6 @@
   }
 
   public boolean setSelectedEMHs(List<EMH> selectedEMH) {
-    if (!layer.isVisible()) {
-      return false;
-    }
     List<EMH> selectEMHS = EMHHelper.selectEMHS(selectedEMH, EnumCatEMH.BRANCHE);
     TIntArrayList positions = new TIntArrayList();
     for (EMH emh : selectEMHS) {
@@ -206,9 +203,6 @@
   }
 
   public boolean setSelectedEMHUids(Collection<Long> selectedUid) {
-    if (!layer.isVisible()) {
-      return false;
-    }
     TIntArrayList positions = new TIntArrayList();
     for (Long uid : selectedUid) {
       int nodePosition = getBranchePosition(uid);

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerCasierController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerCasierController.java	2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerCasierController.java	2014-02-14 08:34:06 UTC (rev 8618)
@@ -127,9 +127,6 @@
   }
 
   public boolean setSelectedEMHs(List<EMH> selectedEMH) {
-    if (!layer.isVisible()) {
-      return false;
-    }
     List<EMH> selectEMHS = EMHHelper.selectEMHS(selectedEMH, EnumCatEMH.CASIER);
     TIntArrayList positions = new TIntArrayList();
     for (EMH emh : selectEMHS) {
@@ -143,9 +140,6 @@
   }
 
   public boolean setSelectedEMHUids(Collection<Long> selectedUids) {
-    if (!layer.isVisible()) {
-      return false;
-    }
     TIntArrayList positions = new TIntArrayList();
     for (Long uid : selectedUids) {
       int nodePosition = getCasierPosition(uid);

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerNodeController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerNodeController.java	2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerNodeController.java	2014-02-14 08:34:06 UTC (rev 8618)
@@ -151,9 +151,6 @@
   }
 
   public boolean setSelectedEMHs(List<EMH> selectedEMH) {
-    if (!layer.isVisible()) {
-      return false;
-    }
     List<EMH> selectEMHS = EMHHelper.selectEMHS(selectedEMH, EnumCatEMH.NOEUD);
     TIntArrayList positions = new TIntArrayList();
     for (EMH emh : selectEMHS) {
@@ -167,9 +164,6 @@
   }
 
   public boolean setSelectedEMHUids(Collection<Long> selectedEMHUids) {
-    if (!layer.isVisible()) {
-      return false;
-    }
     TIntArrayList positions = new TIntArrayList();
     for (Long uid : selectedEMHUids) {
       int nodePosition = getNodePosition(uid);

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerSectionController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerSectionController.java	2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerSectionController.java	2014-02-14 08:34:06 UTC (rev 8618)
@@ -101,9 +101,6 @@
   }
 
   public boolean setSelectedEMHs(List<EMH> selectedEMH) {
-    if (!layer.isVisible()) {
-      return false;
-    }
     List<EMH> selectEMHS = EMHHelper.selectEMHS(selectedEMH, EnumCatEMH.SECTION);
     TIntArrayList positions = new TIntArrayList();
     if (!selectEMHS.isEmpty()) {
@@ -126,9 +123,6 @@
   }
 
   public boolean setSelectedEMHUids(Collection<Long> uids) {
-    if (!layer.isVisible()) {
-      return false;
-    }
     TIntArrayList positions = new TIntArrayList();
     if (!uids.isEmpty()) {
       GISZoneCollectionPoint gisCollection = getGISCollection();

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerTraceController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerTraceController.java	2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerTraceController.java	2014-02-14 08:34:06 UTC (rev 8618)
@@ -105,9 +105,6 @@
   }
 
   public boolean setSelectedEMHs(List<EMH> selectedEMH) {
-    if (!layer.isVisible()) {
-      return false;
-    }
     List<EMH> selectEMHS = EMHHelper.selectEMHS(selectedEMH, EnumCatEMH.SECTION);
     TIntArrayList positions = new TIntArrayList();
     if (!selectEMHS.isEmpty()) {
@@ -130,9 +127,6 @@
   }
 
   public boolean setSelectedEMHUids(Collection<Long> uids) {
-    if (!layer.isVisible()) {
-      return false;
-    }
     TIntArrayList positions = new TIntArrayList();
     if (!uids.isEmpty()) {
       GISZoneCollectionLigneBrisee gisCollection = getGISCollection();

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java	2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java	2014-02-14 08:34:06 UTC (rev 8618)
@@ -48,16 +48,27 @@
   @Override
   public void setView(final ZEbliCalquesPanel view) {
     super.setView(view);
-    view.getVueCalque().removeKeyListener(cqCatchI_);
-    removeCalqueInteraction(cqCatchI_);
+//    view.getVueCalque().removeKeyListener(cqCatchI_);
+//    removeCalqueInteraction(cqCatchI_);
+    cqCatchI_.setGele(true);
     view.getVueCalque().addKeyListener(new KeyAdapter() {
       @Override
       public void keyPressed(KeyEvent e) {
         super.keyPressed(e);
         if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
           getCqSelectionI().setGele(false);
+        } else if (e.getKeyCode() == KeyEvent.VK_A) {
+          cqCatchI_.setGele(false);
         }
       }
+
+      @Override
+      public void keyReleased(KeyEvent e) {
+        if (e.getKeyCode() == KeyEvent.VK_A) {
+          cqCatchI_.setGele(true);
+        }
+      }
+
     });
     new PlanimetryAccrocheController((PlanimetryVisuPanel) view).install();
     SelectionMoveInteraction selection = (SelectionMoveInteraction) getCalqueInteraction("cqSELECTION");
@@ -85,7 +96,6 @@
   }
   DeleteEMHCascadeAction deleteCascadeAction;
 
-
   public DeleteEMHCascadeAction getDeleteCascade() {
     if (deleteCascadeAction == null) {
       deleteCascadeAction = new DeleteEMHCascadeAction(getVisuPanel().getEditor());
@@ -149,11 +159,11 @@
     EbliActionPaletteAbstract ebliActionPaletteAbstract = new EbliActionPaletteAbstract(EbliLib.getS("Légende"),
             EbliResource.EBLI.getToolIcon("legend"),
             "EDIT_LEGEND", true) {
-      @Override
-      public JComponent buildContentPane() {
-        return new BCalqueLegendeCustomizer(getView().getCqLegend());
-      }
-    };
+              @Override
+              public JComponent buildContentPane() {
+                return new BCalqueLegendeCustomizer(getView().getCqLegend());
+              }
+            };
     ebliActionPaletteAbstract.setParent(pn_);
     l.add(ebliActionPaletteAbstract);
     standardActionGroup_ = new EbliActionInterface[l.size()];

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheLayer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheLayer.java	2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheLayer.java	2014-02-14 08:34:06 UTC (rev 8618)
@@ -105,11 +105,40 @@
     return layerConfiguration.getFlecheSize();
   }
 
+  private boolean userVisible = true;
+
   @Override
+  public boolean isUserVisible() {
+    return userVisible;
+  }
+
+  @Override
+  public void setUserVisible(boolean userVisible) {
+    if (this.userVisible != userVisible) {
+      super.setUserVisible(userVisible);
+      this.userVisible = userVisible;
+      clearCacheAndRepaint();
+    }
+  }
+
+  @Override
+  public boolean isVisible() {
+    return !isSelectionEmpty() || isUserVisible();
+  }
+
+  @Override
+  protected boolean clearSelectionIfLayerNonVisible() {
+    return false;
+  }
+
+  @Override
   protected boolean isPainted(int idx, GrMorphisme _versEcran) {
     if (isSelected(idx)) {
       return true;
     }
+    if (!isUserVisible()) {
+      return false;
+    }
     boolean res = super.isPainted(idx, _versEcran);
     if (!res) {
       return false;

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCasierLayer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCasierLayer.java	2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCasierLayer.java	2014-02-14 08:34:06 UTC (rev 8618)
@@ -119,6 +119,9 @@
     if (isSelected(idx)) {
       return true;
     }
+    if (!isUserVisible()) {
+      return false;
+    }
     CatEMHCasier casier = getCasierController().getEMHFromPositionInModel(idx);
     PlanimetryControllerHelper helper = getCasierController().getHelper();
     if (!helper.isVisible(casier)) {
@@ -130,7 +133,28 @@
     return true;
   }
 
+  private boolean userVisible = true;
+
   @Override
+  public boolean isUserVisible() {
+    return userVisible;
+  }
+
+  @Override
+  public void setUserVisible(boolean userVisible) {
+    if (this.userVisible != userVisible) {
+      super.setUserVisible(userVisible);
+      this.userVisible = userVisible;
+      clearCacheAndRepaint();
+    }
+  }
+
+  @Override
+  public boolean isVisible() {
+    return !isSelectionEmpty() || isUserVisible();
+  }
+
+  @Override
   protected boolean isPainted(int idx, GrMorphisme _versEcran) {
     return isActivityPainted(idx) && isPaintedAsPolyligne(idx, _versEcran);
   }
@@ -168,6 +192,11 @@
   LabelPainter labelPainter = new LabelPainter();
 
   @Override
+  protected boolean clearSelectionIfLayerNonVisible() {
+    return false;
+  }
+
+  @Override
   protected Color getSurfaceSpecColor(int i, Color initColor) {
     CatEMHCasier casier = getCasierController().getCasier(i);
     Color res = layerConfiguration.getFond(casier, modeleDonnees());

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryNodeLayer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryNodeLayer.java	2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryNodeLayer.java	2014-02-14 08:34:06 UTC (rev 8618)
@@ -2,9 +2,11 @@
 
 import com.memoire.bu.BuPopupMenu;
 import java.awt.Graphics2D;
+import org.fudaa.ctulu.CtuluListSelection;
 import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
 import org.fudaa.dodico.crue.metier.emh.EMH;
 import org.fudaa.ebli.calque.dessin.DeForme;
+import org.fudaa.ebli.controle.BSelecteurCheckBox;
 import org.fudaa.ebli.find.EbliFindActionInterface;
 import org.fudaa.ebli.geometrie.GrBoite;
 import org.fudaa.ebli.geometrie.GrPoint;
@@ -56,6 +58,32 @@
   }
 
   @Override
+  protected boolean clearSelectionIfLayerNonVisible() {
+    return false;
+  }
+
+  private boolean userVisible = true;
+
+  @Override
+  public boolean isUserVisible() {
+    return userVisible;
+  }
+
+  @Override
+  public void setUserVisible(boolean userVisible) {
+    if (this.userVisible != userVisible) {
+      super.setUserVisible(userVisible);
+      this.userVisible = userVisible;
+      clearCacheAndRepaint();
+    }
+  }
+
+  @Override
+  public boolean isVisible() {
+    return !isSelectionEmpty() || isUserVisible();
+  }
+
+  @Override
   public boolean isMovable() {
     return false;
   }
@@ -96,6 +124,9 @@
     if (getLayerSelection().isSelected(idx)) {
       return true;
     }
+    if (!isUserVisible()) {
+      return false;
+    }
     CatEMHNoeud noeud = getNoeudController().getEMHFromPositionInModel(idx);
     PlanimetryControllerHelper helper = getNoeudController().getHelper();
     if (!helper.isVisible(noeud)) {

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetrySectionLayer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetrySectionLayer.java	2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetrySectionLayer.java	2014-02-14 08:34:06 UTC (rev 8618)
@@ -94,10 +94,18 @@
   }
 
   @Override
+  protected boolean clearSelectionIfLayerNonVisible() {
+    return false;
+  }
+
+  @Override
   protected boolean isPainted(int idx) {
     if (getLayerSelection().isSelected(idx)) {
       return true;
     }
+    if (!isUserVisible()) {
+      return false;
+    }
     boolean res = super.isPainted(idx);
     CatEMHSection section = getController().getEMHFromPositionInModel(idx);
     PlanimetryControllerHelper helper = getLayerController().getHelper();
@@ -110,7 +118,28 @@
     return res;
   }
 
+  private boolean userVisible = true;
+
   @Override
+  public boolean isUserVisible() {
+    return userVisible;
+  }
+
+  @Override
+  public void setUserVisible(boolean userVisible) {
+    if (this.userVisible != userVisible) {
+      super.setUserVisible(userVisible);
+      this.userVisible = userVisible;
+      clearCacheAndRepaint();
+    }
+  }
+
+  @Override
+  public boolean isVisible() {
+    return !isSelectionEmpty() || isUserVisible();
+  }
+
+  @Override
   public void paintDonnees(Graphics2D _g, GrMorphisme _versEcran, GrMorphisme _versReel, GrBoite _clipReel) {
     if (!isVisible()) {
       return;

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryTraceLayer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryTraceLayer.java	2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryTraceLayer.java	2014-02-14 08:34:06 UTC (rev 8618)
@@ -10,6 +10,7 @@
 import javax.swing.SwingConstants;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.fudaa.ctulu.CtuluListSelection;
 import org.fudaa.ctulu.gis.GISPolyligne;
 import org.fudaa.ctulu.gis.GisAbscCurviligneToCoordinate;
 import org.fudaa.dodico.crue.config.comparator.XtComparator;
@@ -20,6 +21,8 @@
 import org.fudaa.dodico.crue.metier.emh.LitNumerote;
 import org.fudaa.dodico.crue.metier.emh.PtProfil;
 import org.fudaa.dodico.crue.metier.helper.EMHHelper;
+import org.fudaa.ebli.commun.EbliListeSelectionMultiInterface;
+import org.fudaa.ebli.controle.BSelecteurCheckBox;
 import org.fudaa.ebli.find.EbliFindActionInterface;
 import org.fudaa.ebli.geometrie.GrBoite;
 import org.fudaa.ebli.geometrie.GrMorphisme;
@@ -38,7 +41,8 @@
  *
  * @author deniger ( genesis)
  */
-public class PlanimetryTraceLayer extends PlanimetryLigneBriseeLayer<TraceConfiguration> implements LayerWithCascadeDeleteAction, PlanimetryLayerWithEMHContrat {
+public class PlanimetryTraceLayer extends PlanimetryLigneBriseeLayer<TraceConfiguration> implements LayerWithCascadeDeleteAction,
+        PlanimetryLayerWithEMHContrat {
 
   public PlanimetryTraceLayer(PlanimetryTraceLayerModel _modele, FSigEditor _editor) {
     super(_modele, _editor);
@@ -60,6 +64,32 @@
   }
 
   @Override
+  protected boolean clearSelectionIfLayerNonVisible() {
+    return false;
+  }
+
+  private boolean userVisible = true;
+
+  @Override
+  public boolean isUserVisible() {
+    return userVisible;
+  }
+
+  @Override
+  public void setUserVisible(boolean userVisible) {
+    if (this.userVisible != userVisible) {
+      super.setUserVisible(userVisible);
+      this.userVisible = userVisible;
+      clearCacheAndRepaint();
+    }
+  }
+
+  @Override
+  public boolean isVisible() {
+    return !isSelectionEmpty() || isUserVisible();
+  }
+
+  @Override
   public String editSelected() {
     getActions()[0].actionPerformed(null);
     return null;
@@ -82,10 +112,13 @@
 
   @Override
   protected boolean isPainted(int idx, GrMorphisme _versEcran) {
-    boolean res = super.isPainted(idx, _versEcran);
     if (isSelected(idx)) {
       return true;
     }
+    if (!isUserVisible()) {
+      return false;
+    }
+    boolean res = super.isPainted(idx, _versEcran);
     if (!res) {
       return false;
     }
@@ -155,7 +188,6 @@
       double xmax = LayerTraceGisBuilder.findXmaxLit(profilSection.getLitNumerote(), false);
       double length = xmax - xmin;
 
-
       super.layerConfiguration.initTraceIconLimiteLitOrEtiquette(iconEtiquette.getModel(), i);
       //les limites de lits
       TreeSet<Double> done = new TreeSet<Double>(xtComparator);
@@ -271,7 +303,8 @@
         }
         if (_clipReel.contientXY(pt)) {
           pt.autoApplique(_versEcran);
-          labelPainter.paintLabels(_g, pt, layerConfiguration.getDisplayName(profilSection, modeleDonnees(), isSelected(i)), layerConfiguration.getSectionLabelConfiguration(), alpha_);
+          labelPainter.paintLabels(_g, pt, layerConfiguration.getDisplayName(profilSection, modeleDonnees(), isSelected(i)), layerConfiguration.
+                  getSectionLabelConfiguration(), alpha_);
         }
       }
 

Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportLayersTreeComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportLayersTreeComponent.java	2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportLayersTreeComponent.java	2014-02-14 08:34:06 UTC (rev 8618)
@@ -118,7 +118,7 @@
     this.revalidate();
     List<BCalque> mainLayers = panel.getPlanimetryController().getMainLayers();
     for (BCalque bCalque : mainLayers) {
-      bCalque.addPropertyChangeListener(BSelecteurCheckBox.PROP_VISIBLE, this);
+      bCalque.addPropertyChangeListener(BSelecteurCheckBox.PROP_USER_VISIBLE, this);
     }
     panel.getPlanimetryController().getGroupExternController().addObserver(this);
 
@@ -149,7 +149,7 @@
     if (panel != null) {
       List<BCalque> mainLayers = panel.getPlanimetryController().getMainLayers();
       for (BCalque bCalque : mainLayers) {
-        bCalque.removePropertyChangeListener(BSelecteurCheckBox.PROP_VISIBLE, this);
+        bCalque.removePropertyChangeListener(BSelecteurCheckBox.PROP_USER_VISIBLE, this);
       }
       panel.getPlanimetryController().getGroupExternController().deleteObserver(this);
     }

Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponent.java	2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponent.java	2014-02-14 08:34:06 UTC (rev 8618)
@@ -283,7 +283,7 @@
     panel = reportVisuService.getPlanimetryVisuPanel();
     List<BCalque> mainLayers = panel.getPlanimetryController().getMainLayers();
     for (BCalque bCalque : mainLayers) {
-      bCalque.addPropertyChangeListener(BSelecteurCheckBox.PROP_VISIBLE, this);
+      bCalque.addPropertyChangeListener(BSelecteurCheckBox.PROP_USER_VISIBLE, this);
     }
     initConfiguration = panel.getPlanimetryController().getVisuConfiguration().deepClone();
     restoreDefaultConfigurationData();
@@ -424,7 +424,7 @@
       panel.getScene().removeSelectionListener(selectionListener);
       List<BCalque> mainLayers = panel.getPlanimetryController().getMainLayers();
       for (BCalque bCalque : mainLayers) {
-        bCalque.removePropertyChangeListener(BSelecteurCheckBox.PROP_VISIBLE, this);
+        bCalque.removePropertyChangeListener(BSelecteurCheckBox.PROP_USER_VISIBLE, this);
       }
     }
     

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8617] trunk/framework/ebli-2d/src/main/java/org/fudaa/ ebli/calque

From: <de...@us...> - 2014-02-14 08:28:43

Revision: 8617
          http://sourceforge.net/p/fudaa/svn/8617
Author:   deniger
Date:     2014-02-14 08:28:37 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------


Modified Paths:
--------------
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalque.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalqueModel.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BCalque.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueAffichageDonneesConfigure.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueCatchInteraction.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZEbliCalquesPanel.java

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalque.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalque.java	2014-02-13 16:34:05 UTC (rev 8616)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalque.java	2014-02-14 08:28:37 UTC (rev 8617)
@@ -34,6 +34,7 @@
 
 /**
  * Un menu pour le composant de cartographie utilisant des calques non bas\xE9s sur des mod\xE8le.
+ *
  * @see EbliFilleCalques
  * @deprecated
  */
@@ -57,11 +58,11 @@
     addMenuItem(EbliResource.EBLI.getString("Actif"), "GELE_NON", null, true, 0, _arbre);
     addSeparator();
     addMenuItem(EbliResource.EBLI.getString("En premier"), "PREMIER", EbliResource.EBLI.getIcon("enpremier"), true, 0,
-                _arbre);
+            _arbre);
     addMenuItem(CtuluLib.getS("Monter"), "MONTER", CtuluResource.CTULU.getIcon("monter"), true, 0, _arbre);
     addMenuItem(CtuluLib.getS("Descendre"), "DESCENDRE", CtuluResource.CTULU.getIcon("descendre"), true, 0, _arbre);
     addMenuItem(EbliResource.EBLI.getString("En dernier"), "DERNIER", EbliResource.EBLI.getIcon("endernier"), true, 0,
-                _arbre);
+            _arbre);
     addSeparator();
     add(new JMenuItem(_arbre.actDelete_));
   }
@@ -133,7 +134,7 @@
         @Override
         public void itemStateChanged(ItemEvent e) {
           if (cqEdite_ != null) {;
-            cqEdite_.setVisible(editor_.cbVisible_.isSelected());
+            cqEdite_.setUserVisible(editor_.cbVisible_.isSelected());
             fireEditingStopped();
           }
         }
@@ -147,7 +148,7 @@
         @Override
         public void keyReleased(final KeyEvent _e) {
           if (_e.getKeyCode() == KeyEvent.VK_ENTER && editor_.r1_.getText() != null
-              && editor_.r1_.getText().trim().length() > 0) {
+                  && editor_.r1_.getText().trim().length() > 0) {
             cqEdite_.setTitle(editor_.r1_.getText());
             fireEditingStopped();
           }
@@ -216,7 +217,7 @@
             return true;
           } // pour modifier le nom
           else if (e.getClickCount() == 2 && (e.getX() > r.x + cbWidth_ + cq.getIconWidth()) && (e.getX() < r.x + r.width)
-                   && cq.isTitleModifiable()) {
+                  && cq.isTitleModifiable()) {
             return true;
           }
 
@@ -243,7 +244,7 @@
 
     @Override
     public Component getTreeCellEditorComponent(final JTree _tree, final Object _value, final boolean _isSelected,
-                                                final boolean _expanded, final boolean _leaf, final int _row) {
+            final boolean _expanded, final boolean _leaf, final int _row) {
       cqEdite_ = (BCalque) _value;
       editor_.getTreeCellRendererComponent(_tree, _value, _isSelected, _expanded, _leaf, _row, true);
       editor_.r1_.setEditable(cqEdite_.isTitleModifiable());
@@ -271,10 +272,10 @@
     boolean old = isEditable();
     if (old != flag) {
       super.setEditable(flag);
-      
+
       if (getArbreModel() != null) {
         getArbreModel().setEditable(flag);
-        
+
       }
     }
   }
@@ -498,8 +499,8 @@
   }
 
   /**
-   * Representation d'un calque dans un cellule de l'arbre. Elle associe au nom du calque son icone, et la dessine devant. Elle
-   * dessine aussi l'etat du calque (attenue, rapide, gele) sous la forme d'une chaine de caracteres. Utilisee pour tous les lnk
+   * Representation d'un calque dans un cellule de l'arbre. Elle associe au nom du calque son icone, et la dessine devant. Elle dessine aussi l'etat
+   * du calque (attenue, rapide, gele) sous la forme d'une chaine de caracteres. Utilisee pour tous les lnk
    */
   public static class ArbreCell1 extends JPanel implements TreeCellRenderer {
 
@@ -582,19 +583,19 @@
 
     @Override
     public Component getTreeCellRendererComponent(final JTree _tree, final Object _value, final boolean _selected,
-                                                  final boolean _expanded, final boolean _leaf, final int _row,
-                                                  final boolean _hasFocus) {
+            final boolean _expanded, final boolean _leaf, final int _row,
+            final boolean _hasFocus) {
       r1_.setText(_value.toString());
       final Font ft = _tree.getFont();
       r1_.setFont(ft);
       r2_.setFont(BuLib.deriveFont(ft, -2));
       String calqueInfo = null;
-      String longTitle=null;
+      String longTitle = null;
       final StringBuffer s = new StringBuffer();
       if (_value instanceof BCalque) {
         final BCalque calque = (BCalque) _value;
         r3_.setIcon(calque);
-        longTitle=calque.getLongTitle();
+        longTitle = calque.getLongTitle();
         // Si on souhaite pouvoir retailler l'icon du calque.
 //        r3_.setIcon(CtuluLibImage.resize(calque,r3_.getPreferredSize().width,r3_.getPreferredSize().height));
 
@@ -650,7 +651,7 @@
           } else {
             cbVisible_.setState(BuCheckBox3States.STATE_MIXED);
           }
-        } else if (!calque.isVisible()) {
+        } else if (!calque.isUserVisible()) {
           if (s.length() > 0) {
             s.append(CtuluLibString.ESPACE);
           }
@@ -697,10 +698,11 @@
       final JComponent cq = (JComponent) _value;
       final String link = CtuluLibSwing.getHelpUrl(cq);
       if (link == null) {
-        if (longTitle==null)
+        if (longTitle == null) {
           tooltip.append(_value.toString());
-        else
+        } else {
           tooltip.append(longTitle);
+        }
       } else {
         tooltip.append("<a href=\"").append(link).append("\">").append(_value.toString()).append("</a>");
       }
@@ -729,8 +731,8 @@
   }
 
   /**
-   * Representation d'un calque dans une cellule de l'arbre. Elle est toute simple: nom du calque dans un label. Utilisee dans les
-   * looks Windows et Motif
+   * Representation d'un calque dans une cellule de l'arbre. Elle est toute simple: nom du calque dans un label. Utilisee dans les looks Windows et
+   * Motif
    */
   public static class ArbreCellLabel extends JLabel implements TreeCellRenderer {
 
@@ -744,8 +746,8 @@
 
     @Override
     public Component getTreeCellRendererComponent(final JTree _tree, final Object _value, final boolean _selected,
-                                                  final boolean _expanded, final boolean _leaf, final int _row,
-                                                  final boolean _hasFocus) {
+            final boolean _expanded, final boolean _leaf, final int _row,
+            final boolean _hasFocus) {
       this.setFont(_tree.getFont());
       setIcon((Icon) _value);
       setText(_value.toString());

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalqueModel.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalqueModel.java	2014-02-13 16:34:05 UTC (rev 8616)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalqueModel.java	2014-02-14 08:28:37 UTC (rev 8617)
@@ -56,7 +56,7 @@
   public static final String LAYER_ADDED = "added";
   public static final String LAYER_REMOVED = "removed";
   private static final Object[] PROP_TO_LISTEN = CtuluLibArray.sort(
-          new String[]{"foreground", "visible", "attenue",
+          new String[]{"foreground", "visible", "attenue", "userVisible",
             "rapide", "ajustement", "paletteCouleur", "iconeChanged", "title", "nodeEdit", "alpha", "model"});
 
   private static String getActLast() {
@@ -226,6 +226,8 @@
           quickRefresh();
         } else if ("VISIBLE".equals(action)) {
           calque.setVisible(!calque.isVisible());
+        } else if ("USER_VISIBLE".equals(action)) {
+          calque.setUserVisible(!calque.isVisible());
         } else if ("SELECTABLE".equals(action) && (calque instanceof ZCalqueAffichageDonneesAbstract)) {
           ((ZCalqueAffichageDonneesAbstract) calque).setSelectable(!((ZCalqueAffichageDonneesAbstract) calque).isSelectable());
           // refreshSelect = true;
@@ -401,8 +403,8 @@
   public void fillMenu(final BuMenu _m) {
     _m.addMenuItem(EbliResource.EBLI.getString("Centrer la vue"), getActCenter(), EbliResource.EBLI.getToolIcon("zoom-layer"),
             true, 0, this);
-    _m.addMenuItem(EbliResource.EBLI.getString("Visible"), "VISIBLE_OUI", null, editable, 0, this);
-    _m.addMenuItem(EbliResource.EBLI.getString("Cach\xE9"), "VISIBLE_NON", BuResource.BU.getIcon("cacher"), editable, 0, this);
+    _m.addMenuItem(EbliResource.EBLI.getString("Visible"), "USER_VISIBLE_OUI", null, editable, 0, this);
+    _m.addMenuItem(EbliResource.EBLI.getString("Cach\xE9"), "USER_VISIBLE_NON", BuResource.BU.getIcon("cacher"), editable, 0, this);
     _m.addSeparator();
     _m.addMenuItem(EbliResource.EBLI.getString("S\xE9lectionnable"), "SET_SELECTABLE", EbliResource.EBLI.getIcon("fleche"), true, 0,
             this);
@@ -490,9 +492,9 @@
     if (_c instanceof ZCalqueAffichageDonneesAbstract) {
       ZCalqueAffichageDonneesAbstract cq = (ZCalqueAffichageDonneesAbstract) _c;
       if (cq.canSetSelectable()) {
-        BuCheckBoxMenuItem mi =
-                _m.addCheckBox(EbliResource.EBLI.getString("S\xE9lectionnable"), "SELECTABLE", EbliResource.EBLI.getIcon(
-                "fleche"), true, cq.isSelectable());
+        BuCheckBoxMenuItem mi
+                = _m.addCheckBox(EbliResource.EBLI.getString("S\xE9lectionnable"), "SELECTABLE", EbliResource.EBLI.getIcon(
+                                "fleche"), true, cq.isSelectable());
         mi.addActionListener(this);
       }
     }
@@ -769,4 +771,4 @@
   @Override
   public void valueForPathChanged(final TreePath _path, final Object _newValue) {
   }
-}
\ No newline at end of file
+}

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BCalque.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BCalque.java	2014-02-13 16:34:05 UTC (rev 8616)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BCalque.java	2014-02-14 08:28:37 UTC (rev 8617)
@@ -1016,6 +1016,17 @@
     }
   }
 
+  public boolean isUserVisible() {
+    return isVisible();
+  }
+
+  public void setUserVisible(boolean userVisible) {
+    if (isUserVisible() != userVisible) {
+      setVisible(userVisible);
+      firePropertyChange(BSelecteurCheckBox.PROP_USER_VISIBLE, !userVisible, userVisible);
+    }
+  }
+
   /**
    * Controle si tous les calques descendants sont visible.
    *
@@ -1059,4 +1070,4 @@
     }
     return r;
   }
-}
\ No newline at end of file
+}

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java	2014-02-13 16:34:05 UTC (rev 8616)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java	2014-02-14 08:28:37 UTC (rev 8617)
@@ -819,6 +819,10 @@
     return antialiasing_;
   }
 
+  protected boolean clearSelectionIfLayerNonVisible() {
+    return true;
+  }
+
   /**
    * Efface la selection si le calque est rendu invisible.
    */
@@ -826,7 +830,7 @@
   public void setVisible(boolean _b) {
     if (isVisible() != _b) {
       super.setVisible(_b);
-      if (!_b) {
+      if (!_b && clearSelectionIfLayerNonVisible()) {
         clearSelection();
       }
     }

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueAffichageDonneesConfigure.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueAffichageDonneesConfigure.java	2014-02-13 16:34:05 UTC (rev 8616)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueAffichageDonneesConfigure.java	2014-02-14 08:28:37 UTC (rev 8617)
@@ -21,8 +21,9 @@
  * @version $Id: ZCalqueAffichageDonneesConfigure.java,v 1.4 2007-05-04 13:49:43 deniger Exp $
  */
 public class ZCalqueAffichageDonneesConfigure extends BCalqueSectionConfigure {
+
   boolean addVisible_;
-  boolean addColor_=true;
+  boolean addColor_ = true;
 
   public final static String ANTIALIAS = "calque.antialias";
 
@@ -48,6 +49,10 @@
       ((ZCalqueAffichageDonneesAbstract) target_).setVisible(((Boolean) _newProp).booleanValue());
       return true;
     }
+    if (_key == BSelecteurCheckBox.PROP_USER_VISIBLE) {
+      ((ZCalqueAffichageDonneesAbstract) target_).setUserVisible(((Boolean) _newProp).booleanValue());
+      return true;
+    }
     if (_key == ANTIALIAS) {
       ((ZCalqueAffichageDonneesAbstract) target_).antialiasing_ = ((Boolean) _newProp).booleanValue();
       ((ZCalqueAffichageDonneesAbstract) target_).repaint();
@@ -67,6 +72,9 @@
     if (_key == BSelecteurCheckBox.PROP_VISIBLE) {
       return Boolean.valueOf(target_.isVisible());
     }
+    if (_key == BSelecteurCheckBox.PROP_USER_VISIBLE) {
+      return Boolean.valueOf(target_.isUserVisible());
+    }
     return super.getProperty(_key);
   }
 
@@ -74,7 +82,7 @@
   public BSelecteurInterface[] createSelecteurs() {
     final List dest = new ArrayList();
     if (addVisible_) {
-      dest.add(new BSelecteurCheckBox(BSelecteurCheckBox.PROP_VISIBLE, new BuCheckBox()));
+      dest.add(new BSelecteurCheckBox(BSelecteurCheckBox.PROP_USER_VISIBLE, new BuCheckBox()));
     }
     if (((ZCalqueAffichageDonneesAbstract) target_).isAntialiasSupported()) {
       final BSelecteurCheckBox cbAntialias = new BSelecteurCheckBox(ANTIALIAS);
@@ -82,7 +90,7 @@
       cbAntialias.setTooltip(EbliLib.getS("Permet de lisser les trac\xE9s"));
       dest.add(cbAntialias);
     }
-    if(addColor_) {
+    if (addColor_) {
       dest.add(new BSelecteurColorChooserBt());
     }
     dest.add(new BSelecteurAlpha());

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueCatchInteraction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueCatchInteraction.java	2014-02-13 16:34:05 UTC (rev 8616)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueCatchInteraction.java	2014-02-14 08:28:37 UTC (rev 8617)
@@ -31,6 +31,8 @@
    * La tol\xE9rance en pixels pour l'accrochage
    */
   private static int tolerancePixel_ = 4;
+
+  private int keyAccrocheActive = KeyEvent.VK_N;
   /**
    * La scene
    */
@@ -84,6 +86,10 @@
   public void mouseEntered(final MouseEvent _evt) {
   }
 
+  public void setKeyAccrocheActive(int keyAccrocheActive) {
+    this.keyAccrocheActive = keyAccrocheActive;
+  }
+
   /**
    * Methode inactive.
    */
@@ -135,7 +141,7 @@
     ptTmp_.x_ = _evt.getX();
     ptTmp_.y_ = _evt.getY();
 //Fred ajout de isCachingEnableForOneLayer: si aucun calque ne se souci du catchevent pas besoin de le calculer.
-    if (isCachingEnableForOneLayer() && !isGele() && scene_ != null && bcatch_) {
+    if (!isGele() && isCachingEnableForOneLayer() && scene_ != null && bcatch_) {
       mouseMoved(ptTmp_);
     }
   }
@@ -258,7 +264,9 @@
   }
 
   /**
-   * Gere lees actions 'suivant' et 'decrochage'.<p> U : pour inactiver le mode d'accrochage, N : Pour switcher de point accroch\xE9.
+   * Gere lees actions 'suivant' et 'decrochage'
+   * .<p>
+   * U : pour inactiver le mode d'accrochage, N : Pour switcher de point accroch\xE9.
    */
   @Override
   public void keyPressed(KeyEvent e) {
@@ -266,7 +274,7 @@
       bcatch_ = false;
       fireCatchEvent(ZCatchEvent.UNCAUGHT, 0, 0);
     }
-    if (e.getKeyCode() == KeyEvent.VK_N) {
+    if (e.getKeyCode() == keyAccrocheActive) {
       if (selAccroch_.getNbSelectedItem() > 1) {
         iidxVertex_++;
         if (iidxVertex_ == idxVertices_.length) {
@@ -283,7 +291,8 @@
   }
 
   /**
-   * Gere le SHIFT.<p> SHIFT : pour reactiver le mode d'accrochage
+   * Gere le SHIFT.<p>
+   * SHIFT : pour reactiver le mode d'accrochage
    */
   @Override
   public void keyReleased(KeyEvent e) {

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZEbliCalquesPanel.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZEbliCalquesPanel.java	2014-02-13 16:34:05 UTC (rev 8616)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZEbliCalquesPanel.java	2014-02-14 08:28:37 UTC (rev 8617)
@@ -543,7 +543,7 @@
       }
     }
     if (selected.length() > 0) {
-      if (info.length() > 0) {
+      if (info != null && info.length() > 0) {
         info = "|" + selected + "  " + info;
       } else {
         info = "|" + selected;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8611] trunk/framework/ebli-2d/src/main/java/org/fudaa/ ebli/calque/BVueCalque.java

From: <de...@us...> - 2014-02-11 15:56:03

Revision: 8611
          http://sourceforge.net/p/fudaa/svn/8611
Author:   deniger
Date:     2014-02-11 15:55:59 +0000 (Tue, 11 Feb 2014)
Log Message:
-----------
edition axe avec 2-click

Modified Paths:
--------------
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BVueCalque.java

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BVueCalque.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BVueCalque.java	2014-02-11 15:49:31 UTC (rev 8610)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BVueCalque.java	2014-02-11 15:55:59 UTC (rev 8611)
@@ -71,7 +71,6 @@
   GrVecteur vect_ = new GrVecteur();
   private double margeXCentre;
   private double margeYCentre;
-  private boolean doCheckBoiteBeforeChangeRepere = true;
 
   public BVueCalque(final BCalque _c) {
     repere_ = new double[4][3];
@@ -287,16 +286,14 @@
     changeRepere(_source, _boite, _rz, _mrg, _mrg, _rapide, changeZ);
   }
 
-
   public void changeRepere(final Object _source, final GrBoite _boite, final double _rz, final int mrgHorizontal, final int mrgVertical,
           final boolean _rapide, final boolean _changeZ) {
     if (_boite == null) {
       return;
     }
-    if (doCheckBoiteBeforeChangeRepere && !checkBoite(_boite, true, true)) {
+    if (!checkBoite(_boite, true, true)) {
       return;
     }
-    doCheckBoiteBeforeChangeRepere = true
     final Insets insets = getInsets();
     final double wd = _boite.getDeltaX();
     final double hd = _boite.getDeltaY();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8610] trunk/soft/fudaa-crue

From: <de...@us...> - 2014-02-11 15:49:33

Revision: 8610
          http://sourceforge.net/p/fudaa/svn/8610
Author:   deniger
Date:     2014-02-11 15:49:31 +0000 (Tue, 11 Feb 2014)
Log Message:
-----------
edition axe avec 2-click

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-application/pom.xml
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryControllerBuilder.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheLayer.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCasierLayer.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryLigneBriseeLayer.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryNodeLayer.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetrySectionLayer.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryTraceLayer.java

Added Paths:
-----------
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/listener/SectionTraceSelectionSynchronizer.java

Modified: trunk/soft/fudaa-crue/ui-application/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-application/pom.xml	2014-02-11 15:48:26 UTC (rev 8609)
+++ trunk/soft/fudaa-crue/ui-application/pom.xml	2014-02-11 15:49:31 UTC (rev 8610)
@@ -103,7 +103,7 @@
         <artifactId>nbm-maven-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <finalName>Fudaa-Crue-${version}</finalName> 
+          <finalName>Fudaa-Crue-${project.version}</finalName> 
           <etcConfFile>src/main/resources/etc/fudaacrue.conf</etcConfFile> 
         </configuration>
       </plugin>
@@ -120,7 +120,7 @@
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>nbm-maven-plugin</artifactId>
             <configuration>
-              <finalName>Dev-Fudaa-Crue-${version}</finalName> 
+              <finalName>Dev-Fudaa-Crue-${project.version}</finalName> 
               <etcConfFile>src/main/resources/etc/fudaacrueDev.conf</etcConfFile> 
             </configuration>
           </plugin>

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java	2014-02-11 15:48:26 UTC (rev 8609)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java	2014-02-11 15:49:31 UTC (rev 8610)
@@ -149,6 +149,7 @@
     selectPrevious = (JMenuItem) sceneSelectPreviousAction.buildMenuItem(EbliComponentFactory.INSTANCE);
     FSigEditor.activeDeferredModificationAsDefault();
     getScene().setUseSelectedLayerFirstForSelection(false);
+    setAddNbSelectionInInfo(true);
   }
 
   public PlanimetryVisuPanelConfigurer getConfigurer() {

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryControllerBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryControllerBuilder.java	2014-02-11 15:48:26 UTC (rev 8609)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryControllerBuilder.java	2014-02-11 15:49:31 UTC (rev 8610)
@@ -7,6 +7,7 @@
 import org.fudaa.fudaa.crue.planimetry.layer.PlanimetryCLimMLayer;
 import org.fudaa.fudaa.crue.planimetry.layer.PlanimetrySectionLayer;
 import org.fudaa.fudaa.crue.planimetry.layer.PlanimetryTraceLayer;
+import org.fudaa.fudaa.crue.planimetry.listener.SectionTraceSelectionSynchronizer;
 
 /**
  *
@@ -47,6 +48,7 @@
     groupHydraulic.enPremier(nodeController.getLayer());
     groupHydraulic.enPremier(sectionController.getLayer());
     groupHydraulic.enPremier(condLimiteController.getLayer());
+    new SectionTraceSelectionSynchronizer(res.getScene(), traceController.getLayer(), sectionController.getLayer()).install();
 
   }
 }

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheLayer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheLayer.java	2014-02-11 15:48:26 UTC (rev 8609)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheLayer.java	2014-02-11 15:49:31 UTC (rev 8610)
@@ -107,6 +107,9 @@
 
   @Override
   protected boolean isPainted(int idx, GrMorphisme _versEcran) {
+    if (isSelected(idx)) {
+      return true;
+    }
     boolean res = super.isPainted(idx, _versEcran);
     if (!res) {
       return false;
@@ -165,7 +168,8 @@
           TraceIcon icon = super.layerConfiguration.getMiddleIcon(branche, modeleDonnees(), segment);
           icon.paintIconCentre(_g, pt.x_, pt.y_);
           if (layerConfiguration.getLabelConfiguration().isDisplayLabels()) {
-            labelPainter.paintLabels(_g, pt, layerConfiguration.getDisplayName(branche, modeleDonnees(), isSelected(i)), layerConfiguration.getLabelConfiguration(), alpha_);
+            labelPainter.paintLabels(_g, pt, layerConfiguration.getDisplayName(branche, modeleDonnees(), isSelected(i)), layerConfiguration.
+                    getLabelConfiguration(), alpha_);
           }
         }
       }

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCasierLayer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCasierLayer.java	2014-02-11 15:48:26 UTC (rev 8609)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCasierLayer.java	2014-02-11 15:49:31 UTC (rev 8610)
@@ -116,6 +116,9 @@
    * @return true si l'emh active/inactive peut être dessinée
    */
   protected boolean isActivityPainted(int idx) {
+    if (isSelected(idx)) {
+      return true;
+    }
     CatEMHCasier casier = getCasierController().getEMHFromPositionInModel(idx);
     PlanimetryControllerHelper helper = getCasierController().getHelper();
     if (!helper.isVisible(casier)) {
@@ -228,7 +231,6 @@
                   getLabelConfiguration(), alpha_);
         }
 
-
       }
     }
   }

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryLigneBriseeLayer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryLigneBriseeLayer.java	2014-02-11 15:48:26 UTC (rev 8609)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryLigneBriseeLayer.java	2014-02-11 15:49:31 UTC (rev 8610)
@@ -4,7 +4,10 @@
 import org.fudaa.ctulu.CtuluCommandContainer;
 import org.fudaa.ctulu.CtuluListSelection;
 import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ebli.calque.ZSceneSelection;
 import org.fudaa.ebli.calque.dessin.DeForme;
+import org.fudaa.ebli.commun.EbliListeSelectionMulti;
+import org.fudaa.ebli.commun.EbliSelectionState;
 import org.fudaa.ebli.geometrie.GrBoite;
 import org.fudaa.ebli.geometrie.GrMorphisme;
 import org.fudaa.ebli.geometrie.GrPoint;
@@ -87,6 +90,7 @@
         if (seg.distanceXY(_ptReel) < distanceReel) {
           GrPoint ptOnSeg = seg.pointPlusProcheXY(_ptReel);
           modeleDonnees().addPoint(i, j - 1, ptOnSeg.x_, ptOnSeg.y_, null, _cmd);
+          atomAdded(i, j - 1);
           return true;
         }
       }
@@ -95,7 +99,9 @@
         modele_.point(seg.o_, i, modele_.getNbPointForGeometry(i) - 1);
         if (seg.distanceXY(_ptReel) < distanceReel) {
           GrPoint ptOnSeg = seg.pointPlusProcheXY(_ptReel);
-          modeleDonnees().addPoint(i, modele_.getNbPointForGeometry(i) - 1, ptOnSeg.x_, ptOnSeg.y_, null, _cmd);
+          final int idxAdded = modele_.getNbPointForGeometry(i) - 1;
+          modeleDonnees().addPoint(i, idxAdded, ptOnSeg.x_, ptOnSeg.y_, null, _cmd);
+          atomAdded(i, idxAdded);
           return true;
         }
       }
@@ -104,6 +110,18 @@
   }
 
   @Override
+  protected void atomAdded(int geomIdx, int idxOneLine) {
+    FSigEditor editor = (FSigEditor) getEditor();
+    editor.getSceneEditor().getScene().setSelectionMode(SelectionMode.ATOMIC);
+    editor.getSceneEditor().getScene().clearSelection();
+    ZSceneSelection select = new ZSceneSelection(editor.getSceneEditor().getScene());
+    EbliListeSelectionMulti multi = new EbliListeSelectionMulti(1);
+    multi.add(geomIdx, idxOneLine + 1);
+    select.addLayerListSelectionMulti(this, multi);
+    editor.getSceneEditor().getScene().changeSelection(select, EbliSelectionState.ACTION_REPLACE);
+  }
+
+  @Override
   protected void initTrace(TraceIconModel _icon, int _idxPoly) {
     if (!isSelected(_idxPoly) && getSelectionMode() != SelectionMode.ATOMIC) {
       _icon.setType(TraceIcon.RIEN);

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryNodeLayer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryNodeLayer.java	2014-02-11 15:48:26 UTC (rev 8609)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryNodeLayer.java	2014-02-11 15:49:31 UTC (rev 8610)
@@ -25,46 +25,46 @@
  */
 public class PlanimetryNodeLayer extends PlanimetryPointLayer<NodeConfiguration>
         implements LayerWithCascadeDeleteAction, PlanimetryLayerWithEMHContrat, CalqueWithDynamicActions {
-  
+
   public PlanimetryNodeLayer(PlanimetryNodeLayerModel _modele, FSigEditor _editor) {
     super(_modele, _editor);
   }
-  
+
   LayerNodeController getNoeudController() {
     return (LayerNodeController) (((PlanimetryPointLayerModel) modeleDonnees()).getLayerController());
   }
-  
+
   @Override
   public PlanimetryNodeLayerModel modeleDonnees() {
     return (PlanimetryNodeLayerModel) super.modeleDonnees();
   }
-  
+
   @Override
   public EbliFindActionInterface getFinder() {
     return new PlanimetryFindEMHLayerAction(this);
   }
-  
+
   @Override
   public String editSelected() {
     getActions()[0].actionPerformed(null);
     return null;
   }
-  
+
   @Override
   public LayerControllerEMH getLayerControllerEMH() {
     return (LayerControllerEMH) getLayerController();
   }
-  
+
   @Override
   public boolean isMovable() {
     return false;
   }
-  
+
   @Override
   public boolean isTitleModifiable() {
     return false;
   }
-  
+
   @Override
   public void fillPopup(BuPopupMenu popup) {
     if (isEditable() && isOnlyOneObjectSelected()) {
@@ -74,13 +74,13 @@
       dclmController.fillPopupMenu(emh, popup);
     }
   }
-  
+
   @Override
   public GrBoite getDomaine() {
     GrBoite boite = super.getDomaine();
     return boite;
   }
-  
+
   @Override
   public void removeCascadeSelectedObjects() {
     if (!isSelectionEmpty()) {
@@ -90,9 +90,12 @@
       }
     }
   }
-  
+
   @Override
   protected boolean isPainted(int idx) {
+    if (getLayerSelection().isSelected(idx)) {
+      return true;
+    }
     CatEMHNoeud noeud = getNoeudController().getEMHFromPositionInModel(idx);
     PlanimetryControllerHelper helper = getNoeudController().getHelper();
     if (!helper.isVisible(noeud)) {
@@ -104,13 +107,13 @@
     }
     return res;
   }
-  
+
   @Override
   public boolean canAddForme(int _typeForme) {
     return isEditable() && _typeForme == DeForme.POINT;
   }
   LabelPainter painter = new LabelPainter();
-  
+
   @Override
   protected void paintLabels(final Graphics2D g2d, int idx, GrPoint pEcran) {
     LabelConfiguration labelConfiguration = layerConfiguration.getLabelConfiguration();
@@ -118,7 +121,8 @@
       return;
     }
     CatEMHNoeud noeud = getNoeudController().getNoeud(idx);
-    String nom = layerConfiguration.getDisplayedLabel(noeud, (PlanimetryNodeLayerModel) modeleDonnees(), selection_ != null && selection_.isSelected(idx));
+    String nom = layerConfiguration.getDisplayedLabel(noeud, (PlanimetryNodeLayerModel) modeleDonnees(), selection_ != null && selection_.isSelected(
+            idx));
     painter.paintLabels(g2d, pEcran, nom, labelConfiguration, alpha_);
   }
 }

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetrySectionLayer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetrySectionLayer.java	2014-02-11 15:48:26 UTC (rev 8609)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetrySectionLayer.java	2014-02-11 15:49:31 UTC (rev 8610)
@@ -26,7 +26,8 @@
  *
  * @author deniger ( genesis)
  */
-public class PlanimetrySectionLayer extends PlanimetryPointLayer<SectionConfiguration> implements LayerWithCascadeDeleteAction, PlanimetryLayerWithEMHContrat {
+public class PlanimetrySectionLayer extends PlanimetryPointLayer<SectionConfiguration> implements LayerWithCascadeDeleteAction,
+        PlanimetryLayerWithEMHContrat {
 
   public PlanimetrySectionLayer(PlanimetrySectionLayerModel _modele, FSigEditor _editor) {
     super(_modele, _editor);
@@ -94,6 +95,9 @@
 
   @Override
   protected boolean isPainted(int idx) {
+    if (getLayerSelection().isSelected(idx)) {
+      return true;
+    }
     boolean res = super.isPainted(idx);
     CatEMHSection section = getController().getEMHFromPositionInModel(idx);
     PlanimetryControllerHelper helper = getLayerController().getHelper();
@@ -123,7 +127,8 @@
         continue;
       }
       RelationEMHSectionDansBranche sectionDansBranche = getController().getRelationEMHSectionDansBranche(i);
-      final String nom = getLayerConfiguration().getDisplayName(sectionDansBranche.getEmh(), modeleDonnees(), selection_ != null && selection_.isSelected(i));
+      final String nom = getLayerConfiguration().getDisplayName(sectionDansBranche.getEmh(), modeleDonnees(), selection_ != null && selection_.
+              isSelected(i));
       if (!uidDone.contains(sectionDansBranche.getEmh().getUiId())) {
         modele_.point(pt, i, true);
         if (!_clipReel.contientXY(pt)) {

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryTraceLayer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryTraceLayer.java	2014-02-11 15:48:26 UTC (rev 8609)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryTraceLayer.java	2014-02-11 15:49:31 UTC (rev 8610)
@@ -83,6 +83,9 @@
   @Override
   protected boolean isPainted(int idx, GrMorphisme _versEcran) {
     boolean res = super.isPainted(idx, _versEcran);
+    if (isSelected(idx)) {
+      return true;
+    }
     if (!res) {
       return false;
     }

Added: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/listener/SectionTraceSelectionSynchronizer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/listener/SectionTraceSelectionSynchronizer.java	                        (rev 0)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/listener/SectionTraceSelectionSynchronizer.java	2014-02-11 15:49:31 UTC (rev 8610)
@@ -0,0 +1,66 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.crue.planimetry.listener;
+
+import java.util.HashSet;
+import java.util.Set;
+import org.fudaa.ctulu.CtuluListSelection;
+import org.fudaa.ebli.calque.ZScene;
+import org.fudaa.ebli.calque.ZSelectionEvent;
+import org.fudaa.ebli.calque.ZSelectionListener;
+import org.fudaa.ebli.commun.EbliSelectionState;
+import org.fudaa.fudaa.crue.planimetry.layer.PlanimetryLayerWithEMHContrat;
+import org.fudaa.fudaa.crue.planimetry.layer.PlanimetrySectionLayer;
+import org.fudaa.fudaa.crue.planimetry.layer.PlanimetryTraceLayer;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class SectionTraceSelectionSynchronizer implements ZSelectionListener {
+
+  private final PlanimetryTraceLayer trace;
+  private final PlanimetrySectionLayer section;
+  private final ZScene scene;
+  private boolean updating;
+
+  public SectionTraceSelectionSynchronizer(ZScene scene, PlanimetryTraceLayer trace, PlanimetrySectionLayer section) {
+    this.trace = trace;
+    this.section = section;
+    this.scene = scene;
+  }
+
+  public void install() {
+    trace.addSelectionListener(this);
+    section.addSelectionListener(this);
+  }
+
+  @Override
+  public void selectionChanged(ZSelectionEvent _evt) {
+    if (updating) {
+      return;
+    }
+    updating = true;
+    PlanimetryLayerWithEMHContrat source = (PlanimetryLayerWithEMHContrat) _evt.getSource();
+    Set<Long> uidSelected = new HashSet<>();
+    if (source == section) {
+      section.getLayerController().getSelectedEMHs(uidSelected);
+    } else {
+      trace.getLayerController().getSelectedEMHs(uidSelected);
+    }
+    if (scene.isRestrictedToCalqueActif()) {
+      scene.setCalqueActif(trace);
+      trace.getLayerController().setSelectedEMHUids(uidSelected);
+    } else {
+      if (source == section) {
+        trace.getLayerController().setSelectedEMHUids(uidSelected);
+      } else {
+        section.getLayerController().setSelectedEMHUids(uidSelected);
+      }
+    }
+    scene.fireSelectionEvent();
+    updating = false;
+  }
+
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8609] trunk/framework

From: <de...@us...> - 2014-02-11 15:48:29

Revision: 8609
          http://sourceforge.net/p/fudaa/svn/8609
Author:   deniger
Date:     2014-02-11 15:48:26 +0000 (Tue, 11 Feb 2014)
Log Message:
-----------
edition axe avec 2-click

Modified Paths:
--------------
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGActionAxeRepereConfigure.java
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontal.java
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeRepereConfigurator.java
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVertical.java
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGFillePanel.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BVueCalque.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZEbliCalquesPanel.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalqueLigneBriseeEditable.java

Added Paths:
-----------
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGInteractionEditAxe.java

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGActionAxeRepereConfigure.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGActionAxeRepereConfigure.java	2014-02-11 14:28:04 UTC (rev 8608)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGActionAxeRepereConfigure.java	2014-02-11 15:48:26 UTC (rev 8609)
@@ -7,6 +7,7 @@
  */
 package org.fudaa.ebli.courbe;
 
+import java.util.Set;
 import javax.swing.JComponent;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.TreeSelectionEvent;
@@ -20,26 +21,30 @@
  */
 @SuppressWarnings("serial")
 public class EGActionAxeRepereConfigure extends EbliActionPaletteAbstract implements
-    EGSelectionListener, EGGrapheModelListener {
-  
-  
-  
-  
+        EGSelectionListener, EGGrapheModelListener {
 
   @Override
-  public void axeAspectChanged(final EGAxe _c){}
+  public void axeAspectChanged(final EGAxe _c) {
+  }
+
   @Override
-  public void axeContentChanged(final EGAxe _c){
+  public void axeContentChanged(final EGAxe _c) {
     if (axeEditor_ != null && isSelected()) {
       axeEditor_.updateAxesValue();
-    }  
+    }
   }
+
   @Override
-  public void courbeAspectChanged(final EGObject _c, final boolean _visibil){}
+  public void courbeAspectChanged(final EGObject _c, final boolean _visibil) {
+  }
+
   @Override
-  public void courbeContentChanged(final EGObject _c, final boolean _mustRestore){}
+  public void courbeContentChanged(final EGObject _c, final boolean _mustRestore) {
+  }
+
   @Override
-  public void structureChanged(){}
+  public void structureChanged() {
+  }
 
   EGGraphe model_;
   EGAxeRepereConfigurator axeEditor_;
@@ -49,15 +54,23 @@
    */
   public EGActionAxeRepereConfigure(final EGGraphe _g) {
     super(EbliLib.getS("Rep\xE8re"), EbliResource.EBLI.getToolIcon("edit-axes"),
-        "CONFIGURE_REPERE");
+            "CONFIGURE_REPERE");
     model_ = _g;
     model_.getModel().addSelectionListener(this);
     model_.getModel().addModelListener(this);
     setResizable(true);
   }
 
+  public EGGraphe getGraphe() {
+    return model_;
+  }
+
+  public EGAxeRepereConfigurator getAxeEditor() {
+    return axeEditor_;
+  }
+
   @Override
-  public JComponent buildContentPane(){
+  public JComponent buildContentPane() {
     if (axeEditor_ != null) {
       return axeEditor_;
     }
@@ -67,23 +80,36 @@
   }
 
   @Override
-  public void updateBeforeShow(){
-    updateTarget();
+  public void updateBeforeShow() {
+    if (!ignoreTarget) {
+      updateTarget();
+    }
   }
 
-  private void updateTarget(){
+  boolean ignoreTarget;
+
+  protected void showOnTargetAxis(final Set s) {
+    buildContentPane();
+    axeEditor_.setTargetsAxis(s);
+    ignoreTarget = true;
+    actionPerformed(null);
+    ignoreTarget = false;
+
+  }
+
+  private void updateTarget() {
     if (axeEditor_ != null && isSelected()) {
       axeEditor_.setTargets(model_.getModel().getSelectedObjects());
     }
   }
 
   @Override
-  public void valueChanged(final ListSelectionEvent _e){
+  public void valueChanged(final ListSelectionEvent _e) {
     updateTarget();
   }
 
   @Override
-  public void valueChanged(final TreeSelectionEvent _e){
+  public void valueChanged(final TreeSelectionEvent _e) {
     updateTarget();
   }
-}
\ No newline at end of file
+}

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java	2014-02-11 14:28:04 UTC (rev 8608)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java	2014-02-11 15:48:26 UTC (rev 8609)
@@ -10,6 +10,7 @@
 import com.memoire.fu.FuLog;
 import java.awt.Color;
 import java.awt.Font;
+import org.apache.commons.lang.math.IntRange;
 import org.fudaa.ctulu.CtuluLib;
 import org.fudaa.ctulu.CtuluLibString;
 import org.fudaa.ctulu.CtuluNumberFormatI;
@@ -47,6 +48,37 @@
   TickIterator axisIterator_;
   Font font_;
   boolean graduations_;
+
+  private CtuluRange xScreen;
+  private CtuluRange yScreen;
+
+  protected void clearXYScreen() {
+    xScreen = null;
+    yScreen = null;
+  }
+
+  protected void addScreenXY(double x, double y) {
+    addScreenXY((int) x, (int) y);
+
+  }
+
+  protected void addScreenXY(int x, int y) {
+    if (xScreen == null) {
+      xScreen = new CtuluRange();
+    }
+    xScreen.expandTo(x);
+    if (yScreen == null) {
+      yScreen = new CtuluRange();
+    }
+    yScreen.expandTo(y);
+  }
+
+  public boolean isInScreenBounds(int x, int y) {
+    if (xScreen != null && yScreen != null) {
+      return xScreen.isValueContained(x) && yScreen.isValueContained(y);
+    }
+    return false;
+  }
   /**
    * Booleen qui indique si l'on trace ou non la graduation
    */
@@ -225,7 +257,6 @@
       ((NumberIterator) axisIterator_).setMaxFractionDigits(2);
     }
 
-
     if (modeGraduations_ == MANUEL_GRADUATIONS) {
       axisIterator_.initExact(getMinimum(), getMaximum(), nbPas_, nbSousGraduations_ + 1);
     } else if (modeGraduations_ == MANUEL_LONGUEURPAS) {
@@ -852,4 +883,4 @@
     }
     return false;
   }
-}
\ No newline at end of file
+}

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontal.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontal.java	2014-02-11 14:28:04 UTC (rev 8608)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontal.java	2014-02-11 15:48:26 UTC (rev 8609)
@@ -109,16 +109,23 @@
               traceGraduations.dessineTrait(_g, xe, y, xe, yMaxGrad);
             }
             _g.drawLine(xe, y, xe, yBasMajor);
+            addScreenXY(xe, y);
+            addScreenXY(xe, yBasMajor);
             _g.drawString(t, (int) xLeft, (int) (y + ftHaut));
+            addScreenXY(xLeft, y + ftHaut);
             lastMaxX = xLeft + wordWidth;
           } else {
             _g.drawLine(xe, y, xe, yBas);
+            addScreenXY(xe, y);
+            addScreenXY(xe, yBas);
             if (traceGrille_) {
               traceGraduations.dessineTrait(_g, xe, y, xe, yMaxGrad);
             }
           }
         } else {
           _g.drawLine(xe, y, xe, yBas);
+          addScreenXY(xe, y);
+          addScreenXY(xe, yBas);
           if (traceSousGrille_) {
             traceSousGraduations.dessineTrait(_g, xe, y, xe, yMaxGrad);
           } else {
@@ -173,6 +180,7 @@
    * @param _f le repere
    */
   public void dessine(final Graphics2D _g, final EGRepere _f) {
+    clearXYScreen();
     if (!visible_) {
       return;
     }
@@ -192,9 +200,13 @@
       xf = _f.getMaxEcranX();
     }
     _g.drawLine(xi, y, xf, y);
+    addScreenXY(xi, y);
+    addScreenXY(xf, y);
     if (isExtremiteDessinee_) {
       _g.drawLine(xf, y, xf - 3, y - 2);
       _g.drawLine(xf, y, xf - 3, y + 2);
+      addScreenXY(xf - 3, y - 2);
+      addScreenXY(xf - 3, y + 2);
     }
     _g.setFont(old);
     if (FuLog.isDebug() && Fu.DEBUG) {
@@ -228,6 +240,8 @@
         }
         final int xtext = _xi + (_f.getMaxEcranX() - _xi) / 2 - fm.stringWidth(txt) / 2;
         _g.drawString(txt, xtext, _y + getBottomHeightNeeded(_g) - fm.getHeight() - 1);
+//        addScreenXY(xtext, _y + getBottomHeightNeeded(_g) - fm.getHeight() - 1);
+//        addScreenXY(xtext + fm.stringWidth(t), _y + getBottomHeightNeeded(_g));
       } else {
         if (t != null) {
           width = fm.stringWidth(t);
@@ -370,4 +384,4 @@
     duplic.nbSousGraduations_ = nbSousGraduations_;
     return duplic;
   }
-}
\ No newline at end of file
+}

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeRepereConfigurator.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeRepereConfigurator.java	2014-02-11 14:28:04 UTC (rev 8608)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeRepereConfigurator.java	2014-02-11 15:48:26 UTC (rev 8609)
@@ -664,7 +664,6 @@
     pnAxeX.add(tfHorSousPas_);
 
     // -- graduations --//
-
     modelGraduationsX_ = new BSelecteurLineModel(GRILLE_AXE_X, axeX_.traceGraduations_);
     pnAxeX.add(boxAfficheGraduationsX_);
 
@@ -1112,6 +1111,12 @@
         }
       }
     }
+    setTargetsAxis(s);
+  }
+
+  
+
+  protected void setTargetsAxis(final Set s) {
     if (s.size() > 0) {
       axes_ = new EGAxeVertical[s.size()];
       s.toArray(axes_);
@@ -1139,7 +1144,6 @@
     revalidate();
     // }
     pnAxeY_.setToolTipText(EbliLib.getS("Nombre d'axes: {0}", CtuluLibString.getString(nb)));
-
   }
 
   void updateAxesValue() {
@@ -1222,4 +1226,4 @@
 
     }
   }
-}
\ No newline at end of file
+}

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVertical.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVertical.java	2014-02-11 14:28:04 UTC (rev 8608)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVertical.java	2014-02-11 15:48:26 UTC (rev 8609)
@@ -113,6 +113,8 @@
               traceGraduations.dessineTrait(_g2d, (int) xLeft, ye, xMaxGrad, ye);
             }
             _g2d.drawLine((int) xLeft, ye, _x, ye);
+            addScreenXY(xLeft, ye);
+            addScreenXY(_x, ye);
             if (specificFormat_ == null) {
               t = it.currentLabel();
             } else {
@@ -132,6 +134,8 @@
               }
 
               _g2d.drawString(t, tmp, (int) (ye + asc));
+              addScreenXY(tmp, (int) (ye + asc));
+              addScreenXY(tmp + _fm.stringWidth(t), (int) (ye + asc));
               maxLastIteration = ye - fontHeight;
             }
           } else {
@@ -139,6 +143,8 @@
               traceSousGraduations.dessineTrait(_g2d, (int) xLeftMinor, ye, xMaxGrad, ye);
             }
             _g2d.drawLine((int) xLeftMinor, ye, _x, ye);
+            addScreenXY(xLeftMinor, ye);
+            addScreenXY(_x, ye);
           }
 
         }
@@ -165,6 +171,7 @@
     if (FuLog.isDebug() && Fu.DEBUG) {
       FuLog.debug(getClass().getName() + " axe vertical begin ...");
     }
+    clearXYScreen();
     if (!visible_) {
       return;
     }
@@ -192,9 +199,13 @@
     _g2d.setColor(lineColor_);
 
     _g2d.drawLine(x, y, x, yf);
+    addScreenXY(x, y);
+    addScreenXY(x, yf);
     if (isExtremiteDessinee_) {
       _g2d.drawLine(x, yf, x - 2, yf + 2);
       _g2d.drawLine(x, yf, x + 2, yf + 2);
+      addScreenXY(x - 2, yf + 2);
+      addScreenXY(x + 2, yf + 2);
     }
     if (t != null) {
       if (titreVertical_) {
@@ -221,6 +232,8 @@
         _g2d.setTransform(save);
       } else {
         _g2d.drawString(t, x + 1 - fm.stringWidth(t) / 2, yf - fm.getAscent());
+        addScreenXY(x + 1 - fm.stringWidth(t) / 2, yf - fm.getHeight() - fm.getAscent());
+        addScreenXY(x + 1 + fm.stringWidth(t) / 2, yf);
       }
       _g2d.setFont(old);
     }
@@ -369,4 +382,4 @@
     duplic.nbSousGraduations_ = nbSousGraduations_;
     return duplic;
   }
-}
\ No newline at end of file
+}

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGFillePanel.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGFillePanel.java	2014-02-11 14:28:04 UTC (rev 8608)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGFillePanel.java	2014-02-11 15:48:26 UTC (rev 8609)
@@ -114,7 +114,6 @@
     setDoubleBuffered(false);
 
     // suiviInfos_ = new EGInteractionSuiviAllOrdonnees(vue_.getGraphe());
-
   }
 
   protected void addListenerCourbePoint(final CtuluListSelectionListener _l) {
@@ -137,28 +136,30 @@
 
     EbliActionAbstract s = new EbliActionSimple(EbliResource.EBLI.getString("Restaurer"), EbliResource.EBLI
             .getIcon("restore"), "RESTORE") {
-      @Override
-      public void actionPerformed(ActionEvent _e) {
-        vue_.getGraphe().restore();
-      }
-    };
+              @Override
+              public void actionPerformed(ActionEvent _e) {
+                vue_.getGraphe().restore();
+              }
+            };
     s.putValue(Action.SHORT_DESCRIPTION, EbliResource.EBLI.getString("Restaurer la vue globale"));
     s.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('r'));
     s.putValue(EbliActionInterface.SECOND_KEYSTROKE, KeyStroke.getKeyStroke(KeyEvent.VK_F5, 0));
     r.add(s);
     s = new EbliActionChangeState(EbliLib.getS("Restaurer automatiquement"), EbliResource.EBLI.getIcon("restoreauto"),
             "AUTO_REST") {
-      @Override
-      public void changeAction() {
-        getGraphe().setAutoRestore(isSelected());
-      }
-    };
+              @Override
+              public void changeAction() {
+                getGraphe().setAutoRestore(isSelected());
+              }
+            };
     // EM:Si la fonctionnalit\xE9 'Restaurer automatiquement' est d\xE9j\xE0 activ\xE9e, selectionner l'action.
     ((EbliActionChangeState) s).setSelected(getGraphe().isAutoRestore());
     //
     s.putValue(Action.SHORT_DESCRIPTION, EbliLib.getS("Restaurer automatiquement la vue"));
     r.add(s);
-    r.add(new EGActionAxeRepereConfigure(getGraphe()));
+    final EGActionAxeRepereConfigure actionAxeRepereConfigure = new EGActionAxeRepereConfigure(getGraphe());
+    r.add(actionAxeRepereConfigure);
+    new EGInteractionEditAxe(actionAxeRepereConfigure);
     final EGInteractionZoom zoom = new EGInteractionZoom(vue_.graphe_);
     // addKeyListener(zoom);
     vue_.graphe_.addKeyListener(zoom);
@@ -264,12 +265,12 @@
       r.add(null);
       final EbliActionSimple addAction = new EbliActionSimple(EbliLib.getS("Ajouter une courbe"), BuResource.BU
               .getToolIcon("creer"), "NEW_CURVE") {
-        @Override
-        public void actionPerformed(ActionEvent _e) {
-          getModel().addNewCourbe(vue_.graphe_.getCmd(), EGFillePanel.this, EGFillePanel.this.getGraphe());
-          vue_.graphe_.restore();
-        }
-      };
+                @Override
+                public void actionPerformed(ActionEvent _e) {
+                  getModel().addNewCourbe(vue_.graphe_.getCmd(), EGFillePanel.this, EGFillePanel.this.getGraphe());
+                  vue_.graphe_.restore();
+                }
+              };
       getModel().decoreAddButton(addAction);
       addAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_M, InputEvent.CTRL_DOWN_MASK
               | InputEvent.SHIFT_DOWN_MASK));
@@ -279,6 +280,7 @@
     final EbliActionInterface[] rf = new EbliActionInterface[r.size()];
     r.toArray(rf);
     EbliLib.updateMapKeyStroke(this, rf);
+    
 
     return rf;
   }

Added: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGInteractionEditAxe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGInteractionEditAxe.java	                        (rev 0)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGInteractionEditAxe.java	2014-02-11 15:48:26 UTC (rev 8609)
@@ -0,0 +1,79 @@
+/*
+ GPL 2
+ */
+package org.fudaa.ebli.courbe;
+
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.util.Collections;
+import java.util.HashSet;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class EGInteractionEditAxe extends EGInteractiveComponent implements MouseListener {
+
+  private EGActionAxeRepereConfigure configureAction;
+  private EGGraphe target;
+
+  public EGInteractionEditAxe(final EGActionAxeRepereConfigure _a) {
+    configureAction = _a;
+    this.target = configureAction.getGraphe();
+    this.target.addMouseListener(this);
+  }
+
+  @Override
+  public String getDescription() {
+    return "";
+  }
+
+  @Override
+  public void mouseClicked(MouseEvent e) {
+    if (!configureAction.isEnabled()) {
+      return;
+    }
+    if (e.getClickCount() >= 2) {
+      final EGAxeHorizontal axeX = target.getModel().getAxeX();
+      if (axeX.isInScreenBounds(e.getX(), e.getY())) {
+        displayAxeH();
+        return;
+      }
+      for (EGAxeVertical axeV : target.getAllAxeVertical()) {
+        if (axeV.isInScreenBounds(e.getX(), e.getY())) {
+          displayAxeV(axeV);
+          return;
+        }
+      }
+
+    }
+  }
+
+  protected void displayAxeH() {
+    configureAction.buildContentPane();
+    configureAction.actionPerformed(null);
+  }
+
+  protected void displayAxeV(EGAxeVertical v) {
+    configureAction.buildContentPane();
+    configureAction.showOnTargetAxis(new HashSet(Collections.singleton(v)));
+
+  }
+
+  @Override
+  public void mousePressed(MouseEvent e) {
+  }
+
+  @Override
+  public void mouseReleased(MouseEvent e) {
+  }
+
+  @Override
+  public void mouseEntered(MouseEvent e) {
+  }
+
+  @Override
+  public void mouseExited(MouseEvent e) {
+  }
+
+}

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BVueCalque.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BVueCalque.java	2014-02-11 14:28:04 UTC (rev 8608)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BVueCalque.java	2014-02-11 15:48:26 UTC (rev 8609)
@@ -71,6 +71,7 @@
   GrVecteur vect_ = new GrVecteur();
   private double margeXCentre;
   private double margeYCentre;
+  private boolean doCheckBoiteBeforeChangeRepere = true;
 
   public BVueCalque(final BCalque _c) {
     repere_ = new double[4][3];
@@ -286,14 +287,16 @@
     changeRepere(_source, _boite, _rz, _mrg, _mrg, _rapide, changeZ);
   }
 
+
   public void changeRepere(final Object _source, final GrBoite _boite, final double _rz, final int mrgHorizontal, final int mrgVertical,
           final boolean _rapide, final boolean _changeZ) {
     if (_boite == null) {
       return;
     }
-    if (!checkBoite(_boite, true, true)) {
+    if (doCheckBoiteBeforeChangeRepere && !checkBoite(_boite, true, true)) {
       return;
     }
+    doCheckBoiteBeforeChangeRepere = true
     final Insets insets = getInsets();
     final double wd = _boite.getDeltaX();
     final double hd = _boite.getDeltaY();
@@ -421,9 +424,7 @@
   }
 
   /**
-   * Renvoie le morphisme versEcran de la propriete
-   * <code>calque</code>. equivaut a
-   * <code>getCalque().getVersEcran();</code>.
+   * Renvoie le morphisme versEcran de la propriete <code>calque</code>. equivaut a <code>getCalque().getVersEcran();</code>.
    */
   @Override
   public GrMorphisme getVersEcran() {
@@ -440,6 +441,12 @@
    */
   @Override
   public GrBoite getViewBoite() {
+    GrBoite b = getGraphicBoite();
+    b.autoApplique(getCalque().getVersReel());
+    return b;
+  }
+
+  protected GrBoite getGraphicBoite() {
     double minX = 0;
     double minY = 0;
     double maxX = getWidth();
@@ -451,7 +458,6 @@
       maxY = maxY - insets_.bottom;
     }
     final GrBoite b = new GrBoite(new GrPoint(minX, minY, 0), new GrPoint(maxX, maxY, 0));
-    b.autoApplique(getCalque().getVersReel());
     return b;
   }
 
@@ -777,31 +783,52 @@
 
   @Override
   public void zoomOnMouse(final MouseEvent _evt, final boolean _isOut) {
+    final GrBoite graphicBoite = getGraphicBoite();
+    double coef;
+    if (_isOut) {
+      coef = 1 / getZoomCoef();
+    } else {
+      coef = getZoomCoef();
+    }
     final GrPoint p = new GrPoint(_evt.getPoint());
     p.autoApplique(getVersReel());
-    zoomOnRealPoint(p.x_, p.y_, _isOut);
+    GrBoite bReel = getBoiteZoomedOnRealPoint(_isOut, p.x_, p.y_);
+    double dx = _evt.getX() - graphicBoite.getMidX();
+    double dy = _evt.getY() - graphicBoite.getMidY();
+    dx = GrMorphisme.convertDistanceXY(getVersReel(), dx) * coef;
+    dy = GrMorphisme.convertDistanceXY(getVersReel(), dy) * coef;
+    bReel.e_.x_ += dx;
+    bReel.o_.x_ += dx;
+    bReel.e_.y_ += dy;
+    bReel.o_.y_ += dy;
+//    doCheckBoiteBeforeChangeRepere = false;
+    setViewBoite(bReel);
   }
 
   @Override
   public void zoomOnRealPoint(final double _x, final double _y, final boolean _out) {
+    GrBoite bReel = getBoiteZoomedOnRealPoint(_out, _x, _y);
+    setViewBoite(bReel);
+  }
+
+  protected GrBoite getBoiteZoomedOnRealPoint(final boolean _out, final double _x, final double _y) {
     double coef;
     if (_out) {
       coef = 1 / getZoomCoef();
     } else {
       coef = getZoomCoef();
     }
-    coef = coef / 2;
+//    coef = coef / 2;
     final GrBoite bReel = getViewBoite();
-    final double w = bReel.getDeltaX();
-    final double h = bReel.getDeltaY();
+    final double w = bReel.getDeltaX() / 2;
+    final double h = bReel.getDeltaY() / 2;
     final double wDelta = w * coef;
     final double hDelta = h * coef;
     bReel.o_.x_ = _x - wDelta;
-
     bReel.o_.y_ = _y - hDelta;
     bReel.e_.x_ = _x + wDelta;
     bReel.e_.y_ = _y + hDelta;
-    setViewBoite(bReel);
+    return bReel;
   }
 
   @Override

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZEbliCalquesPanel.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZEbliCalquesPanel.java	2014-02-11 14:28:04 UTC (rev 8608)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZEbliCalquesPanel.java	2014-02-11 15:48:26 UTC (rev 8609)
@@ -89,19 +89,19 @@
 import org.fudaa.ebli.ressource.EbliResource;
 
 /**
- * Fenetre d'affichage de calques contenant des services de base. (position souris, zoom fenetre, selection,
- * transformations spatiales). Il est possible d'ajouter des boutons grace aux methodes <code>addButtonGroup</code>. Par
- * defaut, 3 groupes de boutons sont proposes : selection, standard et navigation. Ils peuvent etre supprimes ou
- * modifies avec les methodes remove
- * 
+ * Fenetre d'affichage de calques contenant des services de base. (position souris, zoom fenetre, selection, transformations spatiales). Il est
+ * possible d'ajouter des boutons grace aux methodes <code>addButtonGroup</code>. Par defaut, 3 groupes de boutons sont proposes : selection, standard
+ * et navigation. Ils peuvent etre supprimes ou modifies avec les methodes remove
+ *
  * @version $Id$
  * @author Guillaume Desnoix , Axel von Arnim, Fred deniger
  */
 public class ZEbliCalquesPanel extends BuPanel implements EbliFilleCalquesInterface, BCalqueContextuelListener,
-    CtuluImageProducer, BCalqueSaverTargetInterface, EbliFindable, ActionListener, ZSelectionListener,
-    CtuluSelectionInterface {
+        CtuluImageProducer, BCalqueSaverTargetInterface, EbliFindable, ActionListener, ZSelectionListener,
+        CtuluSelectionInterface {
 
   protected ZEditorDefault gisEditor_;
+  private boolean addNbSelectionInInfo = false;
 
   protected class AnimAdapter extends EbliAnimationSourceAbstract {
 
@@ -180,7 +180,7 @@
 
   /**
    * Le menu des th\xE8mes.
-   * 
+   *
    * @author Fred Deniger
    * @version $Id$
    */
@@ -211,7 +211,9 @@
     }
 
     protected BuMenu createMenu(final BCalque _cq) {
-      if (_cq == null) { return null; }
+      if (_cq == null) {
+        return null;
+      }
       BuMenu m = null;
       if (_cq.isGroupeCalque()) {
         m = new ThemeMenu(_cq, _cq.getTitle(), _cq.getName());
@@ -228,7 +230,7 @@
 
     /**
      * Remplit un menu avec les actions associees aux calques.
-     * 
+     *
      * @param _projectMenu le menu a remplir
      */
     public void fillWithAllLayersAction(final JMenu _projectMenu) {
@@ -245,13 +247,16 @@
     }
 
     @Override
-    public void treeNodesChanged(final TreeModelEvent _e) {}
+    public void treeNodesChanged(final TreeModelEvent _e) {
+    }
 
     @Override
-    public void treeNodesInserted(final TreeModelEvent _e) {}
+    public void treeNodesInserted(final TreeModelEvent _e) {
+    }
 
     @Override
-    public void treeNodesRemoved(final TreeModelEvent _e) {}
+    public void treeNodesRemoved(final TreeModelEvent _e) {
+    }
 
     @Override
     public void treeStructureChanged(final TreeModelEvent _e) {
@@ -262,7 +267,7 @@
 
   /**
    * Rempli le menu avec les actions du calque en question.
-   * 
+   *
    * @param _m le menu a remplir
    * @param _c le calque dont les actions seront ajoutees au menu
    */
@@ -274,7 +279,7 @@
 
   /**
    * Rempli le menu popup avec les actions du calque en question.
-   * 
+   *
    * @param _m le menu a remplir
    * @param _c le calque dont les actions seront ajoutees au menu
    */
@@ -286,7 +291,7 @@
 
   /**
    * Rempli le menu avec les actions de la scene
-   * 
+   *
    * @param _m le menu a remplir
    */
   protected void fillMenuWithSceneActions(final JMenu _m) {
@@ -297,7 +302,7 @@
 
   /**
    * Rempli le menu popup avec les actions de la scene
-   * 
+   *
    * @param _m le menu a remplir
    */
   protected void fillMenuWithSceneActions(final JPopupMenu _m) {
@@ -365,14 +370,14 @@
 
   /**
    * Constructeur minimal. Les groupes de navigation et standard seront construits.
-   * 
+   *
    * @param _gcInit le calque de base
    */
   public ZEbliCalquesPanel(final BCalque _gcInit, final ZEbliCalquePanelController _controller) {
     this(_gcInit, _controller, true);
   }
-  
-   /**
+
+  /**
    * Attention a n'utiliser que si les composants est d\xE9truit et plus utilise.
    */
   public void clearListeners() {
@@ -382,7 +387,7 @@
 
   /**
    * Construction des calques par defaut.
-   * 
+   *
    * @param _gcInit le calque de base
    * @param _controller
    * @param _addSouth Ajout ou non des services d'info en bas de fenetre (position, mode, etc.).
@@ -465,7 +470,9 @@
     }
 
     modelArbre_.refresh();
-    if (_controller == null) { throw new IllegalArgumentException(); }
+    if (_controller == null) {
+      throw new IllegalArgumentException();
+    }
     controller_ = _controller;
     controller_.setView(this);
 
@@ -475,8 +482,9 @@
     modelArbre_.addTreeModelListener(scene_);
 
     gisEditor_ = createGisEditor();
-    if (gisEditor_!=null)
+    if (gisEditor_ != null) {
       gisEditor_.setUi(controller_.getUI());
+    }
     controller_.getCqSelectionI().setEditor(gisEditor_);
     controller_.getCqCatchI().setScene(scene_);
   }
@@ -492,16 +500,63 @@
     return gisEditor_;
   }
 
+  public void setAddNbSelectionInInfo(boolean addNbSelectionInInfo) {
+    if (this.addNbSelectionInInfo == addNbSelectionInInfo) {
+      return;
+    }
+    this.addNbSelectionInInfo = addNbSelectionInInfo;
+    infoTextSelectionUpdated();
+  }
+
   public void setInfoText(final String _s) {
     if (CtuluLibString.isEmpty(_s)) {
       unsetInfoText();
     } else {
-      info_.setText('|' + _s);
+      infoTextUpdated("|" + _s);
     }
   }
 
+  protected void infoTextUpdated(String _s) {
+    info_.putClientProperty("infoText", _s);
+    updateInfoText();
+  }
+
+  protected void infoTextSelectionUpdated() {
+    String selection = null;
+    if (addNbSelectionInInfo) {
+      int selected = selected = getScene().getSelectionHelper().getNbTotalSelectedObject();
+      if (selected > 0) {
+        selection = EbliLib.getS("{0} obj. s\xE9lect.", Integer.toString(selected));
+      }
+    }
+    info_.putClientProperty("infoTextSelection", selection);
+    updateInfoText();
+  }
+
+  protected void updateInfoText() {
+    String info = (String) info_.getClientProperty("infoText");
+    String selected = "";
+    if (addNbSelectionInInfo) {
+      selected = (String) info_.getClientProperty("infoTextSelection");
+      if (selected == null) {
+        selected = "";
+      }
+    }
+    if (selected.length() > 0) {
+      if (info.length() > 0) {
+        info = "|" + selected + "  " + info;
+      } else {
+        info = "|" + selected;
+      }
+
+    }
+    info_.setText(info);
+    info_.setToolTipText(info);
+
+  }
+
   public void unsetInfoText() {
-    info_.setText(CtuluLibString.EMPTY_STRING);
+    infoTextUpdated(CtuluLibString.EMPTY_STRING);
   }
 
   protected void buildTools() {
@@ -510,9 +565,9 @@
   }
 
   /**
-   * Creation des menus sp\xE9cifiques. Les menus sp\xE9cifiques sont switch\xE9s d\xE9s que la fenetre passe de l'\xE9tat actif \xE0
-   * inactif et inversement. Ils sont ajout\xE9s dans la barre de menus.
-   * 
+   * Creation des menus sp\xE9cifiques. Les menus sp\xE9cifiques sont switch\xE9s d\xE9s que la fenetre passe de l'\xE9tat actif \xE0 inactif et inversement. Ils sont
+   * ajout\xE9s dans la barre de menus.
+   *
    * @return Les menus sp\xE9cifiques.
    */
   protected BuMenu[] createSpecificMenus(final String _title) {
@@ -620,7 +675,7 @@
 
   /**
    * Met a jour l'association calque/action.
-   * 
+   *
    * @param _c le calque en question
    * @param _act les actions associees a ce calque
    */
@@ -728,7 +783,7 @@
 
   /**
    * Retourne les menus sp\xE9cifiques pour la fenetre.
-   * 
+   *
    * @see createSpecificMenus(String);
    * @return Les menus sp\xE9cifiques.
    */
@@ -749,7 +804,7 @@
 
   /**
    * Renvoie true si l'affichage peut-etre "customisable".
-   * 
+   *
    * @return boolean
    */
   public boolean isCustomize() {
@@ -764,7 +819,9 @@
   }
 
   public int print(final Graphics _g, final PageFormat _format, final int _numPage) {
-    if (_numPage != 0) { return Printable.NO_SUCH_PAGE; }
+    if (_numPage != 0) {
+      return Printable.NO_SUCH_PAGE;
+    }
     final BVueCalque bv = getVueCalque();
     final Graphics2D g2d = (Graphics2D) _g;
     g2d.setColor(Color.black);
@@ -867,7 +924,7 @@
 
   /**
    * Si true, l'affichage peut-etre modifie.
-   * 
+   *
    * @param _customize The customize to set
    */
   public void setCustomize(final boolean _customize) {
@@ -918,7 +975,8 @@
   }
 
   @Override
-  public void replace() {}
+  public void replace() {
+  }
 
   @Override
   public void select() {
@@ -942,7 +1000,7 @@
           setToolTipText(lb.getText());
         } else {
           setToolTipText("<html><body style=\"padding:3px;\">" + lb.getText() + "<br>" + val.toString()
-              + "</body></html>");
+                  + "</body></html>");
         }
         if (_isSelected && !EbliFindDialog.isCalqueFindable(_value)) {
           setBackground(_l.getBackground());
@@ -965,7 +1023,7 @@
 
   /**
    * Definit le nom des coordonn\xE9es affich\xE9es dans la barre de statut.
-   * 
+   *
    * @param _names Le nom des coordonn\xE9es.
    */
   public void setCoordinateDefinitions(EbliCoordinateDefinition[] _names) {
@@ -974,7 +1032,7 @@
 
   /**
    * Retourne le nom des coordonn\xE9es du syst\xE8me de coordonn\xE9es.
-   * 
+   *
    * @return Le tableau des noms des coordonn\xE9es.
    */
   public EbliCoordinateDefinition[] getCoordinateDefinitions() {
@@ -993,10 +1051,9 @@
   }
 
   /**
-   * Cette fonctionnalit\xE9 est d\xE9plac\xE9e et \xE9tendue dans ZSceneEditor
-   * Remarque de Fred: La fonction zoomOnSelected ajoute des marges sur le cote ce qui \xE9vite d'avoir un zoom avec
-   * une boite de dimension null si un seul point est s\xE9lectionne.
-   * 
+   * Cette fonctionnalit\xE9 est d\xE9plac\xE9e et \xE9tendue dans ZSceneEditor Remarque de Fred: La fonction zoomOnSelected ajoute des marges sur le cote ce qui
+   * \xE9vite d'avoir un zoom avec une boite de dimension null si un seul point est s\xE9lectionne.
+   *
    * @deprecated: \xE0 voir...
    */
   public void zoomOnSelected() {
@@ -1012,7 +1069,7 @@
   public boolean isZoomOnSelectedEnable() {
     final BCalque cq = getCalqueActif();
     return cq instanceof ZCalqueAffichageDonneesInterface
-        && !((ZCalqueAffichageDonneesInterface) cq).isSelectionEmpty();
+            && !((ZCalqueAffichageDonneesInterface) cq).isSelectionEmpty();
   }
 
   /**
@@ -1024,7 +1081,7 @@
 
   /**
    * Retourne les donn\xE9es persistantes.
-   * 
+   *
    * @return
    */
   public ZEbliCalquesPanelPersistManager getPersistenceManager() {
@@ -1047,14 +1104,15 @@
   }
 
   /**
-   * Ajoute les calques d'informations. Les calques contenus dans ce groupe de calques ne sont pas visibles dans l'arbre
-   * des calques. Les objets de ces calques ne sont pas s\xE9lectionnables, mais visibles dans la fenetre de vue des
-   * calques.
-   * 
+   * Ajoute les calques d'informations. Les calques contenus dans ce groupe de calques ne sont pas visibles dans l'arbre des calques. Les objets de
+   * ces calques ne sont pas s\xE9lectionnables, mais visibles dans la fenetre de vue des calques.
+   *
    * @param _g le maillage associe
    */
   protected BGroupeCalque addCqInfos() {
-    if (getCqInfos() != null) { return getCqInfos(); }
+    if (getCqInfos() != null) {
+      return getCqInfos();
+    }
     final BGroupeCalque gr = new BGroupeCalque();
     gr.setName("gpInfo");
     gr.setTitle(EbliLib.getS("infos"));
@@ -1068,7 +1126,9 @@
   }
 
   protected BGroupeCalque addCqInfos(final BCalqueLegende l) {
-    if (getCqInfos() != null) { return getCqInfos(); }
+    if (getCqInfos() != null) {
+      return getCqInfos();
+    }
     final BGroupeCalque gr = new BGroupeCalque();
     gr.setName("gpInfo");
     gr.setTitle(EbliLib.getS("infos"));
@@ -1131,7 +1191,7 @@
       ZCalqueSelectionInteractionAbstract.addSelectionAction(selection, true, this);
     }
     selection.addMenuItem(EbliLib.getS("S\xE9lectionner \xE0 partir de polygones"), "SELECTFROMPOLY", EbliResource.EBLI
-        .getMenuIcon("draw-polygon"), this);
+            .getMenuIcon("draw-polygon"), this);
     return selection;
   }
 
@@ -1141,6 +1201,7 @@
   @Override
   public void selectionChanged(final ZSelectionEvent _evt) {
     modelArbre_.fireObservableChanged();
+    infoTextSelectionUpdated();
   }
 
   public ZEbliCalquesPanel duplicate(final Map options) {
@@ -1148,14 +1209,15 @@
   }
 
   /**
-   * Cree un tableau qui r\xE9capitule le contenu des infos de cr\xE9ation de la vue 2d. Retourne un panel vide si aucune
-   * infos n'est disponible.
-   * 
+   * Cree un tableau qui r\xE9capitule le contenu des infos de cr\xE9ation de la vue 2d. Retourne un panel vide si aucune infos n'est disponible.
+   *
    * @return
    */
   public BuPanel buildInfosCreationComposant() {
 
-    if (infosCreation_ == null || infosCreation_.keySet() == null || infosCreation_.keySet().size() == 0) { return new BuPanel(); }
+    if (infosCreation_ == null || infosCreation_.keySet() == null || infosCreation_.keySet().size() == 0) {
+      return new BuPanel();
+    }
 
     final JTable table = createTable();
 
@@ -1179,7 +1241,7 @@
     JPanel top = new BuPanel(new BuBorderLayout());
 
     top.add(new JLabel("<html><body><b>" + EbliLib.getS("Infos cr\xE9ations") + "</b></body></html>",
-        SwingConstants.CENTER), BorderLayout.CENTER);
+            SwingConstants.CENTER), BorderLayout.CENTER);
     top.add(bt, BuBorderLayout.EAST);
     bt.setBorder(null);
     bt.setMargin(BuInsets.INSETS0000);
@@ -1207,4 +1269,4 @@
     return infosCreation_;
   }
 
-}
\ No newline at end of file
+}

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalqueLigneBriseeEditable.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalqueLigneBriseeEditable.java	2014-02-11 14:28:04 UTC (rev 8608)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalqueLigneBriseeEditable.java	2014-02-11 15:48:26 UTC (rev 8609)
@@ -522,6 +522,7 @@
         if (seg.distanceXY(_ptReel) < distanceReel) {
           GrPoint ptOnSeg = seg.pointPlusProcheXY(_ptReel);
           modeleDonnees().addPoint(geomIdx, j - 1, ptOnSeg.x_, ptOnSeg.y_, null, _cmd);
+          atomAdded(geomIdx, j - 1);
           return true;
         }
       }
@@ -530,11 +531,17 @@
         modele_.point(seg.o_, geomIdx, modele_.getNbPointForGeometry(geomIdx) - 1);
         if (seg.distanceXY(_ptReel) < distanceReel) {
           GrPoint ptOnSeg = seg.pointPlusProcheXY(_ptReel);
-          modeleDonnees().addPoint(geomIdx, modele_.getNbPointForGeometry(geomIdx) - 1, ptOnSeg.x_, ptOnSeg.y_, null, _cmd);
+          final int idxOnLine = modele_.getNbPointForGeometry(geomIdx) - 1;
+          modeleDonnees().addPoint(geomIdx, idxOnLine, ptOnSeg.x_, ptOnSeg.y_, null, _cmd);
+          atomAdded(geomIdx, idxOnLine);
           return true;
         }
       }
     }
     return false;
   }
+
+  protected void atomAdded(int geomIdx, int idxOneLine) {
+
+  }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8604] trunk/soft/fudaa-crue/ui-planimetry/src/main

From: <de...@us...> - 2014-02-07 09:30:20

Revision: 8604
          http://sourceforge.net/p/fudaa/svn/8604
Author:   deniger
Date:     2014-02-07 09:30:15 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
CRUE-603

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/Bundle.properties

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java	2014-02-07 09:27:41 UTC (rev 8603)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java	2014-02-07 09:30:15 UTC (rev 8604)
@@ -287,6 +287,7 @@
 
   public void setWokOnOneLayer(boolean restricted) {
     getScene().setRestrictedToCalqueActif(restricted);
+    getArbreCalqueModel().setSelectionMultiCalques(!restricted);
     getScene().clearSelection();
   }
 

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/Bundle.properties	2014-02-07 09:27:41 UTC (rev 8603)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/Bundle.properties	2014-02-07 09:30:15 UTC (rev 8604)
@@ -4,8 +4,8 @@
 #OpenIDE-Module-Long-Description=
 #OpenIDE-Module-Display-Category=
 
-OneLayer.Action=Travailler sur un calque
-OneLayer.Tooltip=Seuls les objets du calque s\u00e9lectionn\u00e9 seront pris en compte
+OneLayer.Action=S\u00e9lectionner sur un calque
+OneLayer.Tooltip=Limiter la s\u00e9lection des objets dans la vue planim\u00e9trique au seul calque s\u00e9lectionn\u00e9
 RebuildLayout.Action=Reconstruire le r\u00e9seau
 CheckMinDistance.Action=Assurer une distance minimale
 Configure.Action=Configurer l'affichage

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8603] trunk/framework/ebli-2d/src/main/java/org/fudaa/ ebli/calque

From: <de...@us...> - 2014-02-07 09:27:44

Revision: 8603
          http://sourceforge.net/p/fudaa/svn/8603
Author:   deniger
Date:     2014-02-07 09:27:41 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
CRUE-603

Modified Paths:
--------------
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalque.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/TreeDeleteCalqueAction.java

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalque.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalque.java	2014-02-07 08:04:26 UTC (rev 8602)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalque.java	2014-02-07 09:27:41 UTC (rev 8603)
@@ -320,7 +320,9 @@
       int ye = _ye;
       final int selRow = getRowForLocation(xe, ye);
       if (selRow != -1) {
+
         final TreePath selPath = getPathForLocation(xe, ye);
+        getSelectionModel().setSelectionPath(selPath);
         final Object selObject = selPath.getLastPathComponent();
         final JPopupMenu menu = buildPopupMenu((BCalque) selObject);
 // B.M. On abandonne ce calcul cens\xE9 mieux positionner le popupmenu : Si l'arbre

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/TreeDeleteCalqueAction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/TreeDeleteCalqueAction.java	2014-02-07 08:04:26 UTC (rev 8602)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/TreeDeleteCalqueAction.java	2014-02-07 09:27:41 UTC (rev 8603)
@@ -22,7 +22,7 @@
  * @version $Id$
  */
 public class TreeDeleteCalqueAction extends EbliActionSimple {
-  
+
   protected BArbreCalqueModel treeModel_;
 
   /**
@@ -31,22 +31,22 @@
    * @param _treeModel Le modele d'arbre.
    */
   public TreeDeleteCalqueAction(BArbreCalqueModel _treeModel) {
-    super(EbliLib.getS("D\xE9truire"), EbliResource.EBLI.getIcon("detruire"), "DETRUIRE");
+    super(EbliLib.getS("Supprimer"), EbliResource.EBLI.getIcon("detruire"), "DETRUIRE");
     treeModel_ = _treeModel;
   }
-  
+
   @Override
   public void updateStateBeforeShow() {
     super.updateStateBeforeShow();
     setEnabled(treeModel_ != null && treeModel_.isEditable());
   }
-  
+
   @Override
   public void actionPerformed(final ActionEvent _e) {
     if (treeModel_ == null || !treeModel_.isEditable()) {
       return;
     }
-    
+
     final BCalque[] c = treeModel_.getSelection();
     if (c.length == 0) {
       return;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8602] trunk/soft/fudaa-crue

From: <de...@us...> - 2014-02-07 08:04:29

Revision: 8602
          http://sourceforge.net/p/fudaa/svn/8602
Author:   deniger
Date:     2014-02-07 08:04:26 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
java 7 utilis?\195?\169 partout

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-compare/pom.xml
    trunk/soft/fudaa-crue/crue-config/pom.xml
    trunk/soft/fudaa-crue/crue-core/pom.xml
    trunk/soft/fudaa-crue/crue-emh/pom.xml
    trunk/soft/fudaa-crue/crue-io/pom.xml
    trunk/soft/fudaa-crue/crue-otfa/pom.xml
    trunk/soft/fudaa-crue/crue-project/pom.xml
    trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
    trunk/soft/fudaa-crue/crue-test/pom.xml
    trunk/soft/fudaa-crue/crue-validation/pom.xml
    trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/view/DefaultNodePasteType.java
    trunk/soft/fudaa-crue/ui-emh/pom.xml
    trunk/soft/fudaa-crue/ui-loader/pom.xml
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListEditionTopComponent.java
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListBrancheContentNode.java
    trunk/soft/fudaa-crue/ui-wrapper/pom.xml

Modified: trunk/soft/fudaa-crue/crue-compare/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/pom.xml	2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/crue-compare/pom.xml	2014-02-07 08:04:26 UTC (rev 8602)
@@ -25,16 +25,9 @@
           </execution>
         </executions>
       </plugin>
+     
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <parallel>classes</parallel>

Modified: trunk/soft/fudaa-crue/crue-config/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-config/pom.xml	2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/crue-config/pom.xml	2014-02-07 08:04:26 UTC (rev 8602)
@@ -27,14 +27,6 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <parallel>classes</parallel>

Modified: trunk/soft/fudaa-crue/crue-core/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-core/pom.xml	2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/crue-core/pom.xml	2014-02-07 08:04:26 UTC (rev 8602)
@@ -62,16 +62,9 @@
           </execution>
         </executions>
       </plugin>
+      
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <parallel>classes</parallel>

Modified: trunk/soft/fudaa-crue/crue-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/pom.xml	2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/crue-emh/pom.xml	2014-02-07 08:04:26 UTC (rev 8602)
@@ -27,14 +27,6 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <parallel>classes</parallel>

Modified: trunk/soft/fudaa-crue/crue-io/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-io/pom.xml	2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/crue-io/pom.xml	2014-02-07 08:04:26 UTC (rev 8602)
@@ -23,14 +23,6 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <parallel>classes</parallel>

Modified: trunk/soft/fudaa-crue/crue-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/pom.xml	2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/crue-otfa/pom.xml	2014-02-07 08:04:26 UTC (rev 8602)
@@ -27,14 +27,6 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <parallel>classes</parallel>

Modified: trunk/soft/fudaa-crue/crue-project/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-project/pom.xml	2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/crue-project/pom.xml	2014-02-07 08:04:26 UTC (rev 8602)
@@ -27,14 +27,6 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <parallel>classes</parallel>

Modified: trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/pom.xml	2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/crue-sysdoc/pom.xml	2014-02-07 08:04:26 UTC (rev 8602)
@@ -12,14 +12,6 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <parallel>methods</parallel>

Modified: trunk/soft/fudaa-crue/crue-test/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-test/pom.xml	2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/crue-test/pom.xml	2014-02-07 08:04:26 UTC (rev 8602)
@@ -29,14 +29,6 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <parallel>methods</parallel>

Modified: trunk/soft/fudaa-crue/crue-validation/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-validation/pom.xml	2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/crue-validation/pom.xml	2014-02-07 08:04:26 UTC (rev 8602)
@@ -27,14 +27,6 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <parallel>classes</parallel>

Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/view/DefaultNodePasteType.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/view/DefaultNodePasteType.java	2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/view/DefaultNodePasteType.java	2014-02-07 08:04:26 UTC (rev 8602)
@@ -4,8 +4,10 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Iterator;
 import java.util.List;
 import org.apache.commons.collections.CollectionUtils;
+import org.fudaa.ctulu.CtuluLibArray;
 import org.openide.nodes.Node;
 import org.openide.util.datatransfer.PasteType;
 
@@ -15,7 +17,7 @@
  */
 public class DefaultNodePasteType extends PasteType {
 
-  final Node dragged;
+  final Node[] dragged;
   final Node target;
   public static final String PROP_USE_INDEX_AS_DISPLAY_NAME = "useIndexAsDisplayName";
 
@@ -32,6 +34,11 @@
   }
 
   public DefaultNodePasteType(Node dragged, Node target) {
+    this.dragged = new Node[]{dragged};
+    this.target = target;
+  }
+
+  public DefaultNodePasteType(Node[] dragged, Node target) {
     this.dragged = dragged;
     this.target = target;
   }
@@ -66,7 +73,6 @@
       node.setDisplayName(Integer.toString(++ordre));
     }
 
-
   }
 
   public static void nodeToStart(final List<Node> toStart, boolean useIndexAsDisplayName) {
@@ -88,21 +94,33 @@
     }
   }
 
-  protected static void nodeDragged(final Node dragged, final Node target) {
-    if (dragged == null || target == null) {
+  protected static void nodeDragged(final Node[] dragged, final Node target) {
+    if (dragged == null || target == null || dragged.length == 0) {
       return;
     }
-    boolean useIndexAsDisplayName = isIndexUsedAsDisplayName(dragged);
-    Node parentNode = dragged.getParentNode();
+    boolean useIndexAsDisplayName = isIndexUsedAsDisplayName(target);
+    Node parentNode = target.getParentNode();
     List<Node> children = new ArrayList(Arrays.asList(parentNode.getChildren().getNodes()));
+    for (Iterator<Node> it = children.iterator(); it.hasNext();) {
+      Node node = it.next();
+      if (node.getParentNode() != parentNode) {
+        it.remove();
+      }
+    }
     parentNode.getChildren().remove(children.toArray(new Node[children.size()]));
     int targetIdx = children.indexOf(target);
-    children.remove(dragged);
-    if (targetIdx >= children.size()) {
-      children.add(dragged);
-    } else {
-      children.add(targetIdx, dragged);
+    if (targetIdx < children.indexOf(dragged[0])) {
+      CtuluLibArray.invert(dragged, 0);
     }
+    for (Node node : dragged) {
+      children.remove(node);
+      if (targetIdx >= children.size()) {
+        children.add(node);
+      } else {
+        children.add(targetIdx, node);
+      }
+    }
+
     parentNode.getChildren().add(children.toArray(new Node[children.size()]));
     if (useIndexAsDisplayName) {
       updateIndexedDisplayName(parentNode);

Modified: trunk/soft/fudaa-crue/ui-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-emh/pom.xml	2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/ui-emh/pom.xml	2014-02-07 08:04:26 UTC (rev 8602)
@@ -140,17 +140,7 @@
       </plugin>
 
       <plugin>
-        <!-- NetBeans 6.9+ requires JDK 6 -->
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <!-- to have the jar plugin pickup the nbm generated manifest -->

Modified: trunk/soft/fudaa-crue/ui-loader/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loader/pom.xml	2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/ui-loader/pom.xml	2014-02-07 08:04:26 UTC (rev 8602)
@@ -93,11 +93,6 @@
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <useDefaultManifestFile>true</useDefaultManifestFile>

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListEditionTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListEditionTopComponent.java	2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListEditionTopComponent.java	2014-02-07 08:04:26 UTC (rev 8602)
@@ -1,8 +1,12 @@
 package org.fudaa.fudaa.crue.modelling.list;
 
+import java.awt.Rectangle;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionAdapter;
+import java.awt.event.MouseMotionListener;
 import java.util.List;
+import javax.swing.JComponent;
 import org.apache.commons.lang.ArrayUtils;
 import org.fudaa.dodico.crue.metier.emh.EMH;
 import org.fudaa.dodico.crue.metier.emh.EMHScenario;
@@ -28,6 +32,7 @@
   protected void createComponent(String firstColumnName) {
     super.createComponent(firstColumnName);
     outlineView.setDefaultActionAllowed(true);
+    outlineView.getOutline().setAutoscrolls(true);
     outlineView.setNodePopupFactory(new ListNodePopupFactory(this));
     outlineView.getOutline().addMouseListener(new MouseAdapter() {
       @Override
@@ -43,7 +48,19 @@
         }
       }
     });
+//    outlineView.scrollRectToVisible(null);
+    MouseMotionListener doScrollRectToVisible = new MouseMotionAdapter() {
+      public void mouseDragged(MouseEvent e) {
+        System.err.println("e " + e.getY() + " " + outlineView.getOutline().getAutoscrolls());
+        Rectangle r = new Rectangle(0, e.getY(), 10, 10);
+//        outlineView.scrollRectToVisible(r);
+//        ((JComponent) e.getSource()).scrollRectToVisible(r);
+        outlineView.getOutline().scrollRectToVisible(r);
+      }
 
+    };
+    outlineView.getOutline().addMouseMotionListener(doScrollRectToVisible);
+
   }
 
   /**

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListBrancheContentNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListBrancheContentNode.java	2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListBrancheContentNode.java	2014-02-07 08:04:26 UTC (rev 8602)
@@ -62,7 +62,7 @@
   @Override
   public PasteType getDropType(Transferable t, int action, int index) {
     if (isEditMode()) {
-      final Node dragged = NodeTransfer.node(t, NodeTransfer.DND_COPY_OR_MOVE);
+      final Node[] dragged = NodeTransfer.nodes(t, NodeTransfer.DND_COPY_OR_MOVE);
       return new DefaultNodePasteType(dragged, this);
     }
     return null;
@@ -105,7 +105,6 @@
       active.setDisplayName(AbstractListContentNode.getActiveDisplay());
       set.put(active);
 
-
       CrueConfigMetier propDefinition = modellingScenarioService.getSelectedProjet().getPropDefinition();
       NumberFormat formatter = propDefinition.getFormatter(CrueConfigMetierConstants.PROP_XP, DecimalFormatEpsilonEnum.COMPARISON);
       String longeurFormatted = null;

Modified: trunk/soft/fudaa-crue/ui-wrapper/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/pom.xml	2014-02-05 08:08:45 UTC (rev 8601)
+++ trunk/soft/fudaa-crue/ui-wrapper/pom.xml	2014-02-07 08:04:26 UTC (rev 8602)
@@ -95,11 +95,6 @@
         </configuration>
       </plugin>
 
-      <plugin>
-        <!-- NetBeans 6.9+ requires JDK 6 -->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8600] trunk/soft/fudaa-crue

From: <de...@us...> - 2014-02-03 22:09:39

Revision: 8600
          http://sourceforge.net/p/fudaa/svn/8600
Author:   deniger
Date:     2014-02-03 22:09:30 +0000 (Mon, 03 Feb 2014)
Log Message:
-----------
CRUE-610

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/UserPreferencesSaver.java
    trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/Bundle.properties
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryLigneBriseeLayer.java
    trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/actions/Bundle.properties

Added Paths:
-----------
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingShowViewListAction.java
    trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/actions/ReportShowViewListAction.java

Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/UserPreferencesSaver.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/UserPreferencesSaver.java	2014-02-03 22:07:59 UTC (rev 8599)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/UserPreferencesSaver.java	2014-02-03 22:09:30 UTC (rev 8600)
@@ -179,7 +179,7 @@
     return GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
   }
 
-  private static void ensureComponentWillBeVisible(final Component window, final Point initLocation) {
+  public static void ensureComponentWillBeVisible(final Component window, final Point initLocation) {
 
     final Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
     ensureComponentWillBeVisible(window, initLocation, screenSize);

Copied: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingShowViewListAction.java (from rev 8404, trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingHelpAction.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingShowViewListAction.java	                        (rev 0)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingShowViewListAction.java	2014-02-03 22:09:30 UTC (rev 8600)
@@ -0,0 +1,56 @@
+package org.fudaa.fudaa.crue.modelling.action;
+
+import java.awt.MouseInfo;
+import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.util.Collection;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.JPopupMenu;
+import javax.swing.JSeparator;
+import javax.swing.SwingUtilities;
+import org.fudaa.fudaa.crue.common.PerspectiveEnum;
+import org.fudaa.fudaa.crue.common.UserPreferencesSaver;
+import org.fudaa.fudaa.crue.common.action.AbstractPerspectiveAwareAction;
+import static org.fudaa.fudaa.crue.modelling.perspective.ActiveModelisation.ACTIONS_MODELLING_VIEWS;
+import org.openide.awt.*;
+import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
+import org.openide.util.lookup.Lookups;
+import org.openide.windows.WindowManager;
+
+@ActionID(category = "View",
+        id = "org.fudaa.fudaa.crue.modelling.ModellingShowViewListAction")
+//iconBase ne semble pas fonctionner !
+@ActionRegistration(displayName = "#CTL_ModellingShowViewListAction")
+@ActionReference(path = "Shortcuts", name = "A-V")
+public final class ModellingShowViewListAction extends AbstractPerspectiveAwareAction {
+
+  public ModellingShowViewListAction() {
+    super(PerspectiveEnum.MODELLING, false);
+    putValue(Action.NAME, NbBundle.getMessage(ModellingShowViewListAction.class, "CTL_ModellingShowViewListAction"));
+  }
+
+  @Override
+  public void actionPerformed(ActionEvent e) {
+    JPopupMenu menu = new JPopupMenu();
+    Collection all = Lookups.forPath(ACTIONS_MODELLING_VIEWS).lookupAll(Object.class);
+    for (Object object : all) {
+      if (object instanceof AbstractAction) {
+        menu.add((AbstractAction) object);
+      } else if (object instanceof JSeparator) {
+        menu.addSeparator();
+      }
+    }
+    final Point location = MouseInfo.getPointerInfo().getLocation();
+    UserPreferencesSaver.ensureComponentWillBeVisible(menu, location);
+    SwingUtilities.convertPointFromScreen(location, WindowManager.getDefault().getMainWindow());
+    menu.show(WindowManager.getDefault().getMainWindow(), location.x, location.y);
+  }
+
+  @Override
+  public Action createContextAwareInstance(Lookup lkp) {
+    return new ModellingShowViewListAction();
+  }
+
+}

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/Bundle.properties	2014-02-03 22:07:59 UTC (rev 8599)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/Bundle.properties	2014-02-03 22:09:30 UTC (rev 8600)
@@ -10,6 +10,7 @@
 CTL_ModellingLaunchRunQuickAction=Lancer un run rapide
 CTL_ModellingLaunchRunOptionsAction=Lancer un run avec options...
 CTL_ModellingHelpAction=Aide sur la perspective Mod\u00e9lisation
+CTL_ModellingShowViewListAction=Liste des vues perspective Mod\u00e9lisation
 ModellingConvertCrue10.Action=Convertir en sc\u00e9nario Crue10
 ModellingConvertCrue9.Action=Convertir en sc\u00e9nario Crue9
 ExportFileChooser.ApproveText=Exporter

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java	2014-02-03 22:07:59 UTC (rev 8599)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java	2014-02-03 22:09:30 UTC (rev 8600)
@@ -92,7 +92,7 @@
     return action;
   }
 
-  public void installSelectionShortcuts() {
+  public final void installSelectionShortcuts() {
     Action selectAll = createAction("TOUTSELECTIONNER", KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_MASK));
     Action invAction = createAction("INVERSESELECTION", KeyStroke.getKeyStroke(KeyEvent.VK_I, InputEvent.CTRL_MASK));
     Action clearAction = createAction("CLEARSELECTION", KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK));
@@ -140,11 +140,15 @@
     SceneSelectPreviousAction sceneSelectPreviousAction = new SceneSelectPreviousAction(gisEditor_.getSceneEditor());
     SceneSelectNextAction sceneSelectNextAction = new SceneSelectNextAction(gisEditor_.getSceneEditor());
     CalqueSelectNormalSelectionAction normalSelection = new CalqueSelectNormalSelectionAction(gisEditor_.getSupport());
-    EbliLib.updateMapKeyStroke(this, new Action[]{sceneSelectPreviousAction, sceneSelectNextAction, normalSelection});
+    final KeyStroke keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.ALT_MASK);
+    getScene().getAtomicSelectionAction().setKey(keyStroke);
+    EbliLib.updateMapKeyStroke(this, new Action[]{sceneSelectPreviousAction, sceneSelectNextAction, normalSelection, getScene().
+      getAtomicSelectionAction()});
     installSelectionShortcuts();
     selectNext = (JMenuItem) sceneSelectNextAction.buildMenuItem(EbliComponentFactory.INSTANCE);
     selectPrevious = (JMenuItem) sceneSelectPreviousAction.buildMenuItem(EbliComponentFactory.INSTANCE);
     FSigEditor.activeDeferredModificationAsDefault();
+    getScene().setUseSelectedLayerFirstForSelection(false);
   }
 
   public PlanimetryVisuPanelConfigurer getConfigurer() {
@@ -172,10 +176,10 @@
         findSelectedLayer();
       }
 
-      @Override
-      public void setEnabled(boolean _newValue) {
-      }
-    };
+              @Override
+              public void setEnabled(boolean _newValue) {
+              }
+            };
     return res;
   }
 
@@ -214,6 +218,7 @@
     }
     action.updateStateBeforeShow();
     if (itemAtomicActivation == null) {
+      getScene().getAtomicSelectionAction().setKey(KeyStroke.getKeyStroke("Alt s"));
       getScene().getAtomicSelectionAction().updateStateBeforeShow();
       itemAtomicActivation = (JMenuItem) getScene().getAtomicSelectionAction().buildMenuItem(EbliComponentFactory.INSTANCE);
     }
@@ -263,8 +268,6 @@
     selection.add(selectPrevious);
     selection.add(selectNext);
 
-
-
     selection.addSeparator();
     if (!EbliActionMap.getInstance().isEmpty()) {
       addSelectionAction(selection, true);

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryLigneBriseeLayer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryLigneBriseeLayer.java	2014-02-03 22:07:59 UTC (rev 8599)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryLigneBriseeLayer.java	2014-02-03 22:09:30 UTC (rev 8600)
@@ -26,6 +26,7 @@
 
   public PlanimetryLigneBriseeLayer(PlanimetryLigneBriseeLayerModel _modele, FSigEditor _editor) {
     super(_modele, _editor);
+    setSelectClosedLineInterior(true);
   }
 
   @Override

Copied: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/actions/ReportShowViewListAction.java (from rev 8404, trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/actions/ReportCloseAction.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/actions/ReportShowViewListAction.java	                        (rev 0)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/actions/ReportShowViewListAction.java	2014-02-03 22:09:30 UTC (rev 8600)
@@ -0,0 +1,54 @@
+package org.fudaa.fudaa.crue.report.actions;
+
+import java.awt.MouseInfo;
+import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.util.Collection;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.JPopupMenu;
+import javax.swing.JSeparator;
+import javax.swing.SwingUtilities;
+import org.fudaa.fudaa.crue.common.PerspectiveEnum;
+import org.fudaa.fudaa.crue.common.UserPreferencesSaver;
+import org.fudaa.fudaa.crue.common.action.AbstractPerspectiveAwareAction;
+import static org.fudaa.fudaa.crue.report.perspective.ActiveReport.ACTIONS_REPORT_VIEWS;
+import org.openide.awt.ActionID;
+import org.openide.awt.ActionRegistration;
+import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
+import org.openide.util.lookup.Lookups;
+import org.openide.windows.WindowManager;
+
+@ActionID(category = "View",
+        id = "org.fudaa.fudaa.crue.report.actions.ReportShowViewListAction")
+@ActionRegistration(displayName = "#CTL_ReportShowViewListAction")
+public final class ReportShowViewListAction extends AbstractPerspectiveAwareAction {
+
+  public ReportShowViewListAction() {
+    super(PerspectiveEnum.POST, false);
+    putValue(Action.NAME, NbBundle.getMessage(ReportShowViewListAction.class, "CTL_ReportShowViewListAction"));
+  }
+
+  @Override
+  public Action createContextAwareInstance(Lookup actionContext) {
+    return new ReportShowViewListAction();
+  }
+
+  @Override
+  public void actionPerformed(ActionEvent e) {
+    JPopupMenu menu = new JPopupMenu();
+    Collection all = Lookups.forPath(ACTIONS_REPORT_VIEWS).lookupAll(Object.class);
+    for (Object object : all) {
+      if (object instanceof AbstractAction) {
+        menu.add((AbstractAction) object);
+      } else if (object instanceof JSeparator) {
+        menu.addSeparator();
+      }
+    }
+    final Point location = MouseInfo.getPointerInfo().getLocation();
+    UserPreferencesSaver.ensureComponentWillBeVisible(menu, location);
+    SwingUtilities.convertPointFromScreen(location, WindowManager.getDefault().getMainWindow());
+    menu.show(WindowManager.getDefault().getMainWindow(), location.x, location.y);
+  }
+}

Modified: trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/actions/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/actions/Bundle.properties	2014-02-03 22:07:59 UTC (rev 8599)
+++ trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/actions/Bundle.properties	2014-02-03 22:09:30 UTC (rev 8600)
@@ -1,4 +1,5 @@
 CTL_ReportCloseAction=Fermer
+CTL_ReportShowViewListAction=Liste des vues perspective Rapports
 CTL_ReportSaveAction=Sauvegarder
 CTL_ReportReloadAction=Recharger
 ReportSetAsAlternatifNodeAction.DisplayName=Utiliser comme run alternatif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8599] trunk/framework

From: <de...@us...> - 2014-02-03 22:08:02

Revision: 8599
          http://sourceforge.net/p/fudaa/svn/8599
Author:   deniger
Date:     2014-02-03 22:07:59 +0000 (Mon, 03 Feb 2014)
Log Message:
-----------
CRUE-610

Modified Paths:
--------------
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTransfoLib.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueGeometry.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZScene.java

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTransfoLib.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTransfoLib.java	2014-02-03 22:07:27 UTC (rev 8598)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTransfoLib.java	2014-02-03 22:07:59 UTC (rev 8599)
@@ -231,7 +231,7 @@
       double[] newX = new double[nb];
       double[] newY = new double[nb];
       final double min = _c.getModel().getX(_min);
-      final CtuluNumberFormatFortran ft = new CtuluNumberFormatFortran(6);
+      final CtuluNumberFormatFortran ft = new CtuluNumberFormatFortran(10);
       if (_max - _min == 1) {
         final double step = (_c.getModel().getX(_max) - min) / (nb + 1);
         for (int i = 1; i <= nb; i++) {

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueGeometry.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueGeometry.java	2014-02-03 22:07:27 UTC (rev 8598)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueGeometry.java	2014-02-03 22:07:59 UTC (rev 8599)
@@ -9,6 +9,7 @@
 
 import com.memoire.bu.BuLib;
 import com.memoire.fu.FuLog;
+import com.vividsolutions.jts.algorithm.PointInRing;
 import com.vividsolutions.jts.algorithm.SIRtreePointInRing;
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.CoordinateSequence;
@@ -60,14 +61,24 @@
 import org.fudaa.ebli.trace.TraceSurface;
 
 /**
- * Un calque g\xE9rant des g\xE9om\xE9tries quelconques, \xE0 un niveau global ou atomique.<p> Le niveau atomique des g\xE9om\xE9tries est le niveau sommet. Le calque
- * s'appuie sur un mod\xE8le {@link ZModeleGeometry}.
+ * Un calque g\xE9rant des g\xE9om\xE9tries quelconques, \xE0 un niveau global ou atomique.<p>
+ * Le niveau atomique des g\xE9om\xE9tries est le niveau sommet. Le calque s'appuie sur un mod\xE8le {@link ZModeleGeometry}.
  *
  * @author Bertrand Marchand
  * @version $Id$
  */
 public class ZCalqueGeometry<M extends ZModeleGeometry> extends ZCalqueAffichageDonneesLineAbstract implements ZModelGeometryListener {
 
+  private boolean selectClosedLineInterior;
+
+  public void setSelectClosedLineInterior(boolean selectClosedLineInterior) {
+    this.selectClosedLineInterior = selectClosedLineInterior;
+  }
+
+  public boolean isSelectClosedLineInterior() {
+    return selectClosedLineInterior;
+  }
+
   protected void initTraceForAtomics(TraceIconModel iconeModel, int idxPoly, int idxVertexInPoly) {
   }
 
@@ -582,8 +593,6 @@
         setLabelsForegroundColor((Color) _p.get(ZCalqueGeometryLabelConfigure.PROPERTY_LABELS_FOREGROUND));
       }
 
-
-
     }
   }
 
@@ -854,7 +863,6 @@
         }
         initTrace(iconeModel, i);
 
-
         final GrPoint ptDest = new GrPoint();
         for (int j = nbPoints - 1; j >= 0; j--) {
           //l'icone ne doit pas \xEAtre paint:
@@ -913,7 +921,6 @@
             continue;
           }
 
-
           final int nbPoints = modele_.getNbPointForGeometry(i);
           if (nbPoints <= 0) {
             continue;
@@ -1011,9 +1018,6 @@
       boolean bferm = modele_.isGeometryFermee(i);
       boolean breli = modele_.isGeometryReliee(i);
 
-
-
-
       final GrPoint ptOri = new GrPoint();
       modele_.point(ptOri, i, nbPoints - 1);
       ptOri.autoApplique2D(versEcran);
@@ -1142,6 +1146,17 @@
               r.setSelectionInterval(i, i);
               return r;
             }
+            if (selectClosedLineInterior) {
+              final Geometry geometry = modele_.getGeomData().getGeometry(i);
+              if (geometry instanceof LinearRing) {
+                LinearRing ring = (LinearRing) geometry;
+                if (GISLib.createPolygoneTester(ring).isInside(new Coordinate(_pt.x_, _pt.y_))) {
+                  final CtuluListSelection r = new CtuluListSelection(1);
+                  r.setSelectionInterval(i, i);
+                  return r;
+                }
+              }
+            }
           }
         } else {
           for (int j = modele_.getNbPointForGeometry(i) - 1; j >= 0; j--) {
@@ -1307,8 +1322,7 @@
   }
 
   /**
-   * Renvoie sous forme de liste de selection les sommets selectionnes pour la polyligne
-   * <code>_poly</code>.
+   * Renvoie sous forme de liste de selection les sommets selectionnes pour la polyligne <code>_poly</code>.
    *
    * @param _poly Le point pour la selection
    * @return la liste des indexs selectionnes (ou null si aucune selection)
@@ -1551,7 +1565,8 @@
         } else if (modeleDonnees().isGeometryFermee(i)) {
           final Coordinate[] cs = new Coordinate[nbSelected];
           int csi = 0;
-          final CoordinateSequence seq = ((GISCoordinateSequenceContainerInterface) modeleDonnees().getGeomData().getGeometry(i)).getCoordinateSequence();
+          final CoordinateSequence seq = ((GISCoordinateSequenceContainerInterface) modeleDonnees().getGeomData().getGeometry(i)).
+                  getCoordinateSequence();
           for (int j = res[0]; j < nbPointForLigne; j++) {
             cs[csi++] = seq.getCoordinate(j);
           }

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZScene.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZScene.java	2014-02-03 22:07:27 UTC (rev 8598)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZScene.java	2014-02-03 22:07:59 UTC (rev 8599)
@@ -16,6 +16,7 @@
 import gnu.trove.TIntObjectIterator;
 import java.awt.Graphics2D;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
 import javax.swing.event.TreeModelEvent;
 import javax.swing.event.TreeModelListener;
@@ -578,6 +579,16 @@
     return b;
   }
 
+  boolean useSelectedLayerFirstForSelection = true;
+
+  public void setUseSelectedLayerFirstForSelection(boolean useSelectedLayerFirstForSelection) {
+    this.useSelectedLayerFirstForSelection = useSelectedLayerFirstForSelection;
+  }
+
+  public boolean isUseSelectedLayerFirstForSelection() {
+    return useSelectedLayerFirstForSelection;
+  }
+
   /**
    * Permet de modifier la selection de la scene \xE0 partir d'un selection ponctuelle. Le premier objet trouv\xE9 interrompt la s\xE9lection.
    *
@@ -593,7 +604,7 @@
     }
     selectionUpdatedFromScene = true;
     boolean ret = false;
-    for (ZCalqueAffichageDonneesInterface cq : getTargetLayers()) {
+    for (ZCalqueAffichageDonneesInterface cq : getTargetLayers(useSelectedLayerFirstForSelection)) {
       if (cq.changeSelection(_pointReel, _tolerancePixel, _action)) {
         ret = true;
         break;
@@ -617,7 +628,7 @@
   public boolean changeSelection(LinearRing _p, int _action, int _mode) {
     boolean b = false;
     selectionUpdatedFromScene = true;
-    for (ZCalqueAffichageDonneesInterface cq : getTargetLayers()) {
+    for (ZCalqueAffichageDonneesInterface cq : getTargetLayers(useSelectedLayerFirstForSelection)) {
       b |= cq.changeSelection(_p, _action, _mode);
     }
     fireSelectionEvent();
@@ -628,7 +639,7 @@
   public boolean changeSelection(LinearRing[] _p, int _action, int _mode) {
     boolean b = false;
     selectionUpdatedFromScene = true;
-    for (ZCalqueAffichageDonneesInterface cq : getTargetLayers()) {
+    for (ZCalqueAffichageDonneesInterface cq : getTargetLayers(useSelectedLayerFirstForSelection)) {
       b |= cq.changeSelection(_p, _action, _mode);
     }
     fireSelectionEvent();
@@ -646,7 +657,7 @@
   public boolean changeSelection(ZSceneSelection _selection, int _action) {
     selectionUpdatedFromScene = true;
     boolean b = false;
-    for (ZCalqueAffichageDonneesInterface cq : getTargetLayers()) {
+    for (ZCalqueAffichageDonneesInterface cq : getTargetLayers(useSelectedLayerFirstForSelection)) {
       EbliListeSelectionMultiInterface sel = _selection.getLayerListSelectionMulti(cq);
       b |= cq.changeSelection(sel, _action);
     }
@@ -656,8 +667,9 @@
   }
 
   /**
-   * Retourne la selection pour le point donn\xE9. <p> <b>Remarque:</b> Uniquement des sommets pour le moment, et en tenant compte du fait que la
-   * selection est restreinte a un calque ou pas.
+   * Retourne la selection pour le point donn\xE9.
+   * <p>
+   * <b>Remarque:</b> Uniquement des sommets pour le moment, et en tenant compte du fait que la selection est restreinte a un calque ou pas.
    *
    * @param _pt Le point donn\xE9.
    * @param _tolerance La tol\xE9rance, en pixels.
@@ -945,15 +957,20 @@
     //    selection_=null;
   }
 
+  public ZCalqueAffichageDonneesInterface[] getTargetLayers() {
+    return getTargetLayers(true);
+
+  }
+
   /**
    * Retourne les calques cibles, soit tous les calques de donn\xE9es si global, soit le calque actif si restreint, soit [0] si restreint et non calque
    * de donn\xE9es.
    *
    * @return Les calques cibles.
    */
-  public ZCalqueAffichageDonneesInterface[] getTargetLayers() {
+  public ZCalqueAffichageDonneesInterface[] getTargetLayers(boolean selectedFirst) {
     if (!isRestrictedToCalqueActif()) {
-      return getAllLayersWithSelectedFirst();
+      return selectedFirst ? getAllLayersWithSelectedFirst() : getAllLayers();
     } else if (treeModel_.getSelectedCalque() instanceof ZCalqueAffichageDonneesInterface) {
       return new ZCalqueAffichageDonneesInterface[]{(ZCalqueAffichageDonneesInterface) treeModel_.getSelectedCalque()};
     } else {
@@ -982,26 +999,23 @@
 
   /**
    * Retourne tous les calques de donn\xE9es contenus dans la scene, en mettant en premier les calques selectionn\xE9s, puis dans l'ordre de parcours de
-   * l'arbre des calques. <p> Notamment, sert pour la selection de sommets/g\xE9om\xE9tries. TODO : Devrait en toute logique remplacer getAllLayers().
+   * l'arbre des calques.
+   * <p>
+   * Notamment, sert pour la selection de sommets/g\xE9om\xE9tries. TODO : Devrait en toute logique remplacer getAllLayers().
    *
    * @return Les calques de donn\xE9es.
    */
   public ZCalqueAffichageDonneesInterface[] getAllLayersWithSelectedFirst() {
-    ArrayList<BCalque> lcqs = new ArrayList<BCalque>();
-    for (BCalque cq : treeModel_.getRootCalque().getTousCalques()) {
-      if (cq instanceof ZCalqueAffichageDonneesInterface) {
-        lcqs.add(cq);
-      }
-    }
+    ArrayList<ZCalqueAffichageDonneesInterface> lcqs = new ArrayList<ZCalqueAffichageDonneesInterface>();
+    lcqs.addAll(Arrays.<ZCalqueAffichageDonneesInterface>asList(getAllLayers()));
     BCalque[] cqsel = treeModel_.getSelection();
     for (int i = 0; i < cqsel.length; i++) {
       if (cqsel[i] instanceof ZCalqueAffichageDonneesInterface) {
-        lcqs.remove(cqsel[i]);
-        lcqs.add(i, cqsel[i]);
+        lcqs.remove((ZCalqueAffichageDonneesInterface) cqsel[i]);
+        lcqs.add(i, (ZCalqueAffichageDonneesInterface) cqsel[i]);
       }
     }
-    cqs_ = lcqs.toArray(new ZCalqueAffichageDonneesInterface[0]);
-    return cqs_;
+    return lcqs.toArray(new ZCalqueAffichageDonneesInterface[0]);
   }
 
   /*

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8598] trunk/soft/fudaa-crue/ui-planimetry/src/main/java/ org/fudaa/fudaa/crue/planimetry/action/ProjectBrancheOnLineProcess.java

From: <de...@us...> - 2014-02-03 22:07:32

Revision: 8598
          http://sourceforge.net/p/fudaa/svn/8598
Author:   deniger
Date:     2014-02-03 22:07:27 +0000 (Mon, 03 Feb 2014)
Log Message:
-----------
CRUE-601

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/ProjectBrancheOnLineProcess.java

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/ProjectBrancheOnLineProcess.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/ProjectBrancheOnLineProcess.java	2014-02-03 14:34:34 UTC (rev 8597)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/ProjectBrancheOnLineProcess.java	2014-02-03 22:07:27 UTC (rev 8598)
@@ -64,22 +64,19 @@
       }
     }
     //on prend le point le plus proche dans ce cas:
-    if (position == null) {
-      for (int k = 0; k < size; k++) {
-        Coordinate coordinateA = line.getCoordinate(k);
-        if (position == null) {
+    for (int k = 0; k < size; k++) {
+      Coordinate coordinateA = line.getCoordinate(k);
+      if (position == null) {
+        position = coordinateA;
+        idx = 0;
+      } else {
+        double current = position.distance(point);
+        double newDistance = coordinateA.distance(point);
+        if (newDistance < current) {
           position = coordinateA;
-          idx = 0;
-        } else {
-          double current = position.distance(point);
-          double newDistance = coordinateA.distance(point);
-          if (newDistance < current) {
-            position = coordinateA;
-            idx = k;
-          }
+          idx = k;
         }
       }
-
     }
     return position == null ? null : new GeometryLocation(null, idx, position);
   }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8597] trunk/soft/fudaa-crue

From: <de...@us...> - 2014-02-03 14:34:39

Revision: 8597
          http://sourceforge.net/p/fudaa/svn/8597
Author:   deniger
Date:     2014-02-03 14:34:34 +0000 (Mon, 03 Feb 2014)
Log Message:
-----------
CRUE-594

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/edition/EditionChangeBranche.java
    trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/edition/EditionRename.java
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHBrancheTopComponent.java
    trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/emh/Bundle.properties
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheModel.java

Modified: trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/edition/EditionChangeBranche.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/edition/EditionChangeBranche.java	2014-02-03 13:33:27 UTC (rev 8596)
+++ trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/edition/EditionChangeBranche.java	2014-02-03 14:34:34 UTC (rev 8597)
@@ -41,11 +41,11 @@
     this.defaultValues = defaultValues;
   }
 
-  public CtuluLog changeBranche(CatEMHBranche initBranche, BrancheEditionContent newContent, CrueConfigMetier ccm) {
+  public CtuluLog changeBranche(CatEMHBranche initBranche, BrancheEditionContent newContent, CrueConfigMetier ccm, boolean renameSection) {
     Map<String, CatEMHNoeud> noeudsByIds = TransformerHelper.toMapOfNom(initBranche.getParent().getNoeuds());
     CatEMHNoeud noeudAmont = (CatEMHNoeud) noeudsByIds.get(newContent.getNoeudAmont());
     CatEMHNoeud noeudAval = (CatEMHNoeud) noeudsByIds.get(newContent.getNoeudAval());
-    CtuluLog log = prevalidate(newContent, initBranche, noeudAmont, noeudAval, ccm);
+    CtuluLog log = prevalidate(newContent, initBranche, noeudAmont, noeudAval, ccm, renameSection);
     //on s'arrête:
     if (log.containsErrorOrSevereError()) {
       return log;
@@ -67,16 +67,17 @@
     if (!newType.equals(branche.getBrancheType())) {
       branche = changeType(ccm, sousModele, initBranche, newContent, newType);
     }
-    applyModifications(branche, newContent, sousModele, ccm, noeudAmont, noeudAval);
+    applyModifications(branche, newContent, sousModele, ccm, noeudAmont, noeudAval, renameSection);
 
     return log;
   }
 
-  private void applyModifications(CatEMHBranche branche, BrancheEditionContent newContent, final EMHSousModele sousModele, CrueConfigMetier ccm, CatEMHNoeud noeudAmont, CatEMHNoeud noeudAval) {
+  private void applyModifications(CatEMHBranche branche, BrancheEditionContent newContent, final EMHSousModele sousModele, CrueConfigMetier ccm,
+          CatEMHNoeud noeudAmont, CatEMHNoeud noeudAval, boolean renameSection) {
     EnumBrancheType newType = branche.getBrancheType();
     branche.setCommentaire(newContent.getCommentaire());
 
-    new EditionRename().rename(branche, newContent.getNom());
+    new EditionRename().rename(branche, newContent.getNom(), renameSection);
     if (newContent.isActive() != branche.getUserActive()) {
       branche.setUserActive(newContent.isActive());
       EditionChangeActivity activity = new EditionChangeActivity();
@@ -86,7 +87,6 @@
     branche.setNoeudAmont(noeudAmont);
     branche.setNoeudAval(noeudAval);
 
-
     if (requireDcsp(newType)) {
       DonCalcSansPrt dcsp = EMHHelper.selectFirstInstanceOf(branche.getInfosEMH(), DonCalcSansPrt.class);
       applyModification(newContent.getDcsp(), dcsp);
@@ -113,7 +113,8 @@
     }
   }
 
-  private CatEMHBranche changeType(CrueConfigMetier ccm, final EMHSousModele sousModele, CatEMHBranche initBranche, BrancheEditionContent newContent, EnumBrancheType newType) {
+  private CatEMHBranche changeType(CrueConfigMetier ccm, final EMHSousModele sousModele, CatEMHBranche initBranche, BrancheEditionContent newContent,
+          EnumBrancheType newType) {
     //on enleve les relations
     List<RelationEMHSectionDansBranche> currentSections = initBranche.getListeSectionsSortedXP(ccm);
     for (RelationEMHSectionDansBranche relationEMHSectionDansBranche : currentSections) {
@@ -159,7 +160,8 @@
     //les sections...
     CatEMHSection amont = currentSections.get(0).getEmh();
     CatEMHSection aval = currentSections.get(currentSections.size() - 1).getEmh();
-    Collection<EnumSectionType> authorizedType = ValidationContentSectionDansBrancheExecutor.createSectionInterneTypeDansBrancheContents().get(newType);
+    Collection<EnumSectionType> authorizedType = ValidationContentSectionDansBrancheExecutor.createSectionInterneTypeDansBrancheContents().
+            get(newType);
     EditionCreateEMH creator = new EditionCreateEMH(defaultValues);
     if (!authorizedType.contains(amont.getSectionType())) {
       if (authorizedType.contains(EnumSectionType.EMHSectionSansGeometrie)) {
@@ -231,11 +233,12 @@
     }
   }
 
-  private CtuluLog prevalidate(BrancheEditionContent newContent, CatEMHBranche branche, CatEMHNoeud noeudAmont, CatEMHNoeud noeudAval, CrueConfigMetier ccm) {
+  private CtuluLog prevalidate(BrancheEditionContent newContent, CatEMHBranche branche, CatEMHNoeud noeudAmont, CatEMHNoeud noeudAval,
+          CrueConfigMetier ccm, boolean renameSections) {
     CtuluLog log = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
     EditionRename rename = new EditionRename();
     if (!newContent.getNom().equals(branche.getNom())) {
-      String nameValid = rename.isNameValid(branche, newContent.getNom());
+      String nameValid = rename.isNameValid(branche, newContent.getNom(), renameSections);
       if (nameValid != null) {
         log.addSevereError(nameValid);
       }
@@ -278,11 +281,11 @@
       }
       int idx = 0;
       for (RelationEMHSectionDansBrancheSaintVenant relationEMHSectionDansBrancheSaintVenant : saintVenantCoeff) {
-        ValidationHelper.validateObject(BusinessMessages.getString("ChangeEMHBrancheSaintVenant.ValidationRelation", Integer.toString(++idx)), log, relationEMHSectionDansBrancheSaintVenant, ccm);
+        ValidationHelper.validateObject(BusinessMessages.getString("ChangeEMHBrancheSaintVenant.ValidationRelation", Integer.toString(++idx)), log,
+                relationEMHSectionDansBrancheSaintVenant, ccm);
       }
     }
 
-
     return log;
   }
 

Modified: trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/edition/EditionRename.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/edition/EditionRename.java	2014-02-03 13:33:27 UTC (rev 8596)
+++ trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/edition/EditionRename.java	2014-02-03 14:34:34 UTC (rev 8597)
@@ -5,7 +5,9 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import org.apache.commons.lang.StringUtils;
 import org.fudaa.dodico.crue.common.BusinessMessages;
@@ -33,8 +35,37 @@
     }
     emh.setNom(newName);
     propagateName(emh);
+    return null;
+  }
 
-
+  public String rename(CatEMHBranche emh, String newName, boolean renameSection) {
+    //si section renommée, on vérifie d'abord qu'on peut le faire:
+    Map<EMH, String> map = new HashMap<EMH, String>();
+    if (renameSection) {
+      String oldSectionPrefix = CruePrefix.changePrefix(emh.getNom(), EnumCatEMH.SECTION);
+      String newSectionPref = CruePrefix.changePrefix(newName, EnumCatEMH.SECTION);
+      final List<RelationEMHSectionDansBranche> sections = emh.getSections();
+      for (RelationEMHSectionDansBranche relationEMHSectionDansBranche : sections) {
+        final CatEMHSection section = relationEMHSectionDansBranche.getEmh();
+        if (section.getNom().startsWith(oldSectionPrefix)) {
+          String newSectionName = newSectionPref + section.getNom().substring(oldSectionPrefix.length());
+          String newSectioNameValid = isNameValid(section, newSectionName);
+          if (newSectioNameValid != null) {
+            return newSectioNameValid;
+          }
+          map.put(section, newSectionName);
+        }
+      }
+    }
+    String error = rename(emh, newName);
+    if (error != null) {
+      return error;
+    }
+    if (renameSection) {
+      for (Map.Entry<EMH, String> entry : map.entrySet()) {
+        rename(entry.getKey(), entry.getValue());
+      }
+    }
     return null;
   }
 
@@ -52,15 +83,38 @@
       batiCasier.setNom(CruePrefix.changePrefix(newCasierName, CruePrefix.P_CASIER, CruePrefix.P_BATI_CASIER));
     }
   }
-  
-  
 
   /**
    *
    * @param emh
    * @param newName
+   * @param renameSection true si les sections doivent être renommées.
    * @return une chaine non vide si erreur
    */
+  public String isNameValid(CatEMHBranche emh, String newName, boolean renameSection) {
+    final String nameValid = isNameValid(emh, newName);
+    if (nameValid != null) {
+      return nameValid;
+    }
+    if (renameSection) {
+      String oldSectionPrefix = CruePrefix.changePrefix(emh.getNom(), EnumCatEMH.SECTION);
+      String newSectionPref = CruePrefix.changePrefix(newName, EnumCatEMH.SECTION);
+      final List<RelationEMHSectionDansBranche> sections = emh.getSections();
+      for (RelationEMHSectionDansBranche relationEMHSectionDansBranche : sections) {
+        final CatEMHSection section = relationEMHSectionDansBranche.getEmh();
+        if (section.getNom().startsWith(oldSectionPrefix)) {
+          String newSectionName = newSectionPref + section.getNom().substring(oldSectionPrefix.length());
+          String newSectioNameValid = isNameValid(section, newSectionName);
+          if (newSectioNameValid != null) {
+            return newSectioNameValid;
+          }
+        }
+      }
+    }
+    return null;
+
+  }
+
   public String isNameValid(EMH emh, String newName) {
     String nameValidei18nMessage = ValidationPatternHelper.isNameValidei18nMessage(newName, emh.getCatType());
     if (nameValidei18nMessage != null) {

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHBrancheTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHBrancheTopComponent.java	2014-02-03 13:33:27 UTC (rev 8596)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHBrancheTopComponent.java	2014-02-03 14:34:34 UTC (rev 8597)
@@ -20,6 +20,7 @@
 import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
 import org.fudaa.dodico.crue.metier.emh.EnumBrancheType;
 import org.fudaa.dodico.crue.validation.util.DelegateValidatorBranche;
+import org.fudaa.fudaa.crue.common.helper.DialogHelper;
 import org.fudaa.fudaa.crue.common.helper.ObjetNommeCellRenderer;
 import org.fudaa.fudaa.crue.common.helper.ToStringInternationalizableCellRenderer;
 import org.fudaa.fudaa.crue.common.log.LogsDisplayer;
@@ -212,7 +213,16 @@
     EditionChangeBranche edition = new EditionChangeBranche(modellingConfigService.getDefaultValues());
     currentCenter.second.fillWithData(modifications);
     final CatEMHBranche emh = getEMH();
-    CtuluLog log = edition.changeBranche(emh, modifications, getCcm());
+    boolean renameSection = false;
+    if (!modifications.getNom().equals(emh.getNom())) {
+      String optionRename = NbBundle.getMessage(ModellingEMHBrancheTopComponent.class, "BrancheChangeName.RenameSection");
+      String optionNot = NbBundle.getMessage(ModellingEMHBrancheTopComponent.class, "BrancheChangeName.NotRenameSection");
+      String dialogContent = org.openide.util.NbBundle.getMessage(ModellingEMHBrancheTopComponent.class, "BrancheChangeName.Content");
+      renameSection = optionRename.equals(DialogHelper.showQuestion(
+              getDisplayName(), dialogContent, new String[]{optionRename, optionNot}));
+    }
+
+    CtuluLog log = edition.changeBranche(emh, modifications, getCcm(), renameSection);
     if (!log.containsErrorOrSevereError()) {
       modellingScenarioModificationService.setScenarioModified(new ScenarioModificationEvent(EnumModification.EMH));
       setModified(false);

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/emh/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/emh/Bundle.properties	2014-02-03 13:33:27 UTC (rev 8596)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/emh/Bundle.properties	2014-02-03 14:34:34 UTC (rev 8597)
@@ -51,3 +51,6 @@
 Reference.Name=R\u00e9f\u00e9rence
 Dz.Name=Dz
 changeSection.ProfilSectionWillBeLost=Le ProfilSection associ\u00e9 \u00e0 cette section sera perdu. Voulez-vous continuer ?
+BrancheChangeName.RenameSection=Renommer les sections
+BrancheChangeName.NotRenameSection=Ne pas renommer
+BrancheChangeName.Content=<html><body>Le nom de la branche est modifi\u00e9e. Voulez-vous: <ul><li>Renommer les sections nomm\u00e9es pr\u00e9c\u00e9demment selon le nom de la branche</li><li>Ne renommer aucune section de la branche</li></ul></body></html>

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheModel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheModel.java	2014-02-03 13:33:27 UTC (rev 8596)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheModel.java	2014-02-03 14:34:34 UTC (rev 8597)
@@ -134,6 +134,9 @@
 
   @Override
   public boolean addGeometry(GrPolyligne _p, CtuluCommandContainer _cmd, CtuluUI _ui, ZEditionAttributesDataI _d) {
+    if (_p.nombre() == 0) {
+      return false;
+    }
     PlanimetryControllerHelper helper = super.getLayerController().getHelper();
     if (!helper.canEMHBeAddedAndDisplayError()) {
       return false;
@@ -142,6 +145,7 @@
     if (brancheType == null) {
       return false;
     }
+
     GISPolyligne polyligne = _p.toGIS();
     double length = polyligne.getLength();
     CrueConfigMetier crueConfigMetier = helper.getController().getCrueConfigMetier();
@@ -180,9 +184,8 @@
       updateNoeudAvalPosition(nodeController, noeudAvalIdx, polyligne);
     }
 
-
-
-    CatEMHBranche createBranche = new EditionCreateEMH(getLayerController().getDefaultValues()).createBranche(helper.getDefaultSousModele(), brancheType, noeudAmont,
+    CatEMHBranche createBranche = new EditionCreateEMH(getLayerController().getDefaultValues()).createBranche(helper.getDefaultSousModele(),
+            brancheType, noeudAmont,
             noeudAval, crueConfigMetier, polyligne.getLength());
     if (createBranche != null) {
       StringBuilder info = new StringBuilder();
@@ -206,7 +209,8 @@
       }
       Object[] data = helper.getPlanimetryGisModelContainer().buildEdgeData(createBranche);
       getGeometries().addGeometry(polyligne, data, null);
-      DialogHelper.showNotifyOperationTermine(NbBundle.getMessage(PlanimetryBrancheModel.class, "Info.CreatedBranche", createBranche.getNom()), info.toString());
+      DialogHelper.showNotifyOperationTermine(NbBundle.getMessage(PlanimetryBrancheModel.class, "Info.CreatedBranche", createBranche.getNom()), info.
+              toString());
     }
     return true;
   }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8596] trunk/soft/fudaa-crue

From: <de...@us...> - 2014-02-03 13:33:32

Revision: 8596
          http://sourceforge.net/p/fudaa/svn/8596
Author:   deniger
Date:     2014-02-03 13:33:27 +0000 (Mon, 03 Feb 2014)
Log Message:
-----------
correction erreurs de report

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ResultatTimeKey.java
    trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/view/transformer/ResultatTimeKeySimpleToStringTransformer.java
    trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/transformer/ReportRunVariableTimeKeyMultiToStringTransformerTest.java
    trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/transformer/ResultatKeySimpleToStringTransformerTest.java

Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ResultatTimeKey.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ResultatTimeKey.java	2014-02-03 10:42:53 UTC (rev 8595)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ResultatTimeKey.java	2014-02-03 13:33:27 UTC (rev 8596)
@@ -18,6 +18,7 @@
    * Pour les calcul Permanents sera égal à 0
    */
   private final long duree;
+  private final boolean useDay;
   private final String temps;
   private final boolean transitoire;
   public static final ResultatTimeKey NULL_VALUE = new ResultatTimeKey("<NULL>");
@@ -27,6 +28,7 @@
     this.duree = -1;
     temps = StringUtils.EMPTY;
     transitoire = false;
+    useDay = false;
   }
 
   public ResultatTimeKey(String nomCalcul, long duree, boolean useDay) {
@@ -34,8 +36,13 @@
     this.duree = duree;
     temps = DateDurationConverter.durationToDDHHMMSS(new Duration(duree), useDay);
     transitoire = true;
+    this.useDay = useDay;
   }
 
+  public boolean isUseDay() {
+    return useDay;
+  }
+
   public boolean isTransitoire() {
     return transitoire;
   }

Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/view/transformer/ResultatTimeKeySimpleToStringTransformer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/view/transformer/ResultatTimeKeySimpleToStringTransformer.java	2014-02-03 10:42:53 UTC (rev 8595)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/view/transformer/ResultatTimeKeySimpleToStringTransformer.java	2014-02-03 13:33:27 UTC (rev 8596)
@@ -13,16 +13,23 @@
  */
 public class ResultatTimeKeySimpleToStringTransformer extends AbstractPropertyToStringTransformer<ResultatTimeKey> {
 
+  public static final String DAY_YES = "DAY";
+  private static final String DAY_NO = "NO_DAY";
+
   public ResultatTimeKeySimpleToStringTransformer() {
     super(ResultatTimeKey.class);
   }
 
+  private static String getDay(ResultatTimeKey key) {
+    return key.isUseDay() ? DAY_YES : DAY_NO;
+  }
+
   @Override
   public String toStringSafe(ResultatTimeKey in) {
     if (in.isPermanent()) {
       return in.getNomCalcul();
     }
-    return in.getNomCalcul() + KeysToStringConverter.MINOR_SEPARATOR + in.getDuree();
+    return in.getNomCalcul() + KeysToStringConverter.MINOR_SEPARATOR + in.getDuree() + KeysToStringConverter.MINOR_SEPARATOR + getDay(in);
   }
 
   @Override
@@ -43,10 +50,14 @@
     if (split.length == 1) {
       return new ResultatTimeKey(nomCalcul);
     }
-    if (split.length == 2) {
+    if (split.length >= 2) {
+      boolean day = false;
+      if (split.length == 3) {
+        day = DAY_YES.equals(split[2]);
+      }
       try {
         Long duree = Long.valueOf(split[1]);
-        return new ResultatTimeKey(nomCalcul, duree);
+        return new ResultatTimeKey(nomCalcul, duree, day);
       } catch (NumberFormatException numberFormatException) {
       }
     }

Modified: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/transformer/ReportRunVariableTimeKeyMultiToStringTransformerTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/transformer/ReportRunVariableTimeKeyMultiToStringTransformerTest.java	2014-02-03 10:42:53 UTC (rev 8595)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/transformer/ReportRunVariableTimeKeyMultiToStringTransformerTest.java	2014-02-03 13:33:27 UTC (rev 8596)
@@ -23,7 +23,7 @@
   @Test
   public void testReadWrite() {
     ReportRunKey current = new ReportRunKey();
-    ResultatTimeKey currentKey = new ResultatTimeKey("calcul", 1234);
+    ResultatTimeKey currentKey = new ResultatTimeKey("calcul", 1234, false);
     KeysToStringConverter converter = new KeysToStringConverter(current);
     AbstractPropertyToStringTransformer<ReportRunVariableTimeKey> transformer = converter.getReportRunVariableTimeKeyConverter();
     ReportRunVariableTimeKey key = new ReportRunVariableTimeKey(current, ReportVariableTypeEnum.READ, "variable", currentKey);
@@ -36,10 +36,11 @@
     ReportRunKey reportRunKeyAlternatif = new ReportRunKey("manager", "run");
     key = new ReportRunVariableTimeKey(reportRunKeyAlternatif, ReportVariableTypeEnum.READ, "variable", currentKey);
     toString = transformer.toString(key);
-    assertEquals("manager;run|variable;read|calcul;1234", toString);
+    assertEquals("manager;run|variable;read|calcul;1234;NO_DAY", toString);
     fromKey = transformer.fromString(toString);
     assertEquals(key, fromKey);
 
 
+
   }
 }

Modified: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/transformer/ResultatKeySimpleToStringTransformerTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/transformer/ResultatKeySimpleToStringTransformerTest.java	2014-02-03 10:42:53 UTC (rev 8595)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/transformer/ResultatKeySimpleToStringTransformerTest.java	2014-02-03 13:33:27 UTC (rev 8596)
@@ -28,14 +28,28 @@
   }
 
   @Test
+  public void testForTransitoireOldFormat() {
+    String old = "calcul;1234";
+    ResultatTimeKeySimpleToStringTransformer transformer = new ResultatTimeKeySimpleToStringTransformer();
+    final ResultatTimeKey fromString = transformer.fromString(old);
+    assertFalse(fromString.isUseDay());
+    assertEquals("calcul", fromString.getNomCalcul());
+    assertEquals(1234L, fromString.getDuree());
+
+  }
+
+  @Test
   public void testForTransitoire() {
     ResultatTimeKeySimpleToStringTransformer transformer = new ResultatTimeKeySimpleToStringTransformer();
     final long duree = 12345L;
-    ResultatTimeKey key = new ResultatTimeKey("transitoire", duree);
+    ResultatTimeKey key = new ResultatTimeKey("transitoire", duree, true);
     final String toString = transformer.toString(key);
-    assertEquals(key.getNomCalcul() + KeysToStringConverter.MINOR_SEPARATOR + duree, toString);
+    assertEquals(
+            key.getNomCalcul() + KeysToStringConverter.MINOR_SEPARATOR + duree + KeysToStringConverter.MINOR_SEPARATOR + ResultatTimeKeySimpleToStringTransformer.DAY_YES,
+            toString);
     ResultatTimeKey readKey = transformer.fromString(toString);
     assertEquals(readKey, key);
+    assertTrue(key.isUseDay());
     assertEquals(duree, readKey.getDuree());
     assertTrue(readKey.isTransitoire());
   }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8595] trunk/soft/fudaa-crue

From: <de...@us...> - 2014-02-03 10:42:57

Revision: 8595
          http://sourceforge.net/p/fudaa/svn/8595
Author:   deniger
Date:     2014-02-03 10:42:53 +0000 (Mon, 03 Feb 2014)
Log Message:
-----------
CRUE-594, CRUE-604

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
    trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java
    trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu40.java
    trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu41.java
    trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu50.java
    trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu70.java
    trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-0.zip
    trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-1.zip
    trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-2.zip
    trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-3.zip
    trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-4.zip
    trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-5.zip
    trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu4-0.zip
    trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu4-1.zip
    trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu5-0.zip
    trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu6-0.zip
    trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu7-0.zip
    trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestValidatorForValuesAndContents.java
    trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/layer.xml
    trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ScenarioBuilderForTests.java
    trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/CloseProjectAction.java

Added Paths:
-----------
    trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-options-keymap.jar/
    trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-options-keymap.jar/org/
    trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-options-keymap.jar/org/netbeans/
    trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-options-keymap.jar/org/netbeans/modules/
    trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-options-keymap.jar/org/netbeans/modules/options/
    trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-options-keymap.jar/org/netbeans/modules/options/keymap/
    trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-options-keymap.jar/org/netbeans/modules/options/keymap/Bundle_fr_FR.properties

Modified: trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties	2014-01-31 20:53:28 UTC (rev 8594)
+++ trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties	2014-02-03 10:42:53 UTC (rev 8595)
@@ -892,8 +892,8 @@
 externConfig.geo.NoFormatFound.error=Ressource {0}: le format du fichier n''est pas pr\u00e9sent dans le fichier
 externConfig.geo.FormatUnknown.error=Ressource {0}: le format {1} du fichier n''est pas support\u00e9 par Fudaa-Crue
 externConfig.geo.NoDataFound.error=Ressource {0}: le fichier {1} ne contient pas de donn\u00e9es ou est erron\u00e9
-create.SectionAval={0}_Aval
-create.SectionAmont={0}_Amont
+create.SectionAval={0}_Av
+create.SectionAmont={0}_Am
 deleteEMH.SectionUsedByBranche.Title=Des sections ne sont pas supprim\u00e9es car utilis\u00e9es par des branches
 deleteEMH.SectionUsedByBranche.Item=La section {0} est utilis\u00e9e par une branche
 deleteEMH.SectionUsedBySectionIdem.Title=Des sections ne sont pas supprim\u00e9es car r\u00e9f\u00e9renc\u00e9es par des SectionIdem

Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java	2014-01-31 20:53:28 UTC (rev 8594)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java	2014-02-03 10:42:53 UTC (rev 8595)
@@ -301,11 +301,11 @@
     final EMHSectionSansGeometrie amont = new EMHSectionSansGeometrie(CruePrefix.changePrefix(branche.getNom(),
             CruePrefix.P_BRANCHE,
             CruePrefix.P_SECTION)
-            + "_Amont");
+            + "_Am");
     final EMHSectionSansGeometrie aval = new EMHSectionSansGeometrie(CruePrefix.changePrefix(branche.getNom(),
             CruePrefix.P_BRANCHE,
             CruePrefix.P_SECTION)
-            + "_Aval");
+            + "_Av");
     metier.add(amont);
     metier.add(aval);
     branche.addListeSections(Arrays.asList(EMHRelationFactory.createSectionDansBrancheAndSetBrancheContientSection(branche, amont, 0,

Modified: trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu40.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu40.java	2014-01-31 20:53:28 UTC (rev 8594)
+++ trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu40.java	2014-02-03 10:42:53 UTC (rev 8595)
@@ -45,26 +45,26 @@
   @Test
   public void testSc_M40_c9c9() {
     IntegrationHelper.exportToCrue9(getEtuFile().getParentFile(), projet, "Sc_M4-0_c9", "Sc_M4-0_c9c9", "M4-0_c9c9", true, 0);
-    IntegrationHelper.testScenario(projet, "Sc_M4-0_c9c9", new ErrorBilanTester(0, 0, 4, 2));
+    IntegrationHelper.testScenario(projet, "Sc_M4-0_c9c9", new ErrorBilanTester(0, 0, 3, 2));
   }
 
   @Test
   public void testSc_M40_c10c9() {
     IntegrationHelper.exportToCrue9(getEtuFile().getParentFile(), projet, "Sc_M4-0_c10", "Sc_M4-0_c10c9", "M4-0_c10c9",
             Arrays.asList("COM5", "COM1", "COM3", "DLHY1", "DCLM4", "PNUM1", "OPTR1"));
-    IntegrationHelper.testScenario(projet, "Sc_M4-0_c10c9", new ErrorBilanTester(0, 0, 4, 2));
+    IntegrationHelper.testScenario(projet, "Sc_M4-0_c10c9", new ErrorBilanTester(0, 0, 3, 2));
   }
 
   @Test
   public void testSc_M40_c10c10() {
     IntegrationHelper.exportToCrue10(getEtuFile().getParentFile(), projet, "Sc_M4-0_c10", "Sc_M4-0_c10c10", "M4-0_c10c10", true, 0);
-    IntegrationHelper.testScenario(projet, "Sc_M4-0_c10c10", new ErrorBilanTester(0, 0, 3, 1));
+    IntegrationHelper.testScenario(projet, "Sc_M4-0_c10c10", new ErrorBilanTester(0, 0, 2, 1));
   }
 
   @Test
   public void testSc_Poub_c10() {
     IntegrationHelper.exportToCrue10(getEtuFile().getParentFile(), projet, "Sc_M4-0_c10", "Sc_Poub_c10", "Poub_c10", true, 0);
-    IntegrationHelper.testScenario(projet, "Sc_Poub_c10", new ErrorBilanTester(0, 0, 3, 1));
+    IntegrationHelper.testScenario(projet, "Sc_Poub_c10", new ErrorBilanTester(0, 0, 2, 1));
   }
 
   @Test
@@ -74,17 +74,17 @@
             "COM5", "OCAL4",
             "OPTI6", "OPTG4",
             "OPTR1"));// différences
-    IntegrationHelper.testScenario(projet, "Sc_M4-0_c9c10", new ErrorBilanTester(0, 0, 3, 2));
+    IntegrationHelper.testScenario(projet, "Sc_M4-0_c9c10", new ErrorBilanTester(0, 0, 2, 2));
   }
 
   @Test
   public void testSc_M40_c9() {
-    IntegrationHelper.testScenario(projet, "Sc_M4-0_c9", new ErrorBilanTester(0, 0, 4, 2));
+    IntegrationHelper.testScenario(projet, "Sc_M4-0_c9", new ErrorBilanTester(0, 0, 3, 2));
   }
 
   @Test
   public void testSc_M40_v1c9() {
-    IntegrationHelper.testScenario(projet, "Sc_M4-0_v1c9", new ErrorBilanTester(0, 0, 4, 1));
+    IntegrationHelper.testScenario(projet, "Sc_M4-0_v1c9", new ErrorBilanTester(0, 0, 3, 1));
   }
 
   @Test
@@ -94,12 +94,12 @@
 
   @Test
   public void testSc_M40_c10() {
-    IntegrationHelper.testScenario(projet, "Sc_M4-0_c10", new ErrorBilanTester(0, 0, 3, 1));
+    IntegrationHelper.testScenario(projet, "Sc_M4-0_c10", new ErrorBilanTester(0, 0, 2, 1));
   }
 
   @Test
   public void testSc_M40_v1c10() {
-    IntegrationHelper.testScenario(projet, "Sc_M4-0_v1c10", new ErrorBilanTester(0, 0, 3, 1));
+    IntegrationHelper.testScenario(projet, "Sc_M4-0_v1c10", new ErrorBilanTester(0, 0, 2, 1));
   }
 
   private File getEtuFile() {

Modified: trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu41.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu41.java	2014-01-31 20:53:28 UTC (rev 8594)
+++ trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu41.java	2014-02-03 10:42:53 UTC (rev 8595)
@@ -51,7 +51,7 @@
   @Test
   public void testSc_Poub_c9() {
     IntegrationHelper.exportToCrue9(getEtuFile().getParentFile(), projet, "Sc_M4-1_c9", "Sc_Poub_c9", "Poub_c9", true, 0);
-    IntegrationHelper.testScenario(projet, "Sc_Poub_c9", new ErrorBilanTester(0, 0, 6, 2));
+    IntegrationHelper.testScenario(projet, "Sc_Poub_c9", new ErrorBilanTester(0, 0, 5, 2));
   }
 
   @Test

Modified: trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu50.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu50.java	2014-01-31 20:53:28 UTC (rev 8594)
+++ trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu50.java	2014-02-03 10:42:53 UTC (rev 8595)
@@ -46,13 +46,13 @@
   public void testSc_M50_c10c9() {
     IntegrationHelper.exportToCrue9(getEtuFile().getParentFile(), projet, "Sc_M5-0_c10", "Sc_M5-0_c10c9", "M5-0_c10c9",
             Arrays.asList("COM1", "COM3", "COM5", "PNUM1", "OPTR1"));
-    IntegrationHelper.testScenario(projet, "Sc_M5-0_c10c9", new ErrorBilanTester(0, 0, 7, 1));
+    IntegrationHelper.testScenario(projet, "Sc_M5-0_c10c9", new ErrorBilanTester(0, 0, 5, 1));
   }
 
   @Test
   public void testSc_M50_c9c9() {
     IntegrationHelper.exportToCrue9(getEtuFile().getParentFile(), projet, "Sc_M5_c9", "Sc_M5_c9c9", "M5_c9c9", true, 0);
-    IntegrationHelper.testScenario(projet, "Sc_M5_c9c9", new ErrorBilanTester(0, 0, 7, 1));
+    IntegrationHelper.testScenario(projet, "Sc_M5_c9c9", new ErrorBilanTester(0, 0, 5, 1));
   }
 
   @Test
@@ -61,13 +61,13 @@
             "COM5", "OCAL4",
             "OPTI6", "OPTG4",
             "OPTR1"));// différences
-    IntegrationHelper.testScenario(projet, "Sc_M5-0_c9c10", new ErrorBilanTester(0, 0, 6, 1));
+    IntegrationHelper.testScenario(projet, "Sc_M5-0_c9c10", new ErrorBilanTester(0, 0, 4, 1));
   }
 
   @Test
   public void testSc_M50_c10c10() {
     IntegrationHelper.exportToCrue10(getEtuFile().getParentFile(), projet, "Sc_M5-0_c10", "Sc_M5-0_c10c10", "M5-0_c10c10", true, 0);// différences
-    IntegrationHelper.testScenario(projet, "Sc_M5-0_c10c10", new ErrorBilanTester(0, 0, 6, 1));
+    IntegrationHelper.testScenario(projet, "Sc_M5-0_c10c10", new ErrorBilanTester(0, 0, 4, 1));
   }
 
   @Test
@@ -75,22 +75,22 @@
     IntegrationHelper.exportToCrue10(getEtuFile().getParentFile(), projet, "Sc_M5-0_c9", "Sc_Poub_c10", "Poub_c10", Arrays.asList("COM1", "COM3", "COM5",
             "OCAL4", "OPTI6",
             "OPTG4", "OPTR1"));// différences
-    IntegrationHelper.testScenario(projet, "Sc_Poub_c10", new ErrorBilanTester(0, 0, 6, 1));
+    IntegrationHelper.testScenario(projet, "Sc_Poub_c10", new ErrorBilanTester(0, 0, 4, 1));
   }
 
   @Test
   public void testSc_M5_c9() {
-    IntegrationHelper.testScenario(projet, "Sc_M5_c9", new ErrorBilanTester(0, 0, 7, 1));
+    IntegrationHelper.testScenario(projet, "Sc_M5_c9", new ErrorBilanTester(0, 0, 5, 1));
   }
 
   @Test
   public void testSc_M50_c9() {
-    IntegrationHelper.testScenario(projet, "Sc_M5-0_c9", new ErrorBilanTester(0, 0, 7, 1));
+    IntegrationHelper.testScenario(projet, "Sc_M5-0_c9", new ErrorBilanTester(0, 0, 5, 1));
   }
 
   @Test
   public void testSc_M50_c10() {
-    IntegrationHelper.testScenario(projet, "Sc_M5-0_c10", new ErrorBilanTester(0, 0, 6, 1));
+    IntegrationHelper.testScenario(projet, "Sc_M5-0_c10", new ErrorBilanTester(0, 0, 4, 1));
   }
 
   private File getEtuFile() {

Modified: trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu70.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu70.java	2014-01-31 20:53:28 UTC (rev 8594)
+++ trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu70.java	2014-02-03 10:42:53 UTC (rev 8595)
@@ -46,14 +46,14 @@
   public void testSc_M70_c9c9() {
     IntegrationHelper.exportToCrue9(getEtuFile().getParentFile(), projet, "Sc_M7-0_c9", "Sc_M7-0_c9c9", "M7-0_c9c9", true,
             0);
-    IntegrationHelper.testScenario(projet, "Sc_M7-0_c9c9", new ErrorBilanTester(0, 0, 261, 0));
+    IntegrationHelper.testScenario(projet, "Sc_M7-0_c9c9", new ErrorBilanTester(0, 0, 249, 0));
   }
 
   @Test
   public void testSc_M70_c10c9() {
     IntegrationHelper.exportToCrue9(getEtuFile().getParentFile(), projet, "Sc_M7-0_c10", "Sc_M7-0_c10c9", "M7-0_c10c9",
             Arrays.asList("COM5", "COM1", "COM3", "OPTR1"));
-    IntegrationHelper.testScenario(projet, "Sc_M7-0_c10c9", new ErrorBilanTester(0, 0, 261, 0));
+    IntegrationHelper.testScenario(projet, "Sc_M7-0_c10c9", new ErrorBilanTester(0, 0, 249, 0));
   }
 
   @Test
@@ -62,23 +62,23 @@
             Arrays.asList("COM5", "COM1",
             "COM3", "OPTI6",
             "OPTG4", "OPTR1"));// différences
-    IntegrationHelper.testScenario(projet, "Sc_M7-0_c9c10", new ErrorBilanTester(0, 0, 260, 0));
+    IntegrationHelper.testScenario(projet, "Sc_M7-0_c9c10", new ErrorBilanTester(0, 0, 248, 0));
   }
 
   @Test
   public void testSc_M70_c10c10() {
     IntegrationHelper.exportToCrue10(getEtuFile().getParentFile(), projet, "Sc_M7-0_c10", "Sc_M7-0_c10c10", "M7-0_c10c10", true, 0);
-    IntegrationHelper.testScenario(projet, "Sc_M7-0_c10c10", new ErrorBilanTester(0, 0, 260, 0));
+    IntegrationHelper.testScenario(projet, "Sc_M7-0_c10c10", new ErrorBilanTester(0, 0, 248, 0));
   }
 
   @Test
   public void testSc_M70_c10() {
-    IntegrationHelper.testScenario(projet, "Sc_M7-0_c10", new ErrorBilanTester(0, 0, 260, 0));
+    IntegrationHelper.testScenario(projet, "Sc_M7-0_c10", new ErrorBilanTester(0, 0, 248, 0));
   }
 
   @Test
   public void testSc_M70_c9() {
-    IntegrationHelper.testScenario(projet, "Sc_M7-0_c9", new ErrorBilanTester(0, 1, 261, 0));
+    IntegrationHelper.testScenario(projet, "Sc_M7-0_c9", new ErrorBilanTester(0, 1, 249, 0));
   }
 
   private File getEtuFile() {

Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-0.zip
===================================================================
(Binary files differ)

Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-1.zip
===================================================================
(Binary files differ)

Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-2.zip
===================================================================
(Binary files differ)

Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-3.zip
===================================================================
(Binary files differ)

Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-4.zip
===================================================================
(Binary files differ)

Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-5.zip
===================================================================
(Binary files differ)

Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu4-0.zip
===================================================================
(Binary files differ)

Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu4-1.zip
===================================================================
(Binary files differ)

Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu5-0.zip
===================================================================
(Binary files differ)

Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu6-0.zip
===================================================================
(Binary files differ)

Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu7-0.zip
===================================================================
(Binary files differ)

Modified: trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestValidatorForValuesAndContents.java
===================================================================
--- trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestValidatorForValuesAndContents.java	2014-01-31 20:53:28 UTC (rev 8594)
+++ trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestValidatorForValuesAndContents.java	2014-02-03 10:42:53 UTC (rev 8595)
@@ -55,20 +55,20 @@
     
     assertFalse(log.containsErrorOrSevereError());
     ValidationContentSectionDansBrancheExecutor executor = new ValidationContentSectionDansBrancheExecutor(CrueConfigMetierLoaderDefaultTest.DEFAULT);
-    executor.validContent(log, pdc, Arrays.asList(new EMHSectionSansGeometrie("Test_Amont"), new EMHSectionSansGeometrie(
-            "Test_Aval")));
+    executor.validContent(log, pdc, Arrays.asList(new EMHSectionSansGeometrie("Test_Am"), new EMHSectionSansGeometrie(
+            "Test_Av")));
     contents.validateBranche(pdc, new EMHModeleBase(), log);
     assertFalse(log.containsErrorOrSevereError());
-    executor.validContent(log, pdc, Arrays.asList(new EMHSectionSansGeometrie("Test_Amont"), new EMHSectionSansGeometrie(
-            "Test_Amont"),
-            new EMHSectionSansGeometrie("Test_Aval")));
+    executor.validContent(log, pdc, Arrays.asList(new EMHSectionSansGeometrie("Test_Am"), new EMHSectionSansGeometrie(
+            "Test_Am"),
+            new EMHSectionSansGeometrie("Test_Av")));
     assertTrue(log.containsErrorOrSevereError());
     assertEquals(1, log.getRecords().size());
     assertEquals("validation.branche.nbSectionNotEqualsTo", log.getRecords().iterator().next().getMsg());
     log.clear();
-    executor.validContent(log, pdc, Arrays.asList(new EMHSectionIdem("titi"), new EMHSectionSansGeometrie("Test_Amont"),
+    executor.validContent(log, pdc, Arrays.asList(new EMHSectionIdem("titi"), new EMHSectionSansGeometrie("Test_Am"),
             new EMHSectionSansGeometrie(
-            "Test_Amont"), new EMHSectionSansGeometrie("Test_Aval")));
+            "Test_Am"), new EMHSectionSansGeometrie("Test_Av")));
     assertTrue(log.containsErrorOrSevereError());
     assertEquals(2, log.getRecords().size());
     Iterator<CtuluLogRecord> iterator = log.getRecords().iterator();
@@ -85,8 +85,8 @@
     EMHBranchePdc pdc = new EMHBranchePdc("test");
     EMHRelationFactory.addRelationContientEMH(sousModele, pdc);
     pdc.setUserActive(true);
-    final EMHSectionSansGeometrie amont = new EMHSectionSansGeometrie("Test_Amont");
-    final EMHSectionSansGeometrie aval = new EMHSectionSansGeometrie("Test_Aval");
+    final EMHSectionSansGeometrie amont = new EMHSectionSansGeometrie("Test_Am");
+    final EMHSectionSansGeometrie aval = new EMHSectionSansGeometrie("Test_Av");
     pdc.addListeSections(Arrays.asList(
             EMHRelationFactory.createSectionDansBrancheAndSetBrancheContientSection(pdc, amont, 0, EnumPosSection.AMONT,
             CrueConfigMetierLoaderDefaultTest.DEFAULT),

Added: trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-options-keymap.jar/org/netbeans/modules/options/keymap/Bundle_fr_FR.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-options-keymap.jar/org/netbeans/modules/options/keymap/Bundle_fr_FR.properties	                        (rev 0)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-options-keymap.jar/org/netbeans/modules/options/keymap/Bundle_fr_FR.properties	2014-02-03 10:42:53 UTC (rev 8595)
@@ -0,0 +1,60 @@
+AD_Add_Shortcut=Ajouter
+AD_Clear=Effacer le raccourci
+AD_Delete=Effacer
+AD_Duplicate=Dupliquer
+AD_Profiles=Profils
+AD_Remove_Shortcut=Supprimer
+AD_Restore=Restaurer
+AD_Shortcut=raccourci
+AD_Shortcuts=Raccourcis
+AD_ShortcutsDialog=Entrer un nouveau raccourci
+AD_Show_Shortcuts=Raccourcis
+AD_Tab=Ins\u00e9rer un caract\u00e8re TAB
+Add_Alternative=Ajouter un raccourci alternatif
+Add_Shortcut_Dialog=Ajouter un raccourci
+Alternative_Shortcut=(raccourci alternatif)
+AN_Add_Shortcut=Ajouter
+AN_Clear=Effacer le raccourci bouton
+AN_Delete=Supprimer
+AN_Duplicate=Dupliquer
+AN_Profiles=Profils
+AN_Remove_Shortcut=Supprimer
+AN_Restore=Restaurer
+AN_Shortcut=Raccourci
+AN_Shortcuts=Raccourcis
+AN_ShortcutsDialog=Entrer un nouveau raccourci
+AN_Show_Shortcuts=Raccourcis
+AN_Tab=Ins\u00e9rer un caract\u00e8re TAB
+Category=Cat\u00e9gorie
+Clear=Effacer
+Conflicting_Shortcut_Dialog=Dialogue des conflits de raccourcis
+CTL_Add_Shortcut=A&jouter ...
+CTL_Clear=&Effacer
+CTL_Create_New_Profile_Message=&Nom du profil:
+CTL_Create_New_Profile_Title=Nouveau profil
+CTL_Delete=Supprimer
+CTL_Duplicate=&Configurer les profiles...
+CTL_Duplicate_Profile_Name=Un profil avec le nom donn\u00e9 existe d\u00e9j\u00e0. Veuillez proposer un autre nom
+CTL_Export_Editor_Shortcuts_Action=Exporter les raccourcis dans un format XML
+CTL_Export_IDE_Actions_Action=Exporter les raccourcis de l'IDE dans un format XML
+CTL_Export_IDE_Shortcuts_Action=Exporter les raccourcis de l'IDE dans un format XML
+CTL_Export_Shortcuts_to_HTML_Action=Exporter les raccourcis dans un format HTML
+CTL_Files=Fichiers
+CTL_Keymap_Name=&Profil:
+CTL_Keymap_Options=&Raccourcis
+CTL_Keymap_Options_Description=Raccourci
+CTL_Keymap_Options_Title=Raccourcis
+CTL_Manage_Keymap_Profiles=Configurer les profils de raccourcis
+CTL_Other=Autre
+CTL_Remove_Shortcut=Supprimer
+CTL_Restore=&Restaurer
+CTL_Shortcuts=&Raccourcis:
+CTL_Show_Shortcuts=&Raccourcis
+Edit=Editer...
+KeymapPanel.searchLabel.text=&Chercher:
+KeymapPanel.searchSCLabel.text=Chercher dans les raccou&rcis:
+Keymaps=&Raccourcis
+Keymaps.Options.Export.Category.displayName=Raccourcis
+ProfilesPanel.profilesList.AccessibleContext.accessibleDescription=Liste des profils de raccourcis clavier
+Reset_to_Default=R\u00e9initialiser
+Shortcut=Raccourci

Modified: trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/layer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/layer.xml	2014-01-31 20:53:28 UTC (rev 8594)
+++ trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/layer.xml	2014-02-03 10:42:53 UTC (rev 8595)
@@ -27,7 +27,6 @@
   <folder name="OptionsDialog">
     <file name="Advanced.instance_hidden"/>
     <file name="General.instance_hidden"/>
-    <file name="Keymaps.instance_hidden"/>
   </folder>
     <file name="OptionsExport_hidden"/>
 </filesystem>

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ScenarioBuilderForTests.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ScenarioBuilderForTests.java	2014-01-31 20:53:28 UTC (rev 8594)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ScenarioBuilderForTests.java	2014-02-03 10:42:53 UTC (rev 8595)
@@ -109,8 +109,8 @@
   }
 
   private static void addSections(EMHSousModele sousModele, CatEMHBranche br, double length, int nbSection) {
-    EMHSectionSansGeometrie sectionAmont = new EMHSectionSansGeometrie("St_" + br.getNom() + "_Amont");
-    EMHSectionSansGeometrie sectionAval = new EMHSectionSansGeometrie("St_" + br.getNom() + "_Aval");
+    EMHSectionSansGeometrie sectionAmont = new EMHSectionSansGeometrie("St_" + br.getNom() + "_Am");
+    EMHSectionSansGeometrie sectionAval = new EMHSectionSansGeometrie("St_" + br.getNom() + "_Av");
     RelationEMHSectionDansBranche sectionAmontRelation = EMHRelationFactory.createSectionDansBrancheAndSetBrancheContientSection(br,
             false, sectionAmont,
             CrueConfigMetierLoaderDefaultTest.DEFAULT);

Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/CloseProjectAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/CloseProjectAction.java	2014-01-31 20:53:28 UTC (rev 8594)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/CloseProjectAction.java	2014-02-03 10:42:53 UTC (rev 8595)
@@ -13,9 +13,10 @@
 import org.openide.awt.ActionRegistration;
 import org.openide.util.Lookup;
 import org.openide.util.NbBundle;
+import org.openide.windows.WindowManager;
 
 @ActionID(category = "View",
-id = "org.fudaa.fudaa.crue.study.actions.CloseStudy")
+        id = "org.fudaa.fudaa.crue.study.actions.CloseStudy")
 @ActionRegistration(displayName = "#CloseStudy.Name")
 @ActionReferences({
   @ActionReference(path = "Actions/Study", position = 10)
@@ -37,5 +38,7 @@
   @Override
   public void actionPerformed(ActionEvent e) {
     crueService.closeAll();
+    WindowManager.getDefault().getMainWindow().repaint(0);
+
   }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8594] trunk/soft/fudaa-crue

From: <de...@us...> - 2014-01-31 20:53:35

Revision: 8594
          http://sourceforge.net/p/fudaa/svn/8594
Author:   deniger
Date:     2014-01-31 20:53:28 +0000 (Fri, 31 Jan 2014)
Log Message:
-----------
CRUE-626

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/DateDurationConverter.java
    trunk/soft/fudaa-crue/crue-core/src/test/java/org/fudaa/dodico/crue/common/DateDurationConverterTest.java
    trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ResultatTimeKey.java
    trunk/soft/fudaa-crue/crue-emh/src/test/java/org/fudaa/dodico/crue/metier/emh/ResultatPasDeTempsTest.java
    trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java
    trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java
    trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/res/RCalTimeStepBuilder.java
    trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-0.zip
    trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-1.zip
    trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-2.zip
    trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-3.zip
    trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-4.zip
    trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-5.zip
    trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu4-0.zip
    trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu4-1.zip
    trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu5-0.zip
    trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu6-0.zip
    trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu7-0.zip
    trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu7-1.zip
    trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu7-2.zip

Modified: trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/DateDurationConverter.java
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/DateDurationConverter.java	2014-01-31 18:19:15 UTC (rev 8593)
+++ trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/DateDurationConverter.java	2014-01-31 20:53:28 UTC (rev 8594)
@@ -25,16 +25,26 @@
    */
   public final static LocalDateTime ZERO_DATE = new LocalDateTime(01, 01, 01, 0, 0, 0, 0);
   public final static DateTimeFormatter MEDIUM_DATE_TIME = DateTimeFormat.mediumDateTime();
+  private static final PeriodFormatter JJHHMMSS = new PeriodFormatterBuilder().printZeroAlways().minimumPrintedDigits(2).appendDays().
+          appendLiteral(":").
+          appendHours().appendLiteral(":").
+          appendMinutes().appendLiteral(":")
+          .appendSecondsWithOptionalMillis().toFormatter();
+  private static final PeriodFormatter HHMMSS = new PeriodFormatterBuilder().printZeroAlways().minimumPrintedDigits(2).
+          appendHours().appendLiteral(":").
+          appendMinutes().appendLiteral(":")
+          .appendSecondsWithOptionalMillis().toFormatter();
   private static final PeriodFormatter XSD_DURATION_FORMATTER = new PeriodFormatterBuilder().printZeroAlways().appendLiteral(
           "P0Y0M").appendDays().appendSuffix(
-          "D").appendSeparatorIfFieldsAfter("T").appendHours().appendSuffix("H").appendMinutes().appendSuffix("M").appendSecondsWithOptionalMillis().
+                  "D").appendSeparatorIfFieldsAfter("T").appendHours().appendSuffix("H").appendMinutes().appendSuffix("M").
+          appendSecondsWithOptionalMillis().
           appendSuffix(
-          "S").toFormatter();
+                  "S").toFormatter();
   private static final PeriodFormatter CRUE_DURATION_FORMATTER = new PeriodFormatterBuilder().printZeroAlways().appendDays().appendLiteral(
           " ").appendHours().appendLiteral(" ").appendMinutes().appendLiteral(" ").appendSecondsWithOptionalMillis().toFormatter();
   private static final DateTimeFormatter XSD_DATE_FORMATTER = ISODateTimeFormat.dateHourMinuteSecondMillis();
-  public static final DateTimeFormatter XSD_DATE_FORMATTER_UI =
-          new DateTimeFormatterBuilder()
+  public static final DateTimeFormatter XSD_DATE_FORMATTER_UI
+          = new DateTimeFormatterBuilder()
           .append(ISODateTimeFormat.date())
           .appendLiteral(' ')
           .append(ISODateTimeFormat.hourMinuteSecondMillis())
@@ -196,6 +206,10 @@
     return CRUE_DURATION_FORMATTER.print(durationToDaysHourMinSecPeriod(d));
   }
 
+  public static boolean isGreaterThanDay(long millis) {
+    return millis > 1000 * 3600 * 24;
+  }
+
   /**
    * @param d la duration a traiter
    * @return la period avec les jour/heures/minutes/secondes
@@ -207,6 +221,21 @@
     return d.toPeriod(PeriodType.dayTime(), ISOChronology.getInstanceUTC());
   }
 
+  public static String durationToDDHHMMSS(final Duration d, boolean useDay) {
+    if (useDay) {
+      return durationToDDHHMMSS(d);
+    }
+    return durationToHHMMSS(d);
+  }
+
+  public static String durationToDDHHMMSS(final Duration d) {
+    return JJHHMMSS.print(durationToDaysHourMinSecPeriod(d));
+  }
+
+  public static String durationToHHMMSS(final Duration d) {
+    return HHMMSS.print(d.toPeriod(PeriodType.time()));
+  }
+
   /**
    * @param d
    * @return le format xsd en transformant les mois/années en nombre de jour

Modified: trunk/soft/fudaa-crue/crue-core/src/test/java/org/fudaa/dodico/crue/common/DateDurationConverterTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/test/java/org/fudaa/dodico/crue/common/DateDurationConverterTest.java	2014-01-31 18:19:15 UTC (rev 8593)
+++ trunk/soft/fudaa-crue/crue-core/src/test/java/org/fudaa/dodico/crue/common/DateDurationConverterTest.java	2014-01-31 20:53:28 UTC (rev 8594)
@@ -9,7 +9,6 @@
 import org.joda.time.LocalDateTime;
 import org.joda.time.Period;
 
-
 /**
  * @author deniger
  */
@@ -17,6 +16,20 @@
 
   private static final long NB_MILLIS_BY_HOUR = 3600000;
 
+  public void testFormatter() {
+    Duration d = DateDurationConverter.getDuration(1, 2, 3, 64);
+    assertEquals("01:02:04:04",
+            DateDurationConverter.durationToDDHHMMSS(d));
+    assertEquals("26:04:04",
+            DateDurationConverter.durationToHHMMSS(d));
+    d = DateDurationConverter.getDuration(3, 0, 0, 1);
+    assertEquals("72:00:01",
+            DateDurationConverter.durationToHHMMSS(d));
+    assertEquals("03:00:00:01",
+            DateDurationConverter.durationToDDHHMMSS(d));
+
+  }
+
   /**
    * Test la conversion {@link DateDurationConverter#getPeriod(int, int, int, int)}.
    */
@@ -32,7 +45,7 @@
     final long expected = 1 * 24 * NB_MILLIS_BY_HOUR + 25 * NB_MILLIS_BY_HOUR + 3 * 60000 + 62000;
     assertEquals(expected, DateDurationConverter.getDuration(1, 25, 3, 62).getMillis());
   }
-  
+
   public void testMillis() {
     String res = DateDurationConverter.durationToXsd(new Duration(123L));
     assertEquals("P0Y0M0DT0H0M0.123S", res);

Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ResultatTimeKey.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ResultatTimeKey.java	2014-01-31 18:19:15 UTC (rev 8593)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ResultatTimeKey.java	2014-01-31 20:53:28 UTC (rev 8594)
@@ -29,10 +29,10 @@
     transitoire = false;
   }
 
-  public ResultatTimeKey(String nomCalcul, long duree) {
+  public ResultatTimeKey(String nomCalcul, long duree, boolean useDay) {
     this.nomCalcul = nomCalcul;
     this.duree = duree;
-    temps = DateDurationConverter.durationToXsd(new Duration(duree));
+    temps = DateDurationConverter.durationToDDHHMMSS(new Duration(duree), useDay);
     transitoire = true;
   }
 

Modified: trunk/soft/fudaa-crue/crue-emh/src/test/java/org/fudaa/dodico/crue/metier/emh/ResultatPasDeTempsTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/test/java/org/fudaa/dodico/crue/metier/emh/ResultatPasDeTempsTest.java	2014-01-31 18:19:15 UTC (rev 8593)
+++ trunk/soft/fudaa-crue/crue-emh/src/test/java/org/fudaa/dodico/crue/metier/emh/ResultatPasDeTempsTest.java	2014-01-31 20:53:28 UTC (rev 8594)
@@ -44,7 +44,8 @@
 
   @Test
   public void testEquivalence() {
-    List<ResultatTimeKey> times = Arrays.asList(new ResultatTimeKey("CC"), new ResultatTimeKey("CC_T1", 0), new ResultatTimeKey("CC_T1", 10), new ResultatTimeKey("CC_T2", 10), new ResultatTimeKey("CC_T2", 20));
+    List<ResultatTimeKey> times = Arrays.asList(new ResultatTimeKey("CC"), new ResultatTimeKey("CC_T1", 0, false), new ResultatTimeKey("CC_T1", 10,
+            false), new ResultatTimeKey("CC_T2", 10, false), new ResultatTimeKey("CC_T2", 20, false));
     ResultatPasDeTempsDelegate delegate = new DefaultDelegate(times);
     ResultatPasDeTemps res = new ResultatPasDeTemps(delegate);
     ResultatTimeKey in = new ResultatTimeKey("CQ");
@@ -52,12 +53,12 @@
     for (ResultatTimeKey resultatTimeKey : times) {
       assertEquals(resultatTimeKey, res.getEquivalentTempsSimu(resultatTimeKey));
     }
-    in = new ResultatTimeKey("CT_T1Bis", 0);
+    in = new ResultatTimeKey("CT_T1Bis", 0, false);
     assertEquals(times.get(1), res.getEquivalentTempsSimu(in));
-    in = new ResultatTimeKey("CT_T1Bis", 10);
+    in = new ResultatTimeKey("CT_T1Bis", 10, false);
     assertEquals(times.get(2), res.getEquivalentTempsSimu(in));
-    in = new ResultatTimeKey("CT_T2Bis", 20);
+    in = new ResultatTimeKey("CT_T2Bis", 20, false);
     assertEquals(times.get(4), res.getEquivalentTempsSimu(in));
 
   }
-}
\ No newline at end of file
+}

Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java	2014-01-31 18:19:15 UTC (rev 8593)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java	2014-01-31 20:53:28 UTC (rev 8594)
@@ -11,6 +11,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.URL;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -83,7 +84,6 @@
 import org.fudaa.dodico.crue.metier.emh.OrdCalcScenario;
 import org.fudaa.dodico.crue.metier.emh.OrdCalcTransIniCalcPrecedent;
 import org.fudaa.dodico.crue.metier.emh.OrdPrtCIniModeleBase;
-import org.fudaa.dodico.crue.metier.emh.ParamCalcScenario;
 import org.fudaa.dodico.crue.metier.emh.ParamNumCalcPseudoPerm;
 import org.fudaa.dodico.crue.metier.emh.ParamNumCalcTrans;
 import org.fudaa.dodico.crue.metier.emh.ParamNumModeleBase;
@@ -102,7 +102,6 @@
 import org.fudaa.dodico.crue.metier.helper.LoiHelper;
 import org.fudaa.dodico.fortran.FortranReader;
 import org.joda.time.Duration;
-import org.joda.time.LocalDateTime;
 
 /**
  * Reader pour le format Dh crue 9. C'est la methode {@link #readAllDonnees(CrueIOResu)} qui fait le travail. Ensuite elle dispatche les taches entre {@link #readDonneesGenerales(CompositeReader, CrueData, int)},
@@ -129,6 +128,14 @@
    */
   private final Set<String> emhsWithSensOuvInitialized = new HashSet<String>();
 
+  DecimalFormat calulFormat = new DecimalFormat();
+
+  public DHReader() {
+    calulFormat.setParseIntegerOnly(true);
+    calulFormat.setMinimumIntegerDigits(2);
+
+  }
+
   @Override
   public void stop() {
     // ne fait rien pour l'instant
@@ -320,7 +327,8 @@
     final Duration duration = DateDurationConverter.getDuration(reader.intField(idx++), reader.intField(idx++),
             reader.intField(idx++), reader.doubleField(idx++));
     if (isFiner()) {
-      LOGGER.log(Level.FINER, "DATE: Ligne {0} read date {1}", new Object[]{reader.getCurrent().getLineNumber(), DateDurationConverter.durationToXsd(duration)});
+      LOGGER.log(Level.FINER, "DATE: Ligne {0} read date {1}", new Object[]{reader.getCurrent().getLineNumber(), DateDurationConverter.durationToXsd(
+        duration)});
     }
     return duration;
 
@@ -473,7 +481,8 @@
         } else if (iligne == 2) { // Ligne E3
           final double coefRempliPourBrancheI = reader.doubleField(0);
           if (isFine()) {
-            LOGGER.log(Level.FINE, "ligne:{0}-> le niveau initial de la branche {1} est {2}", new Object[]{reader.getCurrent().getLineNumber(), brancheName, coefRempliPourBrancheI});
+            LOGGER.log(Level.FINE, "ligne:{0}-> le niveau initial de la branche {1} est {2}",
+                    new Object[]{reader.getCurrent().getLineNumber(), brancheName, coefRempliPourBrancheI});
           }
           final int size = sectionsBranche.size();
           CatEMHSection sectionEMH = null;
@@ -510,7 +519,8 @@
           } else {
             final double niveauEau = reader.doubleField(i);
             if (isFine()) {
-              LOGGER.log(Level.FINE, "ligne:{0}-> le niveau initial du noeud {1} est {2}", new Object[]{reader.getCurrent().getLineNumber(), noeudName, niveauEau}); //$NON-NLS-1$ //$NON-NLS-2$
+              LOGGER.log(Level.FINE, "ligne:{0}-> le niveau initial du noeud {1} est {2}",
+                      new Object[]{reader.getCurrent().getLineNumber(), noeudName, niveauEau}); //$NON-NLS-1$ //$NON-NLS-2$
             }
 
             final CatEMHNoeud noeud = res.findNoeudByReference(noeudName);
@@ -553,7 +563,8 @@
           } else {
             final double coefRuis = reader.doubleField(i);
             if (isFine()) {
-              LOGGER.log(Level.FINE, "ligne:{0}-> le coefficient de ruissellement {1} est {2}", new Object[]{reader.getCurrent().getLineNumber(), noeudName, coefRuis}); //$NON-NLS-1$ //$NON-NLS-2$
+              LOGGER.log(Level.FINE, "ligne:{0}-> le coefficient de ruissellement {1} est {2}",
+                      new Object[]{reader.getCurrent().getLineNumber(), noeudName, coefRuis}); //$NON-NLS-1$ //$NON-NLS-2$
             }
 
             final CatEMHNoeud noeud = res.findNoeudByReference(noeudName);
@@ -671,10 +682,14 @@
     reader.readLine();
     final Duration dtperm = readDuration(reader);
     final int nbField = reader.getNumberOfFields();
-    final double tolz = nbField > 4 ? reader.doubleField(4) : cruePropertyDefinitionContainer.getDefaultDoubleValue(CrueConfigMetierConstants.PROP_TOL_MAX_Z);
-    final double tolq = nbField > 5 ? reader.doubleField(5) : cruePropertyDefinitionContainer.getDefaultDoubleValue(CrueConfigMetierConstants.PROP_TOL_MAX_Q);
-    final int icalmx = nbField > 6 ? reader.intField(6) : cruePropertyDefinitionContainer.getDefaultIntValue(CrueConfigMetierConstants.PROP_NBR_PDT_MAX);
-    final int ndecou = nbField > 8 ? reader.intField(8) : cruePropertyDefinitionContainer.getDefaultIntValue(CrueConfigMetierConstants.PROP_NBR_PDT_DECOUP);
+    final double tolz = nbField > 4 ? reader.doubleField(4) : cruePropertyDefinitionContainer.getDefaultDoubleValue(
+            CrueConfigMetierConstants.PROP_TOL_MAX_Z);
+    final double tolq = nbField > 5 ? reader.doubleField(5) : cruePropertyDefinitionContainer.getDefaultDoubleValue(
+            CrueConfigMetierConstants.PROP_TOL_MAX_Q);
+    final int icalmx = nbField > 6 ? reader.intField(6) : cruePropertyDefinitionContainer.getDefaultIntValue(
+            CrueConfigMetierConstants.PROP_NBR_PDT_MAX);
+    final int ndecou = nbField > 8 ? reader.intField(8) : cruePropertyDefinitionContainer.getDefaultIntValue(
+            CrueConfigMetierConstants.PROP_NBR_PDT_DECOUP);
     if (isFine()) {
       LOGGER.log(Level.FINE, "dtperm{0} | tolz {1}tolq  {2}  icalmx {3} ndecou{4}", new Object[]{dtperm, tolz, tolq, icalmx, ndecou});
     }
@@ -720,7 +735,8 @@
                 Integer.valueOf(limtyp));
       } else {
         if (isFine()) {
-          LOGGER.log(Level.FINE, "{0}: numPoint={1} limtype={2} soit {3}", new Object[]{reader.getCurrent().getLineNumber(), nomEmh, limtyp, typesConditionLimites.get(limtyp)});
+          LOGGER.log(Level.FINE, "{0}: numPoint={1} limtype={2} soit {3}",
+                  new Object[]{reader.getCurrent().getLineNumber(), nomEmh, limtyp, typesConditionLimites.get(limtyp)});
         }
 
         // Ajout de la condition aux limites à l'EMH correspondante
@@ -869,7 +885,7 @@
 
       final CalcPseudoPerm calcPerm = new CalcPseudoPerm();
 
-      calcPerm.setNom(CruePrefix.P_CALCUL + "P" + (nbEtatPermanent + 1));
+      calcPerm.setNom(CruePrefix.P_CALCUL + "P" + calulFormat.format(nbEtatPermanent + 1));
       calcPerm.setCommentaire("Calcul pseudo-permanent " + (nbEtatPermanent + 1));
       // pour le premier on prend en compte la reprise éventuelle
       final boolean first = ocal.getOrdCalc().isEmpty();
@@ -900,7 +916,6 @@
             dclm = listeDCLMs.get(0);
 
             // listeRefs.add(emh);
-
             if (dclm instanceof CalcPseudoPermNoeudQapp) {
 
               CalcPseudoPermNoeudQapp nncQapp = null;
@@ -940,7 +955,6 @@
           if (CollectionUtils.isNotEmpty(listeDCLMs)) {
             dclm = listeDCLMs.get(0);
 
-
             if (dclm instanceof CalcPseudoPermBrancheOrificeManoeuvre) {
 
               CalcPseudoPermBrancheOrificeManoeuvre brancheOrOuv = null;
@@ -1043,7 +1057,6 @@
     Duration transDureeCalc = readDuration(reader, 4);
     final int nts = reader.intField(16);
 
-
     final ParamNumModeleBase pnum = res.getOrCreatePNUM();
     final PdtCst pdtCst = new PdtCst();
     pdtCst.setPdtCst(pasDeTemps);
@@ -1089,7 +1102,7 @@
 
     // Un seul calcul transitoire possible en version crue 9
     final CalcTrans calcTrans = new CalcTrans();
-    calcTrans.setNom(CruePrefix.P_CALCUL + "T1");
+    calcTrans.setNom(CruePrefix.P_CALCUL + "T01");
     calcTrans.setCommentaire("Calcul transitoire 1");
     dclm.addCalcTrans(calcTrans);
     final OrdCalcTransIniCalcPrecedent prec = new OrdCalcTransIniCalcPrecedent(dataLinked.getCrueConfigMetier());
@@ -1526,7 +1539,6 @@
                 dlhy.addLois(loiFF);
               }
 
-
             }
           }
 
@@ -1592,9 +1604,7 @@
     final CrueData metier = readRegles(res, reader);
 
     // lecture ligne B
-
     // Ligne B : ICAL, CRU, COFQRQ, ISORTI, ILE, TREPJ, TREPH, TREPM, TREPS
-
     // ICAL = 0 : reprise de calcul en transitoire
     // ICAL = 1 : succession de calculs en régime permanent
     // ICAL = 2 : stabilisation d'une ligne d'eau initiale par une suite de calculs en régime permanent, puis calcul en
@@ -1649,7 +1659,6 @@
     crueData.setMethodesInterpolation(methodesInterpolation);
 
     // Pas d'enregistrement de "ile" qui sert pour l'algo uniquement
-
     // Remplissage des données métier en fonction de la valeur de "ical"
     // final CrueData metier = metier;
     if (ical == 0) {

Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java	2014-01-31 18:19:15 UTC (rev 8593)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java	2014-01-31 20:53:28 UTC (rev 8594)
@@ -42,6 +42,7 @@
     // on sait que le premier entier doit etre 800; soit la longueur des 10 commentaires comportant
     // 256 caractères.
     final int firstInt = 10 * sizeTitre;
+
     // on lit le premier enregistrement qui fait 800 p
     /*
      * final int readAll =
@@ -85,7 +86,10 @@
 
     // past r8 : pas de temps d'impression des résultats, en secondes.
     // transformer en single ->ok
-    /**final double r8 = **/bf.getFloat();
+    /**
+     * final double r8 = *
+     */
+    bf.getFloat();
 
     // icodav i4 : présence (1) ou non (0) d'une régulation
     // icodav==0 ou 2 pas de regulation
@@ -106,14 +110,12 @@
     helper.getStingFromBuffer(nbCharTitreDCDh);
 
     // -- on passe a la ligne contenant ibmax et iparam --//
-
     // on arrive a la ligne des profils --//
     // write(ifi2) (tit(ipro),sngl(dist(ipro)),zfond(nuprfl(ipro)), ipro,ipro=1,iprm)
     // on recupere l'indice du début des profils.
     readProfils(infos, nbProfils);
 
     // -- on passe la boucle de nbbranches lignes--//
-
     readBranches(infos, nbBranches);
 
     // -- ensuite on lit les points si ou ils sont affiches--//
@@ -212,9 +214,15 @@
       CalcTrans collectCalcTrans = EMHHelper.collectCalcTrans(ordCalc).get(0);//un seul calcul transitoire
       String nomCalcul = collectCalcTrans.getNom();
       int nbPdt = pdtNormal.size();
+      long max = 0;
       for (int i = 0; i < nbPdt; i++) {
         long duree = DateDurationConverter.toMillis(pdtNormal.get(i));
-        final ResultatTimeKey resultatKey = new ResultatTimeKey(nomCalcul, duree);
+        max = Math.max(max, duree);
+      }
+      boolean useDay = DateDurationConverter.isGreaterThanDay(max);
+      for (int i = 0; i < nbPdt; i++) {
+        long duree = DateDurationConverter.toMillis(pdtNormal.get(i));
+        final ResultatTimeKey resultatKey = new ResultatTimeKey(nomCalcul, duree, useDay);
         indexByResultatKey.put(resultatKey, i);
         orderedResultatKey.add(resultatKey);
       }
@@ -222,7 +230,7 @@
     else {
       if (ordCalc.size() != pdtNormal.size()) {
         analyze_.addSevereError("io.fcb.nbResultatPseudoPermanentNonConcordant.erreur", Integer.toString(pdtNormal.size()),
-                                Integer.toString(ordCalc.size()));
+                Integer.toString(ordCalc.size()));
       } else {
         int nbPdt = pdtNormal.size();
         for (int i = 0; i < nbPdt; i++) {
@@ -233,7 +241,7 @@
       }
     }
     infos.setPdt(new Crue9ResultatCalculPasDeTemps(posNormal, pdtNormal, regul, ruinouNormal,
-                                                                       indexByResultatKey, orderedResultatKey));
+            indexByResultatKey, orderedResultatKey));
 
   }
 

Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/res/RCalTimeStepBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/res/RCalTimeStepBuilder.java	2014-01-31 18:19:15 UTC (rev 8593)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/res/RCalTimeStepBuilder.java	2014-01-31 20:53:28 UTC (rev 8594)
@@ -70,12 +70,23 @@
     String delimiteurChaineTrans = in.getParametrage().getDelimiteurChaine("ResPdt");
     List<ResCalcTransDao> resCalcTranss = in.getResCalcTranss();
     if (CollectionUtils.isNotEmpty(resCalcTranss)) {
+      long max = 0;
       for (ResCalcTransDao resCalcTransDao : resCalcTranss) {
         List<ResPdtDao> resPdts = resCalcTransDao.getResPdts();
         if (CollectionUtils.isNotEmpty(resPdts)) {
           for (ResPdtDao resPdtDao : resPdts) {
+            final long millis = DateDurationConverter.getDuration(resPdtDao.getTempsSimu()).getMillis();
+            max = Math.max(max, millis);
+          }
+        }
+      }
+      boolean useDay = DateDurationConverter.isGreaterThanDay(max);
+      for (ResCalcTransDao resCalcTransDao : resCalcTranss) {
+        List<ResPdtDao> resPdts = resCalcTransDao.getResPdts();
+        if (CollectionUtils.isNotEmpty(resPdts)) {
+          for (ResPdtDao resPdtDao : resPdts) {
             ResultatTimeKey key = new ResultatTimeKey(resCalcTransDao.getNomRef(), DateDurationConverter.getDuration(
-                    resPdtDao.getTempsSimu()).getMillis());
+                    resPdtDao.getTempsSimu()).getMillis(), useDay);
             ResultatEntry entry = new ResultatEntry(key);
             entry.setBinFile(new File(rcalDir, resPdtDao.getHref()));
             entry.setOffsetInBytes(in.getParametrage().getBytes(resPdtDao.getOffsetMot()));

Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-0.zip
===================================================================
(Binary files differ)

Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-1.zip
===================================================================
(Binary files differ)

Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-2.zip
===================================================================
(Binary files differ)

Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-3.zip
===================================================================
(Binary files differ)

Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-4.zip
===================================================================
(Binary files differ)

Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-5.zip
===================================================================
(Binary files differ)

Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu4-0.zip
===================================================================
(Binary files differ)

Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu4-1.zip
===================================================================
(Binary files differ)

Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu5-0.zip
===================================================================
(Binary files differ)

Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu6-0.zip
===================================================================
(Binary files differ)

Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu7-0.zip
===================================================================
(Binary files differ)

Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu7-1.zip
===================================================================
(Binary files differ)

Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu7-2.zip
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8593] trunk/soft/fudaa-crue

From: <de...@us...> - 2014-01-31 18:19:19

Revision: 8593
          http://sourceforge.net/p/fudaa/svn/8593
Author:   deniger
Date:     2014-01-31 18:19:15 +0000 (Fri, 31 Jan 2014)
Log Message:
-----------
CRUE-599

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiCourbeModel.java
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java

Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiCourbeModel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiCourbeModel.java	2014-01-31 18:18:49 UTC (rev 8592)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiCourbeModel.java	2014-01-31 18:19:15 UTC (rev 8593)
@@ -551,7 +551,7 @@
     double oldX = ptEvol.getPtEvolutionFF().getAbscisse();
     double oldY = ptEvol.getPtEvolutionFF().getOrdonnee();
     if (configLoi.getVarAbscisse().getEpsilon().isSame(oldX, newX)
-            && configLoi.getVarAbscisse().getEpsilon().isSame(oldY, newY)) {
+            && configLoi.getVarOrdonnee().getEpsilon().isSame(oldY, newY)) {
       return false;
     }
     if (!isRangeValid(newX, newY)) {

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java	2014-01-31 18:18:49 UTC (rev 8592)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java	2014-01-31 18:19:15 UTC (rev 8593)
@@ -31,6 +31,7 @@
 import org.fudaa.dodico.crue.validation.ValidatorNomProfilCasierContent;
 import org.fudaa.ebli.commun.EbliActionSimple;
 import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
+import org.fudaa.dodico.crue.config.ccm.CrueConfigMetierConstants;
 import org.fudaa.fudaa.crue.common.helper.DialogHelper;
 import org.fudaa.fudaa.crue.common.helper.ObjetNommeCellRenderer;
 import org.fudaa.fudaa.crue.common.log.LogIconTranslationProvider;
@@ -205,7 +206,6 @@
     cbProfils.setRenderer(cellRenderer);
 
     //boutons
-
     btDown = new JButton(ImageUtilities.loadImageIcon("org/fudaa/fudaa/crue/modelling/icons/down.png", false));
     btUp = new JButton(ImageUtilities.loadImageIcon("org/fudaa/fudaa/crue/modelling/icons/up.png", false));
     btDown.setToolTipText(NbBundle.getMessage(ProfilSectionTopComponent.class, "ProfilSection.SelectNext.Tooltip"));
@@ -263,7 +263,7 @@
       return null;
     }
     try {
-      return Double.parseDouble(text);
+      return getCcm().getProperty(CrueConfigMetierConstants.PROP_DISTANCE).getNormalizedValue(Double.parseDouble(text));
     } catch (NumberFormatException numberFormatException) {
     }
     return null;
@@ -297,29 +297,29 @@
   private void createActions() {
     delete = new EbliActionSimple(NbBundle.getMessage(ProfilCasierEditorTopComponent.class, "Delete.DisplayName"), BuResource.BU.getIcon("enlever"),
             "DELETE") {
-      @Override
-      public void actionPerformed(ActionEvent _e) {
-        delete();
-      }
-    };
+              @Override
+              public void actionPerformed(ActionEvent _e) {
+                delete();
+              }
+            };
     delete.putValue(Action.SHORT_DESCRIPTION, NbBundle.getMessage(ProfilCasierEditorTopComponent.class, "Delete.Description"));
 
     duplicate = new EbliActionSimple(NbBundle.getMessage(ProfilCasierEditorTopComponent.class, "Duplicate.DisplayName"), BuResource.BU.getIcon(
             "dupliquer"), "DUPLICATE") {
-      @Override
-      public void actionPerformed(ActionEvent _e) {
-        duplicate();
-      }
-    };
+              @Override
+              public void actionPerformed(ActionEvent _e) {
+                duplicate();
+              }
+            };
     duplicate.putValue(Action.SHORT_DESCRIPTION, NbBundle.getMessage(ProfilCasierEditorTopComponent.class, "Duplicate.Description"));
 
     create = new EbliActionSimple(NbBundle.getMessage(ProfilCasierEditorTopComponent.class, "Create.DisplayName"), BuResource.BU.getIcon("creer"),
             "CREATE") {
-      @Override
-      public void actionPerformed(ActionEvent _e) {
-        create();
-      }
-    };
+              @Override
+              public void actionPerformed(ActionEvent _e) {
+                create();
+              }
+            };
     create.putValue(Action.SHORT_DESCRIPTION, NbBundle.getMessage(ProfilCasierEditorTopComponent.class, "Create.Description"));
   }
 
@@ -606,6 +606,7 @@
     newProfilCasier.setNom(getEditingNom());
     final Double longueur = getLongueur();
     if (longueur != null) {
+
       newProfilCasier.setDistance(longueur);
     }
     return newProfilCasier;
@@ -725,7 +726,7 @@
     txtNomProfilCasier.setText(StringUtils.EMPTY);
     if (profilCasier != null) {
       txtCommentaire.setText(profilCasier.getCommentaire());
-      txtLongeur.setText(TransformerEMHHelper.formatFromPropertyName("longeur", profilCasier.getDistance(), getCcm(),
+      txtLongeur.setText(getCcm().getProperty(CrueConfigMetierConstants.PROP_DISTANCE).format(profilCasier.getDistance(),
               DecimalFormatEpsilonEnum.COMPARISON));
       uptateTxtLongueurTooltip();
       String desc = StringUtils.defaultString(profilCasier.getNom());

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8592] trunk/soft/fudaa-crue/crue-config/src

From: <de...@us...> - 2014-01-31 18:18:54

Revision: 8592
          http://sourceforge.net/p/fudaa/svn/8592
Author:   deniger
Date:     2014-01-31 18:18:49 +0000 (Fri, 31 Jan 2014)
Log Message:
-----------
CRUE-599

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyNature.java
    trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java

Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyNature.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyNature.java	2014-01-31 18:17:11 UTC (rev 8591)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyNature.java	2014-01-31 18:18:49 UTC (rev 8592)
@@ -27,7 +27,7 @@
   private final String nom;
   private final String displayName;
   private final PropertyTypeNumerique typeNumerique;
-  private boolean isEnum;
+  private final boolean isEnum;
   private final List<ItemEnum> enumValues;
   private NumberFormat presentationFormat;
   private NumberFormat comparisonFormat;

Modified: trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java	2014-01-31 18:17:11 UTC (rev 8591)
+++ trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java	2014-01-31 18:18:49 UTC (rev 8592)
@@ -18,6 +18,8 @@
   @Test
   public void testCreateFormatter() {
     test(1e-2, 3, 1e-3, 3);
+    test(1e-3, 4, 1e-3, 3);
+    test(1e-5, 6, 1e-5, 5);
     test(1e-10, 11, 1e-22, 22);
     test(2e-2, 3, 2e-3, 3);
     test(3e-10, 11, 3e-22, 22);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8591] trunk/soft/fudaa-crue/ui-planimetry/src/main/java/ org/fudaa/fudaa/crue/planimetry/sig

From: <de...@us...> - 2014-01-31 18:17:13

Revision: 8591
          http://sourceforge.net/p/fudaa/svn/8591
Author:   deniger
Date:     2014-01-31 18:17:11 +0000 (Fri, 31 Jan 2014)
Log Message:
-----------
CRUE-599

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/tracecasier/TraceCasierToDonPrtGeoProfilCasierTransformer.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/TraceProfilToDonPrtGeoProfilSectionTransformer.java

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/tracecasier/TraceCasierToDonPrtGeoProfilCasierTransformer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/tracecasier/TraceCasierToDonPrtGeoProfilCasierTransformer.java	2014-01-31 17:04:15 UTC (rev 8590)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/tracecasier/TraceCasierToDonPrtGeoProfilCasierTransformer.java	2014-01-31 18:17:11 UTC (rev 8591)
@@ -3,7 +3,6 @@
  */
 package org.fudaa.fudaa.crue.planimetry.sig.tracecasier;
 
-import org.fudaa.fudaa.crue.planimetry.sig.traceprofil.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
@@ -12,7 +11,8 @@
 import org.fudaa.ctulu.gis.GISAttributeInterface;
 import org.fudaa.ctulu.gis.GISZoneCollection;
 import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier;
-import org.fudaa.dodico.crue.config.lit.LitNomme;
+import org.fudaa.dodico.crue.config.ccm.CrueConfigMetierConstants;
+import org.fudaa.dodico.crue.config.ccm.ItemVariable;
 import org.fudaa.dodico.crue.edition.EditionProfilCreator;
 import org.fudaa.dodico.crue.edition.UniqueNomFinder;
 import org.fudaa.dodico.crue.edition.bean.CreationDefaultValue;
@@ -32,11 +32,17 @@
   private final EditionProfilCreator profilCreator;
   private final CrueConfigMetier ccm;
   private final EMHSousModele sousModele;
+  private final ItemVariable propXt;
+  private final ItemVariable propZ;
+  private final ItemVariable propDistance;
 
   public TraceCasierToDonPrtGeoProfilCasierTransformer(CrueConfigMetier ccm, final EMHSousModele sousModele) {
     profilCreator = new EditionProfilCreator(new UniqueNomFinder(), new CreationDefaultValue());
     this.sousModele = sousModele;
     this.ccm = ccm;
+    propXt = ccm.getProperty(CrueConfigMetierConstants.PROP_XT);
+    propZ = ccm.getProperty(CrueConfigMetierConstants.PROP_Z);
+    propDistance = ccm.getProperty(CrueConfigMetierConstants.PROP_DISTANCE);
   }
 
   private <T> T getValueAt(GISZoneCollection zone, GISAttributeInterface att, int idxGeo) {
@@ -50,7 +56,8 @@
     final int size = Math.min(xts.length, zs.length);
     for (int i = 0; i < size; i++) {
       try {
-        pt.add(new PtProfil(Double.parseDouble(xts[i]), Double.parseDouble(zs[i])));
+        pt.add(new PtProfil(propXt.getNormalizedValue(Double.parseDouble(xts[i])),
+                propZ.getNormalizedValue(Double.parseDouble(zs[i]))));
       } catch (NumberFormatException numberFormatException) {
         Logger.getLogger(TraceCasierToDonPrtGeoProfilCasierTransformer.class.getName()).log(Level.WARNING, "message {0}", numberFormatException);
       }
@@ -78,7 +85,7 @@
     }
     DonPrtGeoProfilCasier profilCasier = profilCreator.createProfilCasier(ccm, name, sousModele.getParent().getParent(), pts);
     if (distance != null) {
-      profilCasier.setDistance(distance);
+      profilCasier.setDistance(propDistance.getNormalizedValue(distance));
     }
     String[] listAsArray = splitString(lits);
     if (listAsArray.length > 0) {
@@ -108,9 +115,6 @@
     return profilCasier;
   }
 
-  private LitNomme[] findLit(String limLit) {
-    return LimLitHelper.getLitNommes(limLit, ccm.getLitNomme());
-  }
 
   protected String[] splitString(String lits) {
     return StringUtils.split(lits, ';');

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/TraceProfilToDonPrtGeoProfilSectionTransformer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/TraceProfilToDonPrtGeoProfilSectionTransformer.java	2014-01-31 17:04:15 UTC (rev 8590)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/TraceProfilToDonPrtGeoProfilSectionTransformer.java	2014-01-31 18:17:11 UTC (rev 8591)
@@ -13,7 +13,9 @@
 import org.fudaa.ctulu.gis.GISAttributeModelObjectInterface;
 import org.fudaa.ctulu.gis.GISZoneCollection;
 import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier;
+import org.fudaa.dodico.crue.config.ccm.CrueConfigMetierConstants;
 import org.fudaa.dodico.crue.config.ccm.ItemEnum;
+import org.fudaa.dodico.crue.config.ccm.ItemVariable;
 import org.fudaa.dodico.crue.config.lit.LitNomme;
 import org.fudaa.dodico.crue.edition.EditionProfilCreator;
 import org.fudaa.dodico.crue.edition.UniqueNomFinder;
@@ -36,11 +38,15 @@
   private final EditionProfilCreator profilCreator;
   private final CrueConfigMetier ccm;
   private final EMHSousModele sousModele;
+  private final ItemVariable propXt;
+  private final ItemVariable propZ;
 
   public TraceProfilToDonPrtGeoProfilSectionTransformer(CrueConfigMetier ccm, final EMHSousModele sousModele) {
     profilCreator = new EditionProfilCreator(new UniqueNomFinder(), new CreationDefaultValue());
     this.sousModele = sousModele;
     this.ccm = ccm;
+    propXt = ccm.getProperty(CrueConfigMetierConstants.PROP_XT);
+    propZ = ccm.getProperty(CrueConfigMetierConstants.PROP_Z);
   }
 
   private <T> T getValueAt(GISZoneCollection zone, GISAttributeInterface att, int idxGeo) {
@@ -55,7 +61,7 @@
     }
     final int size = xt.getSize();
     for (int i = 0; i < size; i++) {
-      pt.add(new PtProfil(xt.getValue(i), z.getValue(i)));
+      pt.add(new PtProfil(propXt.getNormalizedValue(xt.getValue(i)), propZ.getNormalizedValue(z.getValue(i))));
     }
     return pt;
   }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8590] trunk/soft/fudaa-crue/ui-modelling/src/main/java/ org/fudaa/fudaa/crue/modelling/edition/ListRelationSectionProcess.java

From: <de...@us...> - 2014-01-31 17:04:19

Revision: 8590
          http://sourceforge.net/p/fudaa/svn/8590
Author:   deniger
Date:     2014-01-31 17:04:15 +0000 (Fri, 31 Jan 2014)
Log Message:
-----------
CRUE-590

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/edition/ListRelationSectionProcess.java

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/edition/ListRelationSectionProcess.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/edition/ListRelationSectionProcess.java	2014-01-28 07:22:54 UTC (rev 8589)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/edition/ListRelationSectionProcess.java	2014-01-31 17:04:15 UTC (rev 8590)
@@ -7,6 +7,7 @@
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import org.apache.commons.lang.StringUtils;
 import org.fudaa.ctulu.CtuluLog;
 import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier;
@@ -48,6 +49,10 @@
     if (messages.accepted) {
       modellingScenarioModificationService.setScenarioModified(new ScenarioModificationEvent(EnumModification.EMH_RELATION));
     } else {
+      for (ListRelationSectionContentNode node : contents.values()) {
+        node.setContainError(false);
+        node.setShortDescription(null);
+      }
       List<ValidationMessage.ResultItem<ListRelationSectionContent>> msgs = messages.messages;
       for (ValidationMessage.ResultItem<ListRelationSectionContent> resultItem : msgs) {
         ListRelationSectionContentNode node = contents.get(resultItem.bean);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Flat | Threaded

<< < 1 .. 26 27 28 29 30 .. 198 > >> (Page 28 of 198)