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

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

Revision: 8197
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8197&view=rev
Author:   deniger
Date:     2013-01-10 15:58:33 +0000 (Thu, 10 Jan 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GisZoneCollectionAsListPointAdapter.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueGeometry.java

Modified: trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GisZoneCollectionAsListPointAdapter.java
===================================================================
--- trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GisZoneCollectionAsListPointAdapter.java	2013-01-10 14:22:01 UTC (rev 8196)
+++ trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GisZoneCollectionAsListPointAdapter.java	2013-01-10 15:58:33 UTC (rev 8197)
@@ -55,6 +55,21 @@
     return null;
   }
 
+  /**
+   * 
+   * @param idxSemis l'indice de la g\xE9ometrie
+   * @param idxPtInSemis l'indice du point dans la g\xE9ometrie
+   * @return  permet de connaitre l'indice dans ce r\xE9f\xE9rentiel.
+   */
+  public int getIdx(int idxSemis, int idxPtInSemis) {
+    int sum = 0;
+    int nb = Math.min(nbPointsBySemis.length, idxSemis);
+    for (int i = 0; i < nb; i++) {
+      sum = sum + nbPointsBySemis[i];
+    }
+    return sum + idxPtInSemis;
+  }
+
   @Override
   public double getPtX(int idxPt) {
     return getCoordinate(idxPt).x;

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	2013-01-10 14:22:01 UTC (rev 8196)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueGeometry.java	2013-01-10 15:58:33 UTC (rev 8197)
@@ -204,7 +204,7 @@
       Color old = this.labelsBackgroundColor;
       this.labelsBackgroundColor = labelsBackgroundColor;
       repaint();
-      firePropertyChange(ZCalqueGeometryLabelConfigure.PROPERTY_LABELS_FOREGROUND, old, labelsBackgroundColor);
+      firePropertyChange(ZCalqueGeometryLabelConfigure.PROPERTY_LABELS_BACKGROUND, old, labelsBackgroundColor);
     }
   }
 
@@ -565,9 +565,13 @@
       if (_p.isDefined(ZCalqueGeometryLabelConfigure.PROPERTY_LABELS_BACKGROUND)) {
         setLabelsBackgroundColor((Color) _p.get(ZCalqueGeometryLabelConfigure.PROPERTY_LABELS_BACKGROUND));
       }
+      else{
+        setLabelsBackgroundColor(null);
+      }
       if (_p.isDefined(ZCalqueGeometryLabelConfigure.PROPERTY_LABELS_FOREGROUND)) {
         setLabelsForegroundColor((Color) _p.get(ZCalqueGeometryLabelConfigure.PROPERTY_LABELS_FOREGROUND));
       }
+      
 
 
     }
@@ -822,11 +826,6 @@
         if (modele_.getNbPointForGeometry(i) <= 0 || !isPainted(i, _versEcran)) {
           continue;
         }
-        // La g\xE9ometrie n'est pas visible
-        //a enlever car deja fait plus haut
-        if (!isPainted(i, _versEcran)) {
-          continue;
-        }
 
         modele_.getDomaineForGeometry(i, bPoly);
         // Si la boite du polygone n'est pas dans la boite d'affichage on passe
@@ -843,6 +842,10 @@
 
         final GrPoint ptDest = new GrPoint();
         for (int j = nbPoints - 1; j >= 0; j--) {
+          //l'icone ne doit pas \xEAtre paint:
+          if (!isIconOnAtomicsPainted(i, j)) {
+            continue;
+          }
           // le point de dest est initialise
           modele_.point(ptDest, i, j);
           if (!_clipReel.contientXY(ptDest)) {
@@ -862,6 +865,10 @@
     }
   }
 
+  protected boolean isIconOnAtomicsPainted(int idxGeometry, int idxPoint) {
+    return true;
+  }
+
   protected void paintLabelsOnAtomics(final Graphics2D _g, final GrMorphisme _versEcran, final GrMorphisme _versReel,
           final GrBoite _clipReel) {
 

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