Author: kono
Date: 2009-08-11 18:31:51 -0700 (Tue, 11 Aug 2009)
New Revision: 17781
Modified:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/pom.xml
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/MultiLayerNetworkBuilderImpl.java
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Visual Style generator had been added.
Modified: csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/pom.xml
===================================================================
--- csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/pom.xml
2009-08-12 00:56:16 UTC (rev 17780)
+++ csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/pom.xml
2009-08-12 01:31:51 UTC (rev 17781)
@@ -44,13 +44,18 @@
<artifactId>session-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
-
+
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>vizmap-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
-
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>default-mappings</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+
<!-- GUI -->
<dependency>
<groupId>org.cytoscape.wrappers</groupId>
Modified:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/MultiLayerNetworkBuilderImpl.java
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/MultiLayerNetworkBuilderImpl.java
2009-08-12 00:56:16 UTC (rev 17780)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/MultiLayerNetworkBuilderImpl.java
2009-08-12 01:31:51 UTC (rev 17781)
@@ -14,9 +14,11 @@
import org.cytoscape.model.CyNetworkFactory;
import org.cytoscape.model.CyNode;
import org.cytoscape.session.CyNetworkManager;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.View;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
-//import org.cytoscape.view.vizmap.mappings.DiscreteMapping;
+import org.cytoscape.view.vizmap.mappings.DiscreteMapping;
/**
* Build actual network here
@@ -30,6 +32,8 @@
private static final String NODE_TITLE = "name";
private static final String EDGE_TITLE = "name";
private static final String LAYER_INDEX = "layer index";
+
+ private static final String VISUAL_STYLE_TITLE = "Layer Style";
private Map<String, CyDataTable> netAttrMgr;
@@ -37,21 +41,22 @@
private CyNetwork layeredNetwork;
private CyNetworkFactory factory;
- private VisualMappingManager visualMappingManager;
- private VisualStyle visualStyle;
+ private VisualMappingManager vmm;
+ private VisualStyle layerVS;
private List<CyNetwork> layers;
private List<CyNetwork> connectors;
public MultiLayerNetworkBuilderImpl(CyNetworkManager manager,
- CyNetworkFactory factory) {
+ CyNetworkFactory factory, VisualMappingManager vmm) {
this.manager = manager;
this.factory = factory;
+ this.vmm = vmm;
}
public CyNetwork buildLayeredNetwork(List<CyNetwork> layers,
List<CyNetwork> connectors) {
-
+
layeredNetwork = factory.getInstance();
layeredNetwork.attrs().set(NETWORK_TITLE, "Layered Network");
@@ -89,6 +94,9 @@
}
+
+ buildVisualStyle();
+
System.out.println("OK!");
return layeredNetwork;
@@ -212,16 +220,26 @@
this.connectors = connectors;
}
- public void setVisualMappingManager(VisualMappingManager
visualMappingManager){
- this.visualMappingManager = visualMappingManager;
- }
- public void setVisualStyle(){
- this.visualStyle =
visualMappingManager.getVisualStyle(manager.getCurrentNetworkView());
+
+ public void buildVisualStyle(){
+ layerVS = vmm.createVisualStyle(VISUAL_STYLE_TITLE);
+ final DiscreteMapping<String, Double> index2zLocation = new
DiscreteMapping<String, Double>(LAYER_INDEX, String.class, NODE_Z_LOCATION);
+
+ CyNetworkView view = (CyNetworkView)
manager.getCurrentPresentation().getViewModel();
+
+ final List<View<CyNode>> nodeViews = view.getNodeViews();
+
+ String indexString;
+ for(View<CyNode> nv: nodeViews) {
+ indexString = nv.getSource().attrs().get(LAYER_INDEX,
String.class);
+ index2zLocation.putMapValue(indexString,
Integer.parseInt(indexString) * 300d);
+ }
+
+ layerVS.addVisualMappingFunction(index2zLocation);
+
+ vmm.setVisualStyle(layerVS, view);
+ layerVS.apply(view);
}
-// public void buildVisualStyle(){
-// DiscreteMapping discreteMapping = new
DiscreteMapping(LAYER_INDEX, String.class, NODE_Z_LOCATION);
-// }
-
}
Modified:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/resources/META-INF/spring/bundle-context.xml
2009-08-12 00:56:16 UTC (rev 17780)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/resources/META-INF/spring/bundle-context.xml
2009-08-12 01:31:51 UTC (rev 17781)
@@ -35,7 +35,7 @@
<bean id="multiLayerNetworkBuilder"
class="org.cytoscape.layer.internal.MultiLayerNetworkBuilderImpl">
<constructor-arg ref="cyNetworkManagerServiceRef" />
<constructor-arg ref="cyNetworkFactoryServiceRef" />
- <property name="visualMappingManager"
ref="visualMappingManagerServiceRef" />
+ <constructor-arg ref="visualMappingManagerServiceRef" />
</bean>
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en
-~----------~----~----~----~------~----~------~--~---
