@@ -36,7 +36,7 @@ public class EnumeratorDebugger { } public static void main(String[] args) { - String formula = "C2H8"; + String formula = "C2H6"; new EnumeratorDebugger(formula); } src/app/EnumeratorDebugger.java @@ -214,9 +214,28 @@ public class OutlineTree { } private boolean within(GraphicalNode node, int x, int y) { - int deltaX = nodeWidth; - int deltaY = nodeHeight; - return Math.abs(node.x - x) < deltaX || Math.abs(node.y - y) < deltaY; + int r = Math.max(nodeWidth, nodeHeight) * 3; + double d = Math.sqrt( + Math.pow((node.x - x), 2) + Math.pow((node.y - y), 2)); +// System.out.println("d=" + d + " r=" + r + "x=" + x + "y=" + y + node); + return d < r; + } + + public String toString() { + StringBuffer buffer = new StringBuffer(); + this.toString(this.root, buffer); + return buffer.toString(); + } + + public void toString(GraphicalNode node, StringBuffer buffer) { + for (GraphicalNode child : node.children) { + this.toString(child, buffer); + } + if (node == selected) { + buffer.append("*" + node.graph + " (" + node.x + ", " + node.y + ")\n"); + } else { + buffer.append(node.graph + " (" + node.x + ", " + node.y + ")\n"); + } } } src/display/signature/OutlineTree.java @@ -53,6 +53,7 @@ public class OutlineTreePanel extends JPanel graphSelectionListener.graphSelected(new GraphSelectionEvent(g)); this.repaint(); } + System.out.println(this.tree); } public void mouseEntered(MouseEvent e) { src/display/signature/OutlineTreePanel.java 7c2a393772a4008e64352ce28ee22fdf71615a4d maclean gilleain.torrance@gmail.com http://github.com/gilleain/generation/commit/0ab7f2486fee2e24a1b6cab6ad98b7c5d2f26c39 0ab7f2486fee2e24a1b6cab6ad98b7c5d2f26c39 2009-09-24T01:48:58-07:00 2009-09-24T01:48:58-07:00 Better hit detection a2a0541bb3ae5dc093023864bdd00454f7e94f5a maclean gilleain.torrance@gmail.com