Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[3717] branches/Prepro-0.92-SNAPSHOT/ebli
|
From: <had...@us...> - 2008-08-06 17:24:29
|
Revision: 3717
http://fudaa.svn.sourceforge.net/fudaa/?rev=3717&view=rev
Author: hadouxad
Date: 2008-08-06 17:24:35 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
AFFECT?\195?\137 - # 40: L?\195?\169gende pour les courbe 1d
http://mantis.genesis-groupe.com//view.php?id=40
-commit de lq visual library remani?\195?\169e
- ajout de la classe rectangle
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGraphe.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTitle.java
branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorRectangle.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-08-06 15:03:18 UTC (rev 3716)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-08-06 17:24:35 UTC (rev 3717)
@@ -51,7 +51,7 @@
getActions().addAction( ActionFactory.createResizeAction());
getActions().addAction(ActionFactory.createMoveAction());
getActions().addAction(scene.createWidgetHoverAction());
- getActions().addAction( scene.createSelectAction());
+ //getActions().addAction( scene.createSelectAction());
setBorder(getScene().getLookFeel().getMiniBorder(ObjectState.createNormal()));
@@ -137,6 +137,8 @@
public void actionPerformed(ActionEvent e) {
EbliWidget.this.setVisible(false);
+ EbliNode n=(EbliNode)EbliWidget.this.getScene_().findObject(EbliWidget.this);
+ EbliWidget.this.getScene_().removeNode(n);
// NE PAS DECOCHER CES ELEMENTS
//fermeture des widgets children
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorRectangle.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorRectangle.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorRectangle.java 2008-08-06 17:24:35 UTC (rev 3717)
@@ -0,0 +1,29 @@
+package org.fudaa.ebli.visuallibrary;
+
+import org.fudaa.ebli.courbe.EGGraphe;
+
+
+public class EbliWidgetCreatorRectangle implements EbliWidgetCreator {
+
+ String label_;
+
+ public EbliWidgetCreatorRectangle(String g) {
+ super();
+ this.label_ = g;
+ }
+
+ public String getG() {
+ return label_;
+ }
+
+ public void setG(String g) {
+ this.label_ = g;
+ }
+
+ public EbliWidget create(EbliScene _scene) {
+ EbliWidgetRectangle res= new EbliWidgetRectangle(_scene, getG());
+
+ return res;
+ }
+
+}
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorRectangle.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGraphe.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGraphe.java 2008-08-06 15:03:18 UTC (rev 3716)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGraphe.java 2008-08-06 17:24:35 UTC (rev 3717)
@@ -115,7 +115,7 @@
//getScene_().addChild(new EbliWidget(getScene_(),null));
//addChild (WidgetLegendeManager.createLegende(GrapheWidget.this.getGraphe(), GrapheWidget.this.getScene_(),null));
- if(nodeLegende==null){
+ if(!EbliWidgetGraphe.this.getScene_().isObject(nodeLegende)){
//-- creation d'un node legende --//
nodeLegende = new EbliNodeDefault();
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java 2008-08-06 17:24:35 UTC (rev 3717)
@@ -0,0 +1,100 @@
+package org.fudaa.ebli.visuallibrary;
+
+
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.Rectangle;
+
+import org.fudaa.ebli.courbe.EGCourbe;
+import org.fudaa.ebli.trace.TraceIcon;
+import org.fudaa.ebli.trace.TraceIconModel;
+import org.fudaa.ebli.trace.TraceLigne;
+import org.netbeans.api.visual.action.ActionFactory;
+import org.netbeans.api.visual.action.ConnectProvider;
+import org.netbeans.api.visual.action.TextFieldInplaceEditor;
+import org.netbeans.api.visual.action.WidgetAction;
+import org.netbeans.api.visual.layout.LayoutFactory.SerialAlignment;
+import org.netbeans.api.visual.widget.LabelWidget;
+import org.netbeans.api.visual.widget.Scene;
+import org.netbeans.api.visual.widget.Widget;
+import org.netbeans.modules.visual.layout.FlowLayout;
+
+
+
+/**
+ * Legende
+ * Widget qui permet de construire des rectangles avec du texte
+ * @author Adrien Hadoux
+ *
+ */
+public class EbliWidgetRectangle extends EbliWidget implements TextFieldInplaceEditor{
+
+
+
+ LabelWidget intern;
+
+ /**
+ * @param _scene
+ */
+ public EbliWidgetRectangle(EbliScene _scene, String label) {
+ super(_scene);
+ setLayout(new FlowLayout(true, SerialAlignment.CENTER, 23));
+ intern = new LabelWidget(_scene);
+ intern.setLabel(label);
+
+ addChild(intern);
+
+ //-- ajouter l option de remplacer le text dans le label --//
+
+ //-- creation de l action --//
+ WidgetAction editorAction = ActionFactory.createInplaceEditorAction (this);
+
+ //-- ajout de l action au label correspondant --//
+ intern.getActions ().addAction (editorAction);
+
+ intern.getActions ().addAction( ActionFactory.createResizeAction());
+
+
+ //setEnabled(false);
+ }
+
+ public void majLabel(String label){
+ //intern.setForeground();
+ intern.setLabel(label);
+ }
+
+
+ protected void paintWidget() {
+ Graphics2D g = getGraphics();
+ Rectangle rec = getClientArea();
+ g.translate(rec.x, rec.y);
+ //la ligne
+
+ TraceLigne l = new TraceLigne();
+ l.setEpaisseur(5);
+ //l.dessineTrait(g, 0, 0, rec.width, rec.height / 2);
+ l.dessineRectangle(g, 0, 0, rec.width, rec.height);
+ g.translate(-rec.x, -rec.y);
+ }
+
+
+
+
+ public String getText(Widget widget) {
+ return ((LabelWidget) widget).getLabel ();
+ }
+
+ public boolean isEnabled(Widget widget) {
+ // TODO Auto-generated method stub
+ return true;
+ }
+
+ public void setText(Widget widget, String text) {
+ ((LabelWidget) widget).setLabel (text);
+
+ }
+
+
+
+
+}
\ No newline at end of file
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTitle.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTitle.java 2008-08-06 15:03:18 UTC (rev 3716)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTitle.java 2008-08-06 17:24:35 UTC (rev 3717)
@@ -45,7 +45,7 @@
//-- ajout de l action au label correspondant --//
intern.getActions ().addAction (editorAction);
- setEnabled(false);
+ //setEnabled(false);
}
public void majLabel(){
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-06 15:03:18 UTC (rev 3716)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-06 17:24:35 UTC (rev 3717)
@@ -51,6 +51,7 @@
import org.fudaa.ebli.visuallibrary.EbliScene;
import org.fudaa.ebli.visuallibrary.EbliWidgetCreatorGraphe;
import org.fudaa.ebli.visuallibrary.EbliWidgetCreatorLegende;
+import org.fudaa.ebli.visuallibrary.EbliWidgetCreatorRectangle;
import org.fudaa.ebli.visuallibrary.EbliWidgetCreatorVue2d;
import org.fudaa.ebli.visuallibrary.EbliWidgetGraphe;
import org.fudaa.ebli.visuallibrary.WidgetLegendeManager;
@@ -201,6 +202,16 @@
// scene.addNode(node);
//scene.addChild(new ComponentWidget(scene, test.getVisuPanel().getVueCalque()));
+
+
+ //-- ajout du rectangle --//
+ node = new EbliNodeDefault();
+ node.setCreator(new EbliWidgetCreatorRectangle("Test recangle"));
+ node.setD(new Dimension(100, 100));
+ node.setP(new Point(350,125));
+ scene.addNode(node);
+
+
// WidgetLegendeManagerOLD.createWidgetLegendeGraphe(this, visu, courbe,
// graphe.getClientArea());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
