Fixed some bugs

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

@@ -95,7 +95,7 @@ public class GraphHelper {
 					if (e.getAttribute("originalElement") == null) {
 						target.getEdge(newId).addAttribute("originalElement", source.getId().concat("+#" + e.getId()));
 					} else {
-						target.getEdge(newId).addAttribute("originalElement", e.getAttribute("originalElement"));
+						target.getEdge(newId).addAttribute("originalElement", (Object) e.getAttribute("originalElement"));
 					}
 
 				} else {
@@ -103,7 +103,7 @@ public class GraphHelper {
 				}
 			}
 			for (String s : e.getAttributeKeySet()) {
-				target.getEdge(newId).addAttribute(s, e.getAttribute(s));
+				target.getEdge(newId).addAttribute(s, (Object) e.getAttribute(s));
 			}
 		}
 	}
@@ -134,7 +134,7 @@ public class GraphHelper {
 					if (n.getAttribute("originalElement") == null) {
 						target.getNode(newId).addAttribute("originalElement", source.getId().concat("+#" + n.getId()));
 					} else {
-						target.getNode(newId).addAttribute("originalElement", n.getAttribute("originalElement"));
+						target.getNode(newId).addAttribute("originalElement", (Object) n.getAttribute("originalElement"));
 					}
 				} else {
 					newId = newId.concat(String.valueOf((char) (ran.nextInt(52) + 'a')));
@@ -142,7 +142,7 @@ public class GraphHelper {
 			}
 			for (String s : n.getAttributeKeySet()) {
 				Debug.out(s);
-				target.getNode(newId).addAttribute(s, n.getAttribute(s));
+				target.getNode(newId).addAttribute(s, (Object) n.getAttribute(s));
 			}
 		}
 

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/main/Main.java

@@ -85,7 +85,7 @@ public final class Main {
 			String tempID = i + "";
 			if (getGraphManager().getGraph().getNode(tempID) == null
 					&& getGraphManager().getGraph().getEdge(tempID) == null
-					&& getGraphManager().getGraph().getNode(getGraphManager().getGraph().getId() + tempID) == null) {
+					&& (getGraphManager().getActiveSubGraph() == null || getGraphManager().getGraph().getNode(getGraphManager().getActiveSubGraph().getId() + tempID) == null)) {
 				return (tempID);
 			} else {
 				i++;

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

@@ -1,5 +1,6 @@
 package de.tu_darmstadt.informatik.tk.scopviz.ui;
 
+import java.awt.Color;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.FileReader;
@@ -141,6 +142,16 @@ public final class OptionsManager {
 
 		Button resetButton = new Button("Reset");
 		resetButton.setOnAction((event) -> {
+			
+			defaultValues();
+			
+			defaultWeightField.setText(Double.toString(defaultWeight));
+			defaultLatitudeField.setText(Double.toString(defaultLat));
+			defaultLongitudeField.setText(Double.toString(defaultLong));
+			
+			loggingLevelSelector.getSelectionModel().select(1);
+			
+			showWeightButton.setSelected(showWeight);
 
 			edgeThickness.setText(Integer.toString(defaultEdgeThickness));
 
@@ -356,13 +367,19 @@ public final class OptionsManager {
 			defaultLat = Double.parseDouble(read.readLine());
 			defaultLong = Double.parseDouble(read.readLine());
 			coordinatesChanged = Boolean.parseBoolean(read.readLine());
-			defaultDeviceSize = Integer.parseInt(read.readLine());
-			defaultEdgeThickness = Integer.parseInt(read.readLine());
-			defaultStandardEdgeColor = read.readLine();
-			defaultClickedEdgeColor = read.readLine();
-			defaultPlacementColor = read.readLine();
-			defaultStandardDeviceColor = read.readLine();
-			defaultClickedDeviceColor = read.readLine();
+			
+			CustomWaypointRenderer.setScaleSize(Integer.parseInt(read.readLine()));
+			
+			EdgePainter.setEdgeThickness(Integer.parseInt(read.readLine()));
+			String standard = read.readLine();
+			String selected = read.readLine();
+			String placement = read.readLine();
+			EdgePainter.setColor(standard, placement, selected);
+			
+			standard = read.readLine();
+			selected = read.readLine();
+			CustomWaypointRenderer.setColor(standard, selected);
+			
 			Debug.setLogLevel(Integer.parseInt(read.readLine()));
 			read.close();
 		} catch (IOException e) {
@@ -374,9 +391,9 @@ public final class OptionsManager {
 		try {
 			BufferedWriter write = new BufferedWriter(new FileWriter("settings.properties"));
 			write.write(defaultWeight + "\n" + showWeight + "\n" + defaultLat + "\n" + defaultLong + "\n"
-					+ coordinatesChanged + "\n" + defaultDeviceSize + "\n" + defaultEdgeThickness + "\n"
-					+ defaultStandardEdgeColor + "\n" + defaultClickedEdgeColor + "\n" + defaultPlacementColor + "\n"
-					+ defaultStandardDeviceColor + "\n" + defaultClickedDeviceColor + "\n" + Debug.getLogLevel());
+					+ coordinatesChanged + "\n" + CustomWaypointRenderer.getDeviceSize() + "\n" + EdgePainter.getThickness() + "\n"
+					+ EdgePainter.getStandardColor() + "\n" + EdgePainter.getClickedColor() + "\n" + EdgePainter.getPlacementColor() + "\n"
+					+ CustomWaypointRenderer.getStandardColor() + "\n" + CustomWaypointRenderer.getClickedColor() + "\n" + Debug.getLogLevel());
 			write.close();
 		} catch (IOException e) {
 		}