Sfoglia il codice sorgente

added new renderer|starting edge weight

added new renderer
	fixed crappy default
	added antialias
start of edge weight
	new Edges have weight (0 by default)
Jascha Bohne 7 anni fa
parent
commit
602229d822

+ 2 - 0
scopviz/.gitignore

@@ -1,3 +1,5 @@
 /target/
 /Example-shape.graphml
 /Example-sprite.graphml
+/Labels.jpg
+/Labels.png

+ 1 - 0
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/main/MainApp.java

@@ -39,6 +39,7 @@ public class MainApp extends Application {
 	 *            implemented
 	 */
 	public static void main(final String[] args) {
+		System.setProperty("org.graphstream.ui.renderer", "org.graphstream.ui.j2dviewer.J2DGraphRenderer");
 		launch(args);
 	}
 

+ 6 - 0
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/GraphDisplayManager.java

@@ -47,6 +47,8 @@ public class GraphDisplayManager {
 		Graph g = new MyGraph(id);
 		GraphManager v = new GraphManager(g);
 		vList.add(v);
+		g.addAttribute("ui.stylesheet", "node{text-alignment:at-right;}");
+		g.addAttribute("ui.antialias");
 		return ++count;
 	}
 
@@ -64,6 +66,8 @@ public class GraphDisplayManager {
 		g.addAttribute("layer", currentLayer);
 		GraphManager v = new GraphManager(g);
 		vList.add(v);
+		g.addAttribute("ui.stylesheet", "node{text-alignment:at-right;}");
+		g.addAttribute("ui.antialias");
 		return count++;
 	}
 
@@ -85,6 +89,8 @@ public class GraphDisplayManager {
 		GraphManager v = new GraphManager(g);
 		vList.add(v);
 		switchActiveGraph();
+		g.addAttribute("ui.stylesheet", "node{text-alignment:at-right;}");
+		g.addAttribute("ui.antialias");
 		return count++;
 	}
 

+ 6 - 4
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/handlers/MyViewerListener.java

@@ -83,7 +83,7 @@ public class MyViewerListener implements ViewerListener {
 	 * @param id
 	 */
 	private void createEdges(String id) {
-
+		String newID = null;
 		switch (Main.getInstance().getCreationMode()) {
 
 		case CREATE_DIRECTED_EDGE:
@@ -92,7 +92,7 @@ public class MyViewerListener implements ViewerListener {
 				lastClickedID = id;
 			} else {
 				if (!id.equals(lastClickedID)) {
-					String newID = Main.getInstance().getUnusedID();
+					newID = Main.getInstance().getUnusedID();
 					graphManager.getGraph().addEdge(newID, lastClickedID, id, true);
 					Debug.out("Created an directed edge with Id " + newID + " between " + lastClickedID + " and " + id);
 
@@ -108,7 +108,7 @@ public class MyViewerListener implements ViewerListener {
 				lastClickedID = id;
 			} else {
 				if (!id.equals(lastClickedID)) {
-					String newID = Main.getInstance().getUnusedID();
+					newID = Main.getInstance().getUnusedID();
 					graphManager.getGraph().addEdge(newID, lastClickedID, id);
 
 					Debug.out(
@@ -124,7 +124,9 @@ public class MyViewerListener implements ViewerListener {
 		default:
 			break;
 		}
-
+		if(newID != null){
+		graphManager.getGraph().getEdge(newID).addAttribute("Weight", 0);
+		}
 		PropertiesManager.setItemsProperties();
 
 		if (!CREATE_MORE_THEN_ONE) {