From 34b71378d83d31e370011c93d591967cbfac5a08 Mon Sep 17 00:00:00 2001 From: sjfink Date: Thu, 16 Oct 2008 14:36:46 +0000 Subject: [PATCH] some generalizations to support SVG git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@3059 f5eafffb-2e1d-0410-98e4-8ec43c5233c4 --- com.ibm.wala.core/src/com/ibm/wala/viz/DotUtil.java | 13 +++++++++++-- .../src/com/ibm/wala/viz/ViewIFDSLocalAction.java | 4 +++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/com.ibm.wala.core/src/com/ibm/wala/viz/DotUtil.java b/com.ibm.wala.core/src/com/ibm/wala/viz/DotUtil.java index a4a67cf83..802593f54 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/viz/DotUtil.java +++ b/com.ibm.wala.core/src/com/ibm/wala/viz/DotUtil.java @@ -42,6 +42,8 @@ public class DotUtil { } private static DotOutputType outputType = DotOutputType.PS; + + private static int fontSize = 6; public static void setOutputType(DotOutputType outType) { outputType = outType; @@ -68,7 +70,6 @@ public class DotUtil { */ private final static int MAX_LABEL_LENGTH = Integer.MAX_VALUE; - private final static int FONT_SIZE = 6; /** */ @@ -176,7 +177,7 @@ public class DotUtil { if (rankdir != null) { result.append("rankdir=" + rankdir + ";"); } - String fontsizeStr = "fontsize=" + FONT_SIZE; + String fontsizeStr = "fontsize=" + fontSize; result.append("center=true;"); result.append(fontsizeStr); result.append("node ["); @@ -260,4 +261,12 @@ public class DotUtil { } + public static int getFontSize() { + return fontSize; + } + + public static void setFontSize(int fontSize) { + DotUtil.fontSize = fontSize; + } + } diff --git a/com.ibm.wala.core/src/com/ibm/wala/viz/ViewIFDSLocalAction.java b/com.ibm.wala.core/src/com/ibm/wala/viz/ViewIFDSLocalAction.java index cef8a92c7..98b55eaf9 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/viz/ViewIFDSLocalAction.java +++ b/com.ibm.wala.core/src/com/ibm/wala/viz/ViewIFDSLocalAction.java @@ -177,7 +177,9 @@ public class ViewIFDSLocalAction extends Action { System.err.println("Spawn Viewer for " + proc); DotUtil.dotify(localGraph, labels, dotFile, psFile, dotExe); - GVUtil.launchGV(psFile, gvExe); + if (DotUtil.getOutputType() == DotUtil.DotOutputType.PS) { + GVUtil.launchGV(psFile, gvExe); + } } catch (WalaException e) { e.printStackTrace(); Assertions.UNREACHABLE();