fudaa-svn-commit

[<de...@us...>]

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.