Author: mes
Date: 2011-07-06 13:15:14 -0700 (Wed, 06 Jul 2011)
New Revision: 26071
Modified:
core3/vizmap-gui-impl/trunk/pom.xml
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditor.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DMappingEditor.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousTrackRenderer.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/util/DefaultVisualStyleBuilder.java
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
Log:
updated to reflect vizmapp mappings api changes
Modified: core3/vizmap-gui-impl/trunk/pom.xml
===================================================================
--- core3/vizmap-gui-impl/trunk/pom.xml 2011-07-06 20:09:13 UTC (rev 26070)
+++ core3/vizmap-gui-impl/trunk/pom.xml 2011-07-06 20:15:14 UTC (rev 26071)
@@ -117,11 +117,6 @@
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>default-mappings</artifactId>
- <version>3.0.0-alpha4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
<artifactId>swing-application-api</artifactId>
<version>3.0.0-alpha3-SNAPSHOT</version>
</dependency>
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditor.java
2011-07-06 20:09:13 UTC (rev 26070)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditor.java
2011-07-06 20:15:14 UTC (rev 26071)
@@ -144,12 +144,14 @@
.getPoint(mapping.getPointCount() - 1);
final BoundaryRangeValues<V> previousRange =
previousPoint.getRange();
- newRange = new BoundaryRangeValues<V>(previousRange);
- newRange.lesserValue = slider.getModel().getSortedThumbs()
+ V lesserVal = slider.getModel().getSortedThumbs()
.get(slider.getModel().getThumbCount() -
1).getObject();
- newRange.equalValue = FIVE;
- newRange.greaterValue = previousRange.greaterValue;
+ V equalVal = FIVE;
+ V greaterVal = previousRange.greaterValue;
+
+ newRange = new BoundaryRangeValues<V>(lesserVal, equalVal,
greaterVal);
+
mapping.addPoint(maxValue, newRange);
updateMap();
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DMappingEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DMappingEditor.java
2011-07-06 20:09:13 UTC (rev 26070)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DMappingEditor.java
2011-07-06 20:15:14 UTC (rev 26071)
@@ -158,18 +158,18 @@
.getPoint(mapping.getPointCount() - 1);
final BoundaryRangeValues<V> previousRange =
previousPoint.getRange();
- newRange = new BoundaryRangeValues<V>(previousRange);
- newRange.lesserValue = slider.getModel().getSortedThumbs()
- .get(slider.getModel().getThumbCount() -
1).getObject();
- newRange.equalValue = defValue;
- newRange.greaterValue = previousRange.greaterValue;
+ V lesserVal = slider.getModel().getSortedThumbs()
+ .get(slider.getModel().getThumbCount() -
1).getObject();
+ V equalVal = defValue;
+ V greaterVal = previousRange.greaterValue;
+
+ newRange = new BoundaryRangeValues<V>(lesserVal, equalVal,
greaterVal);
+
mapping.addPoint(maxValue, newRange);
updateMap();
- //
Cytoscape.redrawGraph(cyNetworkManager.getCurrentNetworkView());
-
slider.repaint();
repaint();
}
@@ -187,12 +187,8 @@
if (thumbs.size() == 1) {
// Special case: only one handle.
- mapping.getPoint(0).getRange().equalValue = below;
- mapping.getPoint(0).getRange().lesserValue = below;
- mapping.getPoint(0).getRange().greaterValue = above;
-
- newVal = ((thumbs.get(0).getPosition() / 100) *
valRange)
- + minValue;
+ mapping.getPoint(0).setRange(new
BoundaryRangeValues<V>(below, below, above));
+ newVal = ((thumbs.get(0).getPosition() / 100) *
valRange) + minValue;
mapping.getPoint(0).setValue(newVal);
return;
@@ -201,24 +197,27 @@
for (int i = 0; i < thumbs.size(); i++) {
t = thumbs.get(i);
+ V lesserVal;
+ V equalVal;
+ V greaterVal;
+
if (i == 0) {
// First thumb
- mapping.getPoint(i).getRange().lesserValue =
below;
- mapping.getPoint(i).getRange().equalValue =
below;
- mapping.getPoint(i).getRange().greaterValue =
thumbs.get(i + 1)
- .getObject();
+ lesserVal = below;
+ equalVal = below;
+ greaterVal = thumbs.get(i + 1).getObject();
} else if (i == (thumbs.size() - 1)) {
// Last thumb
- mapping.getPoint(i).getRange().greaterValue =
above;
- mapping.getPoint(i).getRange().equalValue =
t.getObject();
- mapping.getPoint(i).getRange().lesserValue =
t.getObject();
+ greaterVal = above;
+ equalVal = t.getObject();
+ lesserVal = t.getObject();
} else {
// Others
- mapping.getPoint(i).getRange().lesserValue =
t.getObject();
- mapping.getPoint(i).getRange().equalValue =
t.getObject();
- mapping.getPoint(i).getRange().greaterValue =
thumbs.get(i + 1)
- .getObject();
+ lesserVal = t.getObject();
+ equalVal = t.getObject();
+ greaterVal = thumbs.get(i + 1).getObject();
}
+ mapping.getPoint(i).setRange( new
BoundaryRangeValues<V>(lesserVal, equalVal, greaterVal) );
newVal = ((t.getPosition() / 100) * valRange) +
minValue;
mapping.getPoint(i).setValue(newVal);
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
2011-07-06 20:09:13 UTC (rev 26070)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
2011-07-06 20:15:14 UTC (rev 26071)
@@ -480,11 +480,12 @@
if (thumbs.size() == 1) {
// Special case: only one handle.
- mapping.getPoint(0).getRange().equalValue =
thumbs.get(0)
- .getObject();
- mapping.getPoint(0).getRange().lesserValue = below;
- mapping.getPoint(0).getRange().greaterValue = above;
+ V equalVal = thumbs.get(0).getObject();
+ V lesserVal = below;
+ V greaterVal = above;
+ mapping.getPoint(0).setRange( new
BoundaryRangeValues<V>(equalVal, lesserVal, greaterVal) );
+
newVal = ((thumbs.get(0).getPosition() / 100) * range)
+ min;
mapping.getPoint(0).setValue((K) newVal);
@@ -493,27 +494,30 @@
return;
}
- BoundaryRangeValues rg;
int size = thumbs.size();
for (int i = 0; i < size; i++) {
t = thumbs.get(i);
- rg = mapping.getPoint(i).getRange();
+ V lesserVal;
+ V equalVal = (V)t.getObject();
+ V greaterVal;
+
if (i == 0) {
- rg.lesserValue = below;
- rg.greaterValue = t.getObject();
+ lesserVal = below;
+ greaterVal = (V)t.getObject();
} else if (i == (thumbs.size() - 1)) {
- rg.greaterValue = above;
- rg.lesserValue = t.getObject();
+ greaterVal = above;
+ lesserVal = (V)t.getObject();
} else {
- rg.lesserValue = t.getObject();
- rg.greaterValue = t.getObject();
+ lesserVal = (V)t.getObject();
+ greaterVal = (V)t.getObject();
}
+ mapping.getPoint(i).setRange( new
BoundaryRangeValues<V>(lesserVal, equalVal, greaterVal));
+
newVal = ((t.getPosition() / 100) * range) + min;
mapping.getPoint(i).setValue((K) newVal);
- rg.equalValue = t.getObject();
}
// Apply it.
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousTrackRenderer.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousTrackRenderer.java
2011-07-06 20:09:13 UTC (rev 26070)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousTrackRenderer.java
2011-07-06 20:15:14 UTC (rev 26071)
@@ -539,29 +539,29 @@
// updateMax();
V newVal = newY;
-
cMapping.getPoint(selectedIdx).getRange().equalValue = newVal;
+
//cMapping.getPoint(selectedIdx).getRange().equalValue = newVal;
- final BoundaryRangeValues<V> brv = new
BoundaryRangeValues<V>(
-
cMapping.getPoint(selectedIdx).getRange().lesserValue,
- newVal,
-
cMapping.getPoint(selectedIdx).getRange().greaterValue);
+ V lesserVal =
cMapping.getPoint(selectedIdx).getRange().lesserValue;
+ V greaterVal =
cMapping.getPoint(selectedIdx).getRange().greaterValue;
- cMapping.getPoint(selectedIdx).setRange(brv);
-
int numPoints = cMapping.getAllPoints().size();
// Update Values which are not accessible from
// UI
if (numPoints > 1) {
if (selectedIdx == 0)
- brv.greaterValue = newVal;
+ greaterVal = newVal;
else if (selectedIdx == (numPoints - 1))
- brv.lesserValue = newVal;
+ lesserVal = newVal;
else {
- brv.lesserValue = newVal;
- brv.greaterValue = newVal;
+ lesserVal = newVal;
+ greaterVal = newVal;
}
}
+
+ final BoundaryRangeValues<V> brv = new
BoundaryRangeValues<V>(lesserVal, newVal, greaterVal);
+
+ cMapping.getPoint(selectedIdx).setRange(brv);
}
// dragOrigin = e.getPoint();
@@ -599,33 +599,33 @@
updateMax();
-
cMapping.getPoint(selectedIdx).getRange().equalValue = newVal;
+
//cMapping.getPoint(selectedIdx).getRange().equalValue = newVal;
- final BoundaryRangeValues<V> brv = new
BoundaryRangeValues<V>(
-
cMapping.getPoint(selectedIdx).getRange().lesserValue,
- newVal,
-
cMapping.getPoint(selectedIdx).getRange().greaterValue);
+ V lesserVal =
cMapping.getPoint(selectedIdx).getRange().lesserValue;
+ V greaterVal =
cMapping.getPoint(selectedIdx).getRange().greaterValue;
- cMapping.getPoint(selectedIdx).setRange(brv);
-
- int numPoints = cMapping.getAllPoints().size();
-
// Update Values which are not accessible from
// UI
+ int numPoints = cMapping.getAllPoints().size();
if (numPoints > 1) {
if (selectedIdx == 0)
- brv.greaterValue = newVal;
+ greaterVal = newVal;
else if (selectedIdx == (numPoints - 1))
- brv.lesserValue = newVal;
+ lesserVal = newVal;
else {
- brv.lesserValue = newVal;
- brv.greaterValue = newVal;
+ lesserVal = newVal;
+ greaterVal = newVal;
}
+ }
+ final BoundaryRangeValues<V> brv = new
BoundaryRangeValues<V>(
+ lesserVal, newVal, greaterVal);
+ cMapping.getPoint(selectedIdx).setRange(brv);
+
+ if (numPoints > 1) {
style.apply(manager.getCurrentNetworkView());
manager.getCurrentNetworkView().updateView();
- slider.repaint();
}
repaint();
@@ -652,8 +652,7 @@
BoundaryRangeValues<V> original;
original = cMapping.getPoint(0).getRange();
- brv = new BoundaryRangeValues<V>(newValue,
original.equalValue,
- original.greaterValue);
+ brv = new BoundaryRangeValues<V>(newValue,
original.equalValue, original.greaterValue);
cMapping.getPoint(0).setRange(brv);
@@ -687,8 +686,7 @@
original =
cMapping.getPoint(cMapping.getPointCount() - 1)
.getRange();
- brv = new
BoundaryRangeValues<V>(original.lesserValue,
- original.equalValue, above);
+ brv = new
BoundaryRangeValues<V>(original.lesserValue,original.equalValue, above);
cMapping.getPoint(cMapping.getPointCount() -
1).setRange(brv);
// Update view.
@@ -698,9 +696,7 @@
slider.repaint();
repaint();
- firePropertyChange(
-
ContinuousMappingEditorPanel.ABOVE_VALUE_CHANGED, null,
- above);
+ firePropertyChange(
ContinuousMappingEditorPanel.ABOVE_VALUE_CHANGED, null, above);
}
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
2011-07-06 20:09:13 UTC (rev 26070)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
2011-07-06 20:15:14 UTC (rev 26071)
@@ -169,16 +169,16 @@
slider.getModel().addThumb(100f, Color.white);
// Pick Up first point.
- final ContinuousMappingPoint<Double, Color> previousPoint =
mapping
- .getPoint(mapping.getPointCount() - 1);
- final BoundaryRangeValues<Color> previousRange = previousPoint
- .getRange();
+ final ContinuousMappingPoint<Double, Color> previousPoint =
mapping.getPoint(mapping.getPointCount() - 1);
+ final BoundaryRangeValues<Color> previousRange =
previousPoint.getRange();
- lowerRange = new BoundaryRangeValues<Color>(previousRange);
- lowerRange.lesserValue = slider.getModel().getSortedThumbs()
- .get(slider.getModel().getThumbCount() -
1).getObject();
- lowerRange.equalValue = Color.white;
- lowerRange.greaterValue = previousRange.greaterValue;
+ Color lesserVal = slider.getModel().getSortedThumbs()
+ .get(slider.getModel().getThumbCount() -
1).getObject();
+ Color equalVal = Color.white;
+ Color greaterVal = previousRange.greaterValue;
+
+ lowerRange = new BoundaryRangeValues<Color>(lesserVal,
equalVal, greaterVal);
+
mapping.addPoint(maxValue, lowerRange);
updateMap();
@@ -210,30 +210,27 @@
int selected = getSelectedPoint(slider.getSelectedIndex());
- mapping.getPoint(selected).getRange().equalValue = newColor;
+ Color lesserVal =
mapping.getPoint(selected).getRange().lesserValue;
+ Color equalVal = newColor;
+ Color greaterVal =
mapping.getPoint(selected).getRange().greaterValue;
- final BoundaryRangeValues<Color> brv = new
BoundaryRangeValues<Color>(
-
mapping.getPoint(selected).getRange().lesserValue, newColor,
-
mapping.getPoint(selected).getRange().greaterValue);
-
- mapping.getPoint(selected).setRange(brv);
-
int numPoints = mapping.getAllPoints().size();
-
- // Update Values which are not accessible from UI
if (numPoints > 1) {
if (selected == 0)
- brv.greaterValue = newColor;
+ greaterVal = newColor;
else if (selected == (numPoints - 1))
- brv.lesserValue = newColor;
+ lesserVal = newColor;
else {
- brv.lesserValue = newColor;
- brv.greaterValue = newColor;
+ lesserVal = newColor;
+ greaterVal = newColor;
}
+ }
- // mapping.fireStateChanged();
+ final BoundaryRangeValues<Color> brv = new
BoundaryRangeValues<Color>(lesserVal, newColor, greaterVal);
- // Update view.
+ mapping.getPoint(selected).setRange(brv);
+
+ if (numPoints > 1) {
style.apply(appManager.getCurrentNetworkView());
appManager.getCurrentNetworkView().updateView();
slider.repaint();
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/util/DefaultVisualStyleBuilder.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/util/DefaultVisualStyleBuilder.java
2011-07-06 20:09:13 UTC (rev 26070)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/util/DefaultVisualStyleBuilder.java
2011-07-06 20:15:14 UTC (rev 26071)
@@ -14,6 +14,7 @@
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.view.vizmap.VisualStyleFactory;
+import org.cytoscape.view.vizmap.VisualMappingFunctionFactory;
import org.cytoscape.view.vizmap.mappings.PassthroughMapping;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -61,10 +62,13 @@
// Each lexicon has its own defaults.
private final Map<VisualLexicon, VisualStyle> styleMap;
+ private final VisualMappingFunctionFactory passthroughMappingFactory;
- public DefaultVisualStyleBuilder(final VisualStyleFactory vsFactory) {
+ public DefaultVisualStyleBuilder(final VisualStyleFactory vsFactory,
+ final VisualMappingFunctionFactory
passthroughMappingFactory) {
this.vsFactory = vsFactory;
+ this.passthroughMappingFactory = passthroughMappingFactory;
this.styleMap = new HashMap<VisualLexicon, VisualStyle>();
}
@@ -101,8 +105,8 @@
newStyle.setDefaultValue(NETWORK_BACKGROUND_PAINT,
DEFAULT_BACKGROUND_COLOR );
// Create label mappings
- final PassthroughMapping<String, String> labelMapping = new
PassthroughMapping<String, String>(NAME, String.class, NODE_LABEL);
- final PassthroughMapping<String, String> edgeLabelMapping = new
PassthroughMapping<String, String>(INTERACTION, String.class, EDGE_LABEL);
+ final PassthroughMapping<String, String> labelMapping =
(PassthroughMapping)passthroughMappingFactory.createVisualMappingFunction(NAME,
String.class, NODE_LABEL);
+ final PassthroughMapping<String, String> edgeLabelMapping =
(PassthroughMapping)passthroughMappingFactory.createVisualMappingFunction(INTERACTION,
String.class, EDGE_LABEL);
newStyle.addVisualMappingFunction(labelMapping);
newStyle.addVisualMappingFunction(edgeLabelMapping);
Modified:
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
2011-07-06 20:09:13 UTC (rev 26070)
+++
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
2011-07-06 20:15:14 UTC (rev 26071)
@@ -90,6 +90,11 @@
<osgi:reference id="cyTableManagerServiceRef"
interface="org.cytoscape.model.CyTableManager" />
+ <!-- passthrough mapping factory -->
+ <osgi:reference id="passthroughMappingFactoryRef"
+
interface="org.cytoscape.view.vizmap.VisualMappingFunctionFactory"
+ filter="(mapping.type=passthrough)"/>
+
<!-- Pull-down menu items -->
<osgi:service id="createNewVisualStyleTaskFactoryService"
Modified:
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
2011-07-06 20:09:13 UTC (rev 26070)
+++
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
2011-07-06 20:15:14 UTC (rev 26071)
@@ -41,6 +41,7 @@
<bean name="defaultVisualStyleBuilder"
class="org.cytoscape.view.vizmap.gui.internal.util.DefaultVisualStyleBuilder">
<constructor-arg ref="visualStyleFactoryServiceRef" />
+ <constructor-arg ref="passthroughMappingFactoryRef" />
</bean>
<!-- Property Sheet -->
--
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.
