Browse Source

different color for auto mapped Edges

MW 7 years ago
parent
commit
aa9937aef2

+ 2 - 2
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/graphs/GraphHelper.java

@@ -82,7 +82,7 @@ public class GraphHelper {
 				}
 			}
 			for (String s : e.getAttributeKeySet()) {
-				target.getEdge(newId).addAttribute(s, (Object) e.getAttribute(s));
+				target.getEdge(newId).addAttribute(s, e.getAttribute(s));
 			}
 		}
 	}
@@ -111,7 +111,7 @@ public class GraphHelper {
 			}
 			for (String s : n.getAttributeKeySet()) {
 				Debug.out(s);
-				target.getNode(newId).addAttribute(s, (Object) n.getAttribute(s));
+				target.getNode(newId).addAttribute(s, n.getAttribute(s));
 			}
 		}
 

+ 2 - 0
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/graphs/MappingGraphManager.java

@@ -598,6 +598,7 @@ public class MappingGraphManager extends GraphManager implements EdgeCreatedList
 
 						e.addAttribute("ui.class", UI_CLASS_MAPPING);
 						e.addAttribute(ATTRIBUTE_KEY_MAPPING, true);
+						e.addCSSClass("blue");
 					}
 				}
 			} else if (operatorNode.getAttribute("typeofNode").equals("sink")) {
@@ -611,6 +612,7 @@ public class MappingGraphManager extends GraphManager implements EdgeCreatedList
 
 						e.addAttribute("ui.class", UI_CLASS_MAPPING);
 						e.addAttribute(ATTRIBUTE_KEY_MAPPING, true);
+						e.addCSSClass("blue");
 					}
 				}
 			}

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

@@ -2,7 +2,6 @@ package de.tu_darmstadt.informatik.tk.scopviz.main;
 
 import java.util.Iterator;
 
-import org.graphstream.algorithm.Toolkit;
 import org.graphstream.ui.geom.Point3;
 import org.graphstream.ui.graphicGraph.GraphPosLengthUtils;
 import org.graphstream.ui.view.Camera;

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

@@ -4,7 +4,6 @@ import java.io.IOException;
 import java.net.URL;
 
 import de.tu_darmstadt.informatik.tk.scopviz.debug.Debug;
-import de.tu_darmstadt.informatik.tk.scopviz.io.GraphMLImporter;
 import de.tu_darmstadt.informatik.tk.scopviz.ui.GraphDisplayManager;
 import de.tu_darmstadt.informatik.tk.scopviz.ui.OptionsManager;
 import de.tu_darmstadt.informatik.tk.scopviz.ui.css.CSSManager;
@@ -80,7 +79,7 @@ public class MainApp extends Application {
 				+ ".selectedForEdgeCreation{fill-color: #00ff00;}"
 				+ "edge.mapping {stroke-color: #33ff33; stroke-mode: dashes; fill-mode: none; size: 0px;}"
 				+ "node.procEn.onMapping {fill-mode: plain; shape: pie-chart; fill-color: #555555, #cccc00, #32cd32, #8b0000; size: 20px;}"
-				+ "edge.mapping.selected{stroke-color: #FF0000;}"+"node.procEn.onMapping.selected{size: 15px;}");
+				+ "edge.mapping.selected{stroke-color: #FF0000;}"+"node.procEn.onMapping.selected{size: 15px;}"+"edge.mapping.blue {stroke-color: #3333ff}");
 	}
 
 	/**

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

@@ -4,7 +4,6 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.ResourceBundle;
 
-import javax.swing.JPanel;
 import javax.swing.event.MouseInputListener;
 
 import org.jxmapviewer.JXMapViewer;

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

@@ -5,7 +5,6 @@ import java.util.HashMap;
 
 import de.tu_darmstadt.informatik.tk.scopviz.main.Main;
 import de.tu_darmstadt.informatik.tk.scopviz.metrics.BasicMappingOperator;
-import de.tu_darmstadt.informatik.tk.scopviz.metrics.TestOperator;
 import de.tu_darmstadt.informatik.tk.scopviz.metrics.interfaces.ScopvizGraphOperator;
 import javafx.application.Platform;
 import javafx.collections.FXCollections;

+ 1 - 1
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/OptionsManager.java

@@ -18,6 +18,7 @@ import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.geometry.Insets;
 import javafx.scene.control.Alert;
+import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;
@@ -26,7 +27,6 @@ import javafx.scene.control.Dialog;
 import javafx.scene.control.Label;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.TextField;
-import javafx.scene.control.Alert.AlertType;
 import javafx.scene.layout.GridPane;
 
 /**