Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[3716] branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ ebli/all/TestGraphe2.java
|
From: <had...@us...> - 2008-08-06 15:03:15
|
Revision: 3716
http://fudaa.svn.sourceforge.net/fudaa/?rev=3716&view=rev
Author: hadouxad
Date: 2008-08-06 15:03:18 +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
mise en forme des donnees
- ajout des nodes pour les elements
- implementation dans EbliScene
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java
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 14:53:07 UTC (rev 3715)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-06 15:03:18 UTC (rev 3716)
@@ -23,8 +23,10 @@
import javax.swing.JMenu;
import javax.swing.JMenuBar;
import javax.swing.JScrollPane;
+import javax.swing.JTable;
import javax.swing.JTree;
import javax.swing.WindowConstants;
+import javax.swing.table.DefaultTableModel;
import javax.swing.text.Utilities;
import org.fudaa.ctulu.CtuluResource;
@@ -42,17 +44,24 @@
import org.fudaa.ebli.courbe.EGGrapheTreeModel;
import org.fudaa.ebli.courbe.EGGroup;
import org.fudaa.ebli.courbe.EGObject;
+import org.fudaa.ebli.tableau.EbliGrapheValeur;
import org.fudaa.ebli.trace.TraceLigne;
import org.fudaa.ebli.trace.TraceLigneModel;
-import org.fudaa.ebli.visuallibrary.EbliGraphScene;
-import org.fudaa.ebli.visuallibrary.GrapheWidget;
+import org.fudaa.ebli.visuallibrary.EbliNodeDefault;
+import org.fudaa.ebli.visuallibrary.EbliScene;
+import org.fudaa.ebli.visuallibrary.EbliWidgetCreatorGraphe;
+import org.fudaa.ebli.visuallibrary.EbliWidgetCreatorLegende;
+import org.fudaa.ebli.visuallibrary.EbliWidgetCreatorVue2d;
+import org.fudaa.ebli.visuallibrary.EbliWidgetGraphe;
import org.fudaa.ebli.visuallibrary.WidgetLegendeManager;
import org.fudaa.ebli.visuallibrary.WidgetLegendeManagerOLD;
import org.netbeans.api.visual.action.ActionFactory;
+import org.netbeans.api.visual.border.BorderFactory;
import org.netbeans.api.visual.graph.GraphScene;
import org.netbeans.api.visual.laf.LookFeel;
import org.netbeans.api.visual.layout.LayoutFactory;
import org.netbeans.api.visual.model.ObjectState;
+import org.netbeans.api.visual.widget.ComponentWidget;
import org.netbeans.api.visual.widget.ImageWidget;
import org.netbeans.api.visual.widget.LabelWidget;
import org.netbeans.api.visual.widget.LayerWidget;
@@ -142,7 +151,7 @@
grapheModel.add(gr);
final JFrame f = new JFrame();
f.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
- f.setSize(new Dimension(1024,768));
+ f.setSize(new Dimension(1024, 768));
final BuPanel p = new BuPanel();
p.setLayout(new BuBorderLayout());
@@ -151,55 +160,93 @@
final JTree t = new JTree(grapheModel);
t.setSelectionModel(grapheModel.getSelectionModel());
t.setRootVisible(false);
-
- Box boxEast=Box.createVerticalBox();
+
+ Box boxEast = Box.createVerticalBox();
boxEast.add(new BuScrollPane(t));
p.add(boxEast, BuBorderLayout.EAST);
p.doLayout();
f.setContentPane(p);
final EGFillePanel pn = new EGFillePanel(g);
-
-
+
// creation de la scene EBLI
- EbliGraphScene scene = new EbliGraphScene();
+ EbliScene scene = new EbliScene();
+ // ajout graphe
+ // GrapheWidget graphe=new GrapheWidget(scene,null,g);
+ // graphe.setPreferredSize(new Dimension(300, 300));
+ // scene.addWidget(graphe);
-
- //ajout graphe
- GrapheWidget graphe=new GrapheWidget(scene,null,g);
- graphe.setPreferredSize(new Dimension(300, 300));
- scene.addChild(graphe);
-
+ //-- creation d un noeud Graphe --//
+ EbliNodeDefault node = new EbliNodeDefault();
+ node.setCreator(new EbliWidgetCreatorGraphe(g));
+ node.setD(new Dimension(300, 300));
+ node.setP(new Point(4, 4));
+ scene.addNode(node);
+ //-- creation d un noeud legende --//
+ node = new EbliNodeDefault();
+ node.setCreator(new EbliWidgetCreatorLegende(g));
+ node.setD(new Dimension(100, 100));
+ scene.addNode(node);
+
- //WidgetLegendeManagerOLD.createWidgetLegendeGraphe(this, visu, courbe, graphe.getClientArea());
- scene.addChild (WidgetLegendeManager.createLegende(g, scene,null));
-
- //ajout iconenode
- IconNodeWidget iconNode = new IconNodeWidget (scene);
- iconNode.setImage (CtuluResource.CTULU.getImage("crystal_non"));
- iconNode.setLabel ("MyIconNode");
-// this.addChild (iconNode);
- iconNode.getActions ().addAction (ActionFactory.createCenteredZoomAction (1.1));
- iconNode.getActions ().addAction (ActionFactory.createPanAction ());
+ //-- creation de la vue calque
+ TestZCalquePoint test = new TestZCalquePoint();
+ test.getVueCalque().setPreferredSize(new Dimension(200, 200));
+ node = new EbliNodeDefault();
+ node.setCreator(new EbliWidgetCreatorVue2d(test.getVisuPanel()));
+ node.setD(new Dimension(200, 200));
+ // scene.addNode(node);
+ //scene.addChild(new ComponentWidget(scene, test.getVisuPanel().getVueCalque()));
+
+ // WidgetLegendeManagerOLD.createWidgetLegendeGraphe(this, visu, courbe,
+ // graphe.getClientArea());
+
+ scene.addChild(WidgetLegendeManager.createLegende(g, scene, null));
+
+ // ajout iconenode
+ IconNodeWidget iconNode = new IconNodeWidget(scene);
+ iconNode.setImage(CtuluResource.CTULU.getImage("crystal_non"));
+ iconNode.setLabel("MyIconNode");
+ // this.addChild (iconNode);
+ iconNode.getActions().addAction(
+ ActionFactory.createCenteredZoomAction(1.1));
+ iconNode.getActions().addAction(ActionFactory.createPanAction());
// assign HoverAction - the actual hovered widget is held by the scene
- iconNode.getActions ().addAction (scene.createWidgetHoverAction ());
+ iconNode.getActions().addAction(scene.createWidgetHoverAction());
// MoveAction has to be after the hover action
- // otherwise MoveAction will always consume the event and HoverAction will never be invoked
- iconNode.getActions ().addAction (ActionFactory.createMoveAction ());
- iconNode.setPreferredLocation(new Point(400,150));
- scene.addChild(iconNode);
+ // otherwise MoveAction will always consume the event and HoverAction
+ // will never be invoked
+ iconNode.getActions().addAction(ActionFactory.createMoveAction());
+ iconNode.setPreferredLocation(new Point(400, 150));
+
- //scene.addNode(new Object());
+ JTable table = new JTable();
+ table.setModel(new DefaultTableModel(new Object[][] { { "11", "12" },
+ { "21", "22" } }, new Object[] { "First", "Second" }));
+ ComponentWidget widgetJtable = new ComponentWidget(scene,
+ new JScrollPane(table)) {
+ public void notifyStateChanged(ObjectState previousState,
+ ObjectState newState) {
+ LookFeel lookFeel = getScene().getLookFeel();
+
+ setBorder(BorderFactory.createResizeBorder(10));
+
+ }
+ };
+ widgetJtable.setBorder(BorderFactory.createResizeBorder(10));
+ widgetJtable.setPreferredLocation(new Point(500, 300));
+ widgetJtable.getActions().addAction(ActionFactory.createResizeAction());
+ scene.addChild(widgetJtable);
+ // scene.addNode(new Object());
// fin
p.add(new JScrollPane(scene.createView()), BuBorderLayout.CENTER);
-
- //ajout de la vue sattelite en bas \xE4 gauche
+
+ // ajout de la vue sattelite en bas \xE4 gauche
boxEast.add(scene.createSatelliteView());
-
-
+
final JMenu menu = new JMenu();
menu.setName("essai");
menu.setText("essai");
@@ -209,7 +256,7 @@
f.setJMenuBar(b);
f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
- //f.pack();
+ // f.pack();
f.show();
scene.setFont(CtuluLibSwing.getMiniFont());
g.computeMarges(scene.getGraphics());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
