Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4024] branches/FudaaModeleur_TC1Bis/fudaa_devel
|
From: <emm...@us...> - 2008-10-02 16:17:28
|
Revision: 4024
http://fudaa.svn.sourceforge.net/fudaa/?rev=4024&view=rev
Author: emmanuel_martin
Date: 2008-10-02 16:17:18 +0000 (Thu, 02 Oct 2008)
Log Message:
-----------
pr?\195?\169 commit sur l'ajout de l'etat des g?\195?\169om?\195?\169tries
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeString.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/EbliAtomicCoordinatesTableModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueLigneBriseeEditable.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel1dTrace.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dCloud.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dConstraintLine.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dContour.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dDirectionLine.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dLevel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dProfile.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dZone.java
Added Paths:
-----------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gui/CtuluValueEditorStringRestricted.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java 2008-10-02 12:26:09 UTC (rev 4023)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java 2008-10-02 16:17:18 UTC (rev 4024)
@@ -10,11 +10,12 @@
import java.util.ArrayList;
import java.util.List;
-import com.memoire.fu.FuLib;
-
import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluLibString;
+import org.fudaa.ctulu.gui.CtuluValueEditorStringRestricted;
+import com.memoire.fu.FuLib;
+
/**
* Des constantes pour les attributs associables \xE0 des objets GIS. Les attributs constants sont en
* principe des attributs programme (non construits par l'utilisateur). Dans ce cas, leur ID est
@@ -27,8 +28,6 @@
/** Etat geom modifi\xE9. */
public final static String ATT_VAL_ETAT_MODI="MODI";
- /** Etat geom cr\xE9\xE9 */
- public final static String ATT_VAL_ETAT_CREE="CREE";
/** Etat geom origine */
public final static String ATT_VAL_ETAT_ORIG="ORIG";
@@ -97,8 +96,8 @@
return res;
}
- public static List getDefaults() {
- final ArrayList l = new ArrayList(2);
+ public static List<GISAttribute> getDefaults() {
+ final ArrayList<GISAttribute> l = new ArrayList<GISAttribute>(2);
l.add(BATHY);
l.add(TITRE);
l.add(NATURE);
@@ -154,17 +153,19 @@
/**
* Un attribut etat, global a la g\xE9om\xE9trie.
*/
- public final static GISAttributeString ETAT_GEOM = new GISAttributeString(CtuluLib.getS("Etat"), false) {
+ public final static GISAttributeString ETAT_GEOM=new GISAttributeString(new CtuluValueEditorStringRestricted(new String[]{
+ ATT_VAL_ETAT_ORIG, ATT_VAL_ETAT_MODI}, new String[]{CtuluLib.getS("Origine"), CtuluLib.getS("Modifi\xE9")}), CtuluLib
+ .getS("Etat"), false) {
public String getID() {
return "ATTRIBUTE_ETAT_GEOM";
}
public boolean isEditable() {
- return false;
+ return true;
}
public Object getDefaultValue() {
- return ATT_VAL_ETAT_CREE;
+ return ATT_VAL_ETAT_ORIG;
}
};
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeString.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeString.java 2008-10-02 12:26:09 UTC (rev 4023)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeString.java 2008-10-02 16:17:18 UTC (rev 4024)
@@ -33,6 +33,9 @@
public GISAttributeString(final CtuluValueEditorI _edit,final String _name) {
super(_edit, _name);
}
+ public GISAttributeString(final CtuluValueEditorI _edit, final String _name, final boolean _atomic) {
+ super(_edit, _name, _atomic);
+ }
public final Class getDataClass(){
return String.class;
Added: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gui/CtuluValueEditorStringRestricted.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gui/CtuluValueEditorStringRestricted.java (rev 0)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gui/CtuluValueEditorStringRestricted.java 2008-10-02 16:17:18 UTC (rev 4024)
@@ -0,0 +1,196 @@
+/*
+ * @creation 2 oct. 2008
+ * @modification $Date:$
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2008 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail fud...@li...
+ */
+package org.fudaa.ctulu.gui;
+
+import java.awt.Component;
+import java.util.Enumeration;
+import java.util.EventObject;
+import java.util.Iterator;
+import java.util.Vector;
+
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JTable;
+import javax.swing.event.CellEditorListener;
+import javax.swing.event.ChangeEvent;
+import javax.swing.table.TableCellEditor;
+
+import org.fudaa.ctulu.CtuluLibString;
+
+/**
+ * Cette classe permet de sp\xE9cifier un ensemble de valeur que peut prendre la
+ * chaine. Ainsi si on a un attribut ne pouvant prendre que 'Oui' et 'Non' comme
+ * valeur, l'editeur ne donnera le choix qu'entre ces deux l\xE0 lors de la
+ * modification. Les valeurs possibles ne peuvent \xEAtre que des string.
+ *
+ * @author Emmanuel MARTIN
+ * @version $Id:$
+ */
+public class CtuluValueEditorStringRestricted implements CtuluValueEditorI {
+
+ protected class TableCellEditorWithComboBox implements TableCellEditor {
+
+ private JComboBox co_;
+ private Vector<CellEditorListener> listeners_;
+
+ public TableCellEditorWithComboBox(JComboBox _co) {
+ if (_co==null)
+ throw new IllegalArgumentException("Parameter mustn't be null.");
+ co_=_co;
+ listeners_=new Vector<CellEditorListener>();
+ }
+
+ public Component getTableCellEditorComponent(JTable _table, Object _value, boolean _selected, int _row, int _column) {
+ return co_;
+ }
+
+ public void cancelCellEditing() {
+ ChangeEvent evt=new ChangeEvent(this);
+ for (Enumeration<CellEditorListener> e=listeners_.elements(); e.hasMoreElements();)
+ ((CellEditorListener)e.nextElement()).editingCanceled(evt);
+ }
+
+ public Object getCellEditorValue() {
+ return co_.getSelectedObjects();
+ }
+
+ public boolean isCellEditable(EventObject _evt) {
+ return true;
+ }
+
+ public boolean shouldSelectCell(EventObject _evt) {
+ return true;
+ }
+
+ public boolean stopCellEditing() {
+ ChangeEvent evt=new ChangeEvent(this);
+ for (Enumeration<CellEditorListener> e=listeners_.elements(); e.hasMoreElements();)
+ ((CellEditorListener)e.nextElement()).editingStopped(evt);
+ return false;
+ }
+
+ public void addCellEditorListener(CellEditorListener _l) {
+ if (!listeners_.contains(_l))
+ listeners_.addElement(_l);
+ }
+
+ public void removeCellEditorListener(CellEditorListener _l) {
+ listeners_.removeElement(_l);
+ }
+ }
+
+ private String[] values_;
+ private String[] rawValues_;
+
+ /**
+ * The '_values' parameter can by null. In the case the '_rawValues' will be
+ * displayed.
+ *
+ * @param _rawValues
+ * Values use by the application
+ * @param _values
+ * Values display by the widget
+ */
+ public CtuluValueEditorStringRestricted(String[] _rawValues, String[] _values) {
+ rawValues_ = _rawValues;
+ values_=_values;
+ if(values_!=null && rawValues_.length!=values_.length)
+ throw new IllegalArgumentException("rawValues and values don't have the same size.");
+ }
+
+ public CtuluValueEditorStringRestricted(Iterable<String> _rawValues, Iterable<String> _values) {
+ Vector<String> tmpValues=new Vector<String>();
+ // rawValues
+ Iterator<String> it=_rawValues.iterator();
+ for (; it.hasNext();)
+ tmpValues.add(it.next());
+ rawValues_=(String[])tmpValues.toArray();
+ // values
+ if(_values !=null){
+ it=_values.iterator();
+ for (; it.hasNext();)
+ tmpValues.add(it.next());
+ values_=(String[])tmpValues.toArray();
+ }
+ }
+
+ public Class<String> getDataClass() {
+ return String.class;
+ }
+
+ public String getValidationMessage() {
+ return null;
+ }
+
+ public boolean isValueValidFromComponent(final Component _comp) {
+ return isValid(((String)(((JComboBox)_comp).getSelectedItem())).trim());
+ }
+
+ public boolean isEmpty(final Component _c) {
+ final String txt=(String)((JComboBox)_c).getSelectedItem();
+ return txt==null||txt.trim().length()==0;
+ }
+
+ public boolean isEditable() {
+ return true;
+ }
+
+ public boolean isValid(final String _s) {
+ return true;
+ }
+
+ public Object getValue(final Component _comp) {
+ return getStringValue(_comp);
+ }
+
+ public boolean isValid(final Object _o) {
+ return isValid(_o.toString());
+ }
+
+ public JComponent createCommonEditorComponent() {
+ return createEditorComponent();
+ }
+
+ public String[] getAllowedValues() {
+ return values_.clone();
+ }
+
+ public int getNbAllowedValues() {
+ return values_.length;
+ }
+
+ public void setValue(final Object _s, final Component _comp) {
+ if (_s instanceof String){
+ boolean found=false;
+ int i=-1;
+ while(!found && ++i<rawValues_.length)
+ found=rawValues_[i].equals(_s);
+ if(found)
+ ((JComboBox)_comp).setSelectedIndex(i);
+ }
+ }
+
+ public String toString(final Object _o) {
+ return _o==null ? CtuluLibString.EMPTY_STRING:_o.toString();
+ }
+
+ public String getStringValue(final Component _comp) {
+ return rawValues_[((JComboBox)_comp).getSelectedIndex()];
+ }
+
+ public TableCellEditor createTableEditorComponent() {
+ return new TableCellEditorWithComboBox((JComboBox)createEditorComponent());
+ }
+
+ public JComponent createEditorComponent() {
+ if(values_!=null)
+ return new JComboBox(values_);
+ else
+ return new JComboBox(rawValues_);
+ }
+}
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gui/CtuluValueEditorStringRestricted.java
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/EbliAtomicCoordinatesTableModel.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/EbliAtomicCoordinatesTableModel.java 2008-10-02 12:26:09 UTC (rev 4023)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/EbliAtomicCoordinatesTableModel.java 2008-10-02 16:17:18 UTC (rev 4024)
@@ -151,12 +151,13 @@
}
}
}
+ modelesNewValues_=null;
}
final CoordinateSequence newSeq = this.getNewCoordinateSequence();
if (newSeq != null) {
zone_.setCoordinateSequence(idx_, newSeq, _cmp);
}
-
+ rowNewCoordinates_=null;
}
}
@@ -169,6 +170,10 @@
GISZoneCollection zone_;
EbliFormatterInterface xyFormatter_;
+ public boolean isModified(){
+ return modelesNewValues_!=null||rowNewCoordinates_!=null;
+ }
+
public EbliAtomicCoordinatesTableModel(final EbliFormatterInterface _formatter, final GISZoneCollection _zone,
final int[] _selectedAtomic) {
zone_ = _zone;
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java 2008-10-02 12:26:09 UTC (rev 4023)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java 2008-10-02 16:17:18 UTC (rev 4024)
@@ -40,6 +40,7 @@
import org.fudaa.ctulu.CtuluListSelectionEvent;
import org.fudaa.ctulu.CtuluListSelectionInterface;
import org.fudaa.ctulu.CtuluListSelectionListener;
+import org.fudaa.ctulu.gis.GISAttributeConstants;
import org.fudaa.ctulu.gis.GISAttributeDouble;
import org.fudaa.ctulu.gis.GISAttributeModel;
import org.fudaa.ctulu.gis.GISCoordinateSequenceUnique;
@@ -183,19 +184,39 @@
* Enregistre les modifications effectu\xE9es.
*/
public void apply() {
+ boolean modification=false; // true si une modification a \xE9t\xE9 faite
// Cr\xE9ation d'une nouvelle commande
final CtuluCommandComposite cmp=(cmd_==null ? null:new CtuluCommandComposite());
// Application des modifications des attributs globaux
for (int i=globalAttr_.length-1; i>=0; i--) {
final Object val=globalAttrEditor_[i].getValue(globalComp_[i]);
+ // Si une modificatin a \xE9t\xE9 faite, modification est mis \xE0 true, sauf si
+ // cette modification est faite sur ETAT_GEOM
+ modification = modification||(!val.equals(globalAttr_[i].getObjectValueAt(idx_))&&globalAttr_[i].getAttribute()!=GISAttributeConstants.ETAT_GEOM);
globalAttr_[i].setObject(idx_, val, cmp);
+
}
// Cas du tableau modifi\xE9
- if (isTableStat_)
- model_.apply(cmp);
+ if (isTableStat_){
+ if(model_.isModified()){
+ modification = true;
+ model_.apply(cmp);
+ }
+ }
// Cas du point unique modifi\xE9
- else if (zone_.isGeomModifiable())
+ else if (zone_.isGeomModifiable()&&!zone_.getCoordinateSequence(idx_).equals(getNewCoordinate())){
+ modification=true;
zone_.setCoordinateSequence(idx_, getNewCoordinate(), cmp);
+ }
+ // Si une modification a \xE9t\xE9 faite, l'attribut 'Etat' de la g\xE9om\xE9trie passe \xE0 modifi\xE9
+ if (modification) {
+ boolean found=false;
+ int i=-1;
+ while (!found&&++i<globalAttr_.length)
+ found=globalAttr_[i].getAttribute()==GISAttributeConstants.ETAT_GEOM;
+ if(found)
+ globalAttr_[i].setObject(idx_, GISAttributeConstants.ATT_VAL_ETAT_MODI, cmp);
+ }
// Ajout de la nouvelle commande \xE0 cmd_
if (cmd_!=null)
cmd_.addCmd(cmp.getSimplify());
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueLigneBriseeEditable.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueLigneBriseeEditable.java 2008-10-02 12:26:09 UTC (rev 4023)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueLigneBriseeEditable.java 2008-10-02 16:17:18 UTC (rev 4024)
@@ -15,6 +15,7 @@
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluListSelectionInterface;
import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ctulu.gis.GISAttributeConstants;
import org.fudaa.ebli.calque.ZCalqueLigneBrisee;
import org.fudaa.ebli.calque.ZModeleLigneBrisee;
import org.fudaa.ebli.calque.dessin.DeForme;
@@ -52,7 +53,6 @@
private void addPoint(final int _ligneIdx, final int _idxBefore, final double _x, final double _y, final CtuluCommandContainer _cmd) {
getModelePoly().addPoint(_ligneIdx, _idxBefore, _x, _y, _cmd);
-
}
/**
@@ -185,7 +185,15 @@
modele_.point(seg.e_, i, j);
modele_.point(seg.o_, i, j-1);
if (seg.distanceXY(ptToTest)<distanceReel) {
- addPoint(i, j-1, ptToTest.x_, ptToTest.y_, _cmd);
+ // Modification de l'etat de la geometrie
+ boolean found=false;
+ int k=-1;
+ while (!found&&++k<modele_.getGeomData().getNbAttributes())
+ found=modele_.getGeomData().getAttribute(k)==GISAttributeConstants.ETAT_GEOM;
+ if (found)
+ modele_.getGeomData().getDataModel(k).setObject(i, GISAttributeConstants.ATT_VAL_ETAT_MODI, _cmd);
+ // Fin de la modification de l'etat de la geometrie
+ addPoint(i, k-1, ptToTest.x_, ptToTest.y_, _cmd);
return true;
}
}
@@ -193,6 +201,14 @@
modele_.point(seg.e_, i, 0);
modele_.point(seg.o_, i, modele_.getNbPointForGeometry(i)-1);
if (seg.distanceXY(ptToTest)<distanceReel) {
+ // Modification de l'etat de la geometrie
+ boolean found=false;
+ int j=-1;
+ while (!found&&++j<modele_.getGeomData().getNbAttributes())
+ found=modele_.getGeomData().getAttribute(j)==GISAttributeConstants.ETAT_GEOM;
+ if (found)
+ modele_.getGeomData().getDataModel(j).setObject(i, GISAttributeConstants.ATT_VAL_ETAT_MODI, _cmd);
+ // Fin de la modification de l'etat de la geometrie
addPoint(i, modele_.getNbPointForGeometry(i)-1, ptToTest.x_, ptToTest.y_, _cmd);
return true;
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel1dTrace.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel1dTrace.java 2008-10-02 12:26:09 UTC (rev 4023)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel1dTrace.java 2008-10-02 16:17:18 UTC (rev 4024)
@@ -31,6 +31,7 @@
super(_listener);
GISAttribute[] attrs=new GISAttribute[]{
GISAttributeConstants.TITRE,
+ GISAttributeConstants.ETAT_GEOM,
GISAttributeConstants.NATURE
};
// Pas de container de commande pour cette op\xE9ration, sinon conserv\xE9 en undo/redo.
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dCloud.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dCloud.java 2008-10-02 12:26:09 UTC (rev 4023)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dCloud.java 2008-10-02 16:17:18 UTC (rev 4024)
@@ -39,6 +39,7 @@
// GISAttribute attTry=new GISAttributeString("Nature",false);
GISAttribute[] attrs=new GISAttribute[]{
GISAttributeConstants.BATHY,
+ GISAttributeConstants.ETAT_GEOM,
GISAttributeConstants.TITRE,
GISAttributeConstants.NATURE
// attTry
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dConstraintLine.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dConstraintLine.java 2008-10-02 12:26:09 UTC (rev 4023)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dConstraintLine.java 2008-10-02 16:17:18 UTC (rev 4024)
@@ -30,6 +30,7 @@
super(_listener);
GISAttribute[] attrs=new GISAttribute[]{
GISAttributeConstants.BATHY,
+ GISAttributeConstants.ETAT_GEOM,
GISAttributeConstants.TITRE,
GISAttributeConstants.NATURE
};
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dContour.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dContour.java 2008-10-02 12:26:09 UTC (rev 4023)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dContour.java 2008-10-02 16:17:18 UTC (rev 4024)
@@ -30,6 +30,7 @@
super(_listener);
GISAttribute[] attrs=new GISAttribute[]{
GISAttributeConstants.TITRE,
+ GISAttributeConstants.ETAT_GEOM,
GISAttributeConstants.NATURE
};
// Pas de container de commande pour cette op\xE9ration, sinon conserv\xE9 en undo/redo.
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dDirectionLine.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dDirectionLine.java 2008-10-02 12:26:09 UTC (rev 4023)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dDirectionLine.java 2008-10-02 16:17:18 UTC (rev 4024)
@@ -32,6 +32,7 @@
super(_listener);
GISAttribute[] attrs=new GISAttribute[]{
GISAttributeConstants.BATHY,
+ GISAttributeConstants.ETAT_GEOM,
GISAttributeConstants.TITRE,
GISAttributeConstants.NATURE
};
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dLevel.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dLevel.java 2008-10-02 12:26:09 UTC (rev 4023)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dLevel.java 2008-10-02 16:17:18 UTC (rev 4024)
@@ -35,6 +35,7 @@
GISAttributeDouble zglob=new GISAttributeDouble(MdlResource.MDL.getString("Z"),false);
GISAttribute[] attrs=new GISAttribute[]{
zglob,
+ GISAttributeConstants.ETAT_GEOM,
GISAttributeConstants.TITRE,
GISAttributeConstants.NATURE
};
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dProfile.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dProfile.java 2008-10-02 12:26:09 UTC (rev 4023)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dProfile.java 2008-10-02 16:17:18 UTC (rev 4024)
@@ -31,6 +31,7 @@
super(_listener);
GISAttribute[] attrs=new GISAttribute[]{
GISAttributeConstants.BATHY,
+ GISAttributeConstants.ETAT_GEOM,
GISAttributeConstants.TITRE,
GISAttributeConstants.NATURE
};
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dZone.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dZone.java 2008-10-02 12:26:09 UTC (rev 4023)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dZone.java 2008-10-02 16:17:18 UTC (rev 4024)
@@ -30,6 +30,7 @@
super(_listener);
GISAttribute[] attrs=new GISAttribute[]{
GISAttributeConstants.TITRE,
+ GISAttributeConstants.ETAT_GEOM,
GISAttributeConstants.NATURE
};
// Pas de container de commande pour cette op\xE9ration, sinon conserv\xE9 en undo/redo.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
