Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[3822] branches/Prepro-0.92-SNAPSHOT
|
From: <had...@us...> - 2008-08-18 13:33:04
|
Revision: 3822
http://fudaa.svn.sourceforge.net/fudaa/?rev=3822&view=rev
Author: hadouxad
Date: 2008-08-18 13:33:11 +0000 (Mon, 18 Aug 2008)
Log Message:
-----------
- Gestion des retaillage:
- horizontal min et max
- vertical min et max
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/CommandRetaillage.java
branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionRetaillageHorizontal.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionRetaillageVertical.java
Removed Paths:
-------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionRetaillage.java
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/CommandRetaillage.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/CommandRetaillage.java 2008-08-18 13:07:12 UTC (rev 3821)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/CommandRetaillage.java 2008-08-18 13:33:11 UTC (rev 3822)
@@ -16,10 +16,10 @@
public class CommandRetaillage implements CtuluCommand {
List<Rectangle> oldRectangles;
- Rectangle newRectangle;
+ List<Rectangle> newRectangle;
java.util.List<EbliWidget> widgets_;
- public CommandRetaillage(List<EbliWidget> listeWidget, List<Rectangle> oldRectangle, Rectangle newRectangle) {
+ public CommandRetaillage(List<EbliWidget> listeWidget, List<Rectangle> oldRectangle, List<Rectangle> newRectangle) {
super();
this.widgets_ = listeWidget;
this.newRectangle = newRectangle;
@@ -49,7 +49,7 @@
if (nb == 0)
return;
for (int i = 0; i < nb; i++) {
- widgets_.get(i).setPreferredBounds(newRectangle);
+ widgets_.get(i).setPreferredBounds(newRectangle.get(i));
}
refreshScene();
Deleted: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionRetaillage.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionRetaillage.java 2008-08-18 13:07:12 UTC (rev 3821)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionRetaillage.java 2008-08-18 13:33:11 UTC (rev 3822)
@@ -1,123 +0,0 @@
-package org.fudaa.ebli.visuallibrary.actions;
-
-import java.awt.Rectangle;
-import java.awt.event.ActionEvent;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.fudaa.ctulu.CtuluCommandContainer;
-import org.fudaa.ctulu.CtuluResource;
-import org.fudaa.ebli.commun.EbliActionSimple;
-import org.fudaa.ebli.ressource.EbliResource;
-import org.fudaa.ebli.visuallibrary.EbliNode;
-import org.fudaa.ebli.visuallibrary.EbliScene;
-import org.fudaa.ebli.visuallibrary.EbliWidget;
-
-/**
- * classe qui permet de redimensionnner les widgets selectionnes au min ou max
- * selon choix du type dans le constructeur.
- *
- * @author genesis
- *
- */
-public class EbliWidgetActionRetaillage extends EbliActionSimple {
-
- public final static int RETAIILLAGE_MAX = 0;
- public final static int RETAIILLAGE_MIN = 1;
-
- public int typeRetaillage_;
- EbliScene scene_;
- CtuluCommandContainer cmd_;
-
- public EbliWidgetActionRetaillage(EbliScene _scene, int _typeRetaillage) {
- super(EbliResource.EBLI.getString("Premier plan"), CtuluResource.CTULU.getIcon("crystal_rangericones"), "FORGROUND");
-
- // -- type retailage --//
- typeRetaillage_ = _typeRetaillage;
-
- scene_ = _scene;
- cmd_=_scene.getCmdMng();
- if (_typeRetaillage == RETAIILLAGE_MAX) {
- putValue(NAME, "Resize max");
- setIcon(CtuluResource.CTULU.getIcon("crystal_rangericones"));
- } else {
- putValue(NAME, "Resize min");
- setIcon(CtuluResource.CTULU.getIcon("crystal_rangerpalettes"));
-
- }
- }
-
- private static final long serialVersionUID = 1L;
-
- public void actionPerformed(ActionEvent e) {
- // TODO Auto-generated method stub
-
- // -- recuperation de la liste des nodes de la scene --//
- Set<EbliNode> listeNode = (Set<EbliNode>) scene_.getSelectedObjects();
-
- //-- recherche du Min/Max selon choix constructeur --//
- Iterator<EbliNode> it = listeNode.iterator();
- Rectangle tailleAresize = null;
- if (it.hasNext()){
- tailleAresize = it.next().getCreator().getWidget().getPreferredBounds();
- for (; it.hasNext();) {
-
- EbliNode currentNode=it.next();
-
- if(typeRetaillage_==RETAIILLAGE_MAX && currentNode.hasWidget()){
- if (tailleAresize.width < currentNode.getCreator().getWidget().getPreferredBounds().width
- && tailleAresize.height < currentNode.getCreator().getWidget().getPreferredBounds().height)
- tailleAresize = currentNode.getCreator().getWidget().getPreferredBounds();
- } else if(currentNode.hasWidget()){
- if (tailleAresize.width > currentNode.getCreator().getWidget().getPreferredBounds().width
- && tailleAresize.height > currentNode.getCreator().getWidget().getPreferredBounds().height)
- tailleAresize = currentNode.getCreator().getWidget().getPreferredBounds();
- }
- }
- }
-
- //-- si rien n est selectionne --//
- if(tailleAresize==null)
- return;
-
-
- //-- recupere les anciennes color --//
- List<Rectangle> oldRectangle = new ArrayList<Rectangle>();
- ;
- //-- liste des widget selectionnees --//
- java.util.List<EbliWidget> listeWidget=new ArrayList<EbliWidget>();
-
-
- // -- parcours des nodes
- for (Iterator<EbliNode> it2 = listeNode.iterator(); it2.hasNext();) {
-
-
-
- EbliNode currentNode = it2.next();
- if (currentNode != null && currentNode.hasWidget()) {
-
- listeWidget.add(currentNode.getCreator().getWidget());
- oldRectangle.add(currentNode.getCreator().getWidget().getPreferredBounds());
-
- // -- retaillage --//
- currentNode.getCreator().getWidget().setPreferredBounds(tailleAresize);
-
- // -- rafraichissement de la scene --//
- scene_.refresh();
-
-
- }
-
- }
- //-- ajout de l action undo redo --//
-
- if (cmd_ != null) {
- cmd_.addCmd(new CommandRetaillage(listeWidget, oldRectangle, tailleAresize));
- }
-
-
-
- }
-}
Copied: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionRetaillageHorizontal.java (from rev 3809, branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionRetaillage.java)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionRetaillageHorizontal.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionRetaillageHorizontal.java 2008-08-18 13:33:11 UTC (rev 3822)
@@ -0,0 +1,126 @@
+package org.fudaa.ebli.visuallibrary.actions;
+
+import java.awt.Dimension;
+import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.fudaa.ctulu.CtuluCommandContainer;
+import org.fudaa.ctulu.CtuluResource;
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.ebli.ressource.EbliResource;
+import org.fudaa.ebli.visuallibrary.EbliNode;
+import org.fudaa.ebli.visuallibrary.EbliScene;
+import org.fudaa.ebli.visuallibrary.EbliWidget;
+
+/**
+ * classe qui permet de redimensionnner les widgets selectionnes au min ou max
+ * selon choix du type dans le constructeur.
+ *
+ * @author Adrien Hadoux
+ *
+ */
+public class EbliWidgetActionRetaillageHorizontal extends EbliActionSimple {
+
+ public final static int RETAIILLAGE_MAX = 0;
+ public final static int RETAIILLAGE_MIN = 1;
+
+ public int typeRetaillage_;
+ EbliScene scene_;
+ CtuluCommandContainer cmd_;
+
+ public EbliWidgetActionRetaillageHorizontal(EbliScene _scene, int _typeRetaillage) {
+ super(EbliResource.EBLI.getString("Premier plan"), CtuluResource.CTULU.getIcon("crystal_rangericones"), "FORGROUND");
+
+ // -- type retailage --//
+ typeRetaillage_ = _typeRetaillage;
+
+ scene_ = _scene;
+ cmd_=_scene.getCmdMng();
+ if (_typeRetaillage == RETAIILLAGE_MAX) {
+ putValue(NAME, "Resize Horizontal Max");
+ setIcon(EbliResource.EBLI.getToolIcon("aowidest"));
+ } else {
+ putValue(NAME, "Resize Horizontal Min");
+ setIcon(CtuluResource.CTULU.getIcon("crystal_rangericones"));
+
+ }
+ }
+
+ private static final long serialVersionUID = 1L;
+
+ public void actionPerformed(ActionEvent e) {
+ // TODO Auto-generated method stub
+
+ // -- recuperation de la liste des nodes de la scene --//
+ Set<EbliNode> listeNode = (Set<EbliNode>) scene_.getSelectedObjects();
+
+ //-- recherche du Min/Max selon choix constructeur --//
+ Iterator<EbliNode> it = listeNode.iterator();
+ Rectangle tailleAresize = null;
+ if (it.hasNext()){
+ tailleAresize = it.next().getCreator().getWidget().getPreferredBounds();
+ for (; it.hasNext();) {
+
+ EbliNode currentNode=it.next();
+
+ if(typeRetaillage_==RETAIILLAGE_MAX && currentNode.hasWidget()){
+ if (tailleAresize.width < currentNode.getCreator().getWidget().getPreferredBounds().width)
+ tailleAresize = currentNode.getCreator().getWidget().getPreferredBounds();
+ } else if(currentNode.hasWidget()){
+ if (tailleAresize.width > currentNode.getCreator().getWidget().getPreferredBounds().width)
+ tailleAresize = currentNode.getCreator().getWidget().getPreferredBounds();
+ }
+ }
+ }
+
+ //-- si rien n est selectionne --//
+ if(tailleAresize==null)
+ return;
+
+
+ //-- recupere les anciennes color --//
+ List<Rectangle> oldRectangle = new ArrayList<Rectangle>();
+ List<Rectangle> newRectangle = new ArrayList<Rectangle>();
+ //-- liste des widget selectionnees --//
+ java.util.List<EbliWidget> listeWidget=new ArrayList<EbliWidget>();
+
+
+ // -- parcours des nodes
+ for (Iterator<EbliNode> it2 = listeNode.iterator(); it2.hasNext();) {
+
+
+
+ EbliNode currentNode = it2.next();
+ if (currentNode != null && currentNode.hasWidget()) {
+
+ listeWidget.add(currentNode.getCreator().getWidget());
+ oldRectangle.add(currentNode.getCreator().getWidget().getPreferredBounds());
+
+ // -- retaillage --//
+ currentNode.getCreator().getWidget().setPreferredBounds(
+ new Rectangle(new Dimension(tailleAresize.width,
+ currentNode.getCreator().getWidget().getPreferredBounds().height)));
+
+ newRectangle.add(currentNode.getCreator().getWidget().getPreferredBounds());
+
+ // -- rafraichissement de la scene --//
+ scene_.refresh();
+
+
+ }
+
+ }
+ //-- ajout de l action undo redo --//
+
+ if (cmd_ != null) {
+ cmd_.addCmd(new CommandRetaillage(listeWidget, oldRectangle, newRectangle));
+ }
+
+
+
+ }
+}
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionRetaillageHorizontal.java
___________________________________________________________________
Added: svn:mergeinfo
+
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionRetaillageVertical.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionRetaillageVertical.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionRetaillageVertical.java 2008-08-18 13:33:11 UTC (rev 3822)
@@ -0,0 +1,119 @@
+package org.fudaa.ebli.visuallibrary.actions;
+
+import java.awt.Dimension;
+import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.fudaa.ctulu.CtuluCommandContainer;
+import org.fudaa.ctulu.CtuluResource;
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.ebli.ressource.EbliResource;
+import org.fudaa.ebli.visuallibrary.EbliNode;
+import org.fudaa.ebli.visuallibrary.EbliScene;
+import org.fudaa.ebli.visuallibrary.EbliWidget;
+
+/**
+ * classe qui permet de redimensionnner les widgets selectionnes au min ou max
+ * selon choix du type dans le constructeur.
+ *
+ * @author Adrien Hadoux
+ *
+ */
+public class EbliWidgetActionRetaillageVertical extends EbliActionSimple {
+
+ public final static int RETAIILLAGE_MAX = 0;
+ public final static int RETAIILLAGE_MIN = 1;
+
+ public int typeRetaillage_;
+ EbliScene scene_;
+ CtuluCommandContainer cmd_;
+
+ public EbliWidgetActionRetaillageVertical(EbliScene _scene, int _typeRetaillage) {
+ super(EbliResource.EBLI.getString("Premier plan"), CtuluResource.CTULU.getIcon("crystal_rangericones"), "FORGROUND");
+
+ // -- type retailage --//
+ typeRetaillage_ = _typeRetaillage;
+
+ scene_ = _scene;
+ cmd_ = _scene.getCmdMng();
+ if (_typeRetaillage == RETAIILLAGE_MAX) {
+ putValue(NAME, "Resize Vertical Max");
+ setIcon(EbliResource.EBLI.getToolIcon("aotallest"));
+ } else {
+ putValue(NAME, "Resize Vertical Min");
+ setIcon(CtuluResource.CTULU.getIcon("crystal_rangerpalettes"));
+
+ }
+ }
+
+ private static final long serialVersionUID = 1L;
+
+ public void actionPerformed(ActionEvent e) {
+ // TODO Auto-generated method stub
+
+ // -- recuperation de la liste des nodes de la scene --//
+ Set<EbliNode> listeNode = (Set<EbliNode>) scene_.getSelectedObjects();
+
+ // -- recherche du Min/Max selon choix constructeur --//
+ Iterator<EbliNode> it = listeNode.iterator();
+ Rectangle tailleAresize = null;
+ if (it.hasNext()) {
+ tailleAresize = it.next().getCreator().getWidget().getPreferredBounds();
+ for (; it.hasNext();) {
+
+ EbliNode currentNode = it.next();
+
+ if (typeRetaillage_ == RETAIILLAGE_MAX && currentNode.hasWidget()) {
+ if (tailleAresize.height < currentNode.getCreator().getWidget().getPreferredBounds().height)
+ tailleAresize = currentNode.getCreator().getWidget().getPreferredBounds();
+ } else if (currentNode.hasWidget()) {
+ if (tailleAresize.height > currentNode.getCreator().getWidget().getPreferredBounds().height)
+ tailleAresize = currentNode.getCreator().getWidget().getPreferredBounds();
+ }
+ }
+ }
+
+ // -- si rien n est selectionne --//
+ if (tailleAresize == null)
+ return;
+
+ // -- recupere les anciennes color --//
+ List<Rectangle> oldRectangle = new ArrayList<Rectangle>();
+ List<Rectangle> newRectangle = new ArrayList<Rectangle>();
+ // -- liste des widget selectionnees --//
+ java.util.List<EbliWidget> listeWidget = new ArrayList<EbliWidget>();
+
+ // -- parcours des nodes
+ for (Iterator<EbliNode> it2 = listeNode.iterator(); it2.hasNext();) {
+
+ EbliNode currentNode = it2.next();
+ if (currentNode != null && currentNode.hasWidget()) {
+
+ listeWidget.add(currentNode.getCreator().getWidget());
+ oldRectangle.add(currentNode.getCreator().getWidget().getPreferredBounds());
+
+ // -- retaillage --//
+ currentNode.getCreator().getWidget().setPreferredBounds(
+ new Rectangle(new Dimension(currentNode.getCreator().getWidget().getPreferredBounds().width,
+ tailleAresize.height)));
+
+
+ newRectangle.add(currentNode.getCreator().getWidget().getPreferredBounds());
+ // -- rafraichissement de la scene --//
+ scene_.refresh();
+
+ }
+
+ }
+ // -- ajout de l action undo redo --//
+
+ if (cmd_ != null) {
+ cmd_.addCmd(new CommandRetaillage(listeWidget, oldRectangle, newRectangle));
+ }
+
+ }
+}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-18 13:07:12 UTC (rev 3821)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-18 13:33:11 UTC (rev 3822)
@@ -60,7 +60,8 @@
import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionFont;
import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionForeGround;
import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionImageChooser;
-import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionRetaillage;
+import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionRetaillageHorizontal;
+import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionRetaillageVertical;
import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActiontextEditor;
import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorVueCalque;
import org.fudaa.ebli.visuallibrary.creator.ShapeCreatorCircle;
@@ -441,8 +442,10 @@
bar.add(new EbliWidgetActionColorBackground(scene));
- bar.add(new EbliWidgetActionRetaillage(scene, EbliWidgetActionRetaillage.RETAIILLAGE_MIN));
- bar.add(new EbliWidgetActionRetaillage(scene, EbliWidgetActionRetaillage.RETAIILLAGE_MAX));
+ bar.add(new EbliWidgetActionRetaillageHorizontal(scene, EbliWidgetActionRetaillageHorizontal.RETAIILLAGE_MIN));
+ bar.add(new EbliWidgetActionRetaillageHorizontal(scene, EbliWidgetActionRetaillageHorizontal.RETAIILLAGE_MAX));
+ bar.add(new EbliWidgetActionRetaillageVertical(scene, EbliWidgetActionRetaillageVertical.RETAIILLAGE_MIN));
+ bar.add(new EbliWidgetActionRetaillageVertical(scene, EbliWidgetActionRetaillageVertical.RETAIILLAGE_MAX));
bar.add(new EbliWidgetActionImageChooser(scene));
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java 2008-08-18 13:07:12 UTC (rev 3821)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java 2008-08-18 13:33:11 UTC (rev 3822)
@@ -36,7 +36,8 @@
import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionDuplicate;
import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionForeGround;
import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionImageChooser;
-import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionRetaillage;
+import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionRetaillageHorizontal;
+import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionRetaillageVertical;
import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActiontextEditor;
import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorVueCalque;
import org.fudaa.ebli.visuallibrary.creator.ShapeCreatorCircle;
@@ -355,11 +356,12 @@
init.add(null);
// -- actions de retaillage min et max --//
- init.add(new EbliWidgetActionRetaillage(getScene(), EbliWidgetActionRetaillage.RETAIILLAGE_MIN));
- init.add(new EbliWidgetActionRetaillage(getScene(), EbliWidgetActionRetaillage.RETAIILLAGE_MAX));
+ init.add(new EbliWidgetActionRetaillageHorizontal(getScene(), EbliWidgetActionRetaillageHorizontal.RETAIILLAGE_MIN));
+ init.add(new EbliWidgetActionRetaillageHorizontal(getScene(), EbliWidgetActionRetaillageHorizontal.RETAIILLAGE_MAX));
init.add(null);
-
-
+ init.add(new EbliWidgetActionRetaillageVertical(getScene(), EbliWidgetActionRetaillageVertical.RETAIILLAGE_MIN));
+ init.add(new EbliWidgetActionRetaillageVertical(getScene(), EbliWidgetActionRetaillageVertical.RETAIILLAGE_MAX));
+ init.add(null);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
