Author: kono
Date: 2011-09-26 10:05:48 -0700 (Mon, 26 Sep 2011)
New Revision: 26964
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
Log:
fixes #376 Fixed edge label bug.
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
2011-09-26 16:01:39 UTC (rev 26963)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeDetails.java
2011-09-26 17:05:48 UTC (rev 26964)
@@ -60,9 +60,9 @@
final Map<Integer, Paint> m_targetArrowPaints = new HashMap<Integer,
Paint>();
final Map<Integer, Paint> m_segmentPaints = new HashMap<Integer,
Paint>();
final Map<Integer, Integer> m_labelCounts = new HashMap<Integer,
Integer>();
- final Map<Integer, String> m_labelTexts = new HashMap<Integer,
String>();
- final Map<Integer, Font> m_labelFonts = new HashMap<Integer, Font>();
- final Map<Integer, Paint> m_labelPaints = new HashMap<Integer, Paint>();
+ final Map<Long, String> m_labelTexts = new HashMap<Long, String>();
+ final Map<Long, Font> m_labelFonts = new HashMap<Long, Font>();
+ final Map<Long, Paint> m_labelPaints = new HashMap<Long, Paint>();
final Map<Integer, Double> m_labelWidths = new HashMap<Integer,
Double>();
private final MinIntHeap m_heap = new MinIntHeap();
@@ -510,10 +510,8 @@
public String labelText(final int edge, final int labelInx) {
final long key = (((long) edge) << 32) | ((long) labelInx);
final String text = m_labelTexts.get(key);
-
if (text == null)
return super.labelText(edge, labelInx);
-
return text;
}
@@ -527,7 +525,7 @@
if ((text == null) || text.equals(super.labelText(edge,
labelInx)))
m_labelTexts.remove(key);
else
- m_labelTexts.put((int) key, text);
+ m_labelTexts.put(key, text);
}
/**
@@ -553,7 +551,7 @@
if ((font == null) || font.equals(super.labelFont(edge,
labelInx)))
m_labelFonts.remove(key);
else
- m_labelFonts.put((int) key, font);
+ m_labelFonts.put(key, font);
}
@@ -580,7 +578,7 @@
if ((paint == null) || paint.equals(super.labelPaint(edge,
labelInx)))
m_labelPaints.remove(key);
else
- m_labelPaints.put((int) key, paint);
+ m_labelPaints.put(key, 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
2011-09-26 16:01:39 UTC (rev 26963)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
2011-09-26 17:05:48 UTC (rev 26964)
@@ -107,29 +107,19 @@
m_lineType = EdgeView.STRAIGHT_LINES;
}
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
+ @Override
public int getGraphPerspectiveIndex() {
return m_inx;
}
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
+
+ @Override
public int getRootGraphIndex() {
return m_inx;
}
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
+
+ @Override
public CyEdge getEdge() {
return m_view.getNetwork().getEdge(m_inx);
}
@@ -832,11 +822,7 @@
public void setGreekThreshold(double threshold) {
}
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
+ @Override
public String getText() {
synchronized (m_view.m_lock) {
return m_view.m_edgeDetails.labelText(m_inx, 0);
@@ -849,7 +835,7 @@
m_view.m_edgeDetails.overrideLabelText(m_inx, 0, text);
if
(DEFAULT_LABEL_TEXT.equals(m_view.m_edgeDetails.labelText(m_inx, 0)))
- m_view.m_edgeDetails.overrideLabelCount(m_inx,
0);
+ m_view.m_edgeDetails.overrideLabelCount(m_inx,
0); // TODO is this correct?
else
m_view.m_edgeDetails.overrideLabelCount(m_inx,
1);
@@ -1318,22 +1304,12 @@
return 0;
}
- /**
- * DOCUMENT ME!
- *
- * @param x
- * DOCUMENT ME!
- */
+ @Override
public void setLabelOffsetX(double x) {
// System.out.println("setLabelOffsetX");
}
- /**
- * DOCUMENT ME!
- *
- * @param y
- * DOCUMENT ME!
- */
+ @Override
public void setLabelOffsetY(double y) {
// System.out.println("setLabelOffsetY");
}
--
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.
