Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4112] branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ ebli/visuallibrary
|
From: <had...@us...> - 2008-10-30 10:49:11
|
Revision: 4112
http://fudaa.svn.sourceforge.net/fudaa/?rev=4112&view=rev
Author: hadouxad
Date: 2008-10-30 10:49:01 +0000 (Thu, 30 Oct 2008)
Log Message:
-----------
correction fin rapport recette lot 1
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliSceneController.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGroup.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextEditor.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActiontextEditor.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetGroupAction.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetUngroupAction.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/bahaviorstrategy/AlignWithResizeProportionalStrategy.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/bahaviorstrategy/EbliAlignWithMoveStrategyProvider.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/bahaviorstrategy/EbliWidgetActionFactory.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/bahaviorstrategy/MoveAction.java
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/bahaviorstrategy/
Removed Paths:
-------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/resizestrategy/
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliSceneController.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliSceneController.java 2008-10-30 09:59:16 UTC (rev 4111)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliSceneController.java 2008-10-30 10:49:01 UTC (rev 4112)
@@ -7,8 +7,8 @@
import javax.swing.JScrollPane;
import javax.swing.ListSelectionModel;
-import org.fudaa.ebli.visuallibrary.resizestrategy.EbliAlignWithMoveStrategyProvider;
-import org.fudaa.ebli.visuallibrary.resizestrategy.EbliWidgetActionFactory;
+import org.fudaa.ebli.visuallibrary.bahaviorstrategy.EbliAlignWithMoveStrategyProvider;
+import org.fudaa.ebli.visuallibrary.bahaviorstrategy.EbliWidgetActionFactory;
import org.fudaa.ebli.visuallibrary.tree.EbliJXTreeTableCellRenderer;
import org.jdesktop.swingx.JXTreeTable;
import org.jdesktop.swingx.decorator.HighlighterFactory;
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGroup.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGroup.java 2008-10-30 09:59:16 UTC (rev 4111)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGroup.java 2008-10-30 10:49:01 UTC (rev 4112)
@@ -1,5 +1,14 @@
package org.fudaa.ebli.visuallibrary;
+import java.awt.Dimension;
+import java.awt.Point;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.netbeans.api.visual.widget.Widget;
+
/**
* Widget qui a pour but de grouper plusieurs sous widget.
*
@@ -9,9 +18,62 @@
public final static String NOGROUP = "N/A";
+
+ /**
+ * Enregistre les proportions des widgets initialement par rapport a la taille de la widget
+ */
+ public Map<EbliWidget,Couple> listeProportionsWidgets=new HashMap<EbliWidget,Couple>();
+
public EbliWidgetGroup(final EbliScene scene) {
super(scene);
// TODO Auto-generated constructor stub
}
+
+
+ private class Couple{
+ public double propX;
+ public double propY;
+ public Couple(double propX, double propY) {
+ super();
+ this.propX = propX;
+ this.propY = propY;
+ }
+ }
+
+ public void setProportions(){
+ if(getPreferredSize()==null)
+ return;
+ double width=getPreferredSize().width;
+ double height=getPreferredSize().height;
+
+ for(Widget widget:getChildren()){
+ if(widget instanceof EbliWidget && widget.getPreferredSize()!=null){
+ double w=widget.getPreferredSize().width;
+ double h=widget.getPreferredSize().height;
+
+ Couple prop=new Couple(w/width,h/height);
+ listeProportionsWidgets.put((EbliWidget) widget, prop);
+ }
+
+ }
+ }
+
+ public Dimension getPropDimension(EbliWidget widget){
+
+ Couple proportions=listeProportionsWidgets.get(widget);
+ if(proportions==null)
+ return null;
+
+ if(getBounds()==null)
+ return null;
+ int width=getBounds().width;
+ int height=getBounds().height;
+
+ double w=proportions.propX*width;
+ double h=proportions.propY*height;
+
+ return new Dimension((int)w,(int)h);
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextEditor.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextEditor.java 2008-10-30 09:59:16 UTC (rev 4111)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextEditor.java 2008-10-30 10:49:01 UTC (rev 4112)
@@ -15,7 +15,7 @@
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuPanel;
-public class EbliWidgetTextEditor extends EbliWidget implements InplaceEditorProvider<BuPanel> {
+public class EbliWidgetTextEditor extends EbliWidget implements InplaceEditorProvider<CtuluHtmlEditorPanel> {
// editeur de texte
CtuluHtmlEditorPanel editorPane_ = new CtuluHtmlEditorPanel();
@@ -30,7 +30,8 @@
super(scene, false);
editorPane_ = content;
- intern_ = new ComponentWidget(scene, contenuHTML_);
+ intern_ = new ComponentWidget(scene, contenuHTML_);
+ // intern_ = new ComponentWidget(scene, editorPane_.);
contenuHTML_.setText(content.getDocumentText());
// -- ajout en interne du label d affichage --//
@@ -81,7 +82,7 @@
//
//
// }
- public BuPanel createEditorComponent(
+ public CtuluHtmlEditorPanel createEditorComponent(
final org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller, final Widget widget) {
// --creation du panel ekitcore
if (conteneur == null) {
@@ -99,21 +100,21 @@
}
// -- on masque l affichage du widgetcomponent --//
- contenuHTML_.setText("");
+ // contenuHTML_.setText("");
- return conteneur;
+ return editorPane_;
}
public EnumSet<org.netbeans.api.visual.action.InplaceEditorProvider.ExpansionDirection> getExpansionDirections(
final org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller, final Widget widget,
- final BuPanel editor) {
+ final CtuluHtmlEditorPanel editor) {
return null;
}
public Rectangle getInitialEditorComponentBounds(
final org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller, final Widget widget,
- final BuPanel editor, final Rectangle viewBounds) {
+ final CtuluHtmlEditorPanel editor, final Rectangle viewBounds) {
return null;
}
@@ -133,9 +134,9 @@
//
// }
- public void notifyClosing(final EditorController _controller, final Widget _widget, final BuPanel _editor,
+ public void notifyClosing(final EditorController _controller, final Widget _widget, final CtuluHtmlEditorPanel _editor,
final boolean _commit) {
- // contenuHTML_.setText(editorPane_.getDocumentText());
+ contenuHTML_.setText(editorPane_.getDocumentText());
intern_.repaint();
intern_.revalidate();
this.repaint();
@@ -144,10 +145,13 @@
}
- public void notifyOpened(final EditorController _controller, final Widget _widget, final BuPanel _editor) {
- // contenuHTML_.setText(CtuluHtmlEditorPanel.showMinimalHtmlDialog("",
- // getEbliScene().getView(), true));
- editingStart();
+ public void notifyOpened(final EditorController _controller, final Widget _widget, final CtuluHtmlEditorPanel _editor) {
+ //contenuHTML_.setText(CtuluHtmlEditorPanel.showMinimalHtmlDialog(contenuHTML_.getText(),
+ //getEbliScene().getView(), true));
+ //editorPane_.setDocumentText(contenuHTML_.getText());
+ // -- on masque l affichage du widgetcomponent --//
+ contenuHTML_.setText("");
+ editingStart();
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActiontextEditor.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActiontextEditor.java 2008-10-30 09:59:16 UTC (rev 4111)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActiontextEditor.java 2008-10-30 10:49:01 UTC (rev 4112)
@@ -30,8 +30,8 @@
// -- creation de la widget et ajout dans la scene --//
final EbliNodeDefault nodeText = new EbliNodeDefault();
nodeText.setTitle("Texte");
- final CtuluHtmlEditorPanel editor = new CtuluHtmlEditorPanel(EbliLib.getS("Double-cliquez pour \xE9diter"),
- CtuluHtmlEditorPanel.getMinimalActions());
+ final CtuluHtmlEditorPanel editor = new CtuluHtmlEditorPanel(EbliLib.getS("Double-cliquez pour \xE9diter")/*,
+ CtuluHtmlEditorPanel.getMinimalActions()*/);
// editor.setDocumentText();
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetGroupAction.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetGroupAction.java 2008-10-30 09:59:16 UTC (rev 4111)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetGroupAction.java 2008-10-30 10:49:01 UTC (rev 4112)
@@ -165,6 +165,9 @@
}
+ //-- sauvegarde des proportions pour le ungroup --//
+ parent.setProportions();
+
final EbliWidgetGroupCreator creator = new EbliWidgetGroupCreator();
parent.setGroup(true);
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetUngroupAction.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetUngroupAction.java 2008-10-30 09:59:16 UTC (rev 4111)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetUngroupAction.java 2008-10-30 10:49:01 UTC (rev 4112)
@@ -4,6 +4,7 @@
*/
package org.fudaa.ebli.visuallibrary.actions;
+import java.awt.Dimension;
import java.awt.Point;
import java.awt.event.ActionEvent;
import java.util.ArrayList;
@@ -14,6 +15,7 @@
import org.fudaa.ebli.visuallibrary.EbliNode;
import org.fudaa.ebli.visuallibrary.EbliScene;
import org.fudaa.ebli.visuallibrary.EbliWidget;
+import org.fudaa.ebli.visuallibrary.EbliWidgetGroup;
import org.fudaa.ebli.visuallibrary.calque.EbliWidgetFusionCalques;
import org.netbeans.api.visual.widget.Widget;
@@ -55,7 +57,14 @@
w.removePropertyChangeListenerFormWidget((EbliWidget) widget);
_n.setPreferedLocation(toScene);
- _n.setPreferedSize(widget.getPreferredSize());
+
+ //-- on essaie de recuperere les proportions --//
+ //getPropDimension
+ Dimension sizeProp=((EbliWidgetGroup)_n.getWidget().getIntern()).getPropDimension((EbliWidget) widget);
+ if(sizeProp!=null)
+ n.setPreferedSize(sizeProp);
+ else
+ n.setPreferedSize(widget.getPreferredSize());
// widget.setPreferredLocation(toScene);
_scene.addNode(n).setPreferredLocation(toScene);
n.getWidget().getController().replaceActionResize();
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/bahaviorstrategy
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/bahaviorstrategy/AlignWithResizeProportionalStrategy.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/resizestrategy/AlignWithResizeProportionalStrategy.java 2008-10-29 20:57:44 UTC (rev 4109)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/bahaviorstrategy/AlignWithResizeProportionalStrategy.java 2008-10-30 10:49:01 UTC (rev 4112)
@@ -1,4 +1,4 @@
-package org.fudaa.ebli.visuallibrary.resizestrategy;
+package org.fudaa.ebli.visuallibrary.bahaviorstrategy;
import java.awt.Insets;
import java.awt.Point;
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/bahaviorstrategy/EbliAlignWithMoveStrategyProvider.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/resizestrategy/EbliAlignWithMoveStrategyProvider.java 2008-10-29 20:57:44 UTC (rev 4109)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/bahaviorstrategy/EbliAlignWithMoveStrategyProvider.java 2008-10-30 10:49:01 UTC (rev 4112)
@@ -2,7 +2,7 @@
* Licence GPL
* Copyright Genesis
*/
-package org.fudaa.ebli.visuallibrary.resizestrategy;
+package org.fudaa.ebli.visuallibrary.bahaviorstrategy;
import java.awt.Point;
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/bahaviorstrategy/EbliWidgetActionFactory.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/resizestrategy/EbliWidgetActionFactory.java 2008-10-29 20:57:44 UTC (rev 4109)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/bahaviorstrategy/EbliWidgetActionFactory.java 2008-10-30 10:49:01 UTC (rev 4112)
@@ -1,4 +1,4 @@
-package org.fudaa.ebli.visuallibrary.resizestrategy;
+package org.fudaa.ebli.visuallibrary.bahaviorstrategy;
import java.awt.BasicStroke;
import java.awt.Color;
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/bahaviorstrategy/MoveAction.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/resizestrategy/MoveAction.java 2008-10-29 20:57:44 UTC (rev 4109)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/bahaviorstrategy/MoveAction.java 2008-10-30 10:49:01 UTC (rev 4112)
@@ -1,4 +1,4 @@
-package org.fudaa.ebli.visuallibrary.resizestrategy;
+package org.fudaa.ebli.visuallibrary.bahaviorstrategy;
import java.awt.Point;
import java.awt.event.MouseEvent;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
