From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Wed, 11 Sep 2019 10:16:57 +0000 (+0000)
Subject: Merge "Add node class names to generated SVG"
X-Git-Tag: v1.43.0~136^2~71
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=5e7529d05dde6a355305f9af1682de4cc0b31526;hp=497f90316cb17b5bbd8f8b72af3ab3bb6582a902

Merge "Add node class names to generated SVG"
---

diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/SCLScenegraph.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/SCLScenegraph.java
index 40a526585..fad803ce4 100644
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/SCLScenegraph.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/SCLScenegraph.java
@@ -85,6 +85,7 @@ import org.slf4j.LoggerFactory;
 import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 public class SCLScenegraph {
@@ -916,10 +917,21 @@ public class SCLScenegraph {
             } else if (!(node instanceof RouteGraphNode) && !(node instanceof LinkNode)){
             	try {
             		Element doc = renderSVGNode(svgGenerator, (IG2DNode)node);
-            		if (doc.getElementsByTagName("g").getLength() == 0)
+            		NodeList gList = doc.getElementsByTagName("g");
+            		if (gList.getLength() == 0)
             			return;
+            		boolean hasContent = false;
+            		for (int i = 0; i < gList.getLength(); i++) {
+            		    Node gNode = gList.item(i);
+            		    if (gNode.hasChildNodes()) {
+            		        hasContent = true;
+            		        break;
+            		    }
+            		}
+            		if (!hasContent)
+            		    return;
             		String svg = printSVGDocument(doc);
-            		parentBuilder.append(MAIN_SECTION, "<g>");
+            		parentBuilder.append(MAIN_SECTION, "<g class=\"" +node.getSimpleClassName() +"\">");
             		parentBuilder.append(MAIN_SECTION, svg);
             		parentBuilder.append(MAIN_SECTION, "\n</g>");
             	} catch (Exception e) {