@@ -31,7 +31,7 @@ public class EnumeratorDebugger { outlineTreePanel.addMouseListener(outlineTreePanel); enumerator.generate(); - frame.setSize(800, 800); + frame.setSize(1200, 800); frame.setVisible(true); } src/app/EnumeratorDebugger.java @@ -177,10 +177,11 @@ public class SimpleGraph { int l = this.atomContainer.getAtomNumber(bond.getAtom(0)); int r = this.atomContainer.getAtomNumber(bond.getAtom(1)); if (l < r) { - sb.append(l).append("-").append(r).append(" "); + sb.append(l).append("-").append(r); } else { - sb.append(r).append("-").append(l).append(" "); + sb.append(r).append("-").append(l); } + sb.append("(").append(bond.getOrder().ordinal()).append(")").append(" "); } sb.append("} "); // for (Orbit o : orbits) { src/deterministic/SimpleGraph.java @@ -12,7 +12,7 @@ import deterministic.SimpleGraph; public class GraphRenderer { - private static int nodeRadius = 5; + private static int nodeRadius = 7; public static void paintDiagram(SimpleGraph graph, Graphics g, int center, int width, int axis) { IAtomContainer container = graph.getAtomContainer(); @@ -27,7 +27,10 @@ public class GraphRenderer { int d = nodeRadius * 2; for (IAtom atom : container.atoms()) { nodePositions.put(container.getAtomNumber(atom), i); - g.drawOval(i - nodeRadius, axis - nodeRadius, d, d); + int x = i - nodeRadius; + int y = axis - nodeRadius; + g.drawOval(x, y, d, d); + g.drawString(atom.getSymbol(), x, axis + nodeRadius); i += separation; } src/display/signature/GraphRenderer.java 0ab7f2486fee2e24a1b6cab6ad98b7c5d2f26c39 maclean gilleain.torrance@gmail.com http://github.com/gilleain/generation/commit/400122d998414ff01c426283a74caa4d591ede46 400122d998414ff01c426283a74caa4d591ede46 2009-09-24T12:55:42-07:00 2009-09-24T12:55:42-07:00 Minor tweaks 3540a63b8f0a264d46e0456994e331eb3a519c82 maclean gilleain.torrance@gmail.com