Author: abeld
Date: 2009-03-15 05:28:55 -0700 (Sun, 15 Mar 2009)
New Revision: 16270
Added:
core3/default-mappingcalculators/branches/
core3/default-mappingcalculators/branches/valuecalculator/
core3/vizmap-api/branches/
core3/vizmap-api/branches/valuecalculator/
core3/vizmap-api/branches/valuecalculator/src/main/java/org/cytoscape/vizmap/VisualStyle.java
core3/vizmap-impl/branches/
core3/vizmap-impl/branches/valuecalculator/
core3/vizmap-impl/branches/valuecalculator/src/main/java/org/cytoscape/vizmap/internal/VisualStyleImpl.java
Removed:
core3/vizmap-api/branches/valuecalculator/src/main/java/org/cytoscape/vizmap/VisualStyle.java
core3/vizmap-impl/branches/valuecalculator/src/main/java/org/cytoscape/vizmap/internal/VisualStyleImpl.java
Log:
vizmap: create valuecalculator branch to experiment with simplified
MappingCalculator api: instead of .apply() method, have a .calculateValue()
method and do the looping over View instances in the VisualStyle implementation
Copied: core3/default-mappingcalculators/branches/valuecalculator (from rev
16263, core3/default-mappingcalculators/trunk)
Copied: core3/vizmap-api/branches/valuecalculator (from rev 16263,
core3/vizmap-api/trunk)
Deleted:
core3/vizmap-api/branches/valuecalculator/src/main/java/org/cytoscape/vizmap/VisualStyle.java
===================================================================
--- core3/vizmap-api/trunk/src/main/java/org/cytoscape/vizmap/VisualStyle.java
2009-03-13 21:02:24 UTC (rev 16263)
+++
core3/vizmap-api/branches/valuecalculator/src/main/java/org/cytoscape/vizmap/VisualStyle.java
2009-03-15 12:28:55 UTC (rev 16270)
@@ -1,97 +0,0 @@
-/*
- Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
-
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-*/
-package org.cytoscape.vizmap;
-
-import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.view.model.VisualProperty;
-
-
-/**
- * This is simply a collection of MappingCalculators that define
- * how a set of attributes modify the visual properties of a
- * View object.
- */
-public interface VisualStyle {
- /**
- * DOCUMENT ME!
- *
- * @param c DOCUMENT ME!
- */
- void setMappingCalculator(MappingCalculator c);
-
- /**
- * DOCUMENT ME!
- *
- * @param t DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- MappingCalculator getMappingCalculator(VisualProperty<?> t);
-
- /**
- * Removes the mapping for the given VisualProperty
- *
- * @param t DOCUMENT ME!
- *
- * @return the removed MappingCalculator (null if one was not defined
for the VisualProperty)
- */
- MappingCalculator removeMappingCalculator(VisualProperty<?> t);
- /**
- * DOCUMENT ME!
- *
- * @param <T> DOCUMENT ME!
- * @param prop DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- <T> T getDefault(VisualProperty<T> prop);
-
- /**
- * DOCUMENT ME!
- *
- * @param <T> DOCUMENT ME!
- * @param vp DOCUMENT ME!
- * @param value DOCUMENT ME!
- */
- <T> void setDefault(VisualProperty<T> vp, T value);
-
- // ??
- /**
- * DOCUMENT ME!
- *
- * @param v DOCUMENT ME!
- */
- void apply(CyNetworkView v);
-}
Copied:
core3/vizmap-api/branches/valuecalculator/src/main/java/org/cytoscape/vizmap/VisualStyle.java
(from rev 16269,
core3/vizmap-api/trunk/src/main/java/org/cytoscape/vizmap/VisualStyle.java)
Copied: core3/vizmap-impl/branches/valuecalculator (from rev 16263,
core3/vizmap-impl/trunk)
Deleted:
core3/vizmap-impl/branches/valuecalculator/src/main/java/org/cytoscape/vizmap/internal/VisualStyleImpl.java
===================================================================
---
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/vizmap/internal/VisualStyleImpl.java
2009-03-13 21:02:24 UTC (rev 16263)
+++
core3/vizmap-impl/branches/valuecalculator/src/main/java/org/cytoscape/vizmap/internal/VisualStyleImpl.java
2009-03-15 12:28:55 UTC (rev 16270)
@@ -1,188 +0,0 @@
-/*
- Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
-
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-*/
-package org.cytoscape.vizmap.internal;
-
-import org.cytoscape.event.CyEventHelper;
-
-import org.cytoscape.model.CyEdge;
-import org.cytoscape.model.CyNode;
-import org.cytoscape.model.GraphObject;
-
-import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.view.model.View;
-import org.cytoscape.view.model.ViewColumn;
-import org.cytoscape.view.model.VisualProperty;
-import org.cytoscape.view.model.VisualPropertyCatalog;
-
-import org.cytoscape.vizmap.MappingCalculator;
-import org.cytoscape.vizmap.VisualStyle;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- */
-public class VisualStyleImpl implements VisualStyle {
- private Map<VisualProperty<?>, MappingCalculator> calculators;
- private Map<VisualProperty<?>, Object> perVSDefaults;
- private CyEventHelper eventHelper;
- private VisualPropertyCatalog vpCatalog;
-
- /**
- * Creates a new VisualStyleImpl object.
- *
- * @param eventHelper DOCUMENT ME!
- * @param vpCatalog DOCUMENT ME!
- */
- public VisualStyleImpl(final CyEventHelper eventHelper, final
VisualPropertyCatalog vpCatalog) {
- if (eventHelper == null)
- throw new NullPointerException("CyEventHelper is null");
-
- if (vpCatalog == null)
- throw new NullPointerException("vpCatalog is null");
-
- this.eventHelper = eventHelper;
- this.vpCatalog = vpCatalog;
- calculators = new HashMap<VisualProperty<?>,
MappingCalculator>();
- perVSDefaults = new HashMap<VisualProperty<?>, Object>();
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param c DOCUMENT ME!
- */
- public void setMappingCalculator(final MappingCalculator c) {
- calculators.put(c.getVisualProperty(), c);
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param t DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public MappingCalculator getMappingCalculator(final VisualProperty<?>
t) {
- return calculators.get(t);
- }
-
- public MappingCalculator removeMappingCalculator(final
VisualProperty<?> t) {
- return calculators.remove(t);
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param <T> DOCUMENT ME!
- * @param vp DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public <T> T getDefault(final VisualProperty<T> vp) {
- return (T) perVSDefaults.get(vp);
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param <T> DOCUMENT ME!
- * @param vp DOCUMENT ME!
- * @param value DOCUMENT ME!
- */
- public <T> void setDefault(final VisualProperty<T> vp, final T value) {
- perVSDefaults.put(vp, value);
- }
-
- // ??
- /**
- * DOCUMENT ME!
- *
- * @param view DOCUMENT ME!
- */
- public void apply(final CyNetworkView view) {
- final List<View<CyNode>> nodeviews = view.getCyNodeViews();
- final List<View<CyEdge>> edgeviews = view.getCyEdgeViews();
-
- applyImpl(view, nodeviews,
- vpCatalog.collectionOfVisualProperties(nodeviews,
VisualProperty.NODE));
- applyImpl(view, edgeviews,
- vpCatalog.collectionOfVisualProperties(edgeviews,
VisualProperty.EDGE));
- applyImpl(view, Arrays.asList(view.getNetworkView()),
-
vpCatalog.collectionOfVisualProperties(VisualProperty.NETWORK));
- }
-
- // note: can't use applyImpl(List<View<?>>views ... ) because that does
not compile
- /**
- * DOCUMENT ME!
- *
- * @param <T> DOCUMENT ME!
- * @param views DOCUMENT ME!
- * @param visualProperties DOCUMENT ME!
- */
- public <T extends GraphObject> void applyImpl(final CyNetworkView view,
final List<View<T>> views,
- final Collection<?
extends VisualProperty<?>> visualProperties) {
- for (VisualProperty<?> vp: visualProperties){
- applyImpl(view, views, vp);
- }
- }
- /**
- * DOCUMENT ME!
- *
- * @param <T> DOCUMENT ME!
- * @param views DOCUMENT ME!
- * @param visualProperties DOCUMENT ME!
- */
- public <T, V extends GraphObject> void applyImpl(final CyNetworkView
view, final List<View<V>> views, final VisualProperty<T> vp) {
- ViewColumn<T> column = view.getColumn(vp);
- final MappingCalculator c = getMappingCalculator(vp);
- final T perVSDefault = getDefault(vp);
- if (perVSDefault != null){
- column.setDefaultValue(perVSDefault);
- }
- if (c != null) {
- c.apply(column, views);
- } else {
- // reset all rows to allow usage of default value:
- for (View<V>v: views){
- column.clearValue(v);
- }
- }
- }
-}
Copied:
core3/vizmap-impl/branches/valuecalculator/src/main/java/org/cytoscape/vizmap/internal/VisualStyleImpl.java
(from rev 16269,
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/vizmap/internal/VisualStyleImpl.java)
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
