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

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

Revision: 6023
          http://fudaa.svn.sourceforge.net/fudaa/?rev=6023&view=rev
Author:   bmarchan
Date:     2010-11-04 14:29:18 +0000 (Thu, 04 Nov 2010)

Log Message:
-----------
Ajout m?\195?\169thode setFormEndedByDoubleClic() + possibilit?\195?\169 de changer le model de trac?\195?\169 de la forme en cours.

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

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalqueEditionInteraction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalqueEditionInteraction.java	2010-11-04 14:28:09 UTC (rev 6022)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalqueEditionInteraction.java	2010-11-04 14:29:18 UTC (rev 6023)
@@ -29,8 +29,10 @@
 import org.fudaa.ebli.geometrie.GrObjet;
 import org.fudaa.ebli.geometrie.GrPoint;
 import org.fudaa.ebli.geometrie.GrPolyligne;
+import org.fudaa.ebli.trace.TraceIcon;
+import org.fudaa.ebli.trace.TraceIconModel;
 import org.fudaa.ebli.trace.TraceLigne;
-import org.fudaa.ebli.trace.TracePoint;
+import org.fudaa.ebli.trace.TraceLigneModel;
 
 /**
  * @version $Id: ZCalqueEditionInteraction.java,v 1.16.6.2 2008-03-27 15:26:27 bmarchan Exp $
@@ -673,10 +675,13 @@
   ZCalqueEditionInteractionTargetI support_;
 
   final TraceLigne tl_ = new TraceLigne(TraceLigne.LISSE, 1.5f, Color.ORANGE);
-  final TracePoint tp_ = new TracePoint(TracePoint.PLUS,2,Color.ORANGE);
+  final TraceIcon tp_ = new TraceIcon(TraceIcon.PLUS,3,Color.ORANGE);
 
   GrPoint tmp_ = new GrPoint();
 
+  /** Le double clic termine-t-il la forme en cours ? */
+  boolean isFormEndedByDoubleClic=true;
+
   /**
    * Constructeur, sans listener associ\xE9.
    */
@@ -725,6 +730,14 @@
     super.setGele(_gele);
   }
 
+  /**
+   * Definit si la saisie peut \xEAtre termin\xE9e par un double clic ou CTRL+clic.
+   * @param _b True : Le double clic termine la sisie. False : sinon.
+   */
+  public void setFormEndedByDoubleClic(boolean _b) {
+    isFormEndedByDoubleClic=_b;
+  }
+
   public boolean alwaysPaint() {
     return true;
   }
@@ -789,6 +802,14 @@
     return tl_.getTypeTrait();
   }
 
+  public void setLineModel(TraceLigneModel _md) {
+    tl_.setModel(_md);
+  }
+
+  public void setIconModel(TraceIconModel _md) {
+    tp_.setModel(_md);
+  }
+
   /**
    * @return true si en cours de saisie.
    */
@@ -879,6 +900,10 @@
    */
   public void mouseReleased(final MouseEvent _evt) {
     if (isOk(_evt)) {
+      if ((_evt.isControlDown() || _evt.getClickCount()==2) && !isFormEndedByDoubleClic) {
+        return;
+      }
+      
       if (_evt.isPopupTrigger()) {
         _evt.consume();
         if (formeCourante_ != null) {


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