[DL-Learner SVN] SF.net SVN: dl-learner: [721] trunk/src/dl-learner/org/dllearner/gui

[<ton...@us...>]

Revision: 721
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=721&view=rev
Author:   tonytacker
Date:     2008-03-23 13:11:36 -0700 (Sun, 23 Mar 2008)

Log Message:
-----------
some changes for tree

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/gui/RunPanel.java
    trunk/src/dl-learner/org/dllearner/gui/StartGUI.java
    trunk/src/dl-learner/org/dllearner/gui/ThreadStatistics.java
    trunk/src/dl-learner/org/dllearner/gui/TreeWindow.java

Modified: trunk/src/dl-learner/org/dllearner/gui/RunPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/RunPanel.java	2008-03-20 20:16:04 UTC (rev 720)
+++ trunk/src/dl-learner/org/dllearner/gui/RunPanel.java	2008-03-23 20:11:36 UTC (rev 721)
@@ -266,7 +266,7 @@
 	 * 
 	 * @param a
 	 * @param b
-	 * @return
+	 * @return string that shows percent
 	 */
 	public String Percent(Long a, Long b) {
 		if (a != null && b != null) {

Modified: trunk/src/dl-learner/org/dllearner/gui/StartGUI.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/StartGUI.java	2008-03-20 20:16:04 UTC (rev 720)
+++ trunk/src/dl-learner/org/dllearner/gui/StartGUI.java	2008-03-23 20:11:36 UTC (rev 721)
@@ -70,8 +70,9 @@
 		this.setSize(800, 600);
 
 		// set icon
-		setIconImage(java.awt.Toolkit.getDefaultToolkit().getImage(
-				this.getClass().getResource("icon.gif")));
+		if (this.getClass().getResource("icon.gif") != null)
+			setIconImage(java.awt.Toolkit.getDefaultToolkit().getImage(
+					this.getClass().getResource("icon.gif")));
 
 		tab0 = new KnowledgeSourcePanel(config, this);
 		tab1 = new ReasonerPanel(config, this);

Modified: trunk/src/dl-learner/org/dllearner/gui/ThreadStatistics.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/ThreadStatistics.java	2008-03-20 20:16:04 UTC (rev 720)
+++ trunk/src/dl-learner/org/dllearner/gui/ThreadStatistics.java	2008-03-23 20:11:36 UTC (rev 721)
@@ -40,7 +40,7 @@
 	 */
 	@Override
 	public void run() {
-		this.setPriority(4);
+		//this.setPriority(4);
 		if (config.getThreadIsRunning()) {
 			try {
 				sleep(1000); // sleep 1 second

Modified: trunk/src/dl-learner/org/dllearner/gui/TreeWindow.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/TreeWindow.java	2008-03-20 20:16:04 UTC (rev 720)
+++ trunk/src/dl-learner/org/dllearner/gui/TreeWindow.java	2008-03-23 20:11:36 UTC (rev 721)
@@ -21,37 +21,56 @@
  */
 
 import javax.swing.*;
+import javax.swing.event.TreeExpansionEvent;
+import javax.swing.event.TreeExpansionListener;
 import org.dllearner.algorithms.refexamples.*;
 
+
 /**
  * TreeWindow
  * 
  * @author Tilo Hielscher
  */
-public class TreeWindow extends JFrame {
+public class TreeWindow extends JFrame implements TreeExpansionListener {
 
 	private static final long serialVersionUID = -5807192061389763835L;
 
 	@SuppressWarnings("unused")
 	private Config config;
-
+	private EBNodeTreeModel ebNodeModel;
+	private ExampleBasedNode rootNode;
+	
 	public TreeWindow(Config config) {
 		this.config = config;
 		this.setTitle("DL-Learner Tree");
 		this.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
 		this.setLocationByPlatform(true);
-		this.setSize(300, 400);
+		this.setSize(640, 300);
 
 		// set icon
-		setIconImage(java.awt.Toolkit.getDefaultToolkit().getImage(
-				this.getClass().getResource("icon.gif")));
+		if (this.getClass().getResource("icon.gif") != null)
+			setIconImage(java.awt.Toolkit.getDefaultToolkit().getImage(
+					this.getClass().getResource("icon.gif")));
 
 		// tree model
 		if (config.getLearningAlgorithm() instanceof ExampleBasedROLComponent) {
 			ExampleBasedROLComponent ebrol = (ExampleBasedROLComponent) config
 					.getLearningAlgorithm();
-			ExampleBasedNode rootNode = ebrol.getStartNode();
-			JTree tree = new JTree(new EBNodeTreeModel(rootNode));
+			this.rootNode = ebrol.getStartNode();
+			
+			System.out.println("childs1: " + rootNode.getChildren());
+			
+			this.ebNodeModel = new EBNodeTreeModel(rootNode);
+
+			// childrens to treeModel 
+			Object first = ebNodeModel.getChild(rootNode, 0);
+			System.out.println("getIndexOfChild: " + ebNodeModel.getIndexOfChild(rootNode, first));
+
+			//System.out.println("childs2: " + ebNodeModel.getChildren((ExampleBasedNode) first));
+
+			
+			JTree tree = new JTree(ebNodeModel);
+			tree.addTreeExpansionListener(this);
 			this.add(new JScrollPane(tree));
 		}
 
@@ -60,4 +79,30 @@
 		this.setVisible(true);
 	}
 
+	/* (non-Javadoc)
+	 * @see javax.swing.event.TreeExpansionListener#treeCollapsed(javax.swing.event.TreeExpansionEvent)
+	 */
+	@Override
+	public void treeCollapsed(TreeExpansionEvent event) {
+		System.out.println("collapsed");
+	}
+
+	/* (non-Javadoc)
+	 * @see javax.swing.event.TreeExpansionListener#treeExpanded(javax.swing.event.TreeExpansionEvent)
+	 */
+	@Override
+	public void treeExpanded(TreeExpansionEvent event) {
+		System.out.println("expanded: " + event.getPath());
+		//Object path = event.getPath();
+		
+		//System.out.println("childcount: " + ebNodeModel.getChildCount(path));
+		
+		
+		//ebNodeModel.getChild(event.getSource(), 0);
+		System.out.println("getIndexOfChild: " + ebNodeModel.getIndexOfChild(rootNode, event.getPath()));
+		
+		
+		ebNodeModel.getChild(rootNode, 9);
+	}
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.