fudaa-svn-commit Mailing List for Fudaa (Page 198)

https://gitlab.com/fudaa

Brought to you by: bmarchan, deniger, gpoissonnier, hadouxad

fudaa-svn-commit — svn commit with diffs

You can subscribe to this list here.

2008	Jan	Feb	Mar	Apr	May	Jun (46)	Jul (37)	Aug (154)	Sep (140)	Oct (132)	Nov (104)	Dec (67)
2009	Jan (113)	Feb (73)	Mar (102)	Apr (106)	May (114)	Jun (67)	Jul (116)	Aug (48)	Sep (108)	Oct (296)	Nov (56)	Dec (53)
2010	Jan (95)	Feb (31)	Mar (40)	Apr (12)	May (10)	Jun (27)	Jul (19)	Aug (81)	Sep (48)	Oct (45)	Nov (40)	Dec (7)
2011	Jan (16)	Feb (32)	Mar (55)	Apr (38)	May (24)	Jun (37)	Jul (12)	Aug (16)	Sep (97)	Oct (90)	Nov (101)	Dec (89)
2012	Jan (18)	Feb (2)	Mar (54)	Apr (69)	May (97)	Jun (131)	Jul (70)	Aug (48)	Sep (48)	Oct (119)	Nov (194)	Dec (60)
2013	Jan (73)	Feb (35)	Mar (42)	Apr (28)	May (7)	Jun (17)	Jul (27)	Aug (10)	Sep (38)	Oct (12)	Nov (4)	Dec (16)
2014	Jan (33)	Feb (37)	Mar (19)	Apr (3)	May (47)	Jun (26)	Jul (22)	Aug	Sep (10)	Oct (30)	Nov (24)	Dec (19)
2015	Jan (13)	Feb (16)	Mar (36)	Apr (19)	May (5)	Jun (5)	Jul (3)	Aug (11)	Sep (22)	Oct (7)	Nov (14)	Dec
2016	Jan	Feb (26)	Mar (13)	Apr (61)	May	Jun	Jul (4)	Aug	Sep	Oct (27)	Nov (14)	Dec (21)
2017	Jan (30)	Feb (4)	Mar (3)	Apr (5)	May (69)	Jun (29)	Jul (1)	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 196 197 198 (Page 198 of 198)

[Fudaa-svn-commit] SF.net SVN: fudaa: [3635] branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/ src/org/fudaa/ctulu/gis/GISZoneCollectionLigneBrisee.java

From: <bma...@us...> - 2008-06-11 07:58:08

Revision: 3635
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3635&view=rev
Author:   bmarchan
Date:     2008-06-11 00:58:11 -0700 (Wed, 11 Jun 2008)

Log Message:
-----------
Un peu de doc...

Modified Paths:
--------------
    branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionLigneBrisee.java

Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionLigneBrisee.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionLigneBrisee.java	2008-06-10 12:53:20 UTC (rev 3634)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionLigneBrisee.java	2008-06-11 07:58:11 UTC (rev 3635)
@@ -477,11 +477,22 @@
   }
   
   
-
+  /**
+   * Remplace une ancienne g\xE9om\xE9trie par un nouveau polygone, en interpolant si n\xE9cessaire les attributs.
+   * @param _idx L'index de la g\xE9ometrie.
+   * @param _newLine La nouvelle g\xE9om\xE9trie.
+   * @param _cmd Le container de commandes.
+   */
   public void setValue(final int _idx, final GISPolygone _newLine, final CtuluCommandContainer _cmd) {
     setValueIntern(_idx, _newLine, _cmd);
   }
 
+  /**
+   * Remplace une ancienne g\xE9om\xE9trie par une nouvelle polyligne, en interpolant si n\xE9cessaire les attributs.
+   * @param _idx L'index de la g\xE9ometrie.
+   * @param _newLine La nouvelle g\xE9om\xE9trie.
+   * @param _cmd Le container de commandes.
+   */
   public void setValue(final int _idx, final GISPolyligne _newLine, final CtuluCommandContainer _cmd) {
     setValueIntern(_idx, _newLine, _cmd);
   }


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

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

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.

[Fudaa-svn-commit] SF.net SVN: fudaa: [3633] branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/ src/org/fudaa/ctulu/gis/GISZoneCollectionLigneBrisee.java

From: <bma...@us...> - 2008-06-10 08:23:03

Revision: 3633
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3633&view=rev
Author:   bmarchan
Date:     2008-06-10 01:23:09 -0700 (Tue, 10 Jun 2008)

Log Message:
-----------
removeAtomicValue() effectue a present une seule commande (pour le CommandManager)

Modified Paths:
--------------
    branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionLigneBrisee.java

Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionLigneBrisee.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionLigneBrisee.java	2008-06-10 08:21:23 UTC (rev 3632)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionLigneBrisee.java	2008-06-10 08:23:09 UTC (rev 3633)
@@ -435,7 +435,8 @@
     }
     
     if (r) {
-      super.geometry_.setObject(_idxGeom, newString, _cmd);
+      final CtuluCommandComposite cmp = new CtuluCommandComposite();
+      super.geometry_.setObject(_idxGeom, newString, cmp);
       // si des attributs atomics sont concerne
       if (idxToRemove != null && idxToRemove.size() > 0) {
         final int[] idx = idxToRemove.toNativeArray();
@@ -448,10 +449,12 @@
             // on recupere le sous-model concerne par la modif de geometrie
             final GISAttributeModel atomicModel = (GISAttributeModel) m.getObjectValueAt(_idxGeom);
             // on le change
-            m.setObject(_idxGeom, atomicModel.createSubModel(idx), _cmd);
+            m.setObject(_idxGeom, atomicModel.createSubModel(idx), cmp);
           }
         }
       }
+      if (_cmd!=null)
+        _cmd.addCmd(cmp.getSimplify());
     }
     return r;
   }


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

[Fudaa-svn-commit] SF.net SVN: fudaa: [3632] branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/ src/org/fudaa/ctulu/gui/CtuluDialog.java

From: <bma...@us...> - 2008-06-10 08:21:28

Revision: 3632
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3632&view=rev
Author:   bmarchan
Date:     2008-06-10 01:21:23 -0700 (Tue, 10 Jun 2008)

Log Message:
-----------
Suppression setVisible(false) sur panel pour pouvroi etre reutilis?\195?\169.

Modified Paths:
--------------
    branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/src/org/fudaa/ctulu/gui/CtuluDialog.java

Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/src/org/fudaa/ctulu/gui/CtuluDialog.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/src/org/fudaa/ctulu/gui/CtuluDialog.java	2008-06-10 08:17:37 UTC (rev 3631)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/src/org/fudaa/ctulu/gui/CtuluDialog.java	2008-06-10 08:21:23 UTC (rev 3632)
@@ -388,7 +388,8 @@
   public void cancel() {
     response_ = JOptionPane.CANCEL_OPTION;
     dial_.cancel();
-    dial_.setVisible(false);
+// B.M. L'appel a setVisible(false) empeche de r\xE9afficher le panel au travers d'un autre CtuluDialog.
+//    dial_.setVisible(false);
     dispose();
   }
 
@@ -406,7 +407,8 @@
     if (dial_.valide()) {
       response_ = JOptionPane.OK_OPTION;
       if (dial_.ok()) {
-        dial_.setVisible(false);
+// B.M. L'appel a setVisible(false) empeche de r\xE9afficher le panel au travers d'un autre CtuluDialog.
+//        dial_.setVisible(false);
         dispose();
       }
     }


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

[Fudaa-svn-commit] SF.net SVN: fudaa: [3631] branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src /org/fudaa/ebli/calque/ZScene.java

From: <bma...@us...> - 2008-06-10 08:17:37

Revision: 3631
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3631&view=rev
Author:   bmarchan
Date:     2008-06-10 01:17:37 -0700 (Tue, 10 Jun 2008)

Log Message:
-----------
+ Correction de methodes sur les selections
+ introduction d'un helper selections.

Modified Paths:
--------------
    branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java

Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java	2008-06-10 08:10:33 UTC (rev 3630)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java	2008-06-10 08:17:37 UTC (rev 3631)
@@ -41,6 +41,30 @@
  */
 public class ZScene implements TreeModelListener {
   
+  /** Helper contenant un ensemble de methodes simplifiant les tests sur la selection */
+  public class SceneSelectionHelper {
+    
+    /**
+     * @return La geometrie unique s\xE9lectionn\xE9e (m\xEAme en mode sommet), ou -1 si plusieurs g\xE9om\xE9tries.
+     */
+    public int getUniqueSelectedIdx() {
+      int r;
+      if (ZScene.this.isAtomicMode())
+        r=ZScene.this.getLayerSelectionMulti().isSelectionInOneBloc();
+      else {
+        r=(ZScene.this.getLayerSelection().getNbSelectedIndex()==1) ? ZScene.this.getLayerSelection().getMinIndex():-1;
+      }
+      return r;
+    }
+    
+    /**
+     * @return Le nombre d'atomiques s\xE9lectionn\xE9s, ou 0 si mode global.
+     */
+    public int getNbAtomicSelected() {
+      return ZScene.this.isAtomicMode() ? ZScene.this.getLayerSelectionMulti().getNbSelectedItem():0;
+    }
+  }
+  
   /** Liste des objets geometrique selectionn\xE9s de la scene */
   class SceneListSelection implements CtuluListSelectionInterface {
 
@@ -65,11 +89,15 @@
      * @see org.fudaa.ctulu.CtuluListSelectionInterface#getMaxIndex()
      */
     public int getMaxIndex() {
-      int max=0;
+      int max=-1;
+      int idecal=0;
       ZCalqueAffichageDonneesInterface[] cqs=getTargetLayers();
-      for (int i=0; i<cqs.length-1; i++)
-        max+=cqs[i].modeleDonnees().getNombre();
-      max+=cqs[cqs.length-1].getLayerSelection().getMaxIndex();
+      for (int i=0; i<cqs.length; i++) {
+        if (!cqs[i].isSelectionEmpty()) {
+          max=cqs[i].getLayerSelection().getMaxIndex()+idecal;
+        }
+        idecal+=cqs[i].modeleDonnees().getNombre();
+      }
       return max;
     }
 
@@ -77,7 +105,15 @@
      * @see org.fudaa.ctulu.CtuluListSelectionInterface#getMinIndex()
      */
     public int getMinIndex() {
-      return 0;
+      ZCalqueAffichageDonneesInterface[] cqs=getTargetLayers();
+      int idecal=0;
+      for (int i=0; i<cqs.length; i++) {
+        if (!cqs[i].isSelectionEmpty()) {
+          return cqs[i].getLayerSelection().getMinIndex()+idecal;
+        }
+        idecal+=cqs[i].modeleDonnees().getNombre();
+      }
+      return -1;
     }
 
     /* (non-Javadoc)
@@ -259,6 +295,7 @@
   protected ZCalqueSelectionInteractionAbstract cqSelectionI_=null;
   protected CtuluListSelectionInterface selection_=null;
   protected EbliListeSelectionMultiInterface selectionMulti_=null;
+  protected SceneSelectionHelper selectionHelper_=null;
   protected boolean atomicMode_=false;
   
   /** La scene est r\xE9duite au calque s\xE9lectionn\xE9 pour toutes les actions. */
@@ -284,6 +321,7 @@
     cqSelectionI_=_cqSelectionI;
     cqSelectionI_.setScene(this);
     initSelection();
+    selectionHelper_=new SceneSelectionHelper();
   }
   
   /**
@@ -444,7 +482,7 @@
   public ZCalqueAffichageDonneesInterface getLayerForId(int _idGeom) {
     int idecal=0;
     for (ZCalqueAffichageDonneesInterface cq : getTargetLayers()) {
-      if (_idGeom <= (idecal+=cq.modeleDonnees().getNombre())) 
+      if (_idGeom < (idecal+=cq.modeleDonnees().getNombre())) 
         return cq;
     }
     return null;
@@ -453,8 +491,12 @@
   public int sceneId2LayerId(int _idGeom) {
     int idecal=0;
     for (ZCalqueAffichageDonneesInterface cq : getTargetLayers()) {
-      if (_idGeom <= (idecal+=cq.modeleDonnees().getNombre())) 
+      int nb=cq.modeleDonnees().getNombre();
+      if (_idGeom < idecal+nb) 
         return _idGeom-idecal;
+      idecal+=nb;
+//      if (_idGeom < (idecal+=cq.modeleDonnees().getNombre())) 
+//        return _idGeom-idecal;
     }
     return -1;
   }
@@ -521,6 +563,10 @@
     return selection_;
   }
   
+  public SceneSelectionHelper getSelectionHelper() {
+    return selectionHelper_;
+  }
+  
   private void initSelection() {
     if (selection_==null) {
       selection_=new SceneListSelection();


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

[Fudaa-svn-commit] SF.net SVN: fudaa: [3630] branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/ src/org/fudaa/fudaa/modeleur/action/SceneMoveInLayerAction.java

From: <bma...@us...> - 2008-06-10 08:10:26

Revision: 3630
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3630&view=rev
Author:   bmarchan
Date:     2008-06-10 01:10:33 -0700 (Tue, 10 Jun 2008)

Log Message:
-----------
Nettoyage code.

Modified Paths:
--------------
    branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneMoveInLayerAction.java

Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneMoveInLayerAction.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneMoveInLayerAction.java	2008-06-10 08:10:19 UTC (rev 3629)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneMoveInLayerAction.java	2008-06-10 08:10:33 UTC (rev 3630)
@@ -47,7 +47,7 @@
   /**
    * @param _m l'arbre des calques
    */
-  public SceneMoveInLayerAction(final ZEditorInterface _editor, MdlSceneEditor _sceneEditor) {
+  public SceneMoveInLayerAction(MdlSceneEditor _sceneEditor) {
     super(EbliResource.EBLI.getString("D\xE9placer dans le calque cible"), null/*EbliResource.EBLI.getToolIcon("draw-rotation")*/, "MOVE_IN_LAYER");
     setSceneEditor(_sceneEditor);
     sceneEditor_.getScene().addSelectionListener(this);


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

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

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.

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

From: <bma...@us...> - 2008-06-10 08:09:46

Revision: 3628
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3628&view=rev
Author:   bmarchan
Date:     2008-06-10 01:09:54 -0700 (Tue, 10 Jun 2008)

Log Message:
-----------
Correction message.

Modified Paths:
--------------
    branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlInterpolationPanel.java

Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlInterpolationPanel.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlInterpolationPanel.java	2008-06-10 08:09:30 UTC (rev 3627)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlInterpolationPanel.java	2008-06-10 08:09:54 UTC (rev 3628)
@@ -72,7 +72,7 @@
       return false;
     }
     else if (rbDist_.isSelected() && (tfDist_.getText().trim().length()==0 || (dist_ = (Double)tfDist_.getValue())<=0)) {
-      setErrorText(CtuluLib.getS("La distance entre 2 points cons\xE9cutifs doit \xEAtre >= 0 ") + '!');
+      setErrorText(CtuluLib.getS("La distance entre 2 points cons\xE9cutifs doit \xEAtre > 0 ") + '!');
       return false;
     }
     return true;


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

[Fudaa-svn-commit] SF.net SVN: fudaa: [3627] branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/ src/org/fudaa/fudaa/sig/layer/FSigEditor.java

From: <bma...@us...> - 2008-06-10 08:09:29

Revision: 3627
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3627&view=rev
Author:   bmarchan
Date:     2008-06-10 01:09:30 -0700 (Tue, 10 Jun 2008)

Log Message:
-----------
Correction plantage fonctionnalit?\195?\169 Join

Modified Paths:
--------------
    branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigEditor.java

Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigEditor.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigEditor.java	2008-06-10 07:33:18 UTC (rev 3626)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigEditor.java	2008-06-10 08:09:30 UTC (rev 3627)
@@ -415,7 +415,7 @@
       boolean b=true;
       // Uniquement si le calque est editable, en mode atomique, et si le nombre de sommets est 2.
       b&=cq!=null && 
-         FSigEditor.this.isEditable(cq) && 
+         FSigEditor.this.isEditable(cq) && !cq.isSelectionEmpty() &&
          cq.isAtomicMode() &&
          cq.getLayerSelectionMulti().getNbSelectedItem()==2;
 


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

[Fudaa-svn-commit] SF.net SVN: fudaa: [3626] trunk/fudaa_devel/New Folder/

From: <bma...@us...> - 2008-06-10 07:33:12

Revision: 3626
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3626&view=rev
Author:   bmarchan
Date:     2008-06-10 00:33:18 -0700 (Tue, 10 Jun 2008)

Log Message:
-----------
Deleted trunk/fudaa_devel/New Folder. Probablement une erreur.

Removed Paths:
-------------
    trunk/fudaa_devel/New Folder/


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

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

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.

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

From: <bma...@us...> - 2008-06-06 08:07:03

Revision: 3624
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3624&view=rev
Author:   bmarchan
Date:     2008-06-06 01:07:08 -0700 (Fri, 06 Jun 2008)

Log Message:
-----------
Pour test d'envoi liste de diffusion.

Modified Paths:
--------------
    branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/mdl_en.fr_txt

Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/mdl_en.fr_txt
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/mdl_en.fr_txt	2008-06-06 08:03:11 UTC (rev 3623)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/mdl_en.fr_txt	2008-06-06 08:07:08 UTC (rev 3624)
@@ -1 +1 @@
-Fond de carte=Raster map
+Fond de carte=Raster map
\ No newline at end of file


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

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

From: <bma...@us...> - 2008-06-06 08:03:04

Revision: 3623
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3623&view=rev
Author:   bmarchan
Date:     2008-06-06 01:03:11 -0700 (Fri, 06 Jun 2008)

Log Message:
-----------
Pour test d'envoi liste de diffusion.

Modified Paths:
--------------
    branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/mdl_en.fr_txt

Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/mdl_en.fr_txt
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/mdl_en.fr_txt	2008-06-05 21:33:09 UTC (rev 3622)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/mdl_en.fr_txt	2008-06-06 08:03:11 UTC (rev 3623)
@@ -1 +1 @@
-Fond de carte=Raster map
+Fond de carte=Raster map


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

[Fudaa-svn-commit] SF.net SVN: fudaa: [3622] tags/FudaaModeleur_0_04/

From: <bma...@us...> - 2008-06-05 21:33:05

Revision: 3622
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3622&view=rev
Author:   bmarchan
Date:     2008-06-05 14:33:09 -0700 (Thu, 05 Jun 2008)

Log Message:
-----------
Created tag FudaaModeleur_0_04.

Added Paths:
-----------
    tags/FudaaModeleur_0_04/

Copied: tags/FudaaModeleur_0_04 (from rev 3620, branches/Br_FudaaModeleur_TF)


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

[Fudaa-svn-commit] SF.net SVN: fudaa: [3621] tags/FudaaModeleur_0_04/

From: <bma...@us...> - 2008-06-05 21:32:49

Revision: 3621
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3621&view=rev
Author:   bmarchan
Date:     2008-06-05 14:32:58 -0700 (Thu, 05 Jun 2008)

Log Message:
-----------
Deleted directory FudaaModeleur_0_04.

Removed Paths:
-------------
    tags/FudaaModeleur_0_04/


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

[Fudaa-svn-commit] SF.net SVN: fudaa: [3620] tags/FudaaModeleur_0_04/

From: <bma...@us...> - 2008-06-05 21:28:27

Revision: 3620
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3620&view=rev
Author:   bmarchan
Date:     2008-06-05 14:28:34 -0700 (Thu, 05 Jun 2008)

Log Message:
-----------
Version FudaaModeleur_0_04.

Added Paths:
-----------
    tags/FudaaModeleur_0_04/

Copied: tags/FudaaModeleur_0_04 (from rev 3619, branches/Br_FudaaModeleur_TF)


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

Flat | Threaded

<< < 1 .. 196 197 198 (Page 198 of 198)