fudaa-svn-commit

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

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

Revision: 3664
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3664&view=rev
Author:   bmarchan
Date:     2008-06-27 08:22:32 -0700 (Fri, 27 Jun 2008)

Log Message:
-----------
Les attributs sont r?\195?\169cup?\195?\169r?\195?\169s sur les imports.

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

Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlWizardImport.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlWizardImport.java	2008-06-27 15:21:44 UTC (rev 3663)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlWizardImport.java	2008-06-27 15:22:32 UTC (rev 3664)
@@ -81,7 +81,7 @@
   
   @Override
   protected void importData(ProgressionInterface _prog) {
-    final GISAttributeInterface[] attChosen = new GISAttributeInterface[]{GISAttributeConstants.BATHY};
+    final GISAttributeInterface[] attChosen = new GISAttributeInterface[]{GISAttributeConstants.BATHY, GISAttributeConstants.TITRE};
     data_.preload(attChosen, _prog);
     final CtuluCommandComposite cmp = new CtuluCommandComposite();
     
@@ -92,10 +92,7 @@
       final int nb = pts.length;
       for (int i = 0; i < nb; i++) {
         final GISDataModel model = new GISDataModelPointMultiPointAdapter(pts[i]);
-        for (int j=0; j<model.getNumGeometries(); j++)
-          col.addGeometry(model.getGeometry(j),null, cmp);
-//        col.addAll(model, cmp, true);
-        col.postImport(0);
+        col.addAll(model, cmp, true);
       }
     }
     
@@ -106,10 +103,7 @@
       final int nb=lines.length;
       for (int i=0; i<nb; i++) {
         final GISDataModel model=GISDataModelFilterAdapter.buildLigneAdapter(lines[i], attChosen);
-        for (int j=0; j<model.getNumGeometries(); j++)
-          col.addGeometry(model.getGeometry(j),null, cmp);
-//        col.addAll(model, cmp, true);
-        col.postImport(0);
+        col.addAll(model, cmp, true);
       }
     }
     if (mng_!=null) mng_.addCmd(cmp.getSimplify());


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: [3683] branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/ src/org/fudaa/fudaa/modeleur/MdlWizardImport.java

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

Revision: 3683
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3683&view=rev
Author:   bmarchan
Date:     2008-07-10 00:50:38 -0700 (Thu, 10 Jul 2008)

Log Message:
-----------
Restitution de fichiers sur imports am?\195?\169lior?\195?\169e.

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

Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlWizardImport.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlWizardImport.java	2008-07-10 07:47:45 UTC (rev 3682)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlWizardImport.java	2008-07-10 07:50:38 UTC (rev 3683)
@@ -81,17 +81,16 @@
   
   @Override
   protected void importData(ProgressionInterface _prog) {
-    final GISAttributeInterface[] attChosen = new GISAttributeInterface[]{GISAttributeConstants.BATHY, GISAttributeConstants.TITRE};
-    data_.preload(attChosen, _prog);
     final CtuluCommandComposite cmp = new CtuluCommandComposite();
     
     // Calque des semis de points.
     if (selectedLayer_ instanceof MdlLayer2dMultiPoint) {
       final GISZoneCollectionMultiPoint col = (GISZoneCollectionMultiPoint)((MdlModel2dMultiPoint)selectedLayer_.modeleDonnees()).getGeomData();
+      final GISAttributeInterface[] attChosen=col.getAttributes();
       final GISDataModel[] pts = data_.getPoints();
       final int nb = pts.length;
       for (int i = 0; i < nb; i++) {
-        final GISDataModel model = new GISDataModelPointMultiPointAdapter(pts[i]);
+        final GISDataModel model = GISDataModelFilterAdapter.buildAdapter(new GISDataModelPointMultiPointAdapter(pts[i]),attChosen);
         col.addAll(model, cmp, true);
       }
     }
@@ -99,6 +98,7 @@
     // Les autres calques.
     else if (selectedLayer_ instanceof MdlLayer2dLine) {
       final GISZoneCollectionLigneBrisee col = (GISZoneCollectionLigneBrisee)((MdlModel2dLine)selectedLayer_.modeleDonnees()).getGeomData();
+      final GISAttributeInterface[] attChosen=col.getAttributes();
       GISDataModel[] lines = data_.getPolylignes();
       final int nb=lines.length;
       for (int i=0; i<nb; i++) {


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