[Fudaa-svn-commit] SF.net SVN: fudaa:[4509] branches/FudaaModeleur_TC1Bis/fudaa_devel

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

Revision: 4509
          http://fudaa.svn.sourceforge.net/fudaa/?rev=4509&view=rev
Author:   bmarchan
Date:     2009-03-05 15:55:13 +0000 (Thu, 05 Mar 2009)

Log Message:
-----------
Taches #191 + #192 : Restaure viewport automatique apr?\195?\168s import + Correction info nb de points/polylignes import?\195?\169es sur Rubar ST.

Modified Paths:
--------------
    branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquePanelController.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquesPanel.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlWizardImport.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigFileLoaderRubarSt.java

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquePanelController.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquePanelController.java	2009-03-04 10:45:58 UTC (rev 4508)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquePanelController.java	2009-03-05 15:55:13 UTC (rev 4509)
@@ -691,6 +691,9 @@
     }
   }
 
+  /**
+   * Restaure le viewport sur le domaine \xE9tendu \xE0 tous les calques.
+   */
   public void restaurer() {
     final BCalqueInteraction cq = unsetCurrentInteractifCalque();
     final GrBoite b = pn_.getVueCalque().getCalque().getDomaine();

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquesPanel.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquesPanel.java	2009-03-04 10:45:58 UTC (rev 4508)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquesPanel.java	2009-03-05 15:55:13 UTC (rev 4509)
@@ -729,6 +729,9 @@
     controller_.removeCalqueInteraction(_b);
   }
 
+  /**
+   * Restaure le viewport sur le domaine \xE9tendu \xE0 tous les calques.
+   */
   public void restaurer() {
     controller_.restaurer();
   }

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java	2009-03-04 10:45:58 UTC (rev 4508)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java	2009-03-05 15:55:13 UTC (rev 4509)
@@ -113,7 +113,7 @@
       return;
     }
     
-    final MdlWizardImport importWizard=new MdlWizardImport(getPanel().getDonneesCalque(), getEnglobPolygone(), ed,
+    final MdlWizardImport importWizard=new MdlWizardImport(getPanel(), getEnglobPolygone(), ed,
         ((FSigVisuPanel)getPanel()).getImpl(), ((FSigVisuPanel)getPanel()).getCmdMng());
     final BuWizardDialog dialog=new BuWizardDialog(CtuluLibSwing.getFrameAncestorHelper(super.getPanel()), importWizard);
     importWizard.setDialog(dialog);      

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlWizardImport.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlWizardImport.java	2009-03-04 10:45:58 UTC (rev 4508)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlWizardImport.java	2009-03-05 15:55:13 UTC (rev 4509)
@@ -44,6 +44,7 @@
 import org.fudaa.ctulu.gis.GISZoneCollection;
 import org.fudaa.ebli.calque.BGroupeCalque;
 import org.fudaa.ebli.calque.ZCalqueAffichageDonneesAbstract;
+import org.fudaa.ebli.calque.ZEbliCalquesPanel;
 import org.fudaa.ebli.calque.ZModeleGeometry;
 import org.fudaa.ebli.calque.dessin.DeForme;
 import org.fudaa.ebli.calque.edition.ZCalqueEditable;
@@ -77,15 +78,17 @@
   protected final CtuluUI impl_;
   protected GISAttributeInterface[] src_;
   protected final DefaultListModel srcAtt_ = new DefaultListModel();
+  protected final ZEbliCalquesPanel pnCalques_;
   
   /**
    * @param _previewZone la zone a utiliser pour la pr\xE9visualisation
    * @param _selectedLayer le calque en cours de selection: peut-etre null
    * @param _impl l'impl parent
    */
-  public MdlWizardImport(BGroupeCalque _racine, GISPolygone[] _previewZone, ZCalqueEditable _selectedLayer, CtuluUI _impl, CtuluCommandManager _mng) {
+  public MdlWizardImport(ZEbliCalquesPanel _pn, GISPolygone[] _previewZone, ZCalqueEditable _selectedLayer, CtuluUI _impl, CtuluCommandManager _mng) {
     mng_=_mng;
-    calqueRacine_=_racine;
+    calqueRacine_=_pn.getDonneesCalque();
+    pnCalques_=_pn;
     impl_ = _impl;
     previewZone_ = _previewZone;
     selectedLayer_ = _selectedLayer;
@@ -139,6 +142,7 @@
     task.start(new Runnable() {
       public void run() {
         importData(task.getStateReceiver());
+        pnCalques_.restaurer();
       }
     });
     super.doTask();

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigFileLoaderRubarSt.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigFileLoaderRubarSt.java	2009-03-04 10:45:58 UTC (rev 4508)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigFileLoaderRubarSt.java	2009-03-05 15:55:13 UTC (rev 4509)
@@ -59,18 +59,20 @@
     final GISZoneCollectionLigneBrisee[] res = (GISZoneCollectionLigneBrisee[]) op.getSource();
 
     boolean blines=false;
-    final GISVisitorCount counter=new GISVisitorCount();
     for (int i=0; i<res.length; i++) {
       if (res[i]==null||res[i].getNumGeometries()==0) continue;
       blines=true;
-      res[i].accept(counter);
-      _r.nbPointTotal_+=counter.nbPt_;
+
       // Ajout de l'attribut ETAT_GEOM
       _r.findOrCreateAttribute(GISAttributeConstants.ETAT_GEOM.getID(), String.class, false);
       GISDataModelAttributeAdapter adapter = new GISDataModelAttributeAdapter(res[i]);
       adapter.addAttribut(GISAttributeConstants.ETAT_GEOM, _fileOrigine);
-      // 
       GISAttributeInterface[] attrs=res[i].getAttributes();
+
+      final GISVisitorCount counter=new GISVisitorCount();
+      res[i].accept(counter);
+      _r.nbPointTotal_+=counter.nbPtTotal_;
+      
       if(counter.nbPt_>0) {
         _r.nbPoint_+=counter.nbPt_;
         _r.pointModel_.add(GISDataModelFilterAdapter.buildPointAdapter(adapter, attrs));


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