Labels on subnodes are always visible #128 #197

lisa-analyzer · May 6, 2022 · b0aa710 · b0aa710
1 parent 3e05e78
commit b0aa710
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 33 deletions.
diff --git a/lisa/lisa-sdk/src/main/java/it/unive/lisa/outputs/GraphmlGraph.java b/lisa/lisa-sdk/src/main/java/it/unive/lisa/outputs/GraphmlGraph.java
@@ -164,15 +164,11 @@ public void markSubNode(SerializableNode node, SerializableNode inner) {
 		MultiGraph innergraph = new MultiGraph(graphname);
 		Node n = innergraph.addNode(sub.getId());
 		sub.attributeKeys().forEach(k -> n.setAttribute(k, sub.getAttribute(k)));
-
-		MultiGraph wrappergraph = new MultiGraph(graphname + "_WRAPPER");
-		Node wrapper = wrappergraph.addNode(graphname + "_WRAPPERNODE");
-		wrapper.setAttribute(NODE_KIND, KIND_SUBNODE);
-		wrapper.setAttribute(NODE_CONTENT, innergraph);
+		n.setAttribute(NODE_KIND, KIND_SUBNODE);
 
 		AtomicInteger counter = subnodesCount.computeIfAbsent(nodeName(node.getId()), k -> new AtomicInteger(0));
 		int idx = counter.getAndIncrement();
-		outer.setAttribute(NODE_SUBNODE_PREFIX + idx, wrappergraph);
+		outer.setAttribute(NODE_SUBNODE_PREFIX + idx, innergraph);
 	}
 
 	/**

diff --git a/lisa/lisa-sdk/src/main/resources/html-graph/viewer.html b/lisa/lisa-sdk/src/main/resources/html-graph/viewer.html
@@ -138,38 +138,12 @@ <h3>$$$GRAPH_DESCRIPTION$$$</h3>
 						'border-width': '0px',						
 					}
 				},
-				{
-					selector: 'node[NODE_KIND = "SUBNODE"]',
-					css: {
-						'content': '',
-						'border-width': '0px',
-					}
-				},
-				{
-					selector: 'node[NODE_KIND = "SUBNODE"].cy-expand-collapse-collapsed-node',
-					css: {
-						'content': '',
-						'border-width': '1px',
-						'border-style': 'solid',
-						'border-color': 'darkgray',
-					}
-				},
 				{
 					selector: 'node[NODE_KIND = "DESCRIPTION"]',
-					css: {
-						'content': '',
-						'border-width': '0px',
-					}
-				},	
-				{
-					selector: 'node[NODE_KIND = "DESCRIPTION"].cy-expand-collapse-collapsed-node',
 					css: {
 						'content': '$$$GRAPH_DESCRIPTION_LABEL$$$',
-						'border-width': '1px',
-						'border-style': 'solid',
-						'border-color': 'darkgray',
 					}
-				},
+				},	
 				{
 					selector: 'node[NODE_IS_ENTRY = "yes"]',
 					css: {