[Fudaa-svn-commit] SF.net SVN: fudaa: [3648] branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/ src/org/fudaa/fudaa/modeleur

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

Revision: 3648
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3648&view=rev
Author:   bmarchan
Date:     2008-06-19 03:56:32 -0700 (Thu, 19 Jun 2008)

Log Message:
-----------
Mise en place des calques 2D non encore impl?\195?\169ment?\195?\169s.

Modified Paths:
--------------
    branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlFille2d.java
    branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlVisuPanel.java
    branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dCloud.java

Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlFille2d.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlFille2d.java	2008-06-19 10:55:49 UTC (rev 3647)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlFille2d.java	2008-06-19 10:56:32 UTC (rev 3648)
@@ -96,19 +96,13 @@
 
   }
 
-  public void copy() {
-    getMdlVisuPanel().copy();
-  }
+  public void copy() {}
 
-  public void cut() {
-    getMdlVisuPanel().cut();
-  }
+  public void cut() {}
 
   public void duplicate() {
     getMdlVisuPanel().duplicate();
   }
 
-  public void paste() {
-    getMdlVisuPanel().paste();
-  }
+  public void paste() {}
 }

Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlVisuPanel.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlVisuPanel.java	2008-06-19 10:55:49 UTC (rev 3647)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlVisuPanel.java	2008-06-19 10:56:32 UTC (rev 3648)
@@ -20,8 +20,12 @@
 import org.fudaa.fudaa.modeleur.action.CalqueNewCalqueAction;
 import org.fudaa.fudaa.modeleur.layer.MdlLayer1dTrace;
 import org.fudaa.fudaa.modeleur.layer.MdlLayer2dCloud;
+import org.fudaa.fudaa.modeleur.layer.MdlLayer2dConstraintLine;
+import org.fudaa.fudaa.modeleur.layer.MdlLayer2dContour;
+import org.fudaa.fudaa.modeleur.layer.MdlLayer2dDirectionLine;
 import org.fudaa.fudaa.modeleur.layer.MdlLayer2dLevel;
 import org.fudaa.fudaa.modeleur.layer.MdlLayer2dProfile;
+import org.fudaa.fudaa.modeleur.layer.MdlLayer2dZone;
 import org.fudaa.fudaa.modeleur.layer.MdlModel2dCloud;
 import org.fudaa.fudaa.modeleur.layer.MdlModel2dLevel;
 import org.fudaa.fudaa.modeleur.layer.MdlModel2dProfile;
@@ -43,6 +47,7 @@
 //  final FSigLayerGroup parent_;
   BGroupeCalque cqImg_;
   BGroupeCalque cqAlti_;
+  BGroupeCalque cqSing_;
   BGroupeCalque cqMdl1d_;
   
   /**
@@ -79,6 +84,7 @@
   public void initCalques(boolean _build) {
     removeAllCalqueDonnees();
     buildAltiLayerGroup(_build);
+    buildSingLayerGroup(_build);
     buildModel1dLayerGroup(_build);
     buildImageGroup();
     
@@ -132,6 +138,35 @@
     cqAlti_.add(cqProfile);
   }
   
+  /**
+   * Mise en place du groupe des singularit\xE9s 2D.
+   */
+  protected void buildSingLayerGroup(boolean _build) {
+    cqSing_ = new BGroupeCalque();
+    cqSing_.setTitle(MdlResource.MDL.getString("Singularit\xE9s"));
+    cqSing_.setName("gcSing");
+    cqSing_.putClientProperty(Action.SHORT_DESCRIPTION, TrResource.getS("Permet le stockage singularit\xE9s 2D"));
+    cqSing_.setDestructible(false);
+    addCalque(cqSing_);
+
+    if (!_build) return;
+    
+    MdlLayer2dContour cqCnt=MdlLayer2dContour.createNew(getGisEditor());
+    cqCnt.setName(BGroupeCalque.findUniqueChildName(cqSing_, cqCnt.getExtName()));
+    cqSing_.add(cqCnt);
+
+    MdlLayer2dZone cqZone=MdlLayer2dZone.createNew(getGisEditor());
+    cqZone.setName(BGroupeCalque.findUniqueChildName(cqSing_, cqZone.getExtName()));
+    cqSing_.add(cqZone);
+    
+    MdlLayer2dConstraintLine cqConst=MdlLayer2dConstraintLine.createNew(getGisEditor());
+    cqConst.setName(BGroupeCalque.findUniqueChildName(cqSing_, cqConst.getExtName()));
+    cqSing_.add(cqConst);
+    
+    MdlLayer2dDirectionLine cqDirect=MdlLayer2dDirectionLine.createNew(getGisEditor());
+    cqDirect.setName(BGroupeCalque.findUniqueChildName(cqSing_, cqDirect.getExtName()));
+    cqSing_.add(cqDirect);
+  }
   
   /**
    * Mise en place du groupe du mod\xE8le 1d.

Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dCloud.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dCloud.java	2008-06-19 10:55:49 UTC (rev 3647)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dCloud.java	2008-06-19 10:56:32 UTC (rev 3648)
@@ -7,6 +7,7 @@
  */
 package org.fudaa.fudaa.modeleur.layer;
 
+import java.awt.Color;
 import java.util.ArrayList;
 import java.util.Arrays;
 
@@ -16,6 +17,8 @@
 import org.fudaa.ebli.calque.edition.ZCalqueMultiPointEditable;
 import org.fudaa.ebli.calque.edition.ZModeleMultiPointEditable;
 import org.fudaa.ebli.commun.EbliActionInterface;
+import org.fudaa.ebli.trace.TraceIcon;
+import org.fudaa.ebli.trace.TraceIconModel;
 import org.fudaa.fudaa.modeleur.MdlResource;
 import org.fudaa.fudaa.modeleur.persistence.MdlLayer2dCloudPersistence;
 import org.fudaa.fudaa.modeleur.persistence.MdlLayer2dMultiPointPersistence;
@@ -36,6 +39,8 @@
   private MdlLayer2dCloud(ZModeleMultiPointEditable _model,  final FSigEditor _editor) {
     super(_model,_editor);
     setName(getExtName());
+    setIconModel(0, new TraceIconModel(TraceIcon.CARRE_PLEIN, 2, new Color(0,190,0)));
+
     setTitle(MdlResource.MDL.getString("Semis de points"));
   }
   


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