[Fudaa-svn-commit] SF.net SVN: fudaa:[7228] trunk/framework/ebli-2d/src/main/java/org/fudaa/ ebli/calque

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

Revision: 7228
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7228&view=rev
Author:   deniger
Date:     2012-05-23 21:51:48 +0000 (Wed, 23 May 2012)
Log Message:
-----------
prise en compte du nouveau coeur

Modified Paths:
--------------
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueGeometry.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalquePoint.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModeleGeometryDefault.java

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-05-23 12:24:03 UTC (rev 7227)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueGeometry.java	2012-05-23 21:51:48 UTC (rev 7228)
@@ -581,6 +581,8 @@
     // Enfin les labels sur les atomiques.
     paintLabelsOnAtomics(_g, _versEcran, _versReel, _clipReel);
   }
+  
+  
 
   protected void paintSurfaces(final Graphics2D _g, final GrMorphisme _versEcran, final GrMorphisme _versReel,
                                final GrBoite _clipReel) {

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalquePoint.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalquePoint.java	2012-05-23 12:24:03 UTC (rev 7227)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalquePoint.java	2012-05-23 21:51:48 UTC (rev 7228)
@@ -1,9 +1,6 @@
 /**
- * @creation 2000-11-09
- * @modification $Date: 2008-02-20 10:16:01 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
+ * @creation 2000-11-09 @modification $Date: 2008-02-20 10:16:01 $ @license GNU General Public License 2 @copyright (c)1998-2001
+ * CETMEF 2 bd Gambetta F-60231 Compiegne @mail de...@fu...
  */
 package org.fudaa.ebli.calque;
 
@@ -35,7 +32,7 @@
 
 /**
  * Un calque d'affichage de point avec un icone.
- * 
+ *
  * @version $Id: ZCalquePoint.java,v 1.51.6.1 2008-02-20 10:16:01 bmarchan Exp $
  * @author Guillaume Desnoix
  */
@@ -91,11 +88,9 @@
     }
   }
 
-  
   public void fillWithInterpolateInfo(final InfoData _m) {
-
   }
-  
+
   /**
    * @author Fred Deniger
    * @version $Id: ZCalquePoint.java,v 1.51.6.1 2008-02-20 10:16:01 bmarchan Exp $
@@ -126,12 +121,11 @@
       }
       return super.getValueAt(_rowIndex, _columnIndex);
     }
-
   }
-
   protected ZModelePoint modele_;
 
-  /** */
+  /**
+   *    */
   public ZCalquePoint() {
     this(null);
   }
@@ -237,7 +231,6 @@
   public ZModeleDonnees modeleDonnees() {
     return modele();
   }
-
   GrPoint p_;
 
   public void setForeground(final Color _v) {
@@ -248,7 +241,7 @@
   }
 
   public void paintDonnees(final Graphics2D _g, final GrMorphisme _versEcran, final GrMorphisme _versReel,
-      final GrBoite _clipReel) {
+                           final GrBoite _clipReel) {
     if ((modele_ != null) && (modele_.getNombre() > 0)) {
       paintDonnees(_g, modele_.getNombre(), _versEcran, _clipReel);
     }
@@ -291,10 +284,14 @@
         icone.setCouleur(c);
       }
       icone.paintIconCentre(this, _g, (int) p_.x_, (int) p_.y_);
+      paintLabels(_g, i, p_);
     }
 
   }
 
+  protected void paintLabels(final Graphics2D g2d, int idx, GrPoint pEcran) {
+  }
+
   protected TraceIcon getTraceIcon() {
     final TraceIcon icone = iconModel_.buildCopy();
     return icone;
@@ -305,10 +302,8 @@
       return null;
     }
     final Coordinate[] cs = new Coordinate[2];
-    cs[0] = new Coordinate(modele_.getX(getLayerSelection().getMinIndex()), modele_.getY(getLayerSelection()
-        .getMinIndex()));
-    cs[1] = new Coordinate(modele_.getX(getLayerSelection().getMaxIndex()), modele_.getY(getLayerSelection()
-        .getMaxIndex()));
+    cs[0] = new Coordinate(modele_.getX(getLayerSelection().getMinIndex()), modele_.getY(getLayerSelection().getMinIndex()));
+    cs[1] = new Coordinate(modele_.getX(getLayerSelection().getMaxIndex()), modele_.getY(getLayerSelection().getMaxIndex()));
     if (cs[0].compareTo(cs[1]) > 0) {
       final Coordinate tmp = cs[0];
       cs[0] = cs[1];
@@ -319,7 +314,7 @@
   }
 
   public void paintSelection(final Graphics2D _g, final ZSelectionTrace _trace, final GrMorphisme _versEcran,
-      final GrBoite _clipReel) {
+                             final GrBoite _clipReel) {
     if ((modele_ == null) || (modele_.getNombre() <= 0) || isSelectionEmpty() || isRapide()) {
       return;
     }
@@ -360,13 +355,13 @@
   }
 
   public CtuluListSelection selectionBasic(final LinearRing _poly, final int _mode) {
-    if (modele_==null||modele_.getNombre() == 0 || !isVisible()) {
+    if (modele_ == null || modele_.getNombre() == 0 || !isVisible()) {
       return null;
     }
     final Envelope polyEnv = _poly.getEnvelopeInternal();
     final GrBoite domaineBoite = getDomaine();
     final Envelope domaine = new Envelope(domaineBoite.e_.x_, domaineBoite.o_.x_, domaineBoite.e_.y_,
-        domaineBoite.o_.y_);
+                                          domaineBoite.o_.y_);
     // si l'envelop du polygone n'intersect pas le domaine, il n'y a pas de selection
     if (!polyEnv.intersects(domaine)) {
       return null;
@@ -392,7 +387,7 @@
   }
 
   public static int getSelectedPoint(final ZModelePoint _modele, final GrPoint _p, final int _tolerance,
-      final GrMorphisme _versReel, final GrBoite _clipReel) {
+                                     final GrMorphisme _versReel, final GrBoite _clipReel) {
     final GrBoite bClip = _modele.getDomaine();
     final double toleranceReel = GrMorphisme.convertDistanceXY(_versReel, _tolerance);
     if ((!bClip.contientXY(_p)) && (bClip.distanceXY(_p) > toleranceReel)) {
@@ -410,17 +405,18 @@
     }
     return -1;
   }
-  
-  public GrPoint getPoint( int i){
-	  if(i>= modeleDonnees().getNombre())
-		  return null;
-	  GrPoint p=new GrPoint();
-	  modele().point(p, i, true);
-	  return p;
+
+  public GrPoint getPoint(int i) {
+    if (i >= modeleDonnees().getNombre()) {
+      return null;
+    }
+    GrPoint p = new GrPoint();
+    modele().point(p, i, true);
+    return p;
   }
 
   protected CtuluListSelection selectionBasic(final GrPoint _pt, final int _tolerance) {
-    if (modele()==null||modele().getNombre() == 0 || (!isVisible())) {
+    if (modele() == null || modele().getNombre() == 0 || (!isVisible())) {
       return null;
     }
     final int i = getSelectedPoint(modele_, _pt, _tolerance, getVersReel(), getClipReel(getGraphics()));

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModeleGeometryDefault.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModeleGeometryDefault.java	2012-05-23 12:24:03 UTC (rev 7227)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModeleGeometryDefault.java	2012-05-23 21:51:48 UTC (rev 7228)
@@ -59,13 +59,13 @@
 
   /**
    * Called from constructor !
-   * @param geometries 
+   * @param geometries
    */
   public void setGeometries(GISZoneCollectionGeometry geometries) {
     if (geometries_ != null) {
       if (geometries_.getListener() instanceof GISZoneListenerDispatcher) {
         ((GISZoneListenerDispatcher) geometries_.getListener()).removeListener(this);
-      } else {
+      } else if (geometries_.getListener() == this) {
         geometries_.setListener(null);
       }
 

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