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

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

Revision: 8500
          http://sourceforge.net/p/fudaa/svn/8500
Author:   deniger
Date:     2013-09-13 09:22:47 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
corrections minor bugs

Modified Paths:
--------------
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueAffichageDonnees.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZSceneEditor.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/find/CalqueFindActionAbstract.java

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueAffichageDonnees.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueAffichageDonnees.java	2013-09-13 09:21:37 UTC (rev 8499)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueAffichageDonnees.java	2013-09-13 09:22:47 UTC (rev 8500)
@@ -92,8 +92,7 @@
       sentEvent = selection_.xor(_s);
       break;
     case EbliSelectionState.ACTION_REPLACE:
-      selection_.setSelection(_s);
-      sentEvent = true;
+      sentEvent = selection_.setSelection(_s);
       break;
     case EbliSelectionState.ACTION_AND:
       sentEvent = selection_.intersection(_s);

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZSceneEditor.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZSceneEditor.java	2013-09-13 09:21:37 UTC (rev 8499)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZSceneEditor.java	2013-09-13 09:22:47 UTC (rev 8500)
@@ -195,6 +195,11 @@
     GrBoite boite = null;
     for (ZCalqueAffichageDonneesInterface cq : scene_.getAllLayers()) {
       GrBoite boiteTmp = cq.getDomaineOnSelected();
+      if (boiteTmp != null) {
+        if (boiteTmp.getDeltaX() <= 0 || boiteTmp.getDeltaY() <= 0) {
+          boiteTmp = cq.getZoomOnSelected();
+        }
+      }
       if (boite == null) {
         boite = boiteTmp;
       } else {

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/find/CalqueFindActionAbstract.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/find/CalqueFindActionAbstract.java	2013-09-13 09:21:37 UTC (rev 8499)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/find/CalqueFindActionAbstract.java	2013-09-13 09:22:47 UTC (rev 8500)
@@ -78,9 +78,9 @@
     final EbliFindComponent poly = buildPolygoneComponent(_parent);
     final EbliFindComponent first = (expr_ == null) ? buildSimpleComp() : buildExprComp();
     if (layer_ instanceof ZCalqueSondeInterface) {
-      final EbliFindComponent[] cmp = new EbliFindComponent[] { first, poly, new EbliFindComponentSonde() };
-      final String[] str = new String[] { EbliLib.getS("Indices"), getPolygonStr(), EbliLib.getS("Interpolation") };
-      final Icon[] ic = new BuIcon[] { BuResource.BU.getToolIcon("rechercher"), getPolygonIcon(), EbliResource.EBLI.getToolIcon("pointeur") };
+      final EbliFindComponent[] cmp = new EbliFindComponent[]{first, poly, new EbliFindComponentSonde()};
+      final String[] str = new String[]{EbliLib.getS("Indices"), getPolygonStr(), EbliLib.getS("Interpolation")};
+      final Icon[] ic = new BuIcon[]{BuResource.BU.getToolIcon("rechercher"), getPolygonIcon(), EbliResource.EBLI.getToolIcon("pointeur")};
       final EbliFindComponentComposite c = new EbliFindComponentComposite(cmp, str, ic);
       final ZCalqueSondeInterface sonde = (ZCalqueSondeInterface) layer_;
       if (sonde.isSondeActive()) {
@@ -88,8 +88,8 @@
       }
       return c;
     }
-    return new EbliFindComponentComposite(new EbliFindComponent[] { first, poly }, new String[] { EbliLib.getS("Rechercher:"), getPolygonStr() },
-        new BuIcon[] { BuResource.BU.getToolIcon("rechercher"), getPolygonIcon() });
+    return new EbliFindComponentComposite(new EbliFindComponent[]{first, poly}, new String[]{EbliLib.getS("Rechercher:"), getPolygonStr()},
+            new BuIcon[]{BuResource.BU.getToolIcon("rechercher"), getPolygonIcon()});
   }
 
   protected EbliFindComponent buildPolygoneComponent(final EbliFindable _parent) {
@@ -197,7 +197,7 @@
     if (b) {
       visu.getScene().fireSelectionEvent();
     }
-    return b;
+    return selection != null && !selection.isEmpty();
   }
 
   private boolean isSonde(final String _action) {
@@ -229,5 +229,4 @@
   public final String toString() {
     return ((ZCalqueAffichageDonneesInterface) layer_).getTitle();
   }
-
 }
\ No newline at end of file

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