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

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

Revision: 3697
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3697&view=rev
Author:   bmarchan
Date:     2008-07-18 07:32:53 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
Correctif #41 : Taille des entr?\195?\169es de texte augment?\195?\169e dans le panneau de translation/rotation + correction pour dz toujours actif

Modified Paths:
--------------
    branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneDeplacementAction.java
    branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneRotationAction.java
    branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteDeplacement.java
    branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteRotation.java
    branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueDeplacement.java

Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneDeplacementAction.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneDeplacementAction.java	2008-07-18 07:32:10 UTC (rev 3696)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneDeplacementAction.java	2008-07-18 07:32:53 UTC (rev 3697)
@@ -1,93 +1,87 @@
-/*
- *  @creation     1 avr. 2005
- *  @modification $Date: 2008-05-13 12:10:47 $
- *  @license      GNU General Public License 2
- *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
- */
-package org.fudaa.ebli.calque.action;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-import javax.swing.tree.TreeSelectionModel;
-
-import org.fudaa.ebli.calque.ZScene;
-import org.fudaa.ebli.calque.edition.BPaletteDeplacement;
-import org.fudaa.ebli.calque.edition.BPaletteEdition;
-import org.fudaa.ebli.calque.edition.ZCalqueDeplacement;
-import org.fudaa.ebli.calque.edition.ZCalqueEditable;
-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.EbliFormatterInterface;
-import org.fudaa.ebli.ressource.EbliResource;
-
-import com.memoire.fu.FuLog;
-
-/**
- * Une action pour faire une rotation d'objets GIS, reagissant au changement de calque selectionn\xE9.
- * @author Fred Deniger
- * @version $Id: SceneDeplacementAction.java,v 1.1.2.1 2008-05-13 12:10:47 bmarchan Exp $
- */
-public class SceneDeplacementAction extends EbliActionPaletteTreeModel implements PropertyChangeListener {
-
-  ZSceneEditor sceneEditor_;
-  EbliFormatterInterface formatter_;
-  ZCalqueDeplacement cqDep_;
-
-  /**
-   * @param _m l'arbre des calques
-   */
-  public SceneDeplacementAction(final TreeSelectionModel _m, final ZSceneEditor _sceneEditor, EbliFormatterInterface _formatter, ZCalqueDeplacement _cqDep) {
-    super(EbliResource.EBLI.getString("D\xE9placer des objets"), EbliResource.EBLI.getToolIcon("draw-move"), "GLOBAL_MOVE", _m);
-    formatter_=_formatter;
-    cqDep_=_cqDep;
-    setSceneEditor(_sceneEditor);
-    setEnabled(isTargetValid(null));
-    cqDep_.addPropertyChangeListener(this);
-  }
-  /**
-   * @param _editor l'editeur
-   */
-  private void setSceneEditor(final ZSceneEditor _sceneEditor) {
-    sceneEditor_ = _sceneEditor;
-  }
-
-  protected boolean isTargetValid(final Object _o) {
-    return (sceneEditor_!=null && (!sceneEditor_.getScene().isRestrictedToCalqueActif() || sceneEditor_.getScene().isCalqueActifEditable()));
-  }
-
-  public void changeAction(){
-    cqDep_.setGele(!super.isSelected());
-    super.changeAction();
-  }
-
-  /**
-   * Le calque target, c'est \xE0 dire le calque actif.
-   */
-  protected void setTarget(final Object _o) {
-    setDisableWhenHide_ = !isTargetValid(null);
-    if (palette_!=null) palette_.setPalettePanelTarget(_o);
-  }
-
-  public void updateBeforeShow() {
-    if (palette_!=null) ((BPaletteDeplacement)palette_).updateState();
-  }
-
-  protected BPalettePanelInterface buildPaletteContent() {
-    BPaletteDeplacement pal=new BPaletteDeplacement(sceneEditor_,formatter_);
-    pal.setCalqueDeplacement(cqDep_);
-    return pal;
-  }
-
-  public void propertyChange(final PropertyChangeEvent _evt){
-//    changeAction();
-    if (isSelected() == cqDep_.isGele()) {
-      super.setSelected(!cqDep_.isGele());
-    }
-//    super.changeAction();
-  }
-}
+/*
+ *  @creation     1 avr. 2005
+ *  @modification $Date: 2008-05-13 12:10:47 $
+ *  @license      GNU General Public License 2
+ *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.ebli.calque.action;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+
+import javax.swing.tree.TreeSelectionModel;
+
+import org.fudaa.ebli.calque.ZScene;
+import org.fudaa.ebli.calque.edition.BPaletteDeplacement;
+import org.fudaa.ebli.calque.edition.BPaletteEdition;
+import org.fudaa.ebli.calque.edition.ZCalqueDeplacement;
+import org.fudaa.ebli.calque.edition.ZCalqueEditable;
+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.EbliFormatterInterface;
+import org.fudaa.ebli.ressource.EbliResource;
+
+import com.memoire.fu.FuLog;
+
+/**
+ * Une action pour faire une rotation d'objets GIS, reagissant au changement de calque selectionn\xE9.
+ * @author Fred Deniger
+ * @version $Id: SceneDeplacementAction.java,v 1.1.2.1 2008-05-13 12:10:47 bmarchan Exp $
+ */
+public class SceneDeplacementAction extends EbliActionPaletteTreeModel implements PropertyChangeListener {
+
+  ZSceneEditor sceneEditor_;
+  EbliFormatterInterface formatter_;
+  ZCalqueDeplacement cqDep_;
+
+  /**
+   * @param _m l'arbre des calques
+   */
+  public SceneDeplacementAction(final TreeSelectionModel _m, final ZSceneEditor _sceneEditor, EbliFormatterInterface _formatter, ZCalqueDeplacement _cqDep) {
+    super(EbliResource.EBLI.getString("D\xE9placer des objets"), EbliResource.EBLI.getToolIcon("draw-move"), "GLOBAL_MOVE", _m);
+    formatter_=_formatter;
+    cqDep_=_cqDep;
+    setSceneEditor(_sceneEditor);
+    setEnabled(isTargetValid(null));
+    cqDep_.addPropertyChangeListener(this);
+  }
+  /**
+   * @param _editor l'editeur
+   */
+  private void setSceneEditor(final ZSceneEditor _sceneEditor) {
+    sceneEditor_ = _sceneEditor;
+  }
+
+  protected boolean isTargetValid(final Object _o) {
+    // On n'utilise pas le calque actif de la scene (probablement pas encore initialis\xE9), mais l'objet pass\xE9.
+    return (sceneEditor_!=null && (!sceneEditor_.getScene().isRestrictedToCalqueActif() || _o instanceof ZCalqueEditable/*sceneEditor_.getScene().isCalqueActifEditable()*/));
+  }
+
+  public void changeAction(){
+    cqDep_.setGele(!super.isSelected());
+    super.changeAction();
+  }
+
+
+  public void updateBeforeShow() {
+    if (palette_!=null) ((BPaletteDeplacement)palette_).updateState();
+  }
+
+  protected BPalettePanelInterface buildPaletteContent() {
+    BPaletteDeplacement pal=new BPaletteDeplacement(sceneEditor_,formatter_);
+    pal.setCalqueDeplacement(cqDep_);
+    return pal;
+  }
+
+  public void propertyChange(final PropertyChangeEvent _evt){
+//    changeAction();
+    if (isSelected() == cqDep_.isGele()) {
+      super.setSelected(!cqDep_.isGele());
+    }
+//    super.changeAction();
+  }
+}

Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneRotationAction.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneRotationAction.java	2008-07-18 07:32:10 UTC (rev 3696)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneRotationAction.java	2008-07-18 07:32:53 UTC (rev 3697)
@@ -1,70 +1,64 @@
-/*
- *  @creation     1 avr. 2005
- *  @modification $Date: 2008-05-13 12:10:45 $
- *  @license      GNU General Public License 2
- *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
- */
-package org.fudaa.ebli.calque.action;
-
-import javax.swing.tree.TreeSelectionModel;
-
-import org.fudaa.ebli.calque.ZScene;
-import org.fudaa.ebli.calque.edition.BPaletteEdition;
-import org.fudaa.ebli.calque.edition.ZCalqueEditable;
-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.EbliFormatterInterface;
-import org.fudaa.ebli.ressource.EbliResource;
-
-import com.memoire.fu.FuLog;
-
-/**
- * Une action pour faire une rotation d'objets GIS, reagissant au changement de calque selectionn\xE9.
- * @author Fred Deniger
- * @version $Id: SceneRotationAction.java,v 1.1.2.1 2008-05-13 12:10:45 bmarchan Exp $
- */
-public class SceneRotationAction extends EbliActionPaletteTreeModel {
-
-  ZSceneEditor sceneEditor_;
-  EbliFormatterInterface formatter_;
-
-  /**
-   * @param _m l'arbre des calques
-   */
-  public SceneRotationAction(final TreeSelectionModel _m, final ZEditorInterface _editor, ZSceneEditor _sceneEditor, EbliFormatterInterface _formatter) {
-    super(EbliResource.EBLI.getString("Rotation des objets"), EbliResource.EBLI.getToolIcon("draw-rotation"), "GLOBAL_ROTATE", _m);
-    formatter_=_formatter;
-    setSceneEditor(_sceneEditor);
-    setEnabled(isTargetValid(null));
-  }
-  /**
-   * @param _editor l'editeur
-   */
-  private void setSceneEditor(final ZSceneEditor _sceneEditor) {
-    sceneEditor_ = _sceneEditor;
-  }
-
-  protected boolean isTargetValid(final Object _o) {
-    return (sceneEditor_!=null && (!sceneEditor_.getScene().isRestrictedToCalqueActif() || sceneEditor_.getScene().isCalqueActifEditable()));
-  }
-
-  /**
-   * Le calque target, c'est \xE0 dire le calque actif.
-   */
-  protected void setTarget(final Object _o) {
-    setDisableWhenHide_ = !isTargetValid(null);
-    if (palette_!=null) palette_.setPalettePanelTarget(_o);
-  }
-
-  public void updateBeforeShow() {
-    if (palette_!=null) ((BPaletteRotation)palette_).updateForSelectionChanged();
-  }
-
-  protected BPalettePanelInterface buildPaletteContent() {
-    return new BPaletteRotation(sceneEditor_,formatter_);
-  }
-}
+/*
+ *  @creation     1 avr. 2005
+ *  @modification $Date: 2008-05-13 12:10:45 $
+ *  @license      GNU General Public License 2
+ *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.ebli.calque.action;
+
+import javax.swing.tree.TreeSelectionModel;
+
+import org.fudaa.ebli.calque.ZScene;
+import org.fudaa.ebli.calque.edition.BPaletteEdition;
+import org.fudaa.ebli.calque.edition.ZCalqueEditable;
+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.EbliFormatterInterface;
+import org.fudaa.ebli.ressource.EbliResource;
+
+import com.memoire.fu.FuLog;
+
+/**
+ * Une action pour faire une rotation d'objets GIS, reagissant au changement de calque selectionn\xE9.
+ * @author Fred Deniger
+ * @version $Id: SceneRotationAction.java,v 1.1.2.1 2008-05-13 12:10:45 bmarchan Exp $
+ */
+public class SceneRotationAction extends EbliActionPaletteTreeModel {
+
+  ZSceneEditor sceneEditor_;
+  EbliFormatterInterface formatter_;
+
+  /**
+   * @param _m l'arbre des calques
+   */
+  public SceneRotationAction(final TreeSelectionModel _m, final ZEditorInterface _editor, ZSceneEditor _sceneEditor, EbliFormatterInterface _formatter) {
+    super(EbliResource.EBLI.getString("Rotation des objets"), EbliResource.EBLI.getToolIcon("draw-rotation"), "GLOBAL_ROTATE", _m);
+    formatter_=_formatter;
+    setSceneEditor(_sceneEditor);
+    setEnabled(isTargetValid(null));
+  }
+  /**
+   * @param _editor l'editeur
+   */
+  private void setSceneEditor(final ZSceneEditor _sceneEditor) {
+    sceneEditor_ = _sceneEditor;
+  }
+
+  protected boolean isTargetValid(final Object _o) {
+    // On n'utilise pas le calque actif de la scene (probablement pas encore initialis\xE9), mais l'objet pass\xE9.
+    return (sceneEditor_!=null && (!sceneEditor_.getScene().isRestrictedToCalqueActif() || _o instanceof ZCalqueEditable/*sceneEditor_.getScene().isCalqueActifEditable()*/));
+  }
+
+
+  public void updateBeforeShow() {
+    if (palette_!=null) ((BPaletteRotation)palette_).updateForSelectionChanged();
+  }
+
+  protected BPalettePanelInterface buildPaletteContent() {
+    return new BPaletteRotation(sceneEditor_,formatter_);
+  }
+}

Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteDeplacement.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteDeplacement.java	2008-07-18 07:32:10 UTC (rev 3696)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteDeplacement.java	2008-07-18 07:32:53 UTC (rev 3697)
@@ -1,190 +1,184 @@
-/*
- *  @creation     5 avr. 2005
- *  @modification $Date: 2008-05-13 12:10:31 $
- *  @license      GNU General Public License 2
- *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
- */
-package org.fudaa.ebli.calque.edition;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Arrays;
-
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-
-import com.memoire.bu.BuGridLayout;
-import com.memoire.bu.BuLabel;
-import com.memoire.bu.BuPanel;
-import com.memoire.bu.BuResource;
-import com.memoire.bu.BuTextField;
-import com.memoire.bu.BuToolButton;
-import com.memoire.fu.FuLog;
-
-import org.fudaa.ctulu.CtuluLibString;
-import org.fudaa.ctulu.gis.GISAttributeInterface;
-
-import org.fudaa.ebli.calque.ZSelectionEvent;
-import org.fudaa.ebli.calque.ZSelectionListener;
-import org.fudaa.ebli.commun.BPalettePanelInterface;
-import org.fudaa.ebli.commun.EbliFormatterInterface;
-
-/**
- * Un panneau pour saisir les coordonn\xE9es de d\xE9placement d'objets GIS. 
- * Ce panneau est int\xE9gr\xE9 dans la palette des outils lorsque l'outil "d\xE9placement" est s\xE9lectionn\xE9.
- * 
- * @author Fred Deniger
- * @version $Id: BPaletteDeplacement.java,v 1.1.2.1 2008-05-13 12:10:31 bmarchan Exp $
- */
-public class BPaletteDeplacement extends JPanel implements BPalettePanelInterface, ZSelectionListener,
-    ZCalqueDeplacement.SpecPanel, ActionListener {
-
-  JButton btApply_;
-
-  ZCalqueDeplacement deplacement_;
-  private ZSceneEditor sceneEditor_;
-  EbliFormatterInterface formatter_;
-
-  BuTextField tfDx_;
-  BuTextField tfDy_;
-  BuTextField tfDz_;
-  BuLabel lbDz_;
-  boolean bZ_=false;
-
-  /**
-   * @param _deplacement le calque de deplacement
-   * @param _formatter
-   */
-  public BPaletteDeplacement(ZSceneEditor _sceneEditor, EbliFormatterInterface _formatter) {
-    super();
-    
-//    deplacement_ = _deplacement;
-//    deplacement_.specPanel_ = this;
-    
-    formatter_ = _formatter;
-    sceneEditor_=_sceneEditor;
-    
-    tfDx_ = BuTextField.createDoubleField();
-    tfDx_.setSize(new Dimension(50,tfDx_.getPreferredSize().height));
-    tfDx_.setValue(new Double(0));
-    tfDy_ = BuTextField.createDoubleField();
-    tfDy_.setValue(new Double(0));
-    tfDz_ = BuTextField.createDoubleField();
-    tfDz_.setValue(new Double(0));
-    lbDz_=new BuLabel("dz:");
-    
-    btApply_ = new BuToolButton(BuResource.BU.getToolIcon("appliquer"));
-    btApply_.addActionListener(this);
-
-    BuPanel pnMain=new BuPanel();
-    pnMain.setLayout(new BuGridLayout(2,2,2));
-    pnMain.add(new BuLabel("dx:"));
-    pnMain.add(tfDx_);
-    pnMain.add(new BuLabel("dy:"));
-    pnMain.add(tfDy_);
-    pnMain.add(lbDz_);
-    pnMain.add(tfDz_);
-    
-    BuPanel pnButtons=new BuPanel();
-    pnButtons.setLayout(new BorderLayout(5,5));
-    pnButtons.add(btApply_,BorderLayout.SOUTH);
-
-    setLayout(new BorderLayout(5,5));
-    add(pnMain,BorderLayout.CENTER);
-    add(pnButtons,BorderLayout.EAST);
-
-    setName("pnMove");
-
-    sceneEditor_.getScene().addSelectionListener(this);
-  }
-
-  public void actionPerformed(final ActionEvent _e){
-    if (btApply_.isEnabled() && btApply_ == _e.getSource()) {
-      Double dx = (Double) tfDx_.getValue();
-      Double dy = (Double) tfDy_.getValue();
-      Double dz=new Double(0);
-      if (tfDz_.isEnabled()) dz=(Double) tfDz_.getValue();
-      if (dx != null && dy != null && dz!=null) {
-        deplacement_.manualMove(dx.doubleValue(), dy.doubleValue(), dz.doubleValue());
-      }
-
-    }
-  }
-
-  public void setCalqueDeplacement(ZCalqueDeplacement _dep) {
-    deplacement_=_dep;    
-    deplacement_.specPanel_ = this;
-  }
-//  public void close(){
-//    if (FuLog.isTrace()) {
-//      FuLog.trace("EBL: " + getClass().getName() + " close");
-//    }
-//    deplacement_.specPanel_ = null;
-//  }
-
-  public JComponent getComponent(){
-    return this;
-  }
-  
-  public void targetChanged(final ZCalqueEditable _target) {
-    bZ_= (_target != null && _target.getModelEditable() != null && _target.getModelEditable().getGeomData().getAttributeIsZ() != null);
-    lbDz_.setEnabled(bZ_);
-    tfDz_.setEnabled(bZ_);
-  }
-
-  public void updateState(){
-    if (deplacement_.isDragged()) {
-      tfDx_.setEditable(false);
-      tfDy_.setEditable(false);
-      tfDz_.setEditable(false);
-      btApply_.setEnabled(false);
-      tfDx_.setText(formatter_.getXYFormatter().format(deplacement_.getReelDx()));
-      tfDy_.setText(formatter_.getXYFormatter().format(deplacement_.getReelDy()));
-    }
-    else {
-      if (!tfDx_.isEditable()) {
-        tfDx_.setText(CtuluLibString.ZERO);
-        tfDy_.setText(CtuluLibString.ZERO);
-      }
-      tfDx_.setEditable(true);
-      tfDy_.setEditable(true);
-      tfDz_.setEditable(bZ_);
-      btApply_.setEnabled(!deplacement_.isSelectionEmpty());
-    }
-
-  }
-
-  /* (non-Javadoc)
-   * @see org.fudaa.ebli.commun.BPalettePanelInterface#doAfterDisplay()
-   */
-  public void doAfterDisplay() {
-    // TODO Auto-generated method stub
-    
-  }
-
-  /* (non-Javadoc)
-   * @see org.fudaa.ebli.commun.BPalettePanelInterface#paletteDeactivated()
-   */
-  public void paletteDeactivated() {
-    FuLog.trace("BPaletteDeplacement.paletteDeactivated");
-  }
-
-  /* (non-Javadoc)
-   * @see org.fudaa.ebli.commun.BPalettePanelInterface#setPalettePanelTarget(java.lang.Object)
-   */
-  public boolean setPalettePanelTarget(Object _target) {
-    // TODO Auto-generated method stub
-    return false;
-  }
-
-  /* (non-Javadoc)
-   * @see org.fudaa.ebli.calque.ZSelectionListener#selectionChanged(org.fudaa.ebli.calque.ZSelectionEvent)
-   */
-  public void selectionChanged(ZSelectionEvent _evt) {
-    updateState();
-  }
-}
+/*
+ *  @creation     5 avr. 2005
+ *  @modification $Date: 2008-05-13 12:10:31 $
+ *  @license      GNU General Public License 2
+ *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.ebli.calque.edition;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Arrays;
+
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+
+import com.memoire.bu.BuGridLayout;
+import com.memoire.bu.BuLabel;
+import com.memoire.bu.BuPanel;
+import com.memoire.bu.BuResource;
+import com.memoire.bu.BuTextField;
+import com.memoire.bu.BuToolButton;
+import com.memoire.fu.FuLog;
+
+import org.fudaa.ctulu.CtuluLibString;
+import org.fudaa.ctulu.gis.GISAttributeInterface;
+
+import org.fudaa.ebli.calque.ZSelectionEvent;
+import org.fudaa.ebli.calque.ZSelectionListener;
+import org.fudaa.ebli.commun.BPalettePanelInterface;
+import org.fudaa.ebli.commun.EbliFormatterInterface;
+
+/**
+ * Un panneau pour saisir les coordonn\xE9es de d\xE9placement d'objets GIS. 
+ * Ce panneau est int\xE9gr\xE9 dans la palette des outils lorsque l'outil "d\xE9placement" est s\xE9lectionn\xE9.
+ * 
+ * @author Fred Deniger
+ * @version $Id: BPaletteDeplacement.java,v 1.1.2.1 2008-05-13 12:10:31 bmarchan Exp $
+ */
+public class BPaletteDeplacement extends JPanel implements BPalettePanelInterface, ZSelectionListener,
+    ZCalqueDeplacement.SpecPanel, ActionListener {
+
+  JButton btApply_;
+
+  ZCalqueDeplacement deplacement_;
+  private ZSceneEditor sceneEditor_;
+  EbliFormatterInterface formatter_;
+
+  BuTextField tfDx_;
+  BuTextField tfDy_;
+  BuTextField tfDz_;
+  BuLabel lbDz_;
+
+  /**
+   * @param _deplacement le calque de deplacement
+   * @param _formatter
+   */
+  public BPaletteDeplacement(ZSceneEditor _sceneEditor, EbliFormatterInterface _formatter) {
+    super();
+    
+//    deplacement_ = _deplacement;
+//    deplacement_.specPanel_ = this;
+    
+    formatter_ = _formatter;
+    sceneEditor_=_sceneEditor;
+    
+    tfDx_ = BuTextField.createDoubleField();
+    tfDx_.setPreferredSize(new Dimension(70,tfDx_.getPreferredSize().height));
+    tfDx_.setValue(new Double(0));
+    tfDy_ = BuTextField.createDoubleField();
+    tfDy_.setValue(new Double(0));
+    tfDz_ = BuTextField.createDoubleField();
+    tfDz_.setValue(new Double(0));
+    lbDz_=new BuLabel("dz:");
+    
+    btApply_ = new BuToolButton(BuResource.BU.getToolIcon("appliquer"));
+    btApply_.addActionListener(this);
+
+    BuPanel pnMain=new BuPanel();
+    pnMain.setLayout(new BuGridLayout(2,2,2));
+    pnMain.add(new BuLabel("dx:"));
+    pnMain.add(tfDx_);
+    pnMain.add(new BuLabel("dy:"));
+    pnMain.add(tfDy_);
+    pnMain.add(lbDz_);
+    pnMain.add(tfDz_);
+    
+    BuPanel pnButtons=new BuPanel();
+    pnButtons.setLayout(new BorderLayout(5,5));
+    pnButtons.add(btApply_,BorderLayout.SOUTH);
+
+    setLayout(new BorderLayout(5,5));
+    add(pnMain,BorderLayout.CENTER);
+    add(pnButtons,BorderLayout.EAST);
+
+    setName("pnMove");
+
+    sceneEditor_.getScene().addSelectionListener(this);
+  }
+
+  public void actionPerformed(final ActionEvent _e){
+    if (btApply_.isEnabled() && btApply_ == _e.getSource()) {
+      Double dx = (Double) tfDx_.getValue();
+      Double dy = (Double) tfDy_.getValue();
+      Double dz=new Double(0);
+      if (tfDz_.isEnabled()) dz=(Double) tfDz_.getValue();
+      if (dx != null && dy != null && dz!=null) {
+        deplacement_.manualMove(dx.doubleValue(), dy.doubleValue(), dz.doubleValue());
+      }
+
+    }
+  }
+
+  public void setCalqueDeplacement(ZCalqueDeplacement _dep) {
+    deplacement_=_dep;    
+    deplacement_.specPanel_ = this;
+  }
+//  public void close(){
+//    if (FuLog.isTrace()) {
+//      FuLog.trace("EBL: " + getClass().getName() + " close");
+//    }
+//    deplacement_.specPanel_ = null;
+//  }
+
+  public JComponent getComponent(){
+    return this;
+  }
+  
+
+  public void updateState(){
+    if (deplacement_.isDragged()) {
+      tfDx_.setEditable(false);
+      tfDy_.setEditable(false);
+      tfDz_.setEditable(false);
+      btApply_.setEnabled(false);
+      tfDx_.setText(formatter_.getXYFormatter().format(deplacement_.getReelDx()));
+      tfDy_.setText(formatter_.getXYFormatter().format(deplacement_.getReelDy()));
+    }
+    else {
+      if (!tfDx_.isEditable()) {
+        tfDx_.setText(CtuluLibString.ZERO);
+        tfDy_.setText(CtuluLibString.ZERO);
+      }
+      tfDx_.setEditable(true);
+      tfDy_.setEditable(true);
+      tfDz_.setEditable(true);
+      btApply_.setEnabled(!deplacement_.isSelectionEmpty());
+    }
+
+  }
+
+  /* (non-Javadoc)
+   * @see org.fudaa.ebli.commun.BPalettePanelInterface#doAfterDisplay()
+   */
+  public void doAfterDisplay() {
+    // TODO Auto-generated method stub
+    
+  }
+
+  /* (non-Javadoc)
+   * @see org.fudaa.ebli.commun.BPalettePanelInterface#paletteDeactivated()
+   */
+  public void paletteDeactivated() {
+    FuLog.trace("BPaletteDeplacement.paletteDeactivated");
+  }
+
+  /* (non-Javadoc)
+   * @see org.fudaa.ebli.commun.BPalettePanelInterface#setPalettePanelTarget(java.lang.Object)
+   */
+  public boolean setPalettePanelTarget(Object _target) {
+    // TODO Auto-generated method stub
+    return false;
+  }
+
+  /* (non-Javadoc)
+   * @see org.fudaa.ebli.calque.ZSelectionListener#selectionChanged(org.fudaa.ebli.calque.ZSelectionEvent)
+   */
+  public void selectionChanged(ZSelectionEvent _evt) {
+    updateState();
+  }
+}

Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteRotation.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteRotation.java	2008-07-18 07:32:10 UTC (rev 3696)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteRotation.java	2008-07-18 07:32:53 UTC (rev 3697)
@@ -79,7 +79,7 @@
     BuLabel lbAng=new BuLabel(BuResource.BU.getString("Angle:"));
     lbAng.setToolTipText(BuResource.BU.getString("En degr\xE9s"));
     tfX0_ = BuTextField.createDoubleField();
-    tfX0_.setSize(new Dimension(50,tfX0_.getPreferredSize().height));
+    tfX0_.setPreferredSize(new Dimension(70,tfX0_.getPreferredSize().height));
     tfX0_.setValue(new Double(0));
     tfY0_ = BuTextField.createDoubleField();
     tfY0_.setValue(new Double(0));

Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueDeplacement.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueDeplacement.java	2008-07-18 07:32:10 UTC (rev 3696)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueDeplacement.java	2008-07-18 07:32:53 UTC (rev 3697)
@@ -66,9 +66,9 @@
    * @param _dy dy reel
    */
   public final void manualMove(final double _dx, final double _dy, final double _dz) {
-    if (isGele()) {
-      return;
-    }
+//    if (isGele()) {
+//      return;
+//    }
     isDragged_ = false;
     if (target_ != null) {
       target_.moved(_dx, _dy, _dz);


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