From ab1e4ae3dfc169f7a6f0ba5217e3f0d876e88f4d Mon Sep 17 00:00:00 2001 From: OszkarSemerath Date: Wed, 28 Feb 2018 18:11:34 -0500 Subject: removed maven + added refresh() to filesystem --- .../.project | 6 +++--- .../.settings/org.eclipse.jdt.core.prefs | 3 +++ .../META-INF/MANIFEST.MF | 3 ++- .../PartialInterpretation2Graphviz.xtend | 25 ++++++++++------------ 4 files changed, 19 insertions(+), 18 deletions(-) (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation') diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/.project b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/.project index a52c4496..613b4fbc 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/.project +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/.project @@ -25,14 +25,14 @@ - + - org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/.settings/org.eclipse.jdt.core.prefs b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/.settings/org.eclipse.jdt.core.prefs index fd9afef6..86260262 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/.settings/org.eclipse.jdt.core.prefs +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/.settings/org.eclipse.jdt.core.prefs @@ -1,2 +1,5 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF index e7289f24..c34c382d 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF @@ -11,7 +11,8 @@ Require-Bundle: com.google.guava, hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage;bundle-version="1.0.0", hu.bme.mit.inf.dslreasoner.viatra2logic;bundle-version="1.0.0", hu.bme.mit.inf.dslreasoner.logic.model.validation;bundle-version="0.0.1", - org.eclipse.emf.ecore.xmi;bundle-version="2.12.0" + org.eclipse.emf.ecore.xmi;bundle-version="2.12.0", + guru.nidi.graphviz-java;bundle-version="0.2.1" Import-Package: org.apache.log4j;version="1.2.15" Export-Package: hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/PartialInterpretation2Graphviz.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/PartialInterpretation2Graphviz.xtend index 81dd97b1..77646fdd 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/PartialInterpretation2Graphviz.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/PartialInterpretation2Graphviz.xtend @@ -1,11 +1,10 @@ package hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz -import guru.nidi.graphviz.attribute.Arrow -import guru.nidi.graphviz.attribute.Color import guru.nidi.graphviz.attribute.Shape import guru.nidi.graphviz.attribute.Style import guru.nidi.graphviz.engine.Format import guru.nidi.graphviz.engine.Graphviz +import guru.nidi.graphviz.engine.GraphvizV8Engine import guru.nidi.graphviz.model.Graph import guru.nidi.graphviz.model.Label import guru.nidi.graphviz.model.Node @@ -22,19 +21,14 @@ import java.io.File import java.util.HashMap import java.util.HashSet import java.util.LinkedList +import java.util.List import java.util.Random import java.util.Set import static guru.nidi.graphviz.model.Factory.* -import static guru.nidi.graphviz.attribute.Records.*; import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.* -import guru.nidi.graphviz.engine.Engine -import guru.nidi.graphviz.attribute.Records -import guru.nidi.graphviz.attribute.Attributes -import java.util.List -import guru.nidi.graphviz.engine.GraphvizEngine -import guru.nidi.graphviz.engine.GraphvizV8Engine +import java.awt.image.BufferedImage class GraphvizVisualisation implements PartialInterpretationVisualiser { @@ -142,8 +136,10 @@ class GraphvizVisualisation implements PartialInterpretationVisualiser { '''''') val node = node(ID).with(label).with( - Shape.NONE, - Attributes.attr("margin","0") + Shape.NONE + //, + //Attributes::attr("margin","0") + //new MapAttributes() => [add("margin", "0")] ) return node } @@ -233,10 +229,11 @@ class GraphvisVisualisation implements PartialInterpretationVisualisation { } override writeToFile(ReasonerWorkspace workspace, String name) { - val path = '''«workspace.workspaceURI.toFileString»/«name».png''' + val file = workspace.getFile('''«name».png''') + //val bufferedImage = new BufferedImage Graphviz.useEngine(new GraphvizV8Engine()); Graphviz.fromGraph(graph)//.engine(Engine::NEATO) - .render(Format.PNG).toFile(new File(path)); + .render(Format.PNG).toFile(file) + workspace.refreshFile('''«name».png''') } - } -- cgit v1.2.3-70-g09d2