Author: abeld
Date: 2008-12-21 01:14:42 -0800 (Sun, 21 Dec 2008)
New Revision: 15476
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/TextNodeRenderer.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/AdjMatrixTextRenderer.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/TextNodeRendererImpl.java
Log:
refactored-viewmodel: in demo presentation:
add NODE_LABEL node VisualProperty, fix signature of TextNodeRenderer.render()
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/TextNodeRenderer.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/TextNodeRenderer.java
2008-12-21 09:07:20 UTC (rev 15475)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/TextNodeRenderer.java
2008-12-21 09:14:42 UTC (rev 15476)
@@ -3,8 +3,8 @@
import java.util.Set;
import org.cytoscape.viewmodel.VisualProperty;
import org.cytoscape.viewmodel.Renderer;
+import org.cytoscape.viewmodel.View;
-
/**
* Should be implemented as a service.
* 'Renderer' is simply anything that provides VisualProperties.
@@ -12,7 +12,7 @@
*/
public interface TextNodeRenderer extends Renderer {
- public String render();
+ public String render(View<?> view);
/**
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/AdjMatrixTextRenderer.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/AdjMatrixTextRenderer.java
2008-12-21 09:07:20 UTC (rev 15475)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/AdjMatrixTextRenderer.java
2008-12-21 09:14:42 UTC (rev 15476)
@@ -46,11 +46,14 @@
// render each node:
for (View<CyNode> nodeView: view.getCyNodeViews()){
TextNodeRenderer renderer =
nodeView.getVisualProperty(nodeRenderer);
- sb.append("\n"+renderer.render());
+ sb.append("\n"+renderer.render(nodeView));
}
+ /*
+ //just testing DiscreteVisualProperty:
Set<TextNodeRenderer> renderers = nodeRenderer.getValues();
System.out.println("available nodeRenderers: "+renderers.size());
System.out.println(renderers);
+ */
return sb.toString();
}
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/TextNodeRendererImpl.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/TextNodeRendererImpl.java
2008-12-21 09:07:20 UTC (rev 15475)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/presentation/src/main/java/org/cytoscape/presentation/internal/TextNodeRendererImpl.java
2008-12-21 09:14:42 UTC (rev 15476)
@@ -3,12 +3,19 @@
import java.util.Set;
import java.util.HashSet;
import org.cytoscape.viewmodel.VisualProperty;
+import org.cytoscape.viewmodel.View;
import org.cytoscape.presentation.TextNodeRenderer;
public class TextNodeRendererImpl implements TextNodeRenderer {
+ private final VisualProperty<String> nodeLabel =
+ new VisualPropertyImpl<String>("NODE_LABEL", "node label (string)",
+ "default label", String.class,
+ VisualProperty.GraphObjectType.NODE);
- public String render(){
- return "oneTextNode";
+
+ public String render(View<?> view){
+ String label = view.getVisualProperty(nodeLabel);
+ return label;
}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
