[Fudaa-svn-commit] SF.net SVN: fudaa:[4212] branches/FudaaModeleur_TC1Bis/fudaa_devel

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

Revision: 4212
          http://fudaa.svn.sourceforge.net/fudaa/?rev=4212&view=rev
Author:   bmarchan
Date:     2008-11-12 16:24:11 +0000 (Wed, 12 Nov 2008)

Log Message:
-----------
Nouveau calque Axe Hydralique.

Modified Paths:
--------------
    branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleGeometry.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlVisuPanel.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayerFactory.java

Added Paths:
-----------
    branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dAxe.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel1dAxe.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer1dAxePersistence.java

Property Changed:
----------------
    branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayerFactory.java

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java	2008-11-12 15:06:29 UTC (rev 4211)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java	2008-11-12 16:24:11 UTC (rev 4212)
@@ -55,6 +55,8 @@
   public final static String ATT_NATURE_ZN="ZN";
   /** Nature Contour d'\xE9tude */
   public final static String ATT_NATURE_CE="CE";
+  /** Nature axe hydraulique */
+  public final static String ATT_NATURE_AH="AH";
   
   /**
    * Un attribut nom, global.

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleGeometry.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleGeometry.java	2008-11-12 15:06:29 UTC (rev 4211)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleGeometry.java	2008-11-12 16:24:11 UTC (rev 4212)
@@ -13,7 +13,8 @@
 import org.fudaa.ebli.geometrie.GrPoint;
 
 /**
- * Un mod\xE8le contenant toutes sortes de GIS g\xE9om\xE9tries (non sp\xE9cialis\xE9).
+ * Un mod\xE8le contenant toutes sortes de GIS g\xE9om\xE9tries (non sp\xE9cialis\xE9). Les modifications
+ * apport\xE9es au mod\xE8le peuvent \xEAtre \xE9cout\xE9es.
  * @see org.fudaa.ebli.calque.ZCalqueGeometry
  * @author Bertrand Marchand
  * @version $Id$
@@ -78,7 +79,15 @@
    */
   public boolean isGeometryVisible(int _idxGeom);
   
+  /**
+   * Ajoute un listener \xE9coutant les modifications apport\xE9es au mod\xE8le.
+   * @param _listener Le listener.
+   */
   public void addModelListener(ZModelGeometryListener _listener);
   
+  /**
+   * Supprime le listener \xE9coutant les modifications apport\xE9es au mod\xE8le.
+   * @param _listener Le listener.
+   */
   public void removeModelListener(ZModelGeometryListener _listener);
 }

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlVisuPanel.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlVisuPanel.java	2008-11-12 15:06:29 UTC (rev 4211)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlVisuPanel.java	2008-11-12 16:24:11 UTC (rev 4212)
@@ -19,6 +19,7 @@
 import org.fudaa.fudaa.commun.impl.FudaaCommonImplementation;
 import org.fudaa.fudaa.modeleur.action.CalqueDeleteCalqueAction;
 import org.fudaa.fudaa.modeleur.action.CalqueNewCalqueAction;
+import org.fudaa.fudaa.modeleur.layer.MdlLayer1dAxe;
 import org.fudaa.fudaa.modeleur.layer.MdlLayer1dTrace;
 import org.fudaa.fudaa.modeleur.layer.MdlLayer2dCloud;
 import org.fudaa.fudaa.modeleur.layer.MdlLayer2dConstraintLine;
@@ -106,6 +107,10 @@
     EbliActionInterface actNewDir=new CalqueNewCalqueAction(FudaaLib.getS("Nouveau calque lignes directions"),FudaaResource.FUDAA.getIcon("ajouter"),MdlLayerFactory.LAYER2D_DIR_LINE,cqSing_,getGisEditor());
     cqSing_.setActions(new EbliActionInterface[] { actNewZone, actNewCnt, actNewConst, actNewDir});
 
+    EbliActionInterface actNewTrace=new CalqueNewCalqueAction(FudaaLib.getS("Nouveau calque trace de profils"),FudaaResource.FUDAA.getIcon("ajouter"),MdlLayerFactory.LAYER1D_TRACE,cqMdl1d_,getGisEditor());
+    EbliActionInterface actNewAxe=new CalqueNewCalqueAction(FudaaLib.getS("Nouveau calque axes hydrauliques"),FudaaResource.FUDAA.getIcon("ajouter"),MdlLayerFactory.LAYER1D_AXE,cqMdl1d_,getGisEditor());
+    cqMdl1d_.setActions(new EbliActionInterface[] { actNewTrace, actNewAxe});
+
     EbliActionInterface actImport = new FSigImageImportAction(this, cqImg_);
     cqImg_.setActions(new EbliActionInterface[] { actImport });
     
@@ -196,6 +201,10 @@
     MdlLayer1dTrace cqTrace=new MdlLayer1dTrace(getGisEditor());
     cqTrace.setName(BGroupeCalque.findUniqueChildName(cqMdl1d_, cqTrace.getExtName()));
     cqMdl1d_.add(cqTrace);
+
+    MdlLayer1dAxe cqAxe=new MdlLayer1dAxe(getGisEditor());
+    cqAxe.setName(BGroupeCalque.findUniqueChildName(cqMdl1d_, cqAxe.getExtName()));
+    cqMdl1d_.add(cqAxe);
   }
 
   /**

Added: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dAxe.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dAxe.java	                        (rev 0)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dAxe.java	2008-11-12 16:24:11 UTC (rev 4212)
@@ -0,0 +1,60 @@
+/*
+ * @creation     20 janv. 08
+ * @modification $Date$
+ * @license      GNU General Public License 2
+ * @copyright    (c)1998-2008 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail         fud...@li...
+ */
+package org.fudaa.fudaa.modeleur.layer;
+
+import java.awt.Color;
+
+import org.fudaa.ebli.calque.BCalquePersistenceInterface;
+import org.fudaa.ebli.calque.dessin.DeForme;
+import org.fudaa.ebli.calque.edition.ZModeleLigneBriseeEditable;
+import org.fudaa.ebli.trace.TraceLigne;
+import org.fudaa.ebli.trace.TraceLigneModel;
+import org.fudaa.fudaa.modeleur.MdlResource;
+import org.fudaa.fudaa.modeleur.persistence.MdlLayer1dAxePersistence;
+import org.fudaa.fudaa.sig.layer.FSigEditor;
+
+/**
+ * Un calque pour le stockage et la manipulation des donn\xE9es 1d.
+ * @author Bertrand Marchand
+ * @version $Id$
+ */
+public class MdlLayer1dAxe extends MdlLayer2dLine {
+  
+  /**
+   * Constructeur. Utilise un mod\xE8le de donn\xE9es et un editeur.
+   * @param _model Modele
+   * @param _editor Editeur.
+   */
+  private MdlLayer1dAxe(ZModeleLigneBriseeEditable _model,  final FSigEditor _editor) {
+    super(_model,_editor);
+    setLineModel(0, new TraceLigneModel(TraceLigne.POINTILLE, 2f, new Color(0,125,0)));
+    setLineModelOuvert(getLineModel(0));
+    setName(getExtName());
+    setTitle(MdlResource.MDL.getString("Axes hydrauliques"));
+  }
+  
+  public MdlLayer1dAxe(FSigEditor _editor) {
+    this(new MdlModel1dAxe(_editor),_editor);
+  }
+  
+  public BCalquePersistenceInterface getPersistenceMng() {
+    return new MdlLayer1dAxePersistence();
+  }
+
+  /**
+   * Retourne le nom par defaut du calque.
+   * @return Le nom.
+   */
+  public String getExtName() {
+    return "axe";
+  }
+  
+  public boolean canAddForme(int _typeForme) {
+    return _typeForme==DeForme.LIGNE_BRISEE;
+  }
+}


Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dAxe.java
___________________________________________________________________
Added: svn:keywords
   + Date Revision Author URL Id
Added: svn:eol-style
   + native

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayerFactory.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayerFactory.java	2008-11-12 15:06:29 UTC (rev 4211)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayerFactory.java	2008-11-12 16:24:11 UTC (rev 4212)
@@ -1,20 +1,19 @@
 /*
  * @creation     20 janv. 08
- * @modification $Date: 2008/05/13 12:10:43 $
+ * @modification $Date$
  * @license      GNU General Public License 2
  * @copyright    (c)1998-2008 CETMEF 2 bd Gambetta F-60231 Compiegne
  * @mail         fud...@li...
  */
 package org.fudaa.fudaa.modeleur.layer;
 
-import org.fudaa.ebli.calque.BCalque;
 import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
 import org.fudaa.fudaa.sig.layer.FSigEditor;
 
 /**
  * Une fabrique de calques.
  * @author Bertrand Marchand
- * @version $Id: MdlLayer2dProfile.java,v 1.1.2.5 2008/05/13 12:10:43 bmarchan Exp $
+ * @version $Id$
  */
 public class MdlLayerFactory {
   public final static int LAYER2D_CLOUD     =1;
@@ -25,6 +24,7 @@
   public final static int LAYER2D_ZONE      =6;
   public final static int LAYER2D_CONTOUR   =7;
   public final static int LAYER1D_TRACE     =8;
+  public final static int LAYER1D_AXE       =9;
   
   private static MdlLayerFactory factory_=new MdlLayerFactory();
   
@@ -64,6 +64,8 @@
       return new MdlLayer2dContour(_editor);
     case LAYER1D_TRACE:
       return new MdlLayer1dTrace(_editor);
+    case LAYER1D_AXE:
+      return new MdlLayer1dAxe(_editor);
     default:
       throw new IllegalArgumentException("Bad type");
     }


Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayerFactory.java
___________________________________________________________________
Added: svn:keywords
   + Date Revision Author URL Id

Added: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel1dAxe.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel1dAxe.java	                        (rev 0)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel1dAxe.java	2008-11-12 16:24:11 UTC (rev 4212)
@@ -0,0 +1,39 @@
+/*
+ * @creation     20 janv. 08
+ * @modification $Date$
+ * @license      GNU General Public License 2
+ * @copyright    (c)1998-2008 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail         fud...@li...
+ */
+package org.fudaa.fudaa.modeleur.layer;
+
+import org.fudaa.ctulu.gis.GISAttribute;
+import org.fudaa.ctulu.gis.GISAttributeConstants;
+import org.fudaa.ebli.calque.ZModelGeometryListener;
+
+/**
+ * Un mod\xE8le de calque pour le calque 1D des axes hydrauliques. Les axes sont des polylignes XYZ.
+ * 
+ * @author Bertrand Marchand
+ * @version $Id$
+ */
+public class MdlModel1dAxe extends MdlModel2dLine {
+
+  /**
+   * Construction d'un modele d'axes.
+   */
+  public MdlModel1dAxe(final ZModelGeometryListener _listener) {
+    super(_listener);
+    GISAttribute[] attrs=new GISAttribute[]{
+      GISAttributeConstants.BATHY,
+      GISAttributeConstants.ETAT_GEOM,
+      GISAttributeConstants.TITRE,
+      GISAttributeConstants.NATURE,
+      GISAttributeConstants.VISIBILITE
+    };
+    // Pas de container de commande pour cette op\xE9ration, sinon conserv\xE9 en undo/redo.
+    getGeomData().setAttributes(attrs, null);
+    getGeomData().setAttributeIsZ(GISAttributeConstants.BATHY);
+    getGeomData().setFixedAttributeValue(GISAttributeConstants.NATURE, GISAttributeConstants.ATT_NATURE_AH);
+  }
+}


Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel1dAxe.java
___________________________________________________________________
Added: svn:keywords
   + Date Revision Author URL Id
Added: svn:eol-style
   + native

Added: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer1dAxePersistence.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer1dAxePersistence.java	                        (rev 0)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer1dAxePersistence.java	2008-11-12 16:24:11 UTC (rev 4212)
@@ -0,0 +1,27 @@
+/*
+ * @creation     20 janv. 08
+ * @modification $Date$
+ * @license      GNU General Public License 2
+ * @copyright    (c)1998-2008 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail         fud...@li...
+ */
+package org.fudaa.fudaa.modeleur.persistence;
+
+import org.fudaa.fudaa.modeleur.layer.MdlLayer1dAxe;
+import org.fudaa.fudaa.modeleur.layer.MdlLayer2dLine;
+import org.fudaa.fudaa.modeleur.layer.MdlLayer2dProfile;
+import org.fudaa.fudaa.sig.layer.FSigEditor;
+
+/**
+ * Gestion de la persistance pour un calque multipoint.
+ * @author Bertrand Marchand
+ * @version $Id$
+ * @see MdlLayer1dAxe
+ */
+public class MdlLayer1dAxePersistence extends MdlLayer2dLinePersistence {
+  
+  @Override
+  protected MdlLayer2dLine createNewLayer(FSigEditor _editor) {
+    return new MdlLayer1dAxe(_editor);
+  }
+}


Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer1dAxePersistence.java
___________________________________________________________________
Added: svn:keywords
   + Date Revision Author URL Id
Added: svn:eol-style
   + native


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