From: <had...@us...> - 2008-08-07 13:58:35
|
Revision: 3726 http://fudaa.svn.sourceforge.net/fudaa/?rev=3726&view=rev Author: hadouxad Date: 2008-08-07 13:58:44 +0000 (Thu, 07 Aug 2008) Log Message: ----------- AFFECT?\195?\137 - # 40: L?\195?\169gende pour les courbe 1d http://mantis.genesis-groupe.com//view.php?id=40 - les widget fleches directionnelle et bi directionnelle (a ameliorer) - les classes modeles et tree - les methodes de gestion des listener eblinodelistener pour la scene - la classe exemple testGraphe - exemple testgraphe pour voir le fonctionnement du lien tree scene 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-07 13:56:12 UTC (rev 3725) +++ branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-07 13:58:44 UTC (rev 3726) @@ -7,6 +7,7 @@ */ package org.fudaa.ebli.all; +import java.awt.BorderLayout; import java.awt.Color; import java.awt.Dimension; import java.awt.Font; @@ -28,6 +29,7 @@ import javax.swing.WindowConstants; import javax.swing.table.DefaultTableModel; import javax.swing.text.Utilities; +import javax.swing.tree.TreePath; import org.fudaa.ctulu.CtuluResource; import org.fudaa.ctulu.gui.CtuluLibSwing; @@ -49,13 +51,19 @@ import org.fudaa.ebli.trace.TraceLigneModel; import org.fudaa.ebli.visuallibrary.EbliNodeDefault; import org.fudaa.ebli.visuallibrary.EbliScene; +import org.fudaa.ebli.visuallibrary.EbliWidgetCreatorDblFleche; +import org.fudaa.ebli.visuallibrary.EbliWidgetCreatorFleche; 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.EbliWidgetDBLFleche; import org.fudaa.ebli.visuallibrary.EbliWidgetGraphe; +import org.fudaa.ebli.visuallibrary.EbliWidgetJXTree; +import org.fudaa.ebli.visuallibrary.EbliWidgetJXTreeModel; import org.fudaa.ebli.visuallibrary.WidgetLegendeManager; import org.fudaa.ebli.visuallibrary.WidgetLegendeManagerOLD; +import org.jdesktop.swingx.JXTree; import org.netbeans.api.visual.action.ActionFactory; import org.netbeans.api.visual.border.BorderFactory; import org.netbeans.api.visual.graph.GraphScene; @@ -164,14 +172,42 @@ Box boxEast = Box.createVerticalBox(); boxEast.add(new BuScrollPane(t)); - p.add(boxEast, BuBorderLayout.EAST); - p.doLayout(); + p.add(new JScrollPane(boxEast), BuBorderLayout.EAST); + f.setContentPane(p); final EGFillePanel pn = new EGFillePanel(g); // creation de la scene EBLI EbliScene scene = new EbliScene(); + + + + + + + + //-- construction du jtree + + //etape 1 construction du model + EbliWidgetJXTreeModel model=new EbliWidgetJXTreeModel(1/*,scene*/); + + //etape 2 SUPER IMPORTANT: ajout du model comme listener de la scene + scene.addEbliNodeListener(model); + + + //etape 3 creation du jtree + EbliWidgetJXTree tree=new EbliWidgetJXTree(model); + + + p.add(tree,BuBorderLayout.WEST); + + + + + + + // ajout graphe // GrapheWidget graphe=new GrapheWidget(scene,null,g); // graphe.setPreferredSize(new Dimension(300, 300)); @@ -181,15 +217,17 @@ //-- creation d un noeud Graphe --// EbliNodeDefault node = new EbliNodeDefault(); node.setCreator(new EbliWidgetCreatorGraphe(g)); + node.setTitle("Graphe"); 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); + EbliNodeDefault nodeLegende = new EbliNodeDefault(); + nodeLegende.setTitle("Legende"); + nodeLegende.setCreator(new EbliWidgetCreatorLegende(g)); + nodeLegende.setD(new Dimension(100, 100)); + scene.addNode(nodeLegende); @@ -197,6 +235,7 @@ TestZCalquePoint test = new TestZCalquePoint(); test.getVueCalque().setPreferredSize(new Dimension(200, 200)); node = new EbliNodeDefault(); + node.setTitle("Vue Calque"); node.setCreator(new EbliWidgetCreatorVue2d(test.getVisuPanel())); node.setD(new Dimension(200, 200)); // scene.addNode(node); @@ -205,18 +244,49 @@ //-- ajout du rectangle --// + EbliNodeDefault nodeRect = new EbliNodeDefault(); + nodeRect.setTitle("Rectangle"); + nodeRect.setCreator(new EbliWidgetCreatorRectangle("Test recangle")); +// nodeRect.setD(new Dimension(100, 100)); + nodeRect.setP(new Point(350,125)); + scene.addNode(nodeRect); + + + //-- ajout du fleche double sens diagonale--// node = new EbliNodeDefault(); - node.setCreator(new EbliWidgetCreatorRectangle("Test recangle")); -// node.setD(new Dimension(100, 100)); - node.setP(new Point(350,125)); + node.setTitle("Fleche Double"); + node.setCreator(new EbliWidgetCreatorDblFleche(EbliWidgetDBLFleche.ORIENTATION_DIAG1)); + node.setD(new Dimension(100, 100)); + node.setP(new Point(450,125)); scene.addNode(node); + + + //-- ajout du fleche double sens nord--// + node = new EbliNodeDefault(); + node.setTitle("Fleche Double"); + node.setCreator(new EbliWidgetCreatorDblFleche(EbliWidgetDBLFleche.ORIENTATION_WEST)); + node.setD(new Dimension(100, 100)); + node.setP(new Point(450,125)); + scene.addNode(node); + + + //-- ajout du fleche sens unique--// + node = new EbliNodeDefault(); + node.setTitle("Fleche"); + node.setCreator(new EbliWidgetCreatorFleche(0)); + node.setD(new Dimension(100, 100)); + node.setP(new Point(250,525)); + 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")); @@ -232,7 +302,7 @@ // will never be invoked iconNode.getActions().addAction(ActionFactory.createMoveAction()); iconNode.setPreferredLocation(new Point(400, 150)); - +*/ JTable table = new JTable(); table.setModel(new DefaultTableModel(new Object[][] { { "11", "12" }, @@ -250,8 +320,9 @@ widgetJtable.setBorder(BorderFactory.createResizeBorder(10)); widgetJtable.setPreferredLocation(new Point(500, 300)); widgetJtable.getActions().addAction(ActionFactory.createResizeAction()); - scene.addChild(widgetJtable); - // scene.addNode(new Object()); + //scene.addChild(widgetJtable); + + // fin p.add(new JScrollPane(scene.createView()), BuBorderLayout.CENTER); @@ -272,6 +343,22 @@ scene.setFont(CtuluLibSwing.getMiniFont()); g.computeMarges(scene.getGraphics()); g.fullRepaint(); - + + + + + +//-- ajout par la suite --/ +/* + node = new EbliNodeDefault(); + node.setTitle("BOUDOUM"); + node.setCreator(new EbliWidgetCreatorRectangle("BOUDOUM")); + + node.setD(new Dimension(100, 100)); + node.setP(new Point(450,20)); + scene.addNode(node); + */ + + p.doLayout(); } } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |