Menu
▾
▴
fudaa-svn-commit
|
From: <bma...@us...> - 2008-06-06 12:40:53
|
Revision: 3625
http://fudaa.svn.sourceforge.net/fudaa/?rev=3625&view=rev
Author: bmarchan
Date: 2008-06-06 05:40:56 -0700 (Fri, 06 Jun 2008)
Log Message:
-----------
Nettoyage du code.
Modified Paths:
--------------
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneInterpolationAction.java
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java 2008-06-06 08:07:08 UTC (rev 3624)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java 2008-06-06 12:40:56 UTC (rev 3625)
@@ -44,7 +44,7 @@
*/
private void installMethods() {
ArrayList<EbliActionInterface> acts=new ArrayList<EbliActionInterface>();
- acts.add(new SceneInterpolationAction(this,(MdlSceneEditor)getSceneEditor()));
+ acts.add(new SceneInterpolationAction((MdlSceneEditor)getSceneEditor()));
acts.add(new SceneMoveInLayerAction(this,(MdlSceneEditor)getSceneEditor()));
getSceneEditor().getScene().setActions(acts.toArray(new EbliActionAbstract[0]));
}
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneInterpolationAction.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneInterpolationAction.java 2008-06-06 08:07:08 UTC (rev 3624)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneInterpolationAction.java 2008-06-06 12:40:56 UTC (rev 3625)
@@ -9,35 +9,18 @@
import java.awt.event.ActionEvent;
-import javax.swing.tree.TreeSelectionModel;
-
-import org.fudaa.ctulu.gis.GISPolyligne;
-import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
import org.fudaa.ebli.calque.ZScene;
import org.fudaa.ebli.calque.ZSelectionEvent;
import org.fudaa.ebli.calque.ZSelectionListener;
-import org.fudaa.ebli.calque.edition.BPaletteEdition;
-import org.fudaa.ebli.calque.edition.ZCalqueEditable;
-import org.fudaa.ebli.calque.edition.ZCalqueLigneBriseeEditable;
-import org.fudaa.ebli.calque.edition.ZCalqueMultiPointEditable;
-import org.fudaa.ebli.calque.edition.ZEditorInterface;
-import org.fudaa.ebli.calque.edition.BPaletteRotation;
-import org.fudaa.ebli.calque.edition.ZSceneEditor;
-import org.fudaa.ebli.commun.BPalettePanelInterface;
-import org.fudaa.ebli.commun.EbliActionPaletteTreeModel;
import org.fudaa.ebli.commun.EbliActionSimple;
-import org.fudaa.ebli.commun.EbliFormatterInterface;
import org.fudaa.ebli.ressource.EbliResource;
import org.fudaa.fudaa.modeleur.MdlSceneEditor;
import org.fudaa.fudaa.modeleur.layer.MdlLayer2dLine;
import org.fudaa.fudaa.modeleur.layer.MdlLayer2dMultiPoint;
-import com.memoire.fu.Fu;
-import com.memoire.fu.FuLog;
-
/**
- * Une action pour faire une rotation d'objets GIS, reagissant au changement de calque selectionn\xE9.
- * @author Fred Deniger
+ * Une action pour faire une interpolation entre 2 sommet d'un objets GIS.
+ * @author Bertrand Marchand
* @version $Id: SceneInterpolationAction.java,v 1.1.2.1 2008-05-13 12:10:55 bmarchan Exp $
*/
public class SceneInterpolationAction extends EbliActionSimple implements ZSelectionListener {
@@ -47,8 +30,8 @@
/**
* @param _m l'arbre des calques
*/
- public SceneInterpolationAction(final ZEditorInterface _editor, MdlSceneEditor _sceneEditor) {
- super(EbliResource.EBLI.getString("Interpolation entre 2 sommets"), null/*EbliResource.EBLI.getToolIcon("draw-rotation")*/, "INTERPOLER");
+ public SceneInterpolationAction(MdlSceneEditor _sceneEditor) {
+ super(EbliResource.EBLI.getString("Interpolation entre 2 sommets"), null, "INTERPOLER");
setSceneEditor(_sceneEditor);
sceneEditor_.getScene().addSelectionListener(this);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2008-06-10 08:10:12
|
Revision: 3629
http://fudaa.svn.sourceforge.net/fudaa/?rev=3629&view=rev
Author: bmarchan
Date: 2008-06-10 01:10:19 -0700 (Tue, 10 Jun 2008)
Log Message:
-----------
Implementation fonctionnalit?\195?\169 d?\195?\169cimation
Modified Paths:
--------------
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dLine.java
Added Paths:
-----------
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneDecimationAction.java
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java 2008-06-10 08:09:54 UTC (rev 3628)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java 2008-06-10 08:10:19 UTC (rev 3629)
@@ -14,6 +14,7 @@
import org.fudaa.ebli.calque.edition.ZCalqueEditable;
import org.fudaa.ebli.commun.EbliActionAbstract;
import org.fudaa.ebli.commun.EbliActionInterface;
+import org.fudaa.fudaa.modeleur.action.SceneDecimationAction;
import org.fudaa.fudaa.modeleur.action.SceneInterpolationAction;
import org.fudaa.fudaa.modeleur.action.SceneMoveInLayerAction;
import org.fudaa.fudaa.sig.layer.FSigEditor;
@@ -45,7 +46,8 @@
private void installMethods() {
ArrayList<EbliActionInterface> acts=new ArrayList<EbliActionInterface>();
acts.add(new SceneInterpolationAction((MdlSceneEditor)getSceneEditor()));
- acts.add(new SceneMoveInLayerAction(this,(MdlSceneEditor)getSceneEditor()));
+ acts.add(new SceneMoveInLayerAction((MdlSceneEditor)getSceneEditor()));
+ acts.add(new SceneDecimationAction((MdlSceneEditor)getSceneEditor()));
getSceneEditor().getScene().setActions(acts.toArray(new EbliActionAbstract[0]));
}
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java 2008-06-10 08:09:54 UTC (rev 3628)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java 2008-06-10 08:10:19 UTC (rev 3629)
@@ -23,6 +23,7 @@
import org.fudaa.ebli.calque.edition.ZSceneEditor;
import org.fudaa.ebli.geometrie.GrPoint;
import org.fudaa.ebli.geometrie.GrPolyligne;
+import org.fudaa.fudaa.commun.impl.Fudaa;
import org.fudaa.fudaa.modeleur.layer.MdlLayer2dCloud;
import org.fudaa.fudaa.modeleur.layer.MdlModel2dCloud;
import org.fudaa.fudaa.modeleur.layer.MdlModel2dLine;
@@ -35,12 +36,17 @@
import com.vividsolutions.jts.geom.MultiPoint;
/**
+ * L'\xE9diteur effectuant les traitements sur la scene sp\xE9cifiques au modeleur.
* @author Bertrand Marchand
* @version $Id: MdlSceneEditor.java,v 1.1.2.1 2008-05-13 12:10:19 bmarchan Exp $
*/
public class MdlSceneEditor extends ZSceneEditor {
-
- MdlVisuPanel pn_; // Pour l'affichage des boites de dialogue.
+ // Pour l'affichage des boites de dialogue.
+ MdlVisuPanel pn_;
+ // Pour conserver les valeurs IHM d'un appel a un autre.
+ MdlDecimationPanel pnDecimation_=null;
+ // Pour conserver les valeurs IHM d'un appel a un autre.
+ MdlInterpolationPanel pnInterpolation_=null;
public MdlSceneEditor(MdlVisuPanel _pn, ZScene _scene) {
super(_scene);
@@ -51,8 +57,10 @@
* Interpolation entre 2 sommets. Les 2 sommets peuvent appartenir au m\xEAme bloc.
*/
public void interpolateSelectedGeometries() {
- MdlInterpolationPanel pn=new MdlInterpolationPanel();
- if (CtuluDialogPanel.isOkResponse(pn.afficheModale(pn_.getFrame(), "Interpolation entre 2 sommets"))) {
+ if (pnInterpolation_==null)
+ pnInterpolation_=new MdlInterpolationPanel();
+
+ if (pnInterpolation_.afficheModaleOk(pn_.getFrame(), "Interpolation entre 2 sommets")) {
int[] idxGeom=getScene().getLayerSelectionMulti().getIdxSelected();
Coordinate[] coords=new Coordinate[2];
@@ -73,14 +81,14 @@
}
double dist;
- if (pn.isNbPtsGiven()) { // Nombre de points donn\xE9.
- int nbpts=pn.getNbPts();
+ if (pnInterpolation_.isNbPtsGiven()) { // Nombre de points donn\xE9.
+ int nbpts=pnInterpolation_.getNbPts();
dist=Math.sqrt((coords[1].x-coords[0].x)*(coords[1].x-coords[0].x)+
(coords[1].y-coords[0].y)*(coords[1].y-coords[0].y))/
(nbpts+1);
}
else { // Distance donn\xE9e.
- dist=pn.getDistance();
+ dist=pnInterpolation_.getDistance();
}
ZModeleDonnees mdld=((ZCalqueAffichageDonneesInterface)getScene().getCalqueActif()).modeleDonnees();
@@ -100,44 +108,84 @@
*/
public void moveInLayerSelectedGeometries() {
ZModeleDonnees mdld=((ZCalqueAffichageDonneesInterface)getScene().getCalqueActif()).modeleDonnees();
-
- int[] idxGeom=getScene().getLayerSelection().getSelectedIndex();
- Geometry[] geoms=new Geometry[idxGeom.length];
- for (int i=0; i<idxGeom.length; i++) {
- geoms[i]=(Geometry)getScene().getObject(idxGeom[i]);
- }
- final CtuluCommandComposite cmp = new CtuluCommandComposite();
+ int[] idxGeom=getScene().getLayerSelection().getSelectedIndex();
+ Geometry[] geoms=new Geometry[idxGeom.length];
+ for (int i=0; i<idxGeom.length; i++) {
+ geoms[i]=(Geometry)getScene().getObject(idxGeom[i]);
+ }
- // Controle qu'une bloc n'est pas constitu\xE9 que d'un point => Message d'erreur.
- if (mdld instanceof MdlModel2dLine) {
- for (Geometry g : geoms) {
- if (g.getNumPoints()<2) {
- ui_.error("Vous ne pouvez pas d\xE9placer ces g\xE9om\xE9tries.\nUne au moins n'est constitu\xE9e que d'un point!");
- return;
- }
+ final CtuluCommandComposite cmp = new CtuluCommandComposite();
+
+ // Controle qu'une bloc n'est pas constitu\xE9 que d'un point => Message d'erreur.
+ if (mdld instanceof MdlModel2dLine) {
+ for (Geometry g : geoms) {
+ if (g.getNumPoints()<2) {
+ ui_.error("Vous ne pouvez pas d\xE9placer ces g\xE9om\xE9tries.\nUne au moins n'est constitu\xE9e que d'un point!");
+ return;
}
}
+ }
- removeSelectedObjects(cmp);
+ removeSelectedObjects(cmp);
- if (mdld instanceof MdlModel2dMultiPoint) {
- MdlModel2dMultiPoint mdl=(MdlModel2dMultiPoint)mdld;
- for (Geometry g : geoms) {
- Geometry gn=GISGeometryFactory.INSTANCE.createMultiPoint(g.getCoordinates());
- mdl.addGeometry(gn, cmp, ui_,null);
- }
+ if (mdld instanceof MdlModel2dMultiPoint) {
+ MdlModel2dMultiPoint mdl=(MdlModel2dMultiPoint)mdld;
+ for (Geometry g : geoms) {
+ Geometry gn=GISGeometryFactory.INSTANCE.createMultiPoint(g.getCoordinates());
+ mdl.addGeometry(gn, cmp, ui_,null);
}
- else if (mdld instanceof MdlModel2dLine) {
- MdlModel2dLine mdl=(MdlModel2dLine)mdld;
- for (Geometry g : geoms) {
- Geometry gn=GISGeometryFactory.INSTANCE.createLineString(g.getCoordinates());
- mdl.addGeometry(gn, cmp, ui_,null);
- }
+ }
+ else if (mdld instanceof MdlModel2dLine) {
+ MdlModel2dLine mdl=(MdlModel2dLine)mdld;
+ for (Geometry g : geoms) {
+ Geometry gn=GISGeometryFactory.INSTANCE.createLineString(g.getCoordinates());
+ mdl.addGeometry(gn, cmp, ui_,null);
}
+ }
+
+ if (mng_ != null) {
+ mng_.addCmd(cmp.getSimplify());
+ }
+ }
+
+ /**
+ * D\xE9cime la g\xE9om\xE9trie ou entre 2 sommmets de la g\xE9om\xE9trie s\xE9lectionn\xE9e.
+ */
+ public void decimeSelectedGeometries() {
+ if (pnDecimation_==null)
+ pnDecimation_=new MdlDecimationPanel();
+
+ String title;
+ if (getScene().isAtomicMode())
+ title=MdlResource.MDL.getString("D\xE9cimation entre 2 sommets");
+ else
+ title=MdlResource.MDL.getString("D\xE9cimation sur une polyligne");
- if (mng_ != null) {
- mng_.addCmd(cmp.getSimplify());
+ if (pnDecimation_.afficheModaleOk(pn_.getFrame(), title)) {
+ // La g\xE9om\xE9trie.
+ int idxGeom=getScene().getSelectionHelper().getUniqueSelectedIdx();
+ Geometry geom=(Geometry)getScene().getObject(idxGeom);
+ int idxdeb;
+ int idxfin;
+ if (getScene().isAtomicMode()) {
+ int[] idxa=getScene().getLayerSelectionMulti().getSelection(idxGeom).getSelectedIndex();
+ idxdeb=idxa[0];
+ idxfin=idxa[1];
}
+ else {
+ idxdeb=0;
+ idxfin=geom.getNumPoints()-1;
+ }
+
+ ZModeleDonnees mdld=getScene().getLayerForId(idxGeom).modeleDonnees();
+ if (mdld instanceof MdlModel2dLine) {
+ MdlModel2dLine mdl=(MdlModel2dLine)mdld;
+ mdl.decimate(getScene().sceneId2LayerId(idxGeom),idxdeb,idxfin,pnDecimation_.isNbPtsGiven()?0:1,
+ pnDecimation_.getNbPts(),pnDecimation_.getDistance(),getMng());
+ }
+
+ super.getScene().clearSelection();
+ }
}
}
Added: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneDecimationAction.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneDecimationAction.java (rev 0)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneDecimationAction.java 2008-06-10 08:10:19 UTC (rev 3629)
@@ -0,0 +1,82 @@
+/*
+ * @creation 1 avr. 2005
+ * @modification $Date: 2008-05-13 12:10:55 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.fudaa.modeleur.action;
+
+import java.awt.event.ActionEvent;
+
+import org.fudaa.ebli.calque.ZScene;
+import org.fudaa.ebli.calque.ZSelectionEvent;
+import org.fudaa.ebli.calque.ZSelectionListener;
+import org.fudaa.ebli.calque.ZScene.SceneSelectionHelper;
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.ebli.ressource.EbliResource;
+import org.fudaa.fudaa.modeleur.MdlSceneEditor;
+import org.fudaa.fudaa.modeleur.layer.MdlLayer2dLine;
+import org.fudaa.fudaa.modeleur.layer.MdlLayer2dMultiPoint;
+
+/**
+ * Une action pour faire d\xE9cimer entre 2 sommets ou la totalit\xE9 d'un objets GIS.
+ * @author Bertrand Marchand
+ * @version $Id: SceneInterpolationAction.java,v 1.1.2.1 2008-05-13 12:10:55 bmarchan Exp $
+ */
+public class SceneDecimationAction extends EbliActionSimple implements ZSelectionListener {
+
+ MdlSceneEditor sceneEditor_;
+
+ /**
+ * @param _m l'arbre des calques
+ */
+ public SceneDecimationAction(MdlSceneEditor _sceneEditor) {
+ super(EbliResource.EBLI.getString("D\xE9cimer"), null, "DECIMER");
+ setSceneEditor(_sceneEditor);
+ sceneEditor_.getScene().addSelectionListener(this);
+ }
+
+ public void actionPerformed(final ActionEvent _e) {
+ sceneEditor_.decimeSelectedGeometries();
+ }
+
+ /**
+ * @param _editor l'editeur
+ */
+ private void setSceneEditor(final MdlSceneEditor _sceneEditor) {
+ sceneEditor_ = _sceneEditor;
+ }
+
+ /**
+ * Autoris\xE9 si 2 sommets d'un m\xEAme bloc sont selectionn\xE9s ou 1 g\xE9om\xE9trie compl\xE8te.
+ */
+ public void updateForSelectionChanged() {
+ ZScene scn=sceneEditor_.getScene();
+ SceneSelectionHelper hlp=sceneEditor_.getScene().getSelectionHelper();
+ int idGeom=-1;
+
+ boolean b=true;
+ // Si selection n'est pas vide.
+ b&=!scn.isSelectionEmpty();
+ // Si le nombre d'atomiques est de 2 sur le m\xEAme bloc
+ b&=!scn.isAtomicMode() || (hlp.getNbAtomicSelected()==2 && (idGeom=hlp.getUniqueSelectedIdx())!=-1);
+ // Si le nombre de selectionn\xE9s est de 1 en mode global
+ b&=scn.isAtomicMode() || (idGeom=hlp.getUniqueSelectedIdx())!=-1;
+ // Si la g\xE9om\xE9trie appartient a un calque polylignes.
+ b&=scn.getLayerForId(idGeom) instanceof MdlLayer2dLine;
+
+ super.setEnabled(b);
+ }
+
+ public String getEnableCondition() {
+ return EbliResource.EBLI.getString("<p>En mode sommet, s\xE9lectionner 2 sommets d'un m\xEAme objet<p>En mode global, un objet");
+ }
+
+ /* (non-Javadoc)
+ * @see org.fudaa.ebli.calque.ZSelectionListener#selectionChanged(org.fudaa.ebli.calque.ZSelectionEvent)
+ */
+ public void selectionChanged(ZSelectionEvent _evt) {
+ updateForSelectionChanged();
+ }
+}
Property changes on: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneDecimationAction.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dLine.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dLine.java 2008-06-10 08:09:54 UTC (rev 3628)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dLine.java 2008-06-10 08:10:19 UTC (rev 3629)
@@ -7,7 +7,13 @@
*/
package org.fudaa.fudaa.modeleur.layer;
+import gnu.trove.TIntArrayList;
+
+import java.util.ArrayList;
+
import org.fudaa.ctulu.CtuluCommandContainer;
+import org.fudaa.ctulu.CtuluListSelection;
+import org.fudaa.ctulu.CtuluListSelectionInterface;
import org.fudaa.ctulu.gis.GISAttribute;
import org.fudaa.ctulu.gis.GISAttributeConstants;
import org.fudaa.ctulu.gis.GISGeometryFactory;
@@ -18,6 +24,8 @@
import org.fudaa.ebli.calque.edition.ZModeleLigneBriseeEditable;
import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.CoordinateSequence;
+import com.vividsolutions.jts.geom.LineString;
/**
* Un mod\xE8le de calque pour un calque 2D contenant des lignes.
@@ -39,6 +47,7 @@
* Interpole entre 2 points, suivant un nombre de points donn\xE9s.
* @param _coords Les 2 coordonn\xE9es
* @param _dist La distance entre 2 points cons\xE9cutifs.
+ * @param _cmd Le container de commandes.
* @return true si modif ok.
*/
public boolean interpolate(Coordinate[] _coords, double _dist, final CtuluCommandContainer _cmd){
@@ -61,4 +70,56 @@
geometries_.addGeometry(poly, null, _cmd);
return true;
}
+
+ /**
+ * Decime une ligne. La m\xE9thode utilis\xE9e pour d\xE9cimer peut \xEAtre :<p>
+ * 0 : Suivant un nombre de points a supprimer entre 2 points conserv\xE9s.<br>
+ * 1 : Suivant une distance minimale.
+ * @param _idxGeom La g\xE9om\xE9trie a d\xE9cimer.
+ * @param _idxdeb L'indice de d\xE9but de d\xE9cimation.
+ * @param _idxfin L'indice de fin de d\xE9cimation.
+ * @param _meth La m\xE9thode.
+ * @param _nbPts Le nombre de points.
+ * @param _dstmin La distance minimale.
+ * @param _cmd Le container de commandes.
+ * @return true si modif ok.
+ */
+ public boolean decimate(int _idxGeom, int _idxdeb,int _idxfin,int _meth,int _nbPts, double _dstmin, CtuluCommandContainer _cmd) {
+ TIntArrayList list=new TIntArrayList();
+
+ // Methode par nombre de points.
+ if (_meth==0) {
+ int idx=_idxdeb+1+_nbPts;
+ for (int i=_idxdeb+1; i<=_idxfin-1; i++) {
+ if (i<idx) {
+ list.add(i);
+ }
+ else {
+ idx=i+1+_nbPts;
+ }
+ }
+ }
+ // Methode par nombre de points.
+ else if (_meth==1) {
+ LineString geom=(LineString)geometries_.getGeometry(_idxGeom);
+ CoordinateSequence seq=geom.getCoordinateSequence();
+// int idx=_idxdeb;
+ double dst=0;
+ for (int i=_idxdeb+1; i<=_idxfin-1; i++) {
+ dst+=Math.sqrt((seq.getX(i)-seq.getX(i-1))*(seq.getX(i)-seq.getX(i-1))+
+ (seq.getY(i)-seq.getY(i-1))*(seq.getY(i)-seq.getY(i-1)));
+ if (dst<_dstmin) {
+ list.add(i);
+ }
+ else {
+ dst=0;
+// idx=i;
+ }
+ }
+ }
+
+ CtuluListSelectionInterface ids = new CtuluListSelection(list.toNativeArray());
+ geometries_.removeAtomicValue(_idxGeom, ids, null, _cmd); // L'UI est null, le cas ou moins de 2 points ne peut pas arriver.
+ return true;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2008-06-10 12:53:11
|
Revision: 3634
http://fudaa.svn.sourceforge.net/fudaa/?rev=3634&view=rev
Author: bmarchan
Date: 2008-06-10 05:53:20 -0700 (Tue, 10 Jun 2008)
Log Message:
-----------
Chgt nom methode.
Modified Paths:
--------------
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneDecimationAction.java
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java 2008-06-10 08:23:09 UTC (rev 3633)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java 2008-06-10 12:53:20 UTC (rev 3634)
@@ -54,7 +54,7 @@
}
/**
- * Interpolation entre 2 sommets. Les 2 sommets peuvent appartenir au m\xEAme bloc.
+ * Interpole entre 2 sommets. Les 2 sommets peuvent appartenir au m\xEAme bloc.
*/
public void interpolateSelectedGeometries() {
if (pnInterpolation_==null)
@@ -152,7 +152,7 @@
/**
* D\xE9cime la g\xE9om\xE9trie ou entre 2 sommmets de la g\xE9om\xE9trie s\xE9lectionn\xE9e.
*/
- public void decimeSelectedGeometries() {
+ public void decimateSelectedGeometries() {
if (pnDecimation_==null)
pnDecimation_=new MdlDecimationPanel();
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneDecimationAction.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneDecimationAction.java 2008-06-10 08:23:09 UTC (rev 3633)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneDecimationAction.java 2008-06-10 12:53:20 UTC (rev 3634)
@@ -38,7 +38,7 @@
}
public void actionPerformed(final ActionEvent _e) {
- sceneEditor_.decimeSelectedGeometries();
+ sceneEditor_.decimateSelectedGeometries();
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2008-06-11 07:59:18
|
Revision: 3636
http://fudaa.svn.sourceforge.net/fudaa/?rev=3636&view=rev
Author: bmarchan
Date: 2008-06-11 00:59:25 -0700 (Wed, 11 Jun 2008)
Log Message:
-----------
Mise en place fonctionnalite de rafinement de polyligne, Z interpol?\195?\169 a partir des points polyligne.
Modified Paths:
--------------
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dLine.java
Added Paths:
-----------
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneRefinementAction.java
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java 2008-06-11 07:58:11 UTC (rev 3635)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java 2008-06-11 07:59:25 UTC (rev 3636)
@@ -17,6 +17,7 @@
import org.fudaa.fudaa.modeleur.action.SceneDecimationAction;
import org.fudaa.fudaa.modeleur.action.SceneInterpolationAction;
import org.fudaa.fudaa.modeleur.action.SceneMoveInLayerAction;
+import org.fudaa.fudaa.modeleur.action.SceneRefinementAction;
import org.fudaa.fudaa.sig.layer.FSigEditor;
import org.fudaa.fudaa.sig.layer.FSigVisuPanel;
@@ -48,6 +49,7 @@
acts.add(new SceneInterpolationAction((MdlSceneEditor)getSceneEditor()));
acts.add(new SceneMoveInLayerAction((MdlSceneEditor)getSceneEditor()));
acts.add(new SceneDecimationAction((MdlSceneEditor)getSceneEditor()));
+ acts.add(new SceneRefinementAction((MdlSceneEditor)getSceneEditor()));
getSceneEditor().getScene().setActions(acts.toArray(new EbliActionAbstract[0]));
}
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java 2008-06-11 07:58:11 UTC (rev 3635)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java 2008-06-11 07:59:25 UTC (rev 3636)
@@ -47,6 +47,8 @@
MdlDecimationPanel pnDecimation_=null;
// Pour conserver les valeurs IHM d'un appel a un autre.
MdlInterpolationPanel pnInterpolation_=null;
+ // Pour conserver les valeurs IHM d'un appel a un autre.
+ MdlRefinementPanel pnRaffinement_=null;
public MdlSceneEditor(MdlVisuPanel _pn, ZScene _scene) {
super(_scene);
@@ -188,4 +190,44 @@
super.getScene().clearSelection();
}
}
+
+ /**
+ * Raffine la g\xE9om\xE9trie ou entre 2 sommmets de la g\xE9om\xE9trie s\xE9lectionn\xE9e.
+ */
+ public void refineSelectedGeometries() {
+ if (pnRaffinement_==null)
+ pnRaffinement_=new MdlRefinementPanel();
+
+ String title;
+ if (getScene().isAtomicMode())
+ title=MdlResource.MDL.getString("Raffinement entre 2 sommets");
+ else
+ title=MdlResource.MDL.getString("Raffinement sur une polyligne");
+
+ if (pnRaffinement_.afficheModaleOk(pn_.getFrame(), title)) {
+ // La g\xE9om\xE9trie.
+ int idxGeom=getScene().getSelectionHelper().getUniqueSelectedIdx();
+ Geometry geom=(Geometry)getScene().getObject(idxGeom);
+ int idxdeb;
+ int idxfin;
+ if (getScene().isAtomicMode()) {
+ int[] idxa=getScene().getLayerSelectionMulti().getSelection(idxGeom).getSelectedIndex();
+ idxdeb=idxa[0];
+ idxfin=idxa[1];
+ }
+ else {
+ idxdeb=0;
+ idxfin=geom.getNumPoints()-1;
+ }
+
+ ZModeleDonnees mdld=getScene().getLayerForId(idxGeom).modeleDonnees();
+ if (mdld instanceof MdlModel2dLine) {
+ MdlModel2dLine mdl=(MdlModel2dLine)mdld;
+ mdl.refine(getScene().sceneId2LayerId(idxGeom),idxdeb,idxfin,pnRaffinement_.isNbPtsGiven()?0:1,
+ pnRaffinement_.getNbPts(),pnRaffinement_.getDistance(),getMng());
+ }
+
+ super.getScene().clearSelection();
+ }
+ }
}
Added: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneRefinementAction.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneRefinementAction.java (rev 0)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneRefinementAction.java 2008-06-11 07:59:25 UTC (rev 3636)
@@ -0,0 +1,82 @@
+/*
+ * @creation 1 avr. 2005
+ * @modification $Date: 2008-05-13 12:10:55 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.fudaa.modeleur.action;
+
+import java.awt.event.ActionEvent;
+
+import org.fudaa.ebli.calque.ZScene;
+import org.fudaa.ebli.calque.ZSelectionEvent;
+import org.fudaa.ebli.calque.ZSelectionListener;
+import org.fudaa.ebli.calque.ZScene.SceneSelectionHelper;
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.ebli.ressource.EbliResource;
+import org.fudaa.fudaa.modeleur.MdlSceneEditor;
+import org.fudaa.fudaa.modeleur.layer.MdlLayer2dLine;
+import org.fudaa.fudaa.modeleur.layer.MdlLayer2dMultiPoint;
+
+/**
+ * Une action pour raffiner entre 2 sommets ou la totalit\xE9 d'un objets GIS.
+ * @author Bertrand Marchand
+ * @version $Id: SceneInterpolationAction.java,v 1.1.2.1 2008-05-13 12:10:55 bmarchan Exp $
+ */
+public class SceneRefinementAction extends EbliActionSimple implements ZSelectionListener {
+
+ MdlSceneEditor sceneEditor_;
+
+ /**
+ * @param _m l'arbre des calques
+ */
+ public SceneRefinementAction(MdlSceneEditor _sceneEditor) {
+ super(EbliResource.EBLI.getString("Raffiner"), null, "RAFFINER");
+ setSceneEditor(_sceneEditor);
+ sceneEditor_.getScene().addSelectionListener(this);
+ }
+
+ public void actionPerformed(final ActionEvent _e) {
+ sceneEditor_.refineSelectedGeometries();
+ }
+
+ /**
+ * @param _editor l'editeur
+ */
+ private void setSceneEditor(final MdlSceneEditor _sceneEditor) {
+ sceneEditor_ = _sceneEditor;
+ }
+
+ /**
+ * Autoris\xE9 si 2 sommets d'un m\xEAme bloc sont selectionn\xE9s ou 1 g\xE9om\xE9trie compl\xE8te.
+ */
+ public void updateForSelectionChanged() {
+ ZScene scn=sceneEditor_.getScene();
+ SceneSelectionHelper hlp=sceneEditor_.getScene().getSelectionHelper();
+ int idGeom=-1;
+
+ boolean b=true;
+ // Si selection n'est pas vide.
+ b&=!scn.isSelectionEmpty();
+ // Si le nombre d'atomiques est de 2 sur le m\xEAme bloc
+ b&=!scn.isAtomicMode() || (hlp.getNbAtomicSelected()==2 && (idGeom=hlp.getUniqueSelectedIdx())!=-1);
+ // Si le nombre de selectionn\xE9s est de 1 en mode global
+ b&=scn.isAtomicMode() || (idGeom=hlp.getUniqueSelectedIdx())!=-1;
+ // Si la g\xE9om\xE9trie appartient a un calque polylignes.
+ b&=scn.getLayerForId(idGeom) instanceof MdlLayer2dLine;
+
+ super.setEnabled(b);
+ }
+
+ public String getEnableCondition() {
+ return EbliResource.EBLI.getString("<p>En mode sommet, s\xE9lectionner 2 sommets d'un m\xEAme objet<p>En mode global, un objet");
+ }
+
+ /* (non-Javadoc)
+ * @see org.fudaa.ebli.calque.ZSelectionListener#selectionChanged(org.fudaa.ebli.calque.ZSelectionEvent)
+ */
+ public void selectionChanged(ZSelectionEvent _evt) {
+ updateForSelectionChanged();
+ }
+}
Property changes on: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneRefinementAction.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dLine.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dLine.java 2008-06-11 07:58:11 UTC (rev 3635)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dLine.java 2008-06-11 07:59:25 UTC (rev 3636)
@@ -72,6 +72,51 @@
}
/**
+ * Retourne le tableau des coordonn\xE9es de points r\xE9partis uniform\xE9ments entre 2 points.
+ * @param _coords Les coordonn\xE9es des 2 points extr\xE9mit\xE9s
+ * @param _nbpts La distance entre 2 points.
+ * @return Les coordonn\xE9es des points r\xE9partis entre les 2 points extr\xE9mit\xE9s.
+ */
+ private Coordinate[] interpolateCoordinates(Coordinate[] _coords, double _dist) {
+ double distTot=
+ Math.sqrt((_coords[1].x-_coords[0].x)*(_coords[1].x-_coords[0].x)+(_coords[1].y-_coords[0].y)*(_coords[1].y-_coords[0].y));
+ int nbpts=(int)Math.round(distTot/_dist)-1;
+
+ Coordinate[] coords=new Coordinate[nbpts];
+ for (int i=0; i<coords.length; i++) {
+ Coordinate c=new Coordinate();
+ c.x=_coords[0].x+(_coords[1].x-_coords[0].x)*(i+1)*_dist/distTot;
+ c.y=_coords[0].y+(_coords[1].y-_coords[0].y)*(i+1)*_dist/distTot;
+ c.z=_coords[0].z+(_coords[1].z-_coords[0].z)*(i+1)*_dist/distTot;
+ coords[i]=c;
+ }
+
+ return coords;
+ }
+
+ /**
+ * Retourne le tableau des coordonn\xE9es de points r\xE9partis uniform\xE9ments entre 2 points.
+ * @param _coords Les coordonn\xE9es des 2 points extr\xE9mit\xE9s
+ * @param _nbpts Le nombre de points a calculer.
+ * @return Les coordonn\xE9es des points r\xE9partis entre les 2 points extr\xE9mit\xE9s.
+ */
+ private Coordinate[] interpolateNCoordinates(Coordinate[] _coords, int _nbpts) {
+ double distTot=
+ Math.sqrt((_coords[1].x-_coords[0].x)*(_coords[1].x-_coords[0].x)+(_coords[1].y-_coords[0].y)*(_coords[1].y-_coords[0].y));
+
+ Coordinate[] coords=new Coordinate[_nbpts];
+ for (int i=0; i<coords.length; i++) {
+ Coordinate c=new Coordinate();
+ c.x=_coords[0].x+(_coords[1].x-_coords[0].x)*(i+1)/(_nbpts+1.);
+ c.y=_coords[0].y+(_coords[1].y-_coords[0].y)*(i+1)/(_nbpts+1.);
+ c.z=_coords[0].z+(_coords[1].z-_coords[0].z)*(i+1)/(_nbpts+1.);
+ coords[i]=c;
+ }
+
+ return coords;
+ }
+
+ /**
* Decime une ligne. La m\xE9thode utilis\xE9e pour d\xE9cimer peut \xEAtre :<p>
* 0 : Suivant un nombre de points a supprimer entre 2 points conserv\xE9s.<br>
* 1 : Suivant une distance minimale.
@@ -79,31 +124,30 @@
* @param _idxdeb L'indice de d\xE9but de d\xE9cimation.
* @param _idxfin L'indice de fin de d\xE9cimation.
* @param _meth La m\xE9thode.
- * @param _nbPts Le nombre de points.
+ * @param _nbpts Le nombre de points.
* @param _dstmin La distance minimale.
* @param _cmd Le container de commandes.
* @return true si modif ok.
*/
- public boolean decimate(int _idxGeom, int _idxdeb,int _idxfin,int _meth,int _nbPts, double _dstmin, CtuluCommandContainer _cmd) {
+ public boolean decimate(int _idxGeom, int _idxdeb,int _idxfin,int _meth,int _nbpts, double _dstmin, CtuluCommandContainer _cmd) {
TIntArrayList list=new TIntArrayList();
// Methode par nombre de points.
if (_meth==0) {
- int idx=_idxdeb+1+_nbPts;
+ int idx=_idxdeb+1+_nbpts;
for (int i=_idxdeb+1; i<=_idxfin-1; i++) {
if (i<idx) {
list.add(i);
}
else {
- idx=i+1+_nbPts;
+ idx=i+1+_nbpts;
}
}
}
- // Methode par nombre de points.
+ // Methode par distance mini.
else if (_meth==1) {
LineString geom=(LineString)geometries_.getGeometry(_idxGeom);
CoordinateSequence seq=geom.getCoordinateSequence();
-// int idx=_idxdeb;
double dst=0;
for (int i=_idxdeb+1; i<=_idxfin-1; i++) {
dst+=Math.sqrt((seq.getX(i)-seq.getX(i-1))*(seq.getX(i)-seq.getX(i-1))+
@@ -113,7 +157,6 @@
}
else {
dst=0;
-// idx=i;
}
}
}
@@ -122,4 +165,64 @@
geometries_.removeAtomicValue(_idxGeom, ids, null, _cmd); // L'UI est null, le cas ou moins de 2 points ne peut pas arriver.
return true;
}
+
+ /**
+ * Raffine une ligne. La m\xE9thode utilis\xE9e pour raffiner peut \xEAtre :<p>
+ * 0 : Suivant un nombre de points a ajouter entre 2 points.<br>
+ * 1 : Suivant une distance maximale.
+ * @param _idxGeom La g\xE9om\xE9trie a raffiner.
+ * @param _idxdeb L'indice de d\xE9but de raffinement.
+ * @param _idxfin L'indice de fin de raffinement.
+ * @param _meth La m\xE9thode.
+ * @param _nbpts Le nombre de points.
+ * @param _dstmin La distance maximale.
+ * @param _cmd Le container de commandes.
+ * @return true si modif ok.
+ */
+ public boolean refine(int _idxGeom, int _idxdeb,int _idxfin,int _meth,int _nbpts, double _dstmax, CtuluCommandContainer _cmd) {
+ LineString geom=(LineString)geometries_.getGeometry(_idxGeom);
+ CoordinateSequence seq=geom.getCoordinateSequence();
+
+ ArrayList coords=new ArrayList(seq.size());
+
+ for (int i=0; i<_idxdeb; i++) {
+ coords.add(seq.getCoordinate(i).clone());
+ }
+
+ Coordinate[] cexts=new Coordinate[2];
+ // Methode par nombre de points.
+ if (_meth==0) {
+ for (int i=_idxdeb; i<_idxfin; i++) {
+ cexts[0]=seq.getCoordinate(i);
+ cexts[1]=seq.getCoordinate(i+1);
+ Coordinate[] cints=interpolateNCoordinates(cexts,_nbpts);
+ coords.add(cexts[0].clone());
+ for (int j=0; j<cints.length; j++)
+ coords.add(cints[j]);
+ }
+ }
+ // Methode par distance maxi.
+ else if (_meth==1) {
+ for (int i=_idxdeb; i<_idxfin; i++) {
+ double dst=Math.sqrt((seq.getX(i+1)-seq.getX(i))*(seq.getX(i+1)-seq.getX(i))+
+ (seq.getY(i+1)-seq.getY(i))*(seq.getY(i+1)-seq.getY(i)));
+ int nbpts=(int)(dst/_dstmax);
+ if (dst/_dstmax==(int)(dst/_dstmax)) nbpts--;
+ cexts[0]=seq.getCoordinate(i);
+ cexts[1]=seq.getCoordinate(i+1);
+ Coordinate[] cints=interpolateNCoordinates(cexts, nbpts);
+ coords.add(cexts[0].clone());
+ for (int j=0; j<cints.length; j++)
+ coords.add(cints[j]);
+ }
+ }
+
+ for (int i=_idxfin; i<seq.size(); i++) {
+ coords.add(seq.getCoordinate(i).clone());
+ }
+
+ GISPolyligne newgeom=(GISPolyligne)GISGeometryFactory.INSTANCE.createLineString((Coordinate[])coords.toArray(new Coordinate[0]));
+ geometries_.setValue(_idxGeom, newgeom, _cmd);
+ return true;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2008-06-13 09:57:26
|
Revision: 3640
http://fudaa.svn.sourceforge.net/fudaa/?rev=3640&view=rev
Author: bmarchan
Date: 2008-06-13 02:57:24 -0700 (Fri, 13 Jun 2008)
Log Message:
-----------
Implementation fonctionnalit?\195?\169 cr?\195?\169ation trace de profils
Modified Paths:
--------------
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlVisuPanel.java
Added Paths:
-----------
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dTrace.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel1dTrace.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer1dTracePersistence.java
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-12 13:38:48 UTC (rev 3639)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlVisuPanel.java 2008-06-13 09:57:24 UTC (rev 3640)
@@ -15,6 +15,7 @@
import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.commun.impl.FudaaCommonImplementation;
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.MdlLayer2dLevel;
import org.fudaa.fudaa.modeleur.layer.MdlLayer2dProfile;
@@ -39,6 +40,7 @@
// final FSigLayerGroup parent_;
BGroupeCalque cqImg_;
BGroupeCalque cqAlti_;
+ BGroupeCalque cqMdl1d_;
/**
* Construction des calques. Une partie est d\xE9j\xE0 construite par d\xE9faut dans les classes
@@ -73,7 +75,9 @@
public void initCalques(boolean _build) {
removeAllCalqueDonnees();
buildAltiLayerGroup(_build);
+ buildModel1dLayerGroup(_build);
buildImageGroup();
+
installActions();
}
@@ -106,6 +110,7 @@
cqAlti_.setTitle(MdlResource.MDL.getString("Donn\xE9es altim\xE9triques"));
cqAlti_.setName("gcAlti");
cqAlti_.putClientProperty(Action.SHORT_DESCRIPTION, TrResource.getS("Permet le stockage des donn\xE9es altim\xE9triques"));
+ cqAlti_.setDestructible(false);
addCalque(cqAlti_);
if (!_build) return;
@@ -122,5 +127,23 @@
cqProfile.setName(BGroupeCalque.findUniqueChildName(cqAlti_, cqProfile.getExtName()));
cqAlti_.add(cqProfile);
}
+
+
+ /**
+ * Mise en place du groupe du mod\xE8le 1d.
+ */
+ protected void buildModel1dLayerGroup(boolean _build) {
+ cqMdl1d_ = new BGroupeCalque();
+ cqMdl1d_.setTitle(MdlResource.MDL.getString("Mod\xE8le 1D"));
+ cqMdl1d_.setName("gcMdl1d");
+ cqMdl1d_.putClientProperty(Action.SHORT_DESCRIPTION, TrResource.getS("Stocke le mod\xE8le"));
+ cqMdl1d_.setDestructible(false);
+ addCalque(cqMdl1d_);
-}
+ if (!_build) return;
+
+ MdlLayer1dTrace cqTrace=MdlLayer1dTrace.createNew(getGisEditor());
+ cqTrace.setName(BGroupeCalque.findUniqueChildName(cqMdl1d_, cqTrace.getExtName()));
+ cqMdl1d_.add(cqTrace);
+ }
+}
\ No newline at end of file
Added: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dTrace.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dTrace.java (rev 0)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dTrace.java 2008-06-13 09:57:24 UTC (rev 3640)
@@ -0,0 +1,62 @@
+/*
+ * @creation 20 janv. 08
+ * @modification $Date: 2008/05/13 12:10:43 $
+ * @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.MdlLayer1dTracePersistence;
+import org.fudaa.fudaa.sig.layer.FSigEditor;
+
+/**
+ * Un calque pour le stockage et la manipulation des donn\xE9es 1d.
+ * @author Bertrand Marchand
+ * @version $Id: MdlLayer2dProfile.java,v 1.1.2.5 2008/05/13 12:10:43 bmarchan Exp $
+ */
+public class MdlLayer1dTrace extends MdlLayer2dLine {
+
+ /**
+ * Constructeur. Utilise un mod\xE8le de donn\xE9es et un editeur.
+ * @param _model Modele
+ * @param _editor Editeur.
+ */
+ private MdlLayer1dTrace(ZModeleLigneBriseeEditable _model, final FSigEditor _editor) {
+ super(_model,_editor);
+ setLineModel(0, new TraceLigneModel(TraceLigne.TIRETE, 2f, Color.ORANGE.darker()));
+ setLineModelOuvert(getLineModel(0));
+// _model.addListener(this); A implementer.
+ setName(getExtName());
+ setTitle(MdlResource.MDL.getString("Trace profils"));
+ }
+
+ public static MdlLayer1dTrace createNew(FSigEditor _editor) {
+ MdlLayer1dTrace cq=new MdlLayer1dTrace(new MdlModel1dTrace(_editor,_editor.getMng()), _editor);
+ return cq;
+ }
+
+ public BCalquePersistenceInterface getPersistenceMng() {
+ return new MdlLayer1dTracePersistence();
+ }
+
+ /**
+ * Retourne le nom par defaut du calque.
+ * @return Le nom.
+ */
+ public String getExtName() {
+ return "trace";
+ }
+
+ public boolean canAddForme(int _typeForme) {
+ return _typeForme==DeForme.LIGNE_BRISEE;
+ }
+}
Property changes on: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dTrace.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel1dTrace.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel1dTrace.java (rev 0)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel1dTrace.java 2008-06-13 09:57:24 UTC (rev 3640)
@@ -0,0 +1,38 @@
+/*
+ * @creation 20 janv. 08
+ * @modification $Date: 2008-05-13 12:10:42 $
+ * @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.CtuluCommandContainer;
+import org.fudaa.ctulu.gis.GISAttribute;
+import org.fudaa.ctulu.gis.GISAttributeConstants;
+import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
+import org.fudaa.ctulu.gis.GISZoneListener;
+import org.fudaa.ebli.calque.edition.ZModeleLigneBriseeEditable;
+
+/**
+ * Un mod\xE8le de calque pour le calque 1D des traces de profils. Les traces sont des polylignes XY.
+ *
+ * @author Bertrand Marchand
+ * @version $Id: MdlModel2dProfile.java,v 1.1.2.6 2008-05-13 12:10:42 bmarchan Exp $
+ */
+public class MdlModel1dTrace extends MdlModel2dLine {
+
+ /**
+ * Construction d'un modele de trace avec pile de commandes.
+ * @param _cmd La pile de commandes pour le undo/redo.
+ */
+ public MdlModel1dTrace(final GISZoneListener _listener, final CtuluCommandContainer _cmd) {
+ super(_listener);
+ GISAttribute[] attrs=new GISAttribute[]{
+ GISAttributeConstants.TITRE
+ };
+ // Pas de container de commande pour cette op\xE9ration, sinon conserv\xE9 en undo/redo.
+ getGeomData().setAttributes(attrs, null);
+ getGeomData().setAttributeIsZ(null);
+ }
+}
Property changes on: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel1dTrace.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer1dTracePersistence.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer1dTracePersistence.java (rev 0)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer1dTracePersistence.java 2008-06-13 09:57:24 UTC (rev 3640)
@@ -0,0 +1,26 @@
+/*
+ * @creation 20 janv. 08
+ * @modification $Date: 2008/05/13 12:10:58 $
+ * @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.MdlLayer1dTrace;
+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 trace 1d.
+ * @author Bertrand Marchand
+ * @see MdlLayer2dProfile
+ */
+public class MdlLayer1dTracePersistence extends MdlLayer2dLinePersistence {
+
+ @Override
+ protected MdlLayer2dLine createNewLayer(FSigEditor _editor) {
+ return MdlLayer1dTrace.createNew(_editor);
+ }
+}
Property changes on: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer1dTracePersistence.java
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2008-06-19 10:56:33
|
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.
|
|
From: <bma...@us...> - 2008-06-19 10:57:30
|
Revision: 3649
http://fudaa.svn.sourceforge.net/fudaa/?rev=3649&view=rev
Author: bmarchan
Date: 2008-06-19 03:57:35 -0700 (Thu, 19 Jun 2008)
Log Message:
-----------
Mise en place des calques 2D non encore impl?\195?\169ment?\195?\169s.
Added Paths:
-----------
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dConstraintLine.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dContour.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dDirectionLine.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dZone.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dConstraintLine.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dContour.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dDirectionLine.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dZone.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dConstraintLinePersistence.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dContourPersistence.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dDirectionLinePersistence.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dZonePersistence.java
Added: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dConstraintLine.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dConstraintLine.java (rev 0)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dConstraintLine.java 2008-06-19 10:57:35 UTC (rev 3649)
@@ -0,0 +1,61 @@
+/*
+ * @creation 20 janv. 08
+ * @modification $Date: 2008/05/13 12:10:43 $
+ * @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.MdlLayer2dConstraintLinePersistence;
+import org.fudaa.fudaa.sig.layer.FSigEditor;
+
+/**
+ * Un calque pour le stockage et la manipulation des lignes de constraintes.
+ * @author Bertrand Marchand
+ * @version $Id: MdlLayer2dProfile.java,v 1.1.2.5 2008/05/13 12:10:43 bmarchan Exp $
+ */
+public class MdlLayer2dConstraintLine extends MdlLayer2dLine {
+
+ /**
+ * Constructeur. Utilise un mod\xE8le de donn\xE9es et un editeur.
+ * @param _model Modele
+ * @param _editor Editeur.
+ */
+ private MdlLayer2dConstraintLine(ZModeleLigneBriseeEditable _model, final FSigEditor _editor) {
+ super(_model,_editor);
+ setLineModel(0, new TraceLigneModel(TraceLigne.LISSE, 1.5f, new Color(204,0,0)));
+ setLineModelOuvert(getLineModel(0));
+ setName(getExtName());
+ setTitle(MdlResource.MDL.getString("Lignes de contraintes"));
+ }
+
+ public static MdlLayer2dConstraintLine createNew(FSigEditor _editor) {
+ MdlLayer2dConstraintLine cq=new MdlLayer2dConstraintLine(new MdlModel2dConstraintLine(_editor,_editor.getMng()), _editor);
+ return cq;
+ }
+
+ public BCalquePersistenceInterface getPersistenceMng() {
+ return new MdlLayer2dConstraintLinePersistence();
+ }
+
+ /**
+ * Retourne le nom par defaut du calque.
+ * @return Le nom.
+ */
+ public String getExtName() {
+ return "const";
+ }
+
+ public boolean canAddForme(int _typeForme) {
+ return _typeForme==DeForme.LIGNE_BRISEE;
+ }
+}
Property changes on: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dConstraintLine.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dContour.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dContour.java (rev 0)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dContour.java 2008-06-19 10:57:35 UTC (rev 3649)
@@ -0,0 +1,65 @@
+/*
+ * @creation 20 janv. 08
+ * @modification $Date: 2008/05/13 12:10:43 $
+ * @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.TraceIcon;
+import org.fudaa.ebli.trace.TraceIconModel;
+import org.fudaa.ebli.trace.TraceLigne;
+import org.fudaa.ebli.trace.TraceLigneModel;
+import org.fudaa.fudaa.modeleur.MdlResource;
+import org.fudaa.fudaa.modeleur.persistence.MdlLayer2dContourPersistence;
+import org.fudaa.fudaa.sig.layer.FSigEditor;
+
+/**
+ * Un calque pour le stockage et la manipulation des contours d'\xE9tude 2d.
+ * @author Bertrand Marchand
+ * @version $Id: MdlLayer2dProfile.java,v 1.1.2.5 2008/05/13 12:10:43 bmarchan Exp $
+ */
+public class MdlLayer2dContour extends MdlLayer2dLine {
+
+ /**
+ * Constructeur. Utilise un mod\xE8le de donn\xE9es et un editeur.
+ * @param _model Modele
+ * @param _editor Editeur.
+ */
+ private MdlLayer2dContour(ZModeleLigneBriseeEditable _model, final FSigEditor _editor) {
+ super(_model,_editor);
+ setLineModel(0, new TraceLigneModel(TraceLigne.TIRETE, 2f, new Color(153,92,0)));
+ setLineModelOuvert(getLineModel(0));
+ setIconModel(0, new TraceIconModel(TraceIcon.CARRE_PLEIN, 2, new Color(153,92,0).darker()));
+ setIconModel(1, new TraceIconModel(getIconModel(0)));
+ setName(getExtName());
+ setTitle(MdlResource.MDL.getString("Contours d'\xE9tude"));
+ }
+
+ public static MdlLayer2dContour createNew(FSigEditor _editor) {
+ MdlLayer2dContour cq=new MdlLayer2dContour(new MdlModel2dContour(_editor,_editor.getMng()), _editor);
+ return cq;
+ }
+
+ public BCalquePersistenceInterface getPersistenceMng() {
+ return new MdlLayer2dContourPersistence();
+ }
+
+ /**
+ * Retourne le nom par defaut du calque.
+ * @return Le nom.
+ */
+ public String getExtName() {
+ return "contour";
+ }
+
+ public boolean canAddForme(int _typeForme) {
+ return _typeForme==DeForme.POLYGONE | _typeForme==DeForme.RECTANGLE;
+ }
+}
Property changes on: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dContour.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dDirectionLine.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dDirectionLine.java (rev 0)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dDirectionLine.java 2008-06-19 10:57:35 UTC (rev 3649)
@@ -0,0 +1,62 @@
+/*
+ * @creation 20 janv. 08
+ * @modification $Date: 2008/05/13 12:10:43 $
+ * @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.MdlLayer2dDirectionLinePersistence;
+import org.fudaa.fudaa.sig.layer.FSigEditor;
+
+/**
+ * Un calque pour le stockage et la manipulation des lignes de direction.
+ * @author Bertrand Marchand
+ * @version $Id: MdlLayer2dProfile.java,v 1.1.2.5 2008/05/13 12:10:43 bmarchan Exp $
+ */
+public class MdlLayer2dDirectionLine extends MdlLayer2dLine {
+
+ /**
+ * Constructeur. Utilise un mod\xE8le de donn\xE9es et un editeur.
+ * @param _model Modele
+ * @param _editor Editeur.
+ */
+ private MdlLayer2dDirectionLine(ZModeleLigneBriseeEditable _model, final FSigEditor _editor) {
+ super(_model,_editor);
+ setLineModel(0, new TraceLigneModel(TraceLigne.LISSE, 1.5f, new Color(102,102,255)));
+ setLineModelOuvert(getLineModel(0));
+// _model.addListener(this); A implementer.
+ setName(getExtName());
+ setTitle(MdlResource.MDL.getString("Lignes de direction"));
+ }
+
+ public static MdlLayer2dDirectionLine createNew(FSigEditor _editor) {
+ MdlLayer2dDirectionLine cq=new MdlLayer2dDirectionLine(new MdlModel2dDirectionLine(_editor,_editor.getMng()), _editor);
+ return cq;
+ }
+
+ public BCalquePersistenceInterface getPersistenceMng() {
+ return new MdlLayer2dDirectionLinePersistence();
+ }
+
+ /**
+ * Retourne le nom par defaut du calque.
+ * @return Le nom.
+ */
+ public String getExtName() {
+ return "direct";
+ }
+
+ public boolean canAddForme(int _typeForme) {
+ return _typeForme==DeForme.LIGNE_BRISEE;
+ }
+}
Property changes on: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dDirectionLine.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dZone.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dZone.java (rev 0)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dZone.java 2008-06-19 10:57:35 UTC (rev 3649)
@@ -0,0 +1,65 @@
+/*
+ * @creation 20 janv. 08
+ * @modification $Date: 2008/05/13 12:10:43 $
+ * @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.TraceIcon;
+import org.fudaa.ebli.trace.TraceIconModel;
+import org.fudaa.ebli.trace.TraceLigne;
+import org.fudaa.ebli.trace.TraceLigneModel;
+import org.fudaa.fudaa.modeleur.MdlResource;
+import org.fudaa.fudaa.modeleur.persistence.MdlLayer2dZonePersistence;
+import org.fudaa.fudaa.sig.layer.FSigEditor;
+
+/**
+ * Un calque pour le stockage et la manipulation des zones g\xE9om\xE9triques 2d.
+ * @author Bertrand Marchand
+ * @version $Id: MdlLayer2dProfile.java,v 1.1.2.5 2008/05/13 12:10:43 bmarchan Exp $
+ */
+public class MdlLayer2dZone extends MdlLayer2dLine {
+
+ /**
+ * Constructeur. Utilise un mod\xE8le de donn\xE9es et un editeur.
+ * @param _model Modele
+ * @param _editor Editeur.
+ */
+ private MdlLayer2dZone(ZModeleLigneBriseeEditable _model, final FSigEditor _editor) {
+ super(_model,_editor);
+ setLineModel(0, new TraceLigneModel(TraceLigne.TIRETE, 2f, new Color(0,153,153)));
+ setLineModelOuvert(getLineModel(0));
+ setIconModel(0, new TraceIconModel(TraceIcon.CARRE_PLEIN, 2, new Color(0,153,153).darker()));
+ setIconModel(1, new TraceIconModel(getIconModel(0)));
+ setName(getExtName());
+ setTitle(MdlResource.MDL.getString("Zones"));
+ }
+
+ public static MdlLayer2dZone createNew(FSigEditor _editor) {
+ MdlLayer2dZone cq=new MdlLayer2dZone(new MdlModel2dZone(_editor,_editor.getMng()), _editor);
+ return cq;
+ }
+
+ public BCalquePersistenceInterface getPersistenceMng() {
+ return new MdlLayer2dZonePersistence();
+ }
+
+ /**
+ * Retourne le nom par defaut du calque.
+ * @return Le nom.
+ */
+ public String getExtName() {
+ return "zone";
+ }
+
+ public boolean canAddForme(int _typeForme) {
+ return _typeForme==DeForme.POLYGONE | _typeForme==DeForme.RECTANGLE;
+ }
+}
Property changes on: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dZone.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dConstraintLine.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dConstraintLine.java (rev 0)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dConstraintLine.java 2008-06-19 10:57:35 UTC (rev 3649)
@@ -0,0 +1,38 @@
+/*
+ * @creation 20 janv. 08
+ * @modification $Date: 2008-05-13 12:10:42 $
+ * @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.CtuluCommandContainer;
+import org.fudaa.ctulu.gis.GISAttribute;
+import org.fudaa.ctulu.gis.GISAttributeConstants;
+import org.fudaa.ctulu.gis.GISZoneListener;
+
+/**
+ * Un mod\xE8le de calque pour le calque 2D des lignes de constraintes. Les lignes sont des polylignes XYZ, non
+ * ferm\xE9es.
+ *
+ * @author Bertrand Marchand
+ * @version $Id: MdlModel2dProfile.java,v 1.1.2.6 2008-05-13 12:10:42 bmarchan Exp $
+ */
+public class MdlModel2dConstraintLine extends MdlModel2dLine {
+
+ /**
+ * Construction d'un modele avec pile de commandes.
+ * @param _cmd La pile de commandes pour le undo/redo.
+ */
+ public MdlModel2dConstraintLine(final GISZoneListener _listener, final CtuluCommandContainer _cmd) {
+ super(_listener);
+ GISAttribute[] attrs=new GISAttribute[]{
+ GISAttributeConstants.BATHY,
+ GISAttributeConstants.TITRE
+ };
+ // Pas de container de commande pour cette op\xE9ration, sinon conserv\xE9 en undo/redo.
+ getGeomData().setAttributes(attrs, null);
+ getGeomData().setAttributeIsZ(GISAttributeConstants.BATHY);
+ }
+}
Property changes on: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dConstraintLine.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dContour.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dContour.java (rev 0)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dContour.java 2008-06-19 10:57:35 UTC (rev 3649)
@@ -0,0 +1,37 @@
+/*
+ * @creation 20 janv. 08
+ * @modification $Date: 2008/02/21 19:41:56 $
+ * @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.CtuluCommandContainer;
+import org.fudaa.ctulu.gis.GISAttribute;
+import org.fudaa.ctulu.gis.GISAttributeConstants;
+import org.fudaa.ctulu.gis.GISZoneListener;
+
+/**
+ * Un mod\xE8le de calque pour le calque 2D contour d'\xE9tudes. Les contours d'\xE9tude limitent les informations
+ * transmiss lors de l'exportation. Un contour d'\xE9tude est en XY.
+ * @author Bertrand Marchand
+ * @version $Id: MdlModel2dLevel.java,v 1.1.2.6 2008/02/21 19:41:56 bmarchan Exp $
+ */
+public class MdlModel2dContour extends MdlModel2dLine {
+
+ /**
+ * Construction d'un modele de contours avec container de commandes.
+ * @param _listener L'auditeur des modifications du mod\xE8le.
+ * @param _cmd Le container de commandes pour le undo/redo.
+ */
+ public MdlModel2dContour(final GISZoneListener _listener, final CtuluCommandContainer _cmd) {
+ super(_listener);
+ GISAttribute[] attrs=new GISAttribute[]{
+ GISAttributeConstants.TITRE
+ };
+ // Pas de container de commande pour cette op\xE9ration, sinon conserv\xE9 en undo/redo.
+ getGeomData().setAttributes(attrs, null);
+ getGeomData().setAttributeIsZ(null);
+ }
+}
Property changes on: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dContour.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dDirectionLine.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dDirectionLine.java (rev 0)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dDirectionLine.java 2008-06-19 10:57:35 UTC (rev 3649)
@@ -0,0 +1,40 @@
+/*
+ * @creation 20 janv. 08
+ * @modification $Date: 2008-05-13 12:10:42 $
+ * @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.CtuluCommandContainer;
+import org.fudaa.ctulu.gis.GISAttribute;
+import org.fudaa.ctulu.gis.GISAttributeConstants;
+import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
+import org.fudaa.ctulu.gis.GISZoneListener;
+import org.fudaa.ebli.calque.edition.ZModeleLigneBriseeEditable;
+
+/**
+ * Un mod\xE8le de calque pour le calque 2D des lignes de direction. Les lignes sont des polylignes XYZ, non
+ * ferm\xE9es.
+ *
+ * @author Bertrand Marchand
+ * @version $Id: MdlModel2dProfile.java,v 1.1.2.6 2008-05-13 12:10:42 bmarchan Exp $
+ */
+public class MdlModel2dDirectionLine extends MdlModel2dLine {
+
+ /**
+ * Construction d'un modele avec pile de commandes.
+ * @param _cmd La pile de commandes pour le undo/redo.
+ */
+ public MdlModel2dDirectionLine(final GISZoneListener _listener, final CtuluCommandContainer _cmd) {
+ super(_listener);
+ GISAttribute[] attrs=new GISAttribute[]{
+ GISAttributeConstants.BATHY,
+ GISAttributeConstants.TITRE
+ };
+ // Pas de container de commande pour cette op\xE9ration, sinon conserv\xE9 en undo/redo.
+ getGeomData().setAttributes(attrs, null);
+ getGeomData().setAttributeIsZ(GISAttributeConstants.BATHY);
+ }
+}
Property changes on: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dDirectionLine.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dZone.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dZone.java (rev 0)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dZone.java 2008-06-19 10:57:35 UTC (rev 3649)
@@ -0,0 +1,37 @@
+/*
+ * @creation 20 janv. 08
+ * @modification $Date: 2008/02/21 19:41:56 $
+ * @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.CtuluCommandContainer;
+import org.fudaa.ctulu.gis.GISAttribute;
+import org.fudaa.ctulu.gis.GISAttributeConstants;
+import org.fudaa.ctulu.gis.GISZoneListener;
+
+/**
+ * Un mod\xE8le de calque pour le calque 2D de zones g\xE9om\xE9triques. Les zones permettent de sp\xE9cifier un strickler par la suite.
+ * Une zone est en XY, ferm\xE9e.
+ * @author Bertrand Marchand
+ * @version $Id: MdlModel2dLevel.java,v 1.1.2.6 2008/02/21 19:41:56 bmarchan Exp $
+ */
+public class MdlModel2dZone extends MdlModel2dLine {
+
+ /**
+ * Construction d'un modele de contours avec container de commandes.
+ * @param _listener L'auditeur des modifications du mod\xE8le.
+ * @param _cmd Le container de commandes pour le undo/redo.
+ */
+ public MdlModel2dZone(final GISZoneListener _listener, final CtuluCommandContainer _cmd) {
+ super(_listener);
+ GISAttribute[] attrs=new GISAttribute[]{
+ GISAttributeConstants.TITRE
+ };
+ // Pas de container de commande pour cette op\xE9ration, sinon conserv\xE9 en undo/redo.
+ getGeomData().setAttributes(attrs, null);
+ getGeomData().setAttributeIsZ(null);
+ }
+}
Property changes on: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dZone.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dConstraintLinePersistence.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dConstraintLinePersistence.java (rev 0)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dConstraintLinePersistence.java 2008-06-19 10:57:35 UTC (rev 3649)
@@ -0,0 +1,26 @@
+/*
+ * @creation 20 janv. 08
+ * @modification $Date: 2008/05/13 12:10:58 $
+ * @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.MdlLayer2dConstraintLine;
+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 de lignes de contraintes.
+ * @author Bertrand Marchand
+ * @see MdlLayer2dProfile
+ */
+public class MdlLayer2dConstraintLinePersistence extends MdlLayer2dLinePersistence {
+
+ @Override
+ protected MdlLayer2dLine createNewLayer(FSigEditor _editor) {
+ return MdlLayer2dConstraintLine.createNew(_editor);
+ }
+}
Property changes on: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dConstraintLinePersistence.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dContourPersistence.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dContourPersistence.java (rev 0)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dContourPersistence.java 2008-06-19 10:57:35 UTC (rev 3649)
@@ -0,0 +1,26 @@
+/*
+ * @creation 20 janv. 08
+ * @modification $Date: 2008/05/13 12:10:58 $
+ * @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.MdlLayer2dContour;
+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 trace 1d.
+ * @author Bertrand Marchand
+ * @see MdlLayer2dProfile
+ */
+public class MdlLayer2dContourPersistence extends MdlLayer2dLinePersistence {
+
+ @Override
+ protected MdlLayer2dLine createNewLayer(FSigEditor _editor) {
+ return MdlLayer2dContour.createNew(_editor);
+ }
+}
Property changes on: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dContourPersistence.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dDirectionLinePersistence.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dDirectionLinePersistence.java (rev 0)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dDirectionLinePersistence.java 2008-06-19 10:57:35 UTC (rev 3649)
@@ -0,0 +1,26 @@
+/*
+ * @creation 20 janv. 08
+ * @modification $Date: 2008/05/13 12:10:58 $
+ * @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.MdlLayer2dDirectionLine;
+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 de lignes de direction.
+ * @author Bertrand Marchand
+ * @see MdlLayer2dProfile
+ */
+public class MdlLayer2dDirectionLinePersistence extends MdlLayer2dLinePersistence {
+
+ @Override
+ protected MdlLayer2dLine createNewLayer(FSigEditor _editor) {
+ return MdlLayer2dDirectionLine.createNew(_editor);
+ }
+}
Property changes on: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dDirectionLinePersistence.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dZonePersistence.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dZonePersistence.java (rev 0)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dZonePersistence.java 2008-06-19 10:57:35 UTC (rev 3649)
@@ -0,0 +1,26 @@
+/*
+ * @creation 20 janv. 08
+ * @modification $Date: 2008/05/13 12:10:58 $
+ * @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.MdlLayer2dZone;
+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 trace 1d.
+ * @author Bertrand Marchand
+ * @see MdlLayer2dProfile
+ */
+public class MdlLayer2dZonePersistence extends MdlLayer2dLinePersistence {
+
+ @Override
+ protected MdlLayer2dLine createNewLayer(FSigEditor _editor) {
+ return MdlLayer2dZone.createNew(_editor);
+ }
+}
Property changes on: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dZonePersistence.java
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2008-06-19 13:57:06
|
Revision: 3651
http://fudaa.svn.sourceforge.net/fudaa/?rev=3651&view=rev
Author: bmarchan
Date: 2008-06-19 06:57:11 -0700 (Thu, 19 Jun 2008)
Log Message:
-----------
Impl?\195?\169mentation de la gestion des calques de singularit?\195?\169.
Modified Paths:
--------------
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/action/CalqueNewCalqueAction.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dTrace.java
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/MdlLayer2dConstraintLine.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dContour.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dDirectionLine.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dLevel.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dLine.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dMultiPoint.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dProfile.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dZone.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer1dTracePersistence.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dCloudPersistence.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dConstraintLinePersistence.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dContourPersistence.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dDirectionLinePersistence.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dLevelPersistence.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dProfilePersistence.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dZonePersistence.java
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 13:56:12 UTC (rev 3650)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlVisuPanel.java 2008-06-19 13:57:11 UTC (rev 3651)
@@ -26,6 +26,7 @@
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.MdlLayerFactory;
import org.fudaa.fudaa.modeleur.layer.MdlModel2dCloud;
import org.fudaa.fudaa.modeleur.layer.MdlModel2dLevel;
import org.fudaa.fudaa.modeleur.layer.MdlModel2dProfile;
@@ -92,10 +93,16 @@
}
protected void installLayerActions() {
- EbliActionInterface actNewCloud=new CalqueNewCalqueAction(FudaaLib.getS("Nouveau calque semis"),FudaaResource.FUDAA.getIcon("ajouter"),"NEW_LAYER2D_CLOUD",cqAlti_,getGisEditor());
- EbliActionInterface actNewLevel=new CalqueNewCalqueAction(FudaaLib.getS("Nouveau calque courbes de niveaux"),FudaaResource.FUDAA.getIcon("ajouter"),"NEW_LAYER2D_LEVEL",cqAlti_,getGisEditor());
- EbliActionInterface actNewProfile=new CalqueNewCalqueAction(FudaaLib.getS("Nouveau calque profils"),FudaaResource.FUDAA.getIcon("ajouter"),"NEW_LAYER2D_PROFILE",cqAlti_,getGisEditor());
+ EbliActionInterface actNewCloud=new CalqueNewCalqueAction(FudaaLib.getS("Nouveau calque semis"),FudaaResource.FUDAA.getIcon("ajouter"),MdlLayerFactory.LAYER2D_CLOUD,cqAlti_,getGisEditor());
+ EbliActionInterface actNewLevel=new CalqueNewCalqueAction(FudaaLib.getS("Nouveau calque courbes de niveaux"),FudaaResource.FUDAA.getIcon("ajouter"),MdlLayerFactory.LAYER2D_LEVEL,cqAlti_,getGisEditor());
+ EbliActionInterface actNewProfile=new CalqueNewCalqueAction(FudaaLib.getS("Nouveau calque profils"),FudaaResource.FUDAA.getIcon("ajouter"),MdlLayerFactory.LAYER2D_PROFILE,cqAlti_,getGisEditor());
cqAlti_.setActions(new EbliActionInterface[] { actNewCloud, actNewLevel, actNewProfile });
+
+ EbliActionInterface actNewZone=new CalqueNewCalqueAction(FudaaLib.getS("Nouveau calque zones"),FudaaResource.FUDAA.getIcon("ajouter"),MdlLayerFactory.LAYER2D_ZONE,cqSing_,getGisEditor());
+ EbliActionInterface actNewCnt=new CalqueNewCalqueAction(FudaaLib.getS("Nouveau calque contours"),FudaaResource.FUDAA.getIcon("ajouter"),MdlLayerFactory.LAYER2D_CONTOUR,cqSing_,getGisEditor());
+ EbliActionInterface actNewConst=new CalqueNewCalqueAction(FudaaLib.getS("Nouveau calque lignes de contraintes"),FudaaResource.FUDAA.getIcon("ajouter"),MdlLayerFactory.LAYER2D_CONST_LINE,cqSing_,getGisEditor());
+ 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 actImport = new FSigImageImportAction(this, cqImg_);
cqImg_.setActions(new EbliActionInterface[] { actImport });
@@ -125,15 +132,15 @@
if (!_build) return;
- MdlLayer2dLevel cqLevel=MdlLayer2dLevel.createNew(getGisEditor());
+ MdlLayer2dLevel cqLevel=new MdlLayer2dLevel(getGisEditor());
cqLevel.setName(BGroupeCalque.findUniqueChildName(cqAlti_, cqLevel.getExtName()));
cqAlti_.add(cqLevel);
- MdlLayer2dCloud cqCloud=MdlLayer2dCloud.createNew(getGisEditor());
+ MdlLayer2dCloud cqCloud=new MdlLayer2dCloud(getGisEditor());
cqCloud.setName(BGroupeCalque.findUniqueChildName(cqAlti_, cqCloud.getExtName()));
cqAlti_.add(cqCloud);
- MdlLayer2dProfile cqProfile=MdlLayer2dProfile.createNew(getGisEditor());
+ MdlLayer2dProfile cqProfile=new MdlLayer2dProfile(getGisEditor());
cqProfile.setName(BGroupeCalque.findUniqueChildName(cqAlti_, cqProfile.getExtName()));
cqAlti_.add(cqProfile);
}
@@ -151,19 +158,19 @@
if (!_build) return;
- MdlLayer2dContour cqCnt=MdlLayer2dContour.createNew(getGisEditor());
+ MdlLayer2dContour cqCnt=new MdlLayer2dContour(getGisEditor());
cqCnt.setName(BGroupeCalque.findUniqueChildName(cqSing_, cqCnt.getExtName()));
cqSing_.add(cqCnt);
- MdlLayer2dZone cqZone=MdlLayer2dZone.createNew(getGisEditor());
+ MdlLayer2dZone cqZone=new MdlLayer2dZone(getGisEditor());
cqZone.setName(BGroupeCalque.findUniqueChildName(cqSing_, cqZone.getExtName()));
cqSing_.add(cqZone);
- MdlLayer2dConstraintLine cqConst=MdlLayer2dConstraintLine.createNew(getGisEditor());
+ MdlLayer2dConstraintLine cqConst=new MdlLayer2dConstraintLine(getGisEditor());
cqConst.setName(BGroupeCalque.findUniqueChildName(cqSing_, cqConst.getExtName()));
cqSing_.add(cqConst);
- MdlLayer2dDirectionLine cqDirect=MdlLayer2dDirectionLine.createNew(getGisEditor());
+ MdlLayer2dDirectionLine cqDirect=new MdlLayer2dDirectionLine(getGisEditor());
cqDirect.setName(BGroupeCalque.findUniqueChildName(cqSing_, cqDirect.getExtName()));
cqSing_.add(cqDirect);
}
@@ -181,7 +188,7 @@
if (!_build) return;
- MdlLayer1dTrace cqTrace=MdlLayer1dTrace.createNew(getGisEditor());
+ MdlLayer1dTrace cqTrace=new MdlLayer1dTrace(getGisEditor());
cqTrace.setName(BGroupeCalque.findUniqueChildName(cqMdl1d_, cqTrace.getExtName()));
cqMdl1d_.add(cqTrace);
}
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/CalqueNewCalqueAction.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/CalqueNewCalqueAction.java 2008-06-19 13:56:12 UTC (rev 3650)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/CalqueNewCalqueAction.java 2008-06-19 13:57:11 UTC (rev 3651)
@@ -13,10 +13,13 @@
import org.fudaa.ebli.calque.BCalque;
import org.fudaa.ebli.calque.BGroupeCalque;
+import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.fudaa.modeleur.layer.MdlLayer2dCloud;
import org.fudaa.fudaa.modeleur.layer.MdlLayer2dLevel;
import org.fudaa.fudaa.modeleur.layer.MdlLayer2dProfile;
+import org.fudaa.fudaa.modeleur.layer.MdlLayerFactory;
+import org.fudaa.fudaa.modeleur.layer.MdlLayerInterface;
import org.fudaa.fudaa.sig.layer.FSigEditor;
/**
@@ -28,31 +31,26 @@
FSigEditor editor_;
BCalque parent_;
+ int cqType_;
/**
- * @param _m l'arbre des calques
+ * Creation de l'action.
+ * @param _title
+ * @param _icon
+ * @param _cqType Le type de calque ({@link MdlLayerFactory})
+ * @param _parent
+ * @param _editor
*/
- public CalqueNewCalqueAction(String _title, Icon _icon, String _ac, BCalque _parent, FSigEditor _editor) {
- super(_title, _icon, _ac);
+ public CalqueNewCalqueAction(String _title, Icon _icon, int _cqType, BCalque _parent, FSigEditor _editor) {
+ super(_title, _icon, "CREER");
editor_=_editor;
parent_=_parent;
+ cqType_=_cqType;
}
public void actionPerformed(final ActionEvent _e) {
- if (_e.getActionCommand().equals("NEW_LAYER2D_CLOUD")) {
- MdlLayer2dCloud cq=MdlLayer2dCloud.createNew(editor_);
- cq.setName(BGroupeCalque.findUniqueChildName(parent_, cq.getExtName()));
- parent_.enDernier(cq);
- }
- else if (_e.getActionCommand().equals("NEW_LAYER2D_LEVEL")) {
- MdlLayer2dLevel cq=MdlLayer2dLevel.createNew(editor_);
- cq.setName(BGroupeCalque.findUniqueChildName(parent_, cq.getExtName()));
- parent_.enDernier(cq);
- }
- else if (_e.getActionCommand().equals("NEW_LAYER2D_PROFILE")) {
- MdlLayer2dProfile cq=MdlLayer2dProfile.createNew(editor_);
- cq.setName(BGroupeCalque.findUniqueChildName(parent_, cq.getExtName()));
- parent_.enDernier(cq);
- }
+ ZCalqueAffichageDonnees cq=MdlLayerFactory.getInstance().createLayer(cqType_, editor_);
+ cq.setName(BGroupeCalque.findUniqueChildName(parent_, ((MdlLayerInterface)cq).getExtName()));
+ parent_.enDernier(cq);
}
}
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dTrace.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dTrace.java 2008-06-19 13:56:12 UTC (rev 3650)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dTrace.java 2008-06-19 13:57:11 UTC (rev 3651)
@@ -39,10 +39,14 @@
setTitle(MdlResource.MDL.getString("Trace profils"));
}
- public static MdlLayer1dTrace createNew(FSigEditor _editor) {
- MdlLayer1dTrace cq=new MdlLayer1dTrace(new MdlModel1dTrace(_editor,_editor.getMng()), _editor);
- return cq;
+ public MdlLayer1dTrace(FSigEditor _editor) {
+ this(new MdlModel1dTrace(_editor,_editor.getMng()),_editor);
}
+
+// public static MdlLayer1dTrace createNew(FSigEditor _editor) {
+// MdlLayer1dTrace cq=new MdlLayer1dTrace(new MdlModel1dTrace(_editor,_editor.getMng()), _editor);
+// return cq;
+// }
public BCalquePersistenceInterface getPersistenceMng() {
return new MdlLayer1dTracePersistence();
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 13:56:12 UTC (rev 3650)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dCloud.java 2008-06-19 13:57:11 UTC (rev 3651)
@@ -44,10 +44,14 @@
setTitle(MdlResource.MDL.getString("Semis de points"));
}
- public static MdlLayer2dCloud createNew(FSigEditor _editor) {
- MdlLayer2dCloud cq=new MdlLayer2dCloud(new MdlModel2dCloud(_editor,_editor.getMng()), _editor);
- return cq;
+ public MdlLayer2dCloud(FSigEditor _editor) {
+ this(new MdlModel2dCloud(_editor,_editor.getMng()),_editor);
}
+
+// public static MdlLayer2dCloud createNew(FSigEditor _editor) {
+// MdlLayer2dCloud cq=new MdlLayer2dCloud(new MdlModel2dCloud(_editor,_editor.getMng()), _editor);
+// return cq;
+// }
/**
* Le manager de persistence. Celui par defaut ne permet par une restauration
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dConstraintLine.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dConstraintLine.java 2008-06-19 13:56:12 UTC (rev 3650)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dConstraintLine.java 2008-06-19 13:57:11 UTC (rev 3651)
@@ -38,10 +38,14 @@
setTitle(MdlResource.MDL.getString("Lignes de contraintes"));
}
- public static MdlLayer2dConstraintLine createNew(FSigEditor _editor) {
- MdlLayer2dConstraintLine cq=new MdlLayer2dConstraintLine(new MdlModel2dConstraintLine(_editor,_editor.getMng()), _editor);
- return cq;
+ public MdlLayer2dConstraintLine(FSigEditor _editor) {
+ this(new MdlModel2dConstraintLine(_editor,_editor.getMng()),_editor);
}
+
+// public static MdlLayer2dConstraintLine createNew(FSigEditor _editor) {
+// MdlLayer2dConstraintLine cq=new MdlLayer2dConstraintLine(new MdlModel2dConstraintLine(_editor,_editor.getMng()), _editor);
+// return cq;
+// }
public BCalquePersistenceInterface getPersistenceMng() {
return new MdlLayer2dConstraintLinePersistence();
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dContour.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dContour.java 2008-06-19 13:56:12 UTC (rev 3650)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dContour.java 2008-06-19 13:57:11 UTC (rev 3651)
@@ -42,10 +42,14 @@
setTitle(MdlResource.MDL.getString("Contours d'\xE9tude"));
}
- public static MdlLayer2dContour createNew(FSigEditor _editor) {
- MdlLayer2dContour cq=new MdlLayer2dContour(new MdlModel2dContour(_editor,_editor.getMng()), _editor);
- return cq;
+ public MdlLayer2dContour(FSigEditor _editor) {
+ this(new MdlModel2dContour(_editor,_editor.getMng()),_editor);
}
+
+// public static MdlLayer2dContour createNew(FSigEditor _editor) {
+// MdlLayer2dContour cq=new MdlLayer2dContour(new MdlModel2dContour(_editor,_editor.getMng()), _editor);
+// return cq;
+// }
public BCalquePersistenceInterface getPersistenceMng() {
return new MdlLayer2dContourPersistence();
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dDirectionLine.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dDirectionLine.java 2008-06-19 13:56:12 UTC (rev 3650)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dDirectionLine.java 2008-06-19 13:57:11 UTC (rev 3651)
@@ -39,10 +39,14 @@
setTitle(MdlResource.MDL.getString("Lignes de direction"));
}
- public static MdlLayer2dDirectionLine createNew(FSigEditor _editor) {
- MdlLayer2dDirectionLine cq=new MdlLayer2dDirectionLine(new MdlModel2dDirectionLine(_editor,_editor.getMng()), _editor);
- return cq;
+ public MdlLayer2dDirectionLine(FSigEditor _editor) {
+ this(new MdlModel2dDirectionLine(_editor,_editor.getMng()),_editor);
}
+
+// public static MdlLayer2dDirectionLine createNew(FSigEditor _editor) {
+// MdlLayer2dDirectionLine cq=new MdlLayer2dDirectionLine(new MdlModel2dDirectionLine(_editor,_editor.getMng()), _editor);
+// return cq;
+// }
public BCalquePersistenceInterface getPersistenceMng() {
return new MdlLayer2dDirectionLinePersistence();
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dLevel.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dLevel.java 2008-06-19 13:56:12 UTC (rev 3650)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dLevel.java 2008-06-19 13:57:11 UTC (rev 3651)
@@ -44,10 +44,14 @@
setTitle(MdlResource.MDL.getString("Lignes de niveau"));
}
- public static MdlLayer2dLevel createNew(FSigEditor _editor) {
- MdlLayer2dLevel cq=new MdlLayer2dLevel(new MdlModel2dLevel(_editor,_editor.getMng()), _editor);
- return cq;
+ public MdlLayer2dLevel(FSigEditor _editor) {
+ this(new MdlModel2dLevel(_editor,_editor.getMng()),_editor);
}
+
+// public static MdlLayer2dLevel createNew(FSigEditor _editor) {
+// MdlLayer2dLevel cq=new MdlLayer2dLevel(new MdlModel2dLevel(_editor,_editor.getMng()), _editor);
+// return cq;
+// }
public BCalquePersistenceInterface getPersistenceMng() {
return new MdlLayer2dLevelPersistence();
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dLine.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dLine.java 2008-06-19 13:56:12 UTC (rev 3650)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dLine.java 2008-06-19 13:57:11 UTC (rev 3651)
@@ -29,7 +29,7 @@
* @author Bertrand Marchand
* @version $Id: MdlLayer2dLine.java,v 1.1.2.1 2008/05/13 12:10:44 bmarchan Exp $
*/
-public abstract class MdlLayer2dLine extends FSigLayerLineEditable {
+public abstract class MdlLayer2dLine extends FSigLayerLineEditable implements MdlLayerInterface {
/**
* Constructeur. Utilise un mod\xE8le de donn\xE9es et un editeur.
@@ -89,9 +89,9 @@
}
- /**
- * Retourne le nom par defaut du calque.
- * @return Le nom.
- */
- public abstract String getExtName();
+// /**
+// * Retourne le nom par defaut du calque.
+// * @return Le nom.
+// */
+// public abstract String getExtName();
}
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dMultiPoint.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dMultiPoint.java 2008-06-19 13:56:12 UTC (rev 3650)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dMultiPoint.java 2008-06-19 13:57:11 UTC (rev 3651)
@@ -27,7 +27,7 @@
* @author Bertrand Marchand
* @version $Id: MdlLayer2dMultiPoint.java,v 1.1.2.1 2008/05/13 12:10:45 bmarchan Exp $
*/
-public abstract class MdlLayer2dMultiPoint extends ZCalqueMultiPointEditable {
+public abstract class MdlLayer2dMultiPoint extends ZCalqueMultiPointEditable implements MdlLayerInterface {
/**
* Constructeur. Utilise un mod\xE8le de donn\xE9es et un editeur.
@@ -85,9 +85,9 @@
super.detruire();
}
- /**
- * Retourne le nom par defaut du calque.
- * @return Le nom.
- */
- public abstract String getExtName();
+// /**
+// * Retourne le nom par defaut du calque.
+// * @return Le nom.
+// */
+// public abstract String getExtName();
}
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dProfile.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dProfile.java 2008-06-19 13:56:12 UTC (rev 3650)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dProfile.java 2008-06-19 13:57:11 UTC (rev 3651)
@@ -45,10 +45,14 @@
setTitle(MdlResource.MDL.getString("Profils"));
}
- public static MdlLayer2dProfile createNew(FSigEditor _editor) {
- MdlLayer2dProfile cq=new MdlLayer2dProfile(new MdlModel2dProfile(_editor,_editor.getMng()), _editor);
- return cq;
+ public MdlLayer2dProfile(FSigEditor _editor) {
+ this(new MdlModel2dProfile(_editor,_editor.getMng()),_editor);
}
+
+// public static MdlLayer2dProfile createNew(FSigEditor _editor) {
+// MdlLayer2dProfile cq=new MdlLayer2dProfile(new MdlModel2dProfile(_editor,_editor.getMng()), _editor);
+// return cq;
+// }
public BCalquePersistenceInterface getPersistenceMng() {
return new MdlLayer2dProfilePersistence();
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dZone.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dZone.java 2008-06-19 13:56:12 UTC (rev 3650)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dZone.java 2008-06-19 13:57:11 UTC (rev 3651)
@@ -42,11 +42,15 @@
setTitle(MdlResource.MDL.getString("Zones"));
}
- public static MdlLayer2dZone createNew(FSigEditor _editor) {
- MdlLayer2dZone cq=new MdlLayer2dZone(new MdlModel2dZone(_editor,_editor.getMng()), _editor);
- return cq;
+ public MdlLayer2dZone(FSigEditor _editor) {
+ this(new MdlModel2dZone(_editor,_editor.getMng()),_editor);
}
+// public static MdlLayer2dZone createNew(FSigEditor _editor) {
+// MdlLayer2dZone cq=new MdlLayer2dZone(new MdlModel2dZone(_editor,_editor.getMng()), _editor);
+// return cq;
+// }
+
public BCalquePersistenceInterface getPersistenceMng() {
return new MdlLayer2dZonePersistence();
}
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer1dTracePersistence.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer1dTracePersistence.java 2008-06-19 13:56:12 UTC (rev 3650)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer1dTracePersistence.java 2008-06-19 13:57:11 UTC (rev 3651)
@@ -21,6 +21,6 @@
@Override
protected MdlLayer2dLine createNewLayer(FSigEditor _editor) {
- return MdlLayer1dTrace.createNew(_editor);
+ return new MdlLayer1dTrace(_editor);
}
}
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dCloudPersistence.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dCloudPersistence.java 2008-06-19 13:56:12 UTC (rev 3650)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dCloudPersistence.java 2008-06-19 13:57:11 UTC (rev 3651)
@@ -44,6 +44,6 @@
@Override
protected MdlLayer2dMultiPoint createNewLayer(FSigEditor _editor) {
- return MdlLayer2dCloud.createNew(_editor);
+ return new MdlLayer2dCloud(_editor);
}
}
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dConstraintLinePersistence.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dConstraintLinePersistence.java 2008-06-19 13:56:12 UTC (rev 3650)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dConstraintLinePersistence.java 2008-06-19 13:57:11 UTC (rev 3651)
@@ -21,6 +21,6 @@
@Override
protected MdlLayer2dLine createNewLayer(FSigEditor _editor) {
- return MdlLayer2dConstraintLine.createNew(_editor);
+ return new MdlLayer2dConstraintLine(_editor);
}
}
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dContourPersistence.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dContourPersistence.java 2008-06-19 13:56:12 UTC (rev 3650)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dContourPersistence.java 2008-06-19 13:57:11 UTC (rev 3651)
@@ -21,6 +21,6 @@
@Override
protected MdlLayer2dLine createNewLayer(FSigEditor _editor) {
- return MdlLayer2dContour.createNew(_editor);
+ return new MdlLayer2dContour(_editor);
}
}
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dDirectionLinePersistence.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dDirectionLinePersistence.java 2008-06-19 13:56:12 UTC (rev 3650)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dDirectionLinePersistence.java 2008-06-19 13:57:11 UTC (rev 3651)
@@ -21,6 +21,6 @@
@Override
protected MdlLayer2dLine createNewLayer(FSigEditor _editor) {
- return MdlLayer2dDirectionLine.createNew(_editor);
+ return new MdlLayer2dDirectionLine(_editor);
}
}
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dLevelPersistence.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dLevelPersistence.java 2008-06-19 13:56:12 UTC (rev 3650)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dLevelPersistence.java 2008-06-19 13:57:11 UTC (rev 3651)
@@ -46,6 +46,6 @@
@Override
protected MdlLayer2dLine createNewLayer(FSigEditor _editor) {
- return MdlLayer2dLevel.createNew(_editor);
+ return new MdlLayer2dLevel(_editor);
}
}
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dProfilePersistence.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dProfilePersistence.java 2008-06-19 13:56:12 UTC (rev 3650)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dProfilePersistence.java 2008-06-19 13:57:11 UTC (rev 3651)
@@ -46,6 +46,6 @@
@Override
protected MdlLayer2dLine createNewLayer(FSigEditor _editor) {
- return MdlLayer2dProfile.createNew(_editor);
+ return new MdlLayer2dProfile(_editor);
}
}
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dZonePersistence.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dZonePersistence.java 2008-06-19 13:56:12 UTC (rev 3650)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dZonePersistence.java 2008-06-19 13:57:11 UTC (rev 3651)
@@ -21,6 +21,6 @@
@Override
protected MdlLayer2dLine createNewLayer(FSigEditor _editor) {
- return MdlLayer2dZone.createNew(_editor);
+ return new MdlLayer2dZone(_editor);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X