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

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

Revision: 8113
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8113&view=rev
Author:   deniger
Date:     2012-12-11 17:30:50 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fortran/FileOpWriterCharSimpleAbstract.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueGeometry.java

Modified: trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fortran/FileOpWriterCharSimpleAbstract.java
===================================================================
--- trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fortran/FileOpWriterCharSimpleAbstract.java	2012-12-11 17:30:28 UTC (rev 8112)
+++ trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fortran/FileOpWriterCharSimpleAbstract.java	2012-12-11 17:30:50 UTC (rev 8113)
@@ -99,6 +99,9 @@
   public void writelnToOut() throws IOException {
     out_.write(lineSep_);
   }
+  public void writeSpace() throws IOException {
+    out_.write(" ");
+  }
 
   /**
    * Ecrit la chaine plus un retour chariot.

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	2012-12-11 17:30:28 UTC (rev 8112)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueGeometry.java	2012-12-11 17:30:50 UTC (rev 8113)
@@ -24,8 +24,12 @@
 import java.awt.geom.Rectangle2D;
 import org.fudaa.ctulu.CtuluListSelection;
 import org.fudaa.ctulu.CtuluListSelectionInterface;
+import org.fudaa.ctulu.CtuluRange;
+import org.fudaa.ctulu.gis.GISAttributeDouble;
 import org.fudaa.ctulu.gis.GISAttributeInterface;
 import org.fudaa.ctulu.gis.GISAttributeModel;
+import org.fudaa.ctulu.gis.GISAttributeModelDoubleInterface;
+import org.fudaa.ctulu.gis.GISAttributeModelObjectInterface;
 import org.fudaa.ctulu.gis.GISCoordinateSequenceContainerInterface;
 import org.fudaa.ctulu.gis.GISGeometryFactory;
 import org.fudaa.ctulu.gis.GISLib;
@@ -59,6 +63,9 @@
  */
 public class ZCalqueGeometry<M extends ZModeleGeometry> extends ZCalqueAffichageDonneesLineAbstract implements ZModelGeometryListener {
 
+  protected void initTraceForAtomics(TraceIconModel iconeModel, int idxPoly, int idxVertexInPoly) {
+  }
+
   /**
    * Une enumearion pour le mode de selection
    */
@@ -130,6 +137,28 @@
       _ligne.setCouleur(EbliLib.getAlphaColor(_ligne.getCouleur(), alpha_));
     }
   }
+  
+   @Override
+  public boolean getRange(CtuluRange _b) {
+    GISAttributeDouble attributeIsZ = modeleDonnees().getGeomData().getAttributeIsZ();
+    if (attributeIsZ != null) {
+      GISAttributeModel model = modeleDonnees().getGeomData().getModel(attributeIsZ);
+      if (model instanceof GISAttributeModelDoubleInterface) {
+        GISAttributeModelDoubleInterface doubleModel = (GISAttributeModelDoubleInterface) model;
+        _b.expandTo(doubleModel.getMax());
+        _b.expandTo(doubleModel.getMin());
+      } else if (model instanceof GISAttributeModelObjectInterface) {
+        int nb = model.getSize();
+        for (int i = 0; i < nb; i++) {
+          GISAttributeModelDoubleInterface objectValueAt = (GISAttributeModelDoubleInterface) model.getObjectValueAt(i);
+          _b.expandTo(objectValueAt.getMax());
+          _b.expandTo(objectValueAt.getMin());
+        }
+      }
+      return true;
+    }
+    return super.getRange(_b);
+  }
 
   protected void paintSelectionMulti(final Graphics _g, final ZSelectionTrace _trace, final GrMorphisme _versEcran,
           final GrBoite _clipReel) {
@@ -697,6 +726,7 @@
           continue;
         }
         // La g\xE9ometrie n'est pas visible
+        //a enlever car deja fait plus haut
         if (!isPainted(i, _versEcran)) {
           continue;
         }
@@ -721,6 +751,9 @@
           if (!_clipReel.contientXY(ptDest)) {
             continue;
           }
+          if (!isRapide()) {
+          initTraceForAtomics(iconeModel, i,j);
+        }
           ptDest.autoApplique(versEcran);
           icone.paintIconCentre(this, _g, ptDest.x_, ptDest.y_);
         }

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