From 45c3cbec28f7fcb52516fa6ec3529b7d25acc55c Mon Sep 17 00:00:00 2001
From: Philipp Spohr <spohr.philipp@web.de>
Date: Fri, 1 Sep 2017 22:16:48 +0200
Subject: [PATCH] Small fix + use default style for generated subnets
---
.../hhu/ba/yoshikoWrapper/graphModel/YoshikoCluster.java | 6 ++++++
.../ba/yoshikoWrapper/graphModel/YoshikoSolution.java | 9 +++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/graphModel/YoshikoCluster.java b/src/main/java/de/hhu/ba/yoshikoWrapper/graphModel/YoshikoCluster.java
index f2e3d51..3e24075 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/graphModel/YoshikoCluster.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/graphModel/YoshikoCluster.java
@@ -38,6 +38,7 @@ import org.cytoscape.model.subnetwork.CySubNetwork;
import org.cytoscape.view.layout.CyLayoutAlgorithm;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.presentation.RenderingEngine;
+import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.work.Task;
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.TaskMonitor;
@@ -122,6 +123,11 @@ public class YoshikoCluster {
@Override
public void run(TaskMonitor taskMonitor) throws Exception {
taskMonitor.setStatusMessage("Generating cluster view for C:"+id);
+
+ VisualStyle vs= CyCore.visualStyleFactory.createVisualStyle(CyCore.visualMappingManager.getCurrentVisualStyle());
+ CyCore.visualMappingManager.setVisualStyle(vs, view);
+ vs.apply(view);
+
view.setVisualProperty(NETWORK_WIDTH, new Double(width));
view.setVisualProperty(NETWORK_HEIGHT, new Double(height));
view.fitContent();
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/graphModel/YoshikoSolution.java b/src/main/java/de/hhu/ba/yoshikoWrapper/graphModel/YoshikoSolution.java
index 89c6788..3d961ee 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/graphModel/YoshikoSolution.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/graphModel/YoshikoSolution.java
@@ -59,7 +59,8 @@ public class YoshikoSolution {
metaGraph.getRow(metaGraph).set(CyNetwork.NAME, LocalizationManager.get("metaGraph"));
metaGraph.getDefaultNodeTable().createColumn("clusterSize", Integer.class, false);
-
+ metaGraph.getDefaultEdgeTable().createColumn("edgeStrength", Integer.class, false);
+
CyLayoutAlgorithm layout = CyCore.layoutAlgorithmManager.getDefaultLayout();
@@ -84,6 +85,9 @@ public class YoshikoSolution {
null
)
);
+ VisualStyle vs= CyCore.visualStyleFactory.createVisualStyle(CyCore.visualMappingManager.getCurrentVisualStyle());
+ CyCore.visualMappingManager.setVisualStyle(vs, subnetView);
+ vs.apply(subnetView);
clusterNode.setNetworkPointer(subnet);
//Set node attributes
metaGraph.getRow(clusterNode).set("name", LocalizationManager.get("cluster")+" "+c.getID());
@@ -138,7 +142,8 @@ public class YoshikoSolution {
Integer.class,
BasicVisualLexicon.NODE_SIZE
);
- VisualStyle vs= CyCore.visualStyleFactory.createVisualStyle("Meta-Graph Style");
+
+ VisualStyle vs= CyCore.visualStyleFactory.createVisualStyle(CyCore.visualMappingManager.getCurrentVisualStyle());
vs.addVisualMappingFunction(contMap);
CyCore.visualMappingManager.addVisualStyle(vs);
CyCore.cy.setCurrentNetworkView(view);
--
GitLab