Fixed a bug making the old swt dll/so to linger stay in the deliveries.

Ant-Grand · Apr 13, 2005 · 7412a82 · 7412a82
1 parent 935f7d7
commit 7412a82
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/ChangeLog-Ui.txt b/ChangeLog-Ui.txt
@@ -1,5 +1,13 @@
 $Id$
 
+Release 0.7 (build number xxx):
+
+* Upgraded to Grand core 1.8,
+* Added a new export as image feature,
+* Improved sorting in the outline pane,
+* Minor improvements to the log viewer,
+
+
 Release 0.6 (build number 172):
 
 * Upgraded to Grand core 1.7 & and Eclipse 3.1M5a,

diff --git a/build.xml b/build.xml
@@ -51,6 +51,7 @@
 		<element name="select" optional="yes" />
 		<sequential>
 			<get dest="${dlcachedir}/@{dest}.zip" verbose="${verbose-get}" usetimestamp="true" ignoreerrors="true" src="@{url}" />
+            <delete dir="${dlcachedir}/@{dest}" />
 			<mkdir dir="${dlcachedir}/@{dest}" />
 			<unzip dest="${dlcachedir}/@{dest}" src="${dlcachedir}/@{dest}.zip">
 				<select />
@@ -69,6 +70,7 @@
 		<element name="select" optional="yes" />
 		<sequential>
 			<get dest="${dlcachedir}/@{dest}.tgz" verbose="${verbose-get}" usetimestamp="true" ignoreerrors="true" src="@{url}" />
+            <delete dir="${dlcachedir}/@{dest}" />
 			<mkdir dir="${dlcachedir}/@{dest}" />
 			<untar compression="gzip" dest="${dlcachedir}/@{dest}" src="${dlcachedir}/@{dest}.tgz">
 				<select />

diff --git a/src/net/ggtools/grand/ui/graph/GraphControler.java b/src/net/ggtools/grand/ui/graph/GraphControler.java
@@ -266,14 +266,32 @@ public void deselectNode(Draw2dNode node) {
     public void dotPrint() {
         if (log.isDebugEnabled()) log.debug("Printing graph using dot");
         final Properties props = new Properties();
-        props.setProperty("dot.graph.attributes", "");
+        props.setProperty("dot.graph.attributes", "rankdir=\"TB\"");
+        String dotParameters;
+        switch (printMode) {
+        case PrintFigureOperation.FIT_WIDTH:
+            dotParameters = "-Gpage=8,11 -Gsize=10,65536 -Grotate=90 -Gmargin=0.45";
+            break;
+
+        case PrintFigureOperation.FIT_HEIGHT:
+            dotParameters = "-Gpage=8,11 -Gsize=65536,7 -Grotate=90 -Gmargin=0.45";
+            break;
+
+        case PrintFigureOperation.FIT_PAGE:
+            dotParameters = "-Gpage=8,11 -Gsize=10,7 -Grotate=90 -Gmargin=0.45";
+            break;
+
+        default:
+            dotParameters = "-Gpage=8,11 -Grotate=90";
+            break;
+        }
         try {
             final DotWriter dotWriter = new DotWriter(props);
             dotWriter.setProducer(filterChain);
             dotWriter.setShowGraphName(true);
             dotWriter.write(new File("GrandDotPrint.dot"));
             Process proc = Runtime.getRuntime().exec(
-                    "dot -Tps -Gpage=8,10 -o GrandDotPrint.ps GrandDotPrint.dot");
+                    "dot -Tps " + dotParameters + " -o GrandDotPrint.ps GrandDotPrint.dot");
             proc.waitFor();
             proc.destroy();
             log.info("Graph printed to GrandDotPrint.ps");