[Fudaa-svn-commit] SF.net SVN: fudaa:[9104] trunk/business/fudaa-sig/src/main/java/org/fudaa/ fudaa/sig

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

Revision: 9104
          http://sourceforge.net/p/fudaa/svn/9104
Author:   bmarchan
Date:     2015-04-07 15:29:33 +0000 (Tue, 07 Apr 2015)
Log Message:
-----------
Ameliorations

Modified Paths:
--------------
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigResource.java
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigTempLineInLayer.java

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigResource.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigResource.java	2015-04-07 14:57:34 UTC (rev 9103)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigResource.java	2015-04-07 15:29:33 UTC (rev 9104)
@@ -11,6 +11,7 @@
 import org.fudaa.fudaa.ressource.FudaaResource;
 
 import com.memoire.bu.BuResource;
+import com.memoire.fu.FuLib;
 
 /**
  * @version $Id: FSigResource.java,v 1.4 2006-09-19 15:10:20 deniger Exp $
@@ -24,4 +25,22 @@
     super(_b);
   }
 
+  /**
+   * Traduit et retourne la chaine traduite, avec ou sans valeurs \xE0 ins\xE9rer.
+   *
+   * @param _s La chaine \xE0 traduire.
+   * @param _vals Les valeurs, de n'importe quelle type.
+   * @return La chaine traduite.
+   */
+  public static String getS(String _s, Object ... _vals) {
+    String r = FSIG.getString(_s);
+    if (r == null) {
+      return r;
+    }
+
+    for (int i=0; i<_vals.length; i++) {
+      r = FuLib.replace(r, "{"+i+"}", _vals[i].toString());
+    }
+    return r;
+  }
 }
\ No newline at end of file

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigTempLineInLayer.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigTempLineInLayer.java	2015-04-07 14:57:34 UTC (rev 9103)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigTempLineInLayer.java	2015-04-07 15:29:33 UTC (rev 9104)
@@ -26,6 +26,8 @@
 public class FSigTempLineInLayer {
 
   private Color colorLineTempo_ = Color.RED;
+  private TraceIconModel iconModel_=new TraceIconModel(TraceIcon.PLUS_DOUBLE, 4, colorLineTempo_);
+  private TraceLigneModel lineModel_=new TraceLigneModel(TraceLigne.MIXTE, 2, colorLineTempo_);
 
   GrBoite initZoom_;
 
@@ -66,11 +68,22 @@
   }
 
   /**
-   * @param _colorLineTempo the colorLineTempo to set
+   * Modifie la couleur du segment et des icones.
+   * @param _colorLineTempo La couleur de ligne
    */
   public void setColorLineTempo(Color _colorLineTempo) {
     colorLineTempo_ = _colorLineTempo;
+    lineModel_.setCouleur(_colorLineTempo);
+    iconModel_.setCouleur(_colorLineTempo);
   }
+  
+  public void setLineModel(TraceLigneModel _model) {
+    lineModel_=_model;
+  }
+  
+  public void setIconModel(TraceIconModel _model) {
+    iconModel_=_model;
+  }
 
   /**
    * @param _s la ligne a afficher temporairement. si null n'affiche rien
@@ -89,12 +102,10 @@
       initZoom_ = panel_.getVueCalque().getViewBoite();
       tmp_ = new ZCalqueLigneBrisee();
       tmp_.setDestructible(true);
-      final TraceIconModel model = new TraceIconModel(TraceIcon.PLUS_DOUBLE, 4, colorLineTempo_);
-      tmp_.setIconModel(0, model);
-      tmp_.setIconModel(1, model);
-      final TraceLigneModel ligne = new TraceLigneModel(TraceLigne.MIXTE, 2, colorLineTempo_);
-      tmp_.setLineModel(0, ligne);
-      tmp_.setLineModel(1, ligne);
+      tmp_.setIconModel(0, iconModel_);
+      tmp_.setIconModel(1, iconModel_);
+      tmp_.setLineModel(0, lineModel_);
+      tmp_.setLineModel(1, lineModel_);
       panel_.getVueCalque().getCalque().enPremier(tmp_);
       panel_.getCqInfos().enPremier();
     }

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