diff --git a/libPlgVisualizer/src/plg/visualizer/model/DotModel.java b/libPlgVisualizer/src/plg/visualizer/model/DotModel.java index bac41d0..609933b 100644 --- a/libPlgVisualizer/src/plg/visualizer/model/DotModel.java +++ b/libPlgVisualizer/src/plg/visualizer/model/DotModel.java @@ -28,7 +28,8 @@ public DotModel(Process model) { this.model = model; // setOption("splines", "ortho"); -// setOption("nodesep", "0.5"); +// setOption("nodesep", "1.0"); +// setOption("sep", "+4"); setOption("rankdir", "LR"); realize(); diff --git a/libPlgVisualizer/src/plg/visualizer/model/edges/DotDataObjectConnection.java b/libPlgVisualizer/src/plg/visualizer/model/edges/DotDataObjectConnection.java index 93f310d..f65c36f 100644 --- a/libPlgVisualizer/src/plg/visualizer/model/edges/DotDataObjectConnection.java +++ b/libPlgVisualizer/src/plg/visualizer/model/edges/DotDataObjectConnection.java @@ -12,7 +12,7 @@ public class DotDataObjectConnection extends DotEdge { public DotDataObjectConnection(DotNode source, DotNode target) { super(source, target); - setOption("color", "#666666"); + setOption("color", "#303030"); setOption("style", "dashed"); setOption("arrowhead", "open"); } diff --git a/libPlgVisualizer/src/plg/visualizer/model/edges/DotSequence.java b/libPlgVisualizer/src/plg/visualizer/model/edges/DotSequence.java index 0209e99..a96d06f 100644 --- a/libPlgVisualizer/src/plg/visualizer/model/edges/DotSequence.java +++ b/libPlgVisualizer/src/plg/visualizer/model/edges/DotSequence.java @@ -12,6 +12,6 @@ public class DotSequence extends DotEdge { public DotSequence(DotNode source, DotNode target) { super(source, target); - setOption("color", "#5a677b"); + setOption("color", "#303030"); } } diff --git a/libPlgVisualizer/src/plg/visualizer/model/nodes/DotDataObject.java b/libPlgVisualizer/src/plg/visualizer/model/nodes/DotDataObject.java index ab9253b..1c3f74a 100644 --- a/libPlgVisualizer/src/plg/visualizer/model/nodes/DotDataObject.java +++ b/libPlgVisualizer/src/plg/visualizer/model/nodes/DotDataObject.java @@ -11,7 +11,7 @@ public class DotDataObject extends DotNode { public DotDataObject(DataObject node) { - super(node.getName(), null); + super(null, null); setSelectable(true); @@ -21,9 +21,11 @@ public DotDataObject(DataObject node) { setOption("height", "0.5"); setOption("style", "filled"); setOption("fillcolor", "#ffffff"); - setOption("color", "#666666"); - setOption("fontcolor", "#666666"); + setOption("color", "#303030"); + setOption("fontcolor", "#303030"); setOption("fontname", "sans-serif"); + + setLabel("<
" + node.getName() + "
>"); } } diff --git a/libPlgVisualizer/src/plg/visualizer/model/nodes/DotEndEvent.java b/libPlgVisualizer/src/plg/visualizer/model/nodes/DotEndEvent.java index 988e3e0..974ab4b 100644 --- a/libPlgVisualizer/src/plg/visualizer/model/nodes/DotEndEvent.java +++ b/libPlgVisualizer/src/plg/visualizer/model/nodes/DotEndEvent.java @@ -14,12 +14,8 @@ public DotEndEvent() { setSelectable(true); setOption("shape", "circle"); - setOption("style", "filled"); - setOption("fillcolor", "#e46e60:#ffc5c1"); - setOption("gradientangle", "270"); - setOption("color", "#630000"); setOption("width", ".3"); - setOption("fontcolor", "#630000"); + setOption("fontcolor", "#000000"); setOption("fontname", "sans-serif"); setOption("fontsize", "12.0"); setOption("penwidth", "2"); diff --git a/libPlgVisualizer/src/plg/visualizer/model/nodes/DotGateway.java b/libPlgVisualizer/src/plg/visualizer/model/nodes/DotGateway.java index f51447f..cdfd53e 100644 --- a/libPlgVisualizer/src/plg/visualizer/model/nodes/DotGateway.java +++ b/libPlgVisualizer/src/plg/visualizer/model/nodes/DotGateway.java @@ -18,21 +18,17 @@ public DotGateway(TYPE type) { setSelectable(true); setOption("shape", "diamond"); - setOption("style", "filled"); setOption("width", "0.4"); setOption("height", "0.4"); - setOption("fontsize", "20"); - setOption("fillcolor", "#ffff84:#ffffbd"); - setOption("gradientangle", "270"); - setOption("color", "#a6a855"); - setOption("fontcolor", "#708041"); + setOption("fontsize", "30"); + setOption("fontcolor", "#000000"); setOption("fontname", "sans-serif"); setOption("fixedsize", "true"); if (TYPE.PARALLEL.equals(type)) { - setLabel("+"); + setLabel("<
_+
>"); } else { - setLabel("×"); + setLabel("<
_×
>"); } } diff --git a/libPlgVisualizer/src/plg/visualizer/model/nodes/DotStartEvent.java b/libPlgVisualizer/src/plg/visualizer/model/nodes/DotStartEvent.java index 4d48934..8167b93 100644 --- a/libPlgVisualizer/src/plg/visualizer/model/nodes/DotStartEvent.java +++ b/libPlgVisualizer/src/plg/visualizer/model/nodes/DotStartEvent.java @@ -14,12 +14,8 @@ public DotStartEvent() { setSelectable(true); setOption("shape", "circle"); - setOption("style", "filled"); - setOption("fillcolor", "#5dbd5a:#bafcc2"); - setOption("gradientangle", "270"); - setOption("color", "#20962f"); setOption("width", ".3"); - setOption("fontcolor", "#20962f"); + setOption("fontcolor", "#000000"); setOption("fontname", "sans-serif"); setOption("fontsize", "12.0"); setOption("penwidth", "2"); diff --git a/libPlgVisualizer/src/plg/visualizer/model/nodes/DotTask.java b/libPlgVisualizer/src/plg/visualizer/model/nodes/DotTask.java index b0be4e4..aef2afe 100644 --- a/libPlgVisualizer/src/plg/visualizer/model/nodes/DotTask.java +++ b/libPlgVisualizer/src/plg/visualizer/model/nodes/DotTask.java @@ -9,19 +9,21 @@ public class DotTask extends DotNode { public DotTask(String label) { - super(label, null); + super(null, null); setSelectable(true); setOption("shape", "box"); setOption("style", "rounded,filled"); - setOption("fillcolor", "#cedeef:#ffffff"); - setOption("gradientangle", "270"); - setOption("color", "#5a677b"); + setOption("fillcolor", "#ffffff:#ffffcb"); + setOption("gradientangle", "300"); + setOption("color", "#303030"); setOption("width", "0.5"); - setOption("fontcolor", "#5a677b"); + setOption("fontcolor", "#303030"); setOption("fontname", "sans-serif"); - setOption("fontsize", "14.0"); + setOption("fontsize", "12"); setOption("penwidth", "1"); + + setLabel("<
" + label + "
>"); } }