Fixes subcircuit coloring

Author: hackettccp

src/draw/model/AbstractCanvasObject.java

@@ -192,9 +192,11 @@ protected boolean setForStroke(Graphics g) {
 		Integer width = getValue(DrawAttr.STROKE_WIDTH);
 		if (width != null && width.intValue() > 0) {
 			Color color = getValue(DrawAttr.STROKE_COLOR);
-			if (color != null && color.getAlpha() == 0) {
+			if (color != null && color.getAlpha() == 0 && color.getRGB() != 0) {
 				return false;
-			} else {
+			}
+			else {
+				color = new Color(190, 190, 190);
 				GraphicsUtil.switchToWidth(g, width.intValue());
 				if (color != null) g.setColor(color);
 				return true;

src/draw/shapes/SvgReader.java

@@ -69,7 +69,7 @@ public static AbstractCanvasObject createShape(Element elt) {
 		}
 		if (attrs.contains(DrawAttr.FILL_COLOR)) {
 			String color = elt.getAttribute("fill");
-			if (color.equals("")) color = "#000000";
+			if (color.equals("")) color = "#BEBEBE";
 			String opacity = elt.getAttribute("fill-opacity");
 			if (!color.equals("none")) {
 				ret.setValue(DrawAttr.FILL_COLOR, getColor(color, opacity));