diff --git a/AlgebraicDataflowArchitectureModel/src/application/SimulatorWindow.java b/AlgebraicDataflowArchitectureModel/src/application/SimulatorWindow.java index 0dcab51..47b8303 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/SimulatorWindow.java +++ b/AlgebraicDataflowArchitectureModel/src/application/SimulatorWindow.java @@ -147,7 +147,7 @@ ResourcePath res = resNode.getResourceIdentifier(); Object resource = graph.insertVertex(parent, null, res.getLeafResourceName(), x, y, w, h, - "shape=ellipse;perimeter=ellipsePerimeter"); // insert a resource as a vertex + "shape=ellipse;perimeter=ellipsePerimeter;verticalAlign=top;"); // insert a resource as a vertex resources.put(resNode, resource); createChildSimulateResourceVerticies(resource, resNode, resources, w, h); x+=80; @@ -169,7 +169,7 @@ ResourcePath childRes = childNode.getResourceIdentifier(); Object childResource = graph.insertVertex(resource, null, childRes.getName(), 0, 0, w/2, h/2, - "shape=ellipse;perimeter=ellipsePerimeter"); // insert a resource as a vertex + "shape=ellipse;perimeter=ellipsePerimeter;verticalAlign=top;"); // insert a resource as a vertex resources.put(childNode, childResource); createChildSimulateResourceVerticies(childResource, childNode, resources, w, h); } diff --git a/AlgebraicDataflowArchitectureModel/src/application/editor/InputEventCellEditor.java b/AlgebraicDataflowArchitectureModel/src/application/editor/InputEventCellEditor.java index a1fdf79..83baedd 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/editor/InputEventCellEditor.java +++ b/AlgebraicDataflowArchitectureModel/src/application/editor/InputEventCellEditor.java @@ -204,7 +204,7 @@ int h = 150; ResourcePath res = resNode.getResourceIdentifier(); Object resource = nextGraph.insertVertex(parent, null, - res.getLeafResourceName(), x, y, w, h, + res.toString(), x, y, w, h, "shape=ellipse;perimeter=ellipsePerimeter;verticalAlign=top;"); // insert a resource as a vertex resources.put(resNode, resource); @@ -227,7 +227,7 @@ int i = 1; ResourcePath childRes = childNode.getResourceIdentifier(); Object childResource = graph.insertVertex(resource, null, - childRes.getName(), x/i, y, w/(i+1), h/(i+2), + childRes.toString(), x/i, y, w/(i+1), h/(i+2), "shape=ellipse;perimeter=ellipsePerimeter;verticalAlign=top;"); // insert a resource as a vertex resources.put(childNode, childResource); i++;