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

[<emm...@us...>]

Revision: 4214
          http://fudaa.svn.sourceforge.net/fudaa/?rev=4214&view=rev
Author:   emmanuel_martin
Date:     2008-11-13 10:09:54 +0000 (Thu, 13 Nov 2008)

Log Message:
-----------
#60 bis

Modified Paths:
--------------
    branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/CalqueGISEditionAction.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEdition.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/CalqueGISEditionAction.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/CalqueGISEditionAction.java	2008-11-12 17:09:52 UTC (rev 4213)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/CalqueGISEditionAction.java	2008-11-13 10:09:54 UTC (rev 4214)
@@ -92,7 +92,7 @@
     if (target_ != newTarget) {
       target_ = newTarget;
       if (isSelected()) {
-        setPaletteTarget(target_ == null ? null : editor_);
+        setPaletteTarget(editor_);
       } else {
         setEnabled(isTargetValid(null));
       }

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEdition.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEdition.java	2008-11-12 17:09:52 UTC (rev 4213)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEdition.java	2008-11-13 10:09:54 UTC (rev 4214)
@@ -308,7 +308,7 @@
     _target.add(bt);
   }
 
-  final static String ATOM_ACTION = "MODE_ATOME";
+  public final static String ATOM_ACTION = "MODE_ATOME";
 
   /**
    * Envoie les commandes au receveur suite \xE0 un click sur un bouton.

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java	2008-11-12 17:09:52 UTC (rev 4213)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java	2008-11-13 10:09:54 UTC (rev 4214)
@@ -13,7 +13,6 @@
 
 import javax.swing.AbstractButton;
 
-import org.fudaa.ctulu.CtuluCommandManager;
 import org.fudaa.ctulu.CtuluIOOperationSynthese;
 import org.fudaa.ctulu.CtuluRunnable;
 import org.fudaa.ctulu.ProgressionInterface;
@@ -21,26 +20,21 @@
 import org.fudaa.ctulu.gui.CtuluLibSwing;
 import org.fudaa.ebli.calque.BCalque;
 import org.fudaa.ebli.calque.BGroupeCalque;
-import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
 import org.fudaa.ebli.calque.action.SceneSplitAction;
 import org.fudaa.ebli.calque.dessin.DeForme;
+import org.fudaa.ebli.calque.edition.BPaletteEdition;
 import org.fudaa.ebli.calque.edition.ZCalqueEditable;
 import org.fudaa.ebli.commun.EbliActionAbstract;
 import org.fudaa.ebli.commun.EbliActionInterface;
 import org.fudaa.fudaa.commun.FudaaLib;
-import org.fudaa.fudaa.modeleur.action.CalqueNewCalqueAction;
 import org.fudaa.fudaa.modeleur.action.SceneDecimationAction;
 import org.fudaa.fudaa.modeleur.action.SceneInterpolationAction;
 import org.fudaa.fudaa.modeleur.action.SceneMoveInLayerAction;
 import org.fudaa.fudaa.modeleur.action.SceneProjectionAction;
 import org.fudaa.fudaa.modeleur.action.SceneRefinementAction;
-import org.fudaa.fudaa.modeleur.layer.MdlLayerFactory;
-import org.fudaa.fudaa.modeleur.layer.MdlLayerInterface;
-import org.fudaa.fudaa.ressource.FudaaResource;
 import org.fudaa.fudaa.sig.layer.FSigEditor;
 import org.fudaa.fudaa.sig.layer.FSigLayerExporter;
 import org.fudaa.fudaa.sig.layer.FSigLayerFilter;
-import org.fudaa.fudaa.sig.layer.FSigLayerGroup;
 import org.fudaa.fudaa.sig.layer.FSigVisuPanel;
 
 import com.memoire.bu.BuWizardDialog;
@@ -150,10 +144,43 @@
 
   }
   
+  @Override
   public void updatePalette() {
-    super.updatePalette();
-    if(palette_!=null)
-      palette_.setEnable("MODE_ATOME", true);
+    if (palette_ == null) {
+      return;
+    }
+    if (target_ == null) {
+      palette_.setAllEnable(false);
+      palette_.setEnable(BPaletteEdition.ATOM_ACTION, true);
+      boolean atomic = palette_.isAtomicMode();
+      getSupport().setAtomicMode(atomic);
+      palette_.setAtomeEnable(getSupport().canUseAtomicMode(), getSupport().isAtomicMode());
+      palette_.checkEnableAndCheckBt();
+      changeState(null);
+    } else {
+      palette_.setAllEnable(true);
+      boolean atomic = palette_.isAtomicMode();
+      getSupport().setAtomicMode(atomic);
+      palette_.setAtomeEnable(getSupport().canUseAtomicMode(), getSupport().isAtomicMode());
+      boolean isModifiable = true;
+      if(target_.getModelEditable()!=null)
+        if (target_.getModelEditable().getGeomData() != null)
+          isModifiable = target_.getModelEditable().getGeomData().isGeomModifiable();
+      palette_.setEnable("GLOBAL_ADD_POINT", target_.canAddForme(DeForme.POINT) && isModifiable);
+      palette_.setEnable("GLOBAL_ADD_POLYLIGNE", target_.canAddForme(DeForme.LIGNE_BRISEE) && isModifiable);
+      palette_.setEnable("GLOBAL_ADD_RECTANGLE", target_.canAddForme(DeForme.RECTANGLE) && isModifiable);
+      palette_.setEnable("GLOBAL_ADD_ELLIPSE", target_.canAddForme(DeForme.ELLIPSE) && isModifiable);
+      palette_.setEnable("GLOBAL_ADD_POLYGONE", target_.canAddForme(DeForme.POLYGONE) && isModifiable);
+      palette_.setEnable("GLOBAL_ADD_SEMIS", target_.canAddForme(DeForme.MULTI_POINT) && isModifiable);
+
+    }
+    palette_.checkEnableAndCheckBt();
+    final AbstractButton bt = palette_.getSelectedButton();
+    if (bt == null) {
+      changeState(null);
+    } else {
+      changeState(bt.getActionCommand());
+    }
   }
   
 }


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