[Fudaa-svn-commit] SF.net SVN: fudaa:[3803] branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src /org/fudaa/fudaa/modeleur

[<bma...@us...>]

Revision: 3803
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3803&view=rev
Author:   bmarchan
Date:     2008-08-14 15:54:56 +0000 (Thu, 14 Aug 2008)

Log Message:
-----------
Correction pour que le Z soit transport?\195?\169 par les g?\195?\169om?\195?\169tries s?\195?\169lectionn?\195?\169es.

Modified Paths:
--------------
    branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectionPanel.java
    branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java

Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectionPanel.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectionPanel.java	2008-08-14 15:03:15 UTC (rev 3802)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectionPanel.java	2008-08-14 15:54:56 UTC (rev 3803)
@@ -78,7 +78,7 @@
   }
 
   /**
-   * Retourne les g\xE9ometries s\xE9lectionn\xE9es de l'arbre.
+   * Retourne les g\xE9ometries s\xE9lectionn\xE9es de l'arbre. Les g\xE9om\xE9tries transportent le Z en chaque point si un Z existe.
    * @return Les g\xE9om\xE9tries, de taille = 0 si rien de selectionn\xE9.
    */
   private Geometry[] getSelectedGeomInTree() {
@@ -90,7 +90,10 @@
     for (int i=0; i<selpaths.length; i++) {
       final CalqueGISTreeModel.LayerNode node=(CalqueGISTreeModel.LayerNode)selpaths[i].getLastPathComponent();
       final ZCalqueAffichageDonneesAbstract cq = (ZCalqueAffichageDonneesAbstract) node.getUserObject();
-      geoms[i]=((ZModeleGeom)cq.modeleDonnees()).getGeomData().getGeometry(node.getIdxGeom());
+      GISZoneCollection col=((ZModeleGeom)cq.modeleDonnees()).getGeomData();
+      // Pour le transport du Z.
+      col.initZCoordinate(node.getIdxGeom());
+      geoms[i]=col.getGeometry(node.getIdxGeom());
     }
     
     return geoms;

Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java	2008-08-14 15:03:15 UTC (rev 3802)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java	2008-08-14 15:54:56 UTC (rev 3803)
@@ -263,7 +263,6 @@
       
       targetGeoms.setAttributes(new GISAttributeInterface[]{GISAttributeConstants.BATHY}, null);
       targetGeoms.setAttributeIsZ(GISAttributeConstants.BATHY);
-//      targetGeoms.postImport(0);
       
       InterpolationTarget target=new InterpolationTargetGISAdapter(targetGeoms);
       InterpolationParameters params=new InterpolationParameters(vars,target,support);


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