Author: clopes
Date: 2012-12-06 17:07:39 -0800 (Thu, 06 Dec 2012)
New Revision: 30918
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeDetails.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeDetails.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/graph/render/stateful/GraphRenderer.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/graph/render/stateful/NodeDetails.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/DGraphViewApplyTest.java
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy3SimpleSessionLodingTest.java
core3/impl/trunk/session-impl/integration-test/src/test/resources/testData/session3x/simpleSession.cys
Log:
Fixes #1631 (Some locked visual properties reset after applying a visual style)
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeDetails.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeDetails.java
2012-12-07 00:56:33 UTC (rev 30917)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeDetails.java
2012-12-07 01:07:39 UTC (rev 30918)
@@ -721,14 +721,15 @@
if (dev.isValueLocked(DVisualLexicon.EDGE_TRANSPARENCY))
return
dev.getVisualProperty(DVisualLexicon.EDGE_TRANSPARENCY);
- final Integer trans = m_edgeTansparencies.get(edge);
+ Integer trans = m_edgeTansparencies.get(edge);
if (trans == null) {
if (transparencyDefault == null)
- return
DVisualLexicon.EDGE_TRANSPARENCY.getDefault();
+ trans =
DVisualLexicon.EDGE_TRANSPARENCY.getDefault();
else
- return transparencyDefault;
- } else
- return trans;
+ trans = transparencyDefault;
+ }
+
+ return trans;
}
void setTransparencyDefault(Integer transparency) {
@@ -751,14 +752,15 @@
if (dev.isValueLocked(DVisualLexicon.EDGE_LABEL_TRANSPARENCY))
return
dev.getVisualProperty(DVisualLexicon.EDGE_LABEL_TRANSPARENCY);
- final Integer trans = m_edgeLabelTansparencies.get(edge);
+ Integer trans = m_edgeLabelTansparencies.get(edge);
if (trans == null) {
if (labelTransparencyDefault == null)
- return
DVisualLexicon.EDGE_LABEL_TRANSPARENCY.getDefault();
+ trans =
DVisualLexicon.EDGE_LABEL_TRANSPARENCY.getDefault();
else
- return labelTransparencyDefault;
- } else
- return trans;
+ trans = labelTransparencyDefault;
+ }
+
+ return trans;
}
void setLabelTransparencyDefault(Integer transparency) {
@@ -777,19 +779,26 @@
@Override
public Font getLabelFont(final CyEdge edge, final int labelInx) {
+ Number size = null;
+ Font font = null;
+ final DEdgeView dev = dGraphView.getDEdgeView(edge);
+
// Check bypass
- final DEdgeView dev = dGraphView.getDEdgeView(edge);
- if (dev.isValueLocked(DVisualLexicon.EDGE_LABEL_FONT_FACE))
- return
dev.getVisualProperty(DVisualLexicon.EDGE_LABEL_FONT_FACE);
-
- final Font font = m_labelFonts.get(edge);
-
- if (font == null)
- if (m_labelFontDefault == null)
- return super.getLabelFont(edge, labelInx);
- else
- return m_labelFontDefault;
-
+ if (dev.isValueLocked(DVisualLexicon.EDGE_LABEL_FONT_SIZE))
+ size =
dev.getVisualProperty(DVisualLexicon.EDGE_LABEL_FONT_SIZE);
+
+ if (dev.isValueLocked(DVisualLexicon.EDGE_LABEL_FONT_FACE)) {
+ font =
dev.getVisualProperty(DVisualLexicon.EDGE_LABEL_FONT_FACE);
+ } else {
+ font = m_labelFonts.get(edge);
+
+ if (font == null)
+ font = m_labelFontDefault != null ?
m_labelFontDefault : super.getLabelFont(edge, labelInx);
+ }
+
+ if (size != null && font != null)
+ font = font.deriveFont(size.floatValue());
+
return font;
}
@@ -814,20 +823,27 @@
@Override
public Paint getLabelPaint(final CyEdge edge, final int labelInx) {
- // Check bypass
+ Paint paint = null;
+ Integer trans = null;
final DEdgeView dev = dGraphView.getDEdgeView(edge);
- if (dev.isValueLocked(DVisualLexicon.EDGE_LABEL_COLOR))
- return
dev.getVisualProperty(DVisualLexicon.EDGE_LABEL_COLOR);
+
+ // First check if transparency is locked, because the stored
colors may not contain the correct alpha value
+ if (dev.isValueLocked(DVisualLexicon.EDGE_LABEL_TRANSPARENCY))
+ trans = getLabelTransparency(edge);
+
+ if (dev.isValueLocked(DVisualLexicon.EDGE_LABEL_COLOR)) {
+ // Check bypass
+ paint =
dev.getVisualProperty(DVisualLexicon.EDGE_LABEL_COLOR);
+ } else {
+ paint = m_labelPaints.get(edge);
- // final long key = (((long) edge) << 32) | ((long) labelInx);
- final Paint paint = m_labelPaints.get(edge);
+ if (paint == null)
+ paint = m_labelPaintDefault != null ?
m_labelPaintDefault : super.getLabelPaint(edge, labelInx);
+ }
+
+ if (trans != null)
+ paint = dGraphView.getTransparentColor(paint, trans);
- if (paint == null)
- if (m_labelPaintDefault == null)
- return super.getLabelPaint(edge, labelInx);
- else
- return m_labelPaintDefault;
-
return paint;
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
2012-12-07 00:56:33 UTC (rev 30917)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
2012-12-07 01:07:39 UTC (rev 30918)
@@ -680,13 +680,10 @@
final Font newFont = ((Font)
value).deriveFont(fontSize);
setFont(newFont);
} else if (vp == DVisualLexicon.EDGE_LABEL_FONT_SIZE) {
- int newSize = ((Number) value).intValue();
- if (newSize != fontSize) {
- fontSize = newSize;
- final Font f = getFont();
- if (f != null)
- setFont(f.deriveFont(newSize));
- }
+ fontSize = ((Number) value).intValue();
+ final Font f = getFont();
+ if (f != null)
+ setFont(f.deriveFont(fontSize));
} else if (vp == BasicVisualLexicon.EDGE_LABEL_COLOR) {
setTextPaint((Paint) value);
} else if (vp == BasicVisualLexicon.EDGE_VISIBLE) {
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeDetails.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeDetails.java
2012-12-07 00:56:33 UTC (rev 30917)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeDetails.java
2012-12-07 01:07:39 UTC (rev 30918)
@@ -194,17 +194,17 @@
}
@Override
- public Color colorLowDetail(final CyNode node) {
+ public Color getColorLowDetail(final CyNode node) {
boolean isSelected = selected.contains(node);
if (isSelected)
- return selectedColorLowDetail(node);
+ return getSelectedColorLowDetail(node);
else
- return unselectedColorLowDetail(node);
+ return getUnselectedColorLowDetail(node);
}
- private Color unselectedColorLowDetail(CyNode node) {
+ private Color getUnselectedColorLowDetail(CyNode node) {
// Check bypass
final DNodeView dnv = dGraphView.getDNodeView(node);
if (dnv.isValueLocked(DVisualLexicon.NODE_FILL_COLOR))
@@ -214,7 +214,7 @@
if ((o == null) || (o == m_deletedEntry))
if (m_colorLowDetailDefault == null)
- return super.colorLowDetail(node);
+ return super.getColorLowDetail(node);
else
return m_colorLowDetailDefault;
@@ -227,7 +227,7 @@
defaultValues.put(DVisualLexicon.NODE_PAINT,
m_colorLowDetailDefault);
}
- private Color selectedColorLowDetail(CyNode node) {
+ private Color getSelectedColorLowDetail(CyNode node) {
// Check bypass
final DNodeView dnv = dGraphView.getDNodeView(node);
if (dnv.isValueLocked(DVisualLexicon.NODE_SELECTED_PAINT))
@@ -403,9 +403,8 @@
defaultValues.put(DVisualLexicon.NODE_BORDER_WIDTH,
m_borderWidthDefault);
}
- /*
- * A negative width value has the special meaning to remove overridden
- * width.
+ /**
+ * A negative width value has the special meaning to remove overridden
width.
*/
void overrideBorderWidth(final CyNode node, final float width) {
if ((width < 0.0f) || (width == super.getBorderWidth(node)))
@@ -416,7 +415,6 @@
}
}
-
@Override
public Stroke getBorderStroke(final CyNode node) {
final float borderWidth = getBorderWidth(node);
@@ -446,7 +444,6 @@
m_borderStrokeDefault = lineType;
defaultValues.put(DVisualLexicon.NODE_BORDER_LINE_TYPE,
m_borderStrokeDefault);
}
-
void overrideBorderStroke(final CyNode node, final Stroke stroke) {
if (stroke == null)
@@ -457,27 +454,33 @@
}
}
-
-
@Override
public Paint getBorderPaint(final CyNode node) {
- // Check bypass
final DNodeView dnv = dGraphView.getDNodeView(node);
+
if (dnv == null)
return DVisualLexicon.NODE_BORDER_PAINT.getDefault();
+
+ Paint paint = null;
+ Integer trans = null;
+
+ // First check if transparency is locked, because the stored
colors may not contain the correct alpha value
+ if (dnv.isValueLocked(DVisualLexicon.NODE_BORDER_TRANSPARENCY))
+ trans = getBorderTransparency(node);
+
+ if (dnv.isValueLocked(DVisualLexicon.NODE_BORDER_PAINT)) {
+ paint =
dnv.getVisualProperty(DVisualLexicon.NODE_BORDER_PAINT);
+ } else {
+ paint = m_borderPaints.get(node);
- if (dnv.isValueLocked(DVisualLexicon.NODE_BORDER_PAINT))
- return
dnv.getVisualProperty(DVisualLexicon.NODE_BORDER_PAINT);
+ if (paint == null)
+ paint = m_borderPaintDefault != null ?
m_borderPaintDefault : super.getBorderPaint(node);
+ }
- final Paint o = m_borderPaints.get(node);
-
- if (o == null)
- if (m_borderPaintDefault == null)
- return super.getBorderPaint(node);
- else
- return m_borderPaintDefault;
-
- return o;
+ if (trans != null) // New transparency? Recreate the paint
object
+ paint = dGraphView.getTransparentColor(paint, trans);
+
+ return paint;
}
void setBorderPaintDefault(Paint p) {
@@ -485,7 +488,7 @@
defaultValues.put(DVisualLexicon.NODE_BORDER_PAINT, p);
}
- /*
+ /**
* A null paint has the special meaning to remove overridden paint.
*/
void overrideBorderPaint(final CyNode node, final Paint paint) {
@@ -498,7 +501,7 @@
}
@Override
- public int labelCount(final CyNode node) {
+ public int getLabelCount(final CyNode node) {
// Check related bypass
final DNodeView dnv = dGraphView.getDNodeView(node);
if (dnv.isValueLocked(DVisualLexicon.NODE_LABEL) &&
!dnv.getVisualProperty(DVisualLexicon.NODE_LABEL).isEmpty())
@@ -508,7 +511,7 @@
if (o == null)
if (m_labelCountDefault == null)
- return super.labelCount(node);
+ return super.getLabelCount(node);
else
return m_labelCountDefault.intValue();
@@ -519,11 +522,11 @@
m_labelCountDefault = Integer.valueOf(lc);
}
- /*
+ /**
* A negative labelCount has the special meaning to remove overridden
count.
*/
void overrideLabelCount(final CyNode node, final int labelCount) {
- if ((labelCount < 0) || (labelCount == super.labelCount(node)))
+ if ((labelCount < 0) || (labelCount ==
super.getLabelCount(node)))
m_labelCounts.remove(node);
else {
m_labelCounts.put(node, labelCount);
@@ -532,7 +535,7 @@
}
@Override
- public String labelText(final CyNode node, final int labelInx) {
+ public String getLabelText(final CyNode node, final int labelInx) {
// Check bypass
final DNodeView dnv = dGraphView.getDNodeView(node);
if (dnv.isValueLocked(DVisualLexicon.NODE_LABEL))
@@ -543,7 +546,7 @@
if (o == null)
if (m_labelTextDefault == null)
- return super.labelText(node, labelInx);
+ return super.getLabelText(node, labelInx);
else
return m_labelTextDefault;
@@ -555,13 +558,13 @@
defaultValues.put(DVisualLexicon.NODE_LABEL,
m_labelTextDefault);
}
- /*
+ /**
* A null text has the special meaning to remove overridden text.
*/
void overrideLabelText(final CyNode node, final int labelInx, final
String text) {
// final long key = (((long) node) << 32) | ((long) labelInx);
- if ((text == null) || text.equals(super.labelText(node,
labelInx)))
+ if ((text == null) || text.equals(super.getLabelText(node,
labelInx)))
m_labelTexts.remove(node);
else {
m_labelTexts.put(node, text);
@@ -591,7 +594,7 @@
defaultValues.put(DVisualLexicon.NODE_TOOLTIP,
m_tooltipTextDefault);
}
- /*
+ /**
* A null text has the special meaning to remove overridden text.
*/
void overrideTooltipText(final CyNode node, final String text) {
@@ -606,32 +609,29 @@
@Override
public Font getLabelFont(CyNode node, int labelInx) {
+ Number size = null;
+ Font font = null;
+ final DNodeView dnv = dGraphView.getDNodeView(node);
+
// Check bypass
- final DNodeView dnv = dGraphView.getDNodeView(node);
-
- Number size = null;
- Font fontFace = null;
if (dnv.isValueLocked(DVisualLexicon.NODE_LABEL_FONT_SIZE))
size =
dnv.getVisualProperty(DVisualLexicon.NODE_LABEL_FONT_SIZE);
- if (dnv.isValueLocked(DVisualLexicon.NODE_LABEL_FONT_FACE))
- fontFace =
dnv.getVisualProperty(DVisualLexicon.NODE_LABEL_FONT_FACE);
-
- if (size != null && fontFace != null)
- return fontFace.deriveFont(size.floatValue());
-
- final Font font = m_labelFonts.get(node);
-
//System.out.println(dGraphView.getModel().getRow(node).get(CyNetwork.NAME,
String.class) + ": Font is = " + font);
-
- if (font == null) {
- if (m_labelFontDefault == null)
- return
DVisualLexicon.NODE_LABEL_FONT_FACE.getDefault();
- else {
- return m_labelFontDefault;
+ if (dnv.isValueLocked(DVisualLexicon.NODE_LABEL_FONT_FACE)) {
+ font =
dnv.getVisualProperty(DVisualLexicon.NODE_LABEL_FONT_FACE);
+ } else {
+ font = m_labelFonts.get(node);
+
+ if (font == null) {
+ font = m_labelFontDefault != null ?
+ m_labelFontDefault :
DVisualLexicon.NODE_LABEL_FONT_FACE.getDefault();
}
- } else {
- return font;
}
+
+ if (size != null && font != null)
+ font = font.deriveFont(size.floatValue());
+
+ return font;
}
void setLabelFontDefault(Font f) {
@@ -645,7 +645,7 @@
/*
* A null font has the special meaning to remove overridden font.
*/
- void overrideLabelFont(CyNode node, final Font font) {
+ void overrideLabelFont(final CyNode node, final Font font) {
if (font == null) {
m_labelFonts.remove(node);
} else {
@@ -655,21 +655,29 @@
}
@Override
- public Paint labelPaint(CyNode node, int labelInx) {
- // Check bypass
+ public Paint getLabelPaint(final CyNode node, final int labelInx) {
+ Paint paint = null;
+ Integer trans = null;
final DNodeView dnv = dGraphView.getDNodeView(node);
- if (dnv.isValueLocked(DVisualLexicon.NODE_LABEL_COLOR))
- return
dnv.getVisualProperty(DVisualLexicon.NODE_LABEL_COLOR);
+
+ // First check if transparency is locked, because the stored
colors may not contain the correct alpha value
+ if (dnv.isValueLocked(DVisualLexicon.NODE_LABEL_TRANSPARENCY))
+ trans = getLabelTransparency(node);
+
+ if (dnv.isValueLocked(DVisualLexicon.NODE_LABEL_COLOR)) {
+ // Check bypass
+ paint =
dnv.getVisualProperty(DVisualLexicon.NODE_LABEL_COLOR);
+ } else {
+ paint = m_labelPaints.get(node);
- final Object o = m_labelPaints.get(node);
+ if (paint == null)
+ paint = m_labelPaintDefault != null ?
m_labelPaintDefault : DVisualLexicon.NODE_LABEL_COLOR.getDefault();
+ }
+
+ if (trans != null)
+ paint = dGraphView.getTransparentColor(paint, trans);
- if (o == null)
- if (m_labelPaintDefault == null)
- return
DVisualLexicon.NODE_LABEL_COLOR.getDefault();
- else
- return m_labelPaintDefault;
-
- return (Paint) o;
+ return paint;
}
void setLabelPaintDefault(Paint p) {
@@ -677,7 +685,7 @@
defaultValues.put(DVisualLexicon.NODE_LABEL_COLOR,
m_labelPaintDefault);
}
- /*
+ /**
* A null paint has the special meaning to remove overridden paint.
*/
void overrideLabelPaint(CyNode node, int labelInx, Paint paint) {
@@ -690,19 +698,19 @@
}
@Override
- public int customGraphicCount(final CyNode node) {
+ public int getCustomGraphicCount(final CyNode node) {
final DNodeView dnv = (DNodeView) dGraphView.getDNodeView(node);
return dnv.getNumCustomGraphics();
}
@Override
- public Iterator<CustomGraphicLayer> customGraphics(final CyNode node) {
+ public Iterator<CustomGraphicLayer> getCustomGraphics(final CyNode
node) {
final DNodeView dnv = (DNodeView) dGraphView.getDNodeView(node);
return dnv.customGraphicIterator();
}
@Override
- public byte labelTextAnchor(final CyNode node, final int labelInx) {
+ public byte getLabelTextAnchor(final CyNode node, final int labelInx) {
// Check bypass
final DNodeView dnv = dGraphView.getDNodeView(node);
if (dnv.isValueLocked(DVisualLexicon.NODE_LABEL_POSITION)) {
@@ -715,7 +723,7 @@
if (p == null)
if (m_labelTextAnchorDefault == null)
- return super.labelTextAnchor(node, labelInx);
+ return super.getLabelTextAnchor(node, labelInx);
else
return m_labelTextAnchorDefault.byteValue();
@@ -727,7 +735,7 @@
}
void overrideLabelTextAnchor(final CyNode node, final int inx, final
int anchor) {
- if (convertG2ND(anchor) == super.labelTextAnchor(node, inx))
+ if (convertG2ND(anchor) == super.getLabelTextAnchor(node, inx))
m_labelTextAnchors.remove(node);
else {
m_labelTextAnchors.put(node, Integer.valueOf(anchor));
@@ -736,7 +744,7 @@
}
@Override
- public byte labelNodeAnchor(final CyNode node, final int labelInx) {
+ public byte getLabelNodeAnchor(final CyNode node, final int labelInx) {
// Check bypass
final DNodeView dnv = dGraphView.getDNodeView(node);
if (dnv.isValueLocked(DVisualLexicon.NODE_LABEL_POSITION)) {
@@ -749,7 +757,7 @@
if (o == null)
if (m_labelNodeAnchorDefault == null)
- return super.labelNodeAnchor(node, labelInx);
+ return super.getLabelNodeAnchor(node, labelInx);
else
return m_labelNodeAnchorDefault.byteValue();
@@ -761,7 +769,7 @@
}
void overrideLabelNodeAnchor(final CyNode node, final int inx, final
int anchor) {
- if (convertG2ND(anchor) == super.labelNodeAnchor(node, inx))
+ if (convertG2ND(anchor) == super.getLabelNodeAnchor(node, inx))
m_labelNodeAnchors.remove(node);
else {
m_labelNodeAnchors.put(node, Integer.valueOf(anchor));
@@ -770,7 +778,7 @@
}
@Override
- public float labelOffsetVectorX(final CyNode node, final int labelInx) {
+ public float getLabelOffsetVectorX(final CyNode node, final int
labelInx) {
// Check bypass
final DNodeView dnv = dGraphView.getDNodeView(node);
if (dnv.isValueLocked(DVisualLexicon.NODE_LABEL_POSITION)) {
@@ -782,7 +790,7 @@
if (o == null)
if (m_labelOffsetVectorXDefault == null)
- return super.labelOffsetVectorX(node, labelInx);
+ return super.getLabelOffsetVectorX(node,
labelInx);
else
return m_labelOffsetVectorXDefault.floatValue();
@@ -794,7 +802,7 @@
}
void overrideLabelOffsetVectorX(final CyNode node, final int inx, final
double x) {
- if (((float) x) == super.labelOffsetVectorX(node, inx))
+ if (((float) x) == super.getLabelOffsetVectorX(node, inx))
m_labelOffsetXs.remove(node);
else {
m_labelOffsetXs.put(node, new Double(x));
@@ -803,7 +811,7 @@
}
@Override
- public float labelOffsetVectorY(final CyNode node, final int labelInx) {
+ public float getLabelOffsetVectorY(final CyNode node, final int
labelInx) {
// Check bypass
final DNodeView dnv = dGraphView.getDNodeView(node);
if (dnv.isValueLocked(DVisualLexicon.NODE_LABEL_POSITION)) {
@@ -815,7 +823,7 @@
if (o == null)
if (m_labelOffsetVectorYDefault == null)
- return super.labelOffsetVectorY(node, labelInx);
+ return super.getLabelOffsetVectorY(node,
labelInx);
else
return m_labelOffsetVectorYDefault.floatValue();
@@ -827,7 +835,7 @@
}
void overrideLabelOffsetVectorY(final CyNode node, final int inx, final
double y) {
- if (((float) y) == super.labelOffsetVectorY(node, inx))
+ if (((float) y) == super.getLabelOffsetVectorY(node, inx))
m_labelOffsetYs.remove(node);
else {
m_labelOffsetYs.put(node, new Double(y));
@@ -836,7 +844,7 @@
}
@Override
- public byte labelJustify(final CyNode node, final int labelInx) {
+ public byte getLabelJustify(final CyNode node, final int labelInx) {
// Check bypass
final DNodeView dnv = dGraphView.getDNodeView(node);
if (dnv.isValueLocked(DVisualLexicon.NODE_LABEL_POSITION)) {
@@ -849,7 +857,7 @@
if (o == null)
if (m_labelJustifyDefault == null)
- return super.labelJustify(node, labelInx);
+ return super.getLabelJustify(node, labelInx);
else
return m_labelJustifyDefault.byteValue();
@@ -861,7 +869,7 @@
}
void overrideLabelJustify(final CyNode node, final int inx, final int
justify) {
- if (convertG2ND(justify) == super.labelJustify(node, inx))
+ if (convertG2ND(justify) == super.getLabelJustify(node, inx))
m_labelJustifys.remove(node);
else {
m_labelJustifys.put(node, Integer.valueOf(justify));
@@ -870,12 +878,12 @@
}
@Override
- public double labelWidth(CyNode node) {
+ public double getLabelWidth(CyNode node) {
final Double o = m_labelWidths.get(node);
if (o == null)
if (m_labelWidthDefault == null)
- return super.labelWidth(node);
+ return super.getLabelWidth(node);
else
return m_labelWidthDefault.doubleValue();
@@ -887,12 +895,11 @@
defaultValues.put(DVisualLexicon.NODE_LABEL_WIDTH,
m_labelWidthDefault);
}
- /*
- * A negative width value has the special meaning to remove overridden
- * width.
+ /**
+ * A negative width value has the special meaning to remove overridden
width.
*/
void overrideLabelWidth(final CyNode node, final double width) {
- if ((width < 0.0) || (width == super.labelWidth(node)))
+ if ((width < 0.0) || (width == super.getLabelWidth(node)))
m_labelWidths.remove(node);
else {
m_labelWidths.put(node, width);
@@ -908,14 +915,12 @@
if (dnv.isValueLocked(DVisualLexicon.NODE_TRANSPARENCY))
return
dnv.getVisualProperty(DVisualLexicon.NODE_TRANSPARENCY);
- final Integer trans = m_nodeTansparencies.get(node);
+ Integer trans = m_nodeTansparencies.get(node);
if (trans == null) {
- if (transparencyDefault == null)
- return
DVisualLexicon.NODE_TRANSPARENCY.getDefault();
- else
- return transparencyDefault;
- } else
- return trans;
+ trans = transparencyDefault != null ?
transparencyDefault : DVisualLexicon.NODE_TRANSPARENCY.getDefault();
+ }
+
+ return trans;
}
void setTransparencyDefault(Integer transparency) {
@@ -938,14 +943,13 @@
if (dnv.isValueLocked(DVisualLexicon.NODE_LABEL_TRANSPARENCY))
return
dnv.getVisualProperty(DVisualLexicon.NODE_LABEL_TRANSPARENCY);
- final Integer trans = m_nodeLabelTansparencies.get(node);
+ Integer trans = m_nodeLabelTansparencies.get(node);
if (trans == null) {
- if (transparencyLabelDefault == null)
- return
DVisualLexicon.NODE_TRANSPARENCY.getDefault();
- else
- return transparencyLabelDefault;
- } else
- return trans;
+ trans = transparencyLabelDefault != null ?
+ transparencyLabelDefault :
DVisualLexicon.NODE_LABEL_TRANSPARENCY.getDefault();
+ }
+
+ return trans;
}
void setLabelTransparencyDefault(Integer transparency) {
@@ -968,14 +972,13 @@
if (dnv.isValueLocked(DVisualLexicon.NODE_BORDER_TRANSPARENCY))
return
dnv.getVisualProperty(DVisualLexicon.NODE_BORDER_TRANSPARENCY);
- final Integer trans = m_nodeBorderTansparencies.get(node);
+ Integer trans = m_nodeBorderTansparencies.get(node);
if (trans == null) {
- if (transparencyBorderDefault == null)
- return
DVisualLexicon.NODE_BORDER_TRANSPARENCY.getDefault();
- else
- return transparencyBorderDefault;
- } else
- return trans;
+ trans = transparencyBorderDefault != null ?
+ transparencyBorderDefault :
DVisualLexicon.NODE_BORDER_TRANSPARENCY.getDefault();
+ }
+
+ return trans;
}
void setBorderTransparencyDefault(Integer transparency) {
@@ -992,7 +995,6 @@
}
}
-
@Override
public TexturePaint getNestedNetworkTexturePaint(final CyNode node) {
final DNodeView dNodeView = (DNodeView)
dGraphView.getDNodeView(node);
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2012-12-07 00:56:33 UTC (rev 30917)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2012-12-07 01:07:39 UTC (rev 30918)
@@ -315,9 +315,9 @@
}
}
- public void setBorderTransparency(int trans) {
+ public void setBorderTransparency(final int trans) {
synchronized (graphView.m_lock) {
- Integer transparency;
+ final Integer transparency;
if (trans < 0 || trans > 255) {
// If out of range, use default value.
transparency =
BasicVisualLexicon.NODE_BORDER_TRANSPARENCY.getDefault();
@@ -327,9 +327,9 @@
graphView.m_nodeDetails.overrideBorderTransparency(model, transparency);
- Color currentBorderPaint =
((Color)graphView.m_nodeDetails.getBorderPaint(model));
- if(currentBorderPaint.getAlpha() != transparency)
- setBorderPaint(currentBorderPaint);
+ final Color currentBorderPaint = ((Color)
graphView.m_nodeDetails.getBorderPaint(model));
+ setBorderPaint(currentBorderPaint);
+
graphView.m_contentChanged = true;
}
}
@@ -644,7 +644,7 @@
@Override
public Paint getTextPaint() {
synchronized (graphView.m_lock) {
- return graphView.m_nodeDetails.labelPaint(model, 0);
+ return graphView.m_nodeDetails.getLabelPaint(model, 0);
}
}
@@ -671,7 +671,7 @@
}
graphView.m_nodeDetails.overrideLabelTransparency(model, transparency);
- setTextPaint(graphView.m_nodeDetails.labelPaint(model,
0));
+
setTextPaint(graphView.m_nodeDetails.getLabelPaint(model, 0));
graphView.m_contentChanged = true;
}
}
@@ -680,7 +680,7 @@
@Override
public String getText() {
synchronized (graphView.m_lock) {
- return graphView.m_nodeDetails.labelText(model, 0);
+ return graphView.m_nodeDetails.getLabelText(model, 0);
}
}
@@ -689,7 +689,7 @@
//synchronized (graphView.m_lock) {
graphView.m_nodeDetails.overrideLabelText(model, 0,
text);
- if
(DEFAULT_LABEL_TEXT.equals(graphView.m_nodeDetails.labelText(model, 0)))
+ if
(DEFAULT_LABEL_TEXT.equals(graphView.m_nodeDetails.getLabelText(model, 0)))
graphView.m_nodeDetails.overrideLabelCount(model, 0);
else
graphView.m_nodeDetails.overrideLabelCount(model, 1);
@@ -904,7 +904,7 @@
public double getLabelWidth() {
synchronized (graphView.m_lock) {
- return graphView.m_nodeDetails.labelWidth(model);
+ return graphView.m_nodeDetails.getLabelWidth(model);
}
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/graph/render/stateful/GraphRenderer.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/graph/render/stateful/GraphRenderer.java
2012-12-07 00:56:33 UTC (rev 30917)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/graph/render/stateful/GraphRenderer.java
2012-12-07 01:07:39 UTC (rev 30918)
@@ -639,7 +639,7 @@
if ((floatBuff1[0] != floatBuff1[2]) &&
(floatBuff1[1] != floatBuff1[3]))
grafx.drawNodeLow(floatBuff1[0], floatBuff1[1], floatBuff1[2],
-
floatBuff1[3], nodeDetails.colorLowDetail(node));
+
floatBuff1[3], nodeDetails.getColorLowDetail(node));
}
} else { // High detail.
while (nodeHits.numRemaining() > 0) {
@@ -652,28 +652,28 @@
// Take care of label rendering.
if ((lodBits & LOD_NODE_LABELS) != 0) {
// Potential label rendering.
- final int labelCount =
nodeDetails.labelCount(cyNode);
+ final int labelCount =
nodeDetails.getLabelCount(cyNode);
for (int labelInx = 0; labelInx
< labelCount; labelInx++) {
- final String text =
nodeDetails.labelText(cyNode, labelInx);
+ final String text =
nodeDetails.getLabelText(cyNode, labelInx);
final Font font =
nodeDetails.getLabelFont(cyNode, labelInx);
final double
fontScaleFactor = nodeDetails.labelScaleFactor(cyNode,
labelInx);
- final Paint paint =
nodeDetails.labelPaint(cyNode, labelInx);
- final byte textAnchor =
nodeDetails.labelTextAnchor(cyNode, labelInx);
- final byte nodeAnchor =
nodeDetails.labelNodeAnchor(cyNode, labelInx);
- final float
offsetVectorX = nodeDetails.labelOffsetVectorX(cyNode,
+ final Paint paint =
nodeDetails.getLabelPaint(cyNode, labelInx);
+ final byte textAnchor =
nodeDetails.getLabelTextAnchor(cyNode, labelInx);
+ final byte nodeAnchor =
nodeDetails.getLabelNodeAnchor(cyNode, labelInx);
+ final float
offsetVectorX = nodeDetails.getLabelOffsetVectorX(cyNode,
labelInx);
- final float
offsetVectorY = nodeDetails.labelOffsetVectorY(cyNode,
+ final float
offsetVectorY = nodeDetails.getLabelOffsetVectorY(cyNode,
labelInx);
final byte justify;
if (text.indexOf('\n')
>= 0)
- justify =
nodeDetails.labelJustify(cyNode, labelInx);
+ justify =
nodeDetails.getLabelJustify(cyNode, labelInx);
else
justify =
NodeDetails.LABEL_WRAP_JUSTIFY_CENTER;
- final double
nodeLabelWidth = nodeDetails.labelWidth(cyNode);
+ final double
nodeLabelWidth = nodeDetails.getLabelWidth(cyNode);
doubleBuff1[0] =
floatBuff1[0];
doubleBuff1[1] =
floatBuff1[1];
@@ -1092,7 +1092,7 @@
// don't allow our custom graphics to mutate while we
iterate over them:
synchronized (nodeDetails.customGraphicsLock(cyNode)) {
// This iterator will return
CustomGraphicLayers in rendering order:
- Iterator<CustomGraphicLayer> dNodeIt =
nodeDetails.customGraphics(cyNode);
+ Iterator<CustomGraphicLayer> dNodeIt =
nodeDetails.getCustomGraphics(cyNode);
CustomGraphicLayer cg = null;
// The graphic index used to retrieve non
custom graphic info corresponds to the zero-based
// index of the CustomGraphicLayer returned by
the iterator:
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/graph/render/stateful/NodeDetails.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/graph/render/stateful/NodeDetails.java
2012-12-07 00:56:33 UTC (rev 30917)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/graph/render/stateful/NodeDetails.java
2012-12-07 01:07:39 UTC (rev 30918)
@@ -149,7 +149,7 @@
* rendering mode translucent colors are not supported whereas in full
* detail rendering mode they are.
*/
- public Color colorLowDetail(final CyNode node) {
+ public Color getColorLowDetail(final CyNode node) {
return Color.red;
}
@@ -199,7 +199,7 @@
* Returns the number of labels that this node has. By default this
method
* returns zero.
*/
- public int labelCount(final CyNode node) {
+ public int getLabelCount(final CyNode node) {
return 0;
}
@@ -216,7 +216,7 @@
* a value in the range [0, labelCount(node)-1] indicating
which
* node label in question.
*/
- public String labelText(final CyNode node, final int labelInx) {
+ public String getLabelText(final CyNode node, final int labelInx) {
return null;
}
@@ -260,7 +260,7 @@
* a value in the range [0, labelCount(node)-1] indicating
which
* node label in question.
*/
- public Paint labelPaint(final CyNode node, final int labelInx) {
+ public Paint getLabelPaint(final CyNode node, final int labelInx) {
return Color.DARK_GRAY;
}
@@ -280,11 +280,11 @@
* a value in the range [0, labelCount(node)-1] indicating
which
* node label in question.
* @see #ANCHOR_CENTER
- * @see #labelNodeAnchor(int, int)
- * @see #labelOffsetVectorX(int, int)
- * @see #labelOffsetVectorY(int, int)
+ * @see #getLabelNodeAnchor(int, int)
+ * @see #getLabelOffsetVectorX(int, int)
+ * @see #getLabelOffsetVectorY(int, int)
*/
- public byte labelTextAnchor(final CyNode node, final int labelInx) {
+ public byte getLabelTextAnchor(final CyNode node, final int labelInx) {
return ANCHOR_CENTER;
}
@@ -304,11 +304,11 @@
* a value in the range [0, labelCount(node)-1] indicating
which
* node label in question.
* @see #ANCHOR_CENTER
- * @see #labelTextAnchor(int, int)
- * @see #labelOffsetVectorX(int, int)
- * @see #labelOffsetVectorY(int, int)
+ * @see #getLabelTextAnchor(int, int)
+ * @see #getLabelOffsetVectorX(int, int)
+ * @see #getLabelOffsetVectorY(int, int)
*/
- public byte labelNodeAnchor(final CyNode node, final int labelInx) {
+ public byte getLabelNodeAnchor(final CyNode node, final int labelInx) {
return ANCHOR_CENTER;
}
@@ -327,11 +327,11 @@
* @param labelInx
* a value in the range [0, labelCount(node)-1] indicating
which
* node label in question.
- * @see #labelOffsetVectorY(int, int)
- * @see #labelTextAnchor(int, int)
- * @see #labelNodeAnchor(int, int)
+ * @see #getLabelOffsetVectorY(int, int)
+ * @see #getLabelTextAnchor(int, int)
+ * @see #getLabelNodeAnchor(int, int)
*/
- public float labelOffsetVectorX(final CyNode node, final int labelInx) {
+ public float getLabelOffsetVectorX(final CyNode node, final int
labelInx) {
return 0.0f;
}
@@ -350,11 +350,11 @@
* @param labelInx
* a value in the range [0, labelCount(node)-1] indicating
which
* node label in question.
- * @see #labelOffsetVectorX(int, int)
- * @see #labelTextAnchor(int, int)
- * @see #labelNodeAnchor(int, int)
+ * @see #getLabelOffsetVectorX(int, int)
+ * @see #getLabelTextAnchor(int, int)
+ * @see #getLabelNodeAnchor(int, int)
*/
- public float labelOffsetVectorY(final CyNode node, final int labelInx) {
+ public float getLabelOffsetVectorY(final CyNode node, final int
labelInx) {
return 0.0f;
}
@@ -370,7 +370,7 @@
*
* @see #LABEL_WRAP_JUSTIFY_CENTER
*/
- public byte labelJustify(final CyNode node, final int labelInx) {
+ public byte getLabelJustify(final CyNode node, final int labelInx) {
return LABEL_WRAP_JUSTIFY_CENTER;
}
@@ -414,10 +414,10 @@
* method should be abstract, but since it isn't, any real use should
* override this method in a subclass.
*
- * @see #customGraphics(int)
+ * @see #getCustomGraphics(int)
* @since Cytoscape 2.6
*/
- public int customGraphicCount(final CyNode node) {
+ public int getCustomGraphicCount(final CyNode node) {
return 0;
}
@@ -437,7 +437,7 @@
*/
// Should probably be getCustomGraphics(), but all the methods
// seem to have this form.
- public Iterator<CustomGraphicLayer> customGraphics(final CyNode node) {
+ public Iterator<CustomGraphicLayer> getCustomGraphics(final CyNode
node) {
return new Iterator<CustomGraphicLayer>() {
private Iterator<CustomGraphicLayer> _iterator = new
ArrayList<CustomGraphicLayer>(0).iterator();
@@ -515,7 +515,7 @@
* Take note of certain constraints specified in
* GraphGraphics.drawNodeFull().
*/
- public double labelWidth(final CyNode node) {
+ public double getLabelWidth(final CyNode node) {
return 100.0;
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/DGraphViewApplyTest.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/DGraphViewApplyTest.java
2012-12-07 00:56:33 UTC (rev 30917)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/DGraphViewApplyTest.java
2012-12-07 01:07:39 UTC (rev 30918)
@@ -211,25 +211,25 @@
// Test labels
dgv.setViewDefault(DVisualLexicon.NODE_LABEL_COLOR, labelColor);
- assertEquals(labelColor.getRed(), ((Color)
dgv.m_nodeDetails.labelPaint(node1, 0)).getRed());
- assertEquals(labelColor.getGreen(), ((Color)
dgv.m_nodeDetails.labelPaint(node1, 0)).getGreen());
- assertEquals(labelColor.getBlue(), ((Color)
dgv.m_nodeDetails.labelPaint(node1, 0)).getBlue());
- assertEquals(255, ((Color) dgv.m_nodeDetails.labelPaint(node1,
0)).getAlpha());
+ assertEquals(labelColor.getRed(), ((Color)
dgv.m_nodeDetails.getLabelPaint(node1, 0)).getRed());
+ assertEquals(labelColor.getGreen(), ((Color)
dgv.m_nodeDetails.getLabelPaint(node1, 0)).getGreen());
+ assertEquals(labelColor.getBlue(), ((Color)
dgv.m_nodeDetails.getLabelPaint(node1, 0)).getBlue());
+ assertEquals(255, ((Color)
dgv.m_nodeDetails.getLabelPaint(node1, 0)).getAlpha());
dgv.setViewDefault(DVisualLexicon.NODE_LABEL_TRANSPARENCY, 100);
- assertEquals(100, ((Color) dgv.m_nodeDetails.labelPaint(node1,
0)).getAlpha());
- assertEquals(100, ((Color) dgv.m_nodeDetails.labelPaint(node2,
0)).getAlpha());
- assertEquals(100, ((Color) dgv.m_nodeDetails.labelPaint(node3,
0)).getAlpha());
+ assertEquals(100, ((Color)
dgv.m_nodeDetails.getLabelPaint(node1, 0)).getAlpha());
+ assertEquals(100, ((Color)
dgv.m_nodeDetails.getLabelPaint(node2, 0)).getAlpha());
+ assertEquals(100, ((Color)
dgv.m_nodeDetails.getLabelPaint(node3, 0)).getAlpha());
// Test mappings
nodeView1.setVisualProperty(DVisualLexicon.NODE_LABEL_COLOR,
Color.blue);
- assertEquals(Color.blue.getBlue(), ((Color)
dgv.m_nodeDetails.labelPaint(node1, 0)).getBlue());
+ assertEquals(Color.blue.getBlue(), ((Color)
dgv.m_nodeDetails.getLabelPaint(node1, 0)).getBlue());
nodeView1.setVisualProperty(DVisualLexicon.NODE_LABEL_TRANSPARENCY, 20);
- assertEquals(20, ((Color) dgv.m_nodeDetails.labelPaint(node1,
0)).getAlpha());
- assertEquals(100, ((Color) dgv.m_nodeDetails.labelPaint(node2,
0)).getAlpha());
- assertEquals(100, ((Color) dgv.m_nodeDetails.labelPaint(node3,
0)).getAlpha());
+ assertEquals(20, ((Color)
dgv.m_nodeDetails.getLabelPaint(node1, 0)).getAlpha());
+ assertEquals(100, ((Color)
dgv.m_nodeDetails.getLabelPaint(node2, 0)).getAlpha());
+ assertEquals(100, ((Color)
dgv.m_nodeDetails.getLabelPaint(node3, 0)).getAlpha());
// Font
dgv.setViewDefault(DVisualLexicon.NODE_LABEL_FONT_SIZE, 20);
Modified:
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy3SimpleSessionLodingTest.java
===================================================================
---
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy3SimpleSessionLodingTest.java
2012-12-07 00:56:33 UTC (rev 30917)
+++
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy3SimpleSessionLodingTest.java
2012-12-07 01:07:39 UTC (rev 30918)
@@ -147,11 +147,19 @@
assertEquals(Double.valueOf(70.0d),
nv.getVisualProperty(BasicVisualLexicon.NODE_WIDTH));
assertEquals(Double.valueOf(40.0d),
nv.getVisualProperty(BasicVisualLexicon.NODE_HEIGHT));
assertEquals(new Color(0x00acad),
nv.getVisualProperty(BasicVisualLexicon.NODE_FILL_COLOR));
+
assertEquals(view.getModel().getRow(nv.getModel()).get(CyNetwork.NAME,
String.class), nv.getVisualProperty(BasicVisualLexicon.NODE_LABEL));
+ assertEquals(Integer.valueOf(255),
nv.getVisualProperty(BasicVisualLexicon.NODE_LABEL_TRANSPARENCY));
+ assertEquals(new Color(0x000000),
nv.getVisualProperty(BasicVisualLexicon.NODE_LABEL_COLOR));
+ assertEquals(Integer.valueOf(12),
nv.getVisualProperty(BasicVisualLexicon.NODE_LABEL_FONT_SIZE));
View<CyEdge> ev =
view.getEdgeView(getEdgeByName(view.getModel(), "Node 1 (interaction) Node 2"));
assertEquals(Double.valueOf(2.0d),
ev.getVisualProperty(BasicVisualLexicon.EDGE_WIDTH));
assertEquals(new Color(0x333333),
ev.getVisualProperty(BasicVisualLexicon.EDGE_STROKE_UNSELECTED_PAINT));
assertEquals(Integer.valueOf(255),
ev.getVisualProperty(BasicVisualLexicon.EDGE_TRANSPARENCY));
+ assertEquals("",
ev.getVisualProperty(BasicVisualLexicon.EDGE_LABEL));
+ assertEquals(Integer.valueOf(255),
ev.getVisualProperty(BasicVisualLexicon.EDGE_LABEL_TRANSPARENCY));
+ assertEquals(new Color(0x000000),
ev.getVisualProperty(BasicVisualLexicon.EDGE_LABEL_COLOR));
+ assertEquals(Integer.valueOf(10),
ev.getVisualProperty(BasicVisualLexicon.EDGE_LABEL_FONT_SIZE));
// Bypass
nv = view.getNodeView(getNodeByName(view.getModel(), "Node 3"));
@@ -162,12 +170,18 @@
assertEquals(new Color(0x000099),
nv.getVisualProperty(BasicVisualLexicon.NODE_BORDER_PAINT));
assertEquals(new Color(0x0099ff),
nv.getVisualProperty(BasicVisualLexicon.NODE_FILL_COLOR));
assertEquals("Node 3 (BYPASS)",
nv.getVisualProperty(BasicVisualLexicon.NODE_LABEL));
+ assertEquals(new Color(0x9900ff),
nv.getVisualProperty(BasicVisualLexicon.NODE_LABEL_COLOR));
+ assertEquals(Integer.valueOf(120),
nv.getVisualProperty(BasicVisualLexicon.NODE_LABEL_TRANSPARENCY));
+ assertEquals(Integer.valueOf(16),
nv.getVisualProperty(BasicVisualLexicon.NODE_LABEL_FONT_SIZE));
ev = view.getEdgeView(getEdgeByName(view.getModel(), "Node 2
(interaction) Node 3"));
assertEquals(Double.valueOf(5.0d),
ev.getVisualProperty(BasicVisualLexicon.EDGE_WIDTH));
assertEquals(new Color(0xff6699),
ev.getVisualProperty(BasicVisualLexicon.EDGE_STROKE_UNSELECTED_PAINT));
assertEquals(Integer.valueOf(95),
ev.getVisualProperty(BasicVisualLexicon.EDGE_TRANSPARENCY));
assertEquals("2::3 (BYPASS)",
ev.getVisualProperty(BasicVisualLexicon.EDGE_LABEL));
+ assertEquals(Integer.valueOf(100),
ev.getVisualProperty(BasicVisualLexicon.EDGE_LABEL_TRANSPARENCY));
+ assertEquals(new Color(0xff0099),
ev.getVisualProperty(BasicVisualLexicon.EDGE_LABEL_COLOR));
+ assertEquals(Integer.valueOf(8),
ev.getVisualProperty(BasicVisualLexicon.EDGE_LABEL_FONT_SIZE));
}
private void checkRootNetwork(final CyRootNetwork net) {
Modified:
core3/impl/trunk/session-impl/integration-test/src/test/resources/testData/session3x/simpleSession.cys
===================================================================
(Binary files differ)
--
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.
