Author: kono
Date: 2011-10-12 18:02:55 -0700 (Wed, 12 Oct 2011)
New Revision: 27154
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/EdgeViewDefaultSupport.java
Log:
Some bugs related to edge color had been fixed.
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-10-13 00:18:12 UTC (rev 27153)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeDetails.java
2011-10-13 01:02:55 UTC (rev 27154)
@@ -111,7 +111,6 @@
m_segmentPaints = new HashMap<Integer, Paint>();
m_selectedPaints = new HashMap<Integer, Paint>();
-
m_colorsLowDetail = new IntObjHash();
isCleared = true;
@@ -165,8 +164,10 @@
if ((val != null) && (val != m_deletedEntry))
m_colorsLowDetail.put(edge, m_deletedEntry);
- } else
+ } else {
m_colorsLowDetail.put(edge, color);
+ isCleared = false;
+ }
}
@Override
@@ -397,12 +398,14 @@
@Override
public Paint segmentPaint(final int edge) {
final Paint paint = m_segmentPaints.get(edge);
- if (paint == null)
+
+ if (paint == null) {
if ( m_segmentPaintDefault == null )
return super.segmentPaint(edge);
else
return m_segmentPaintDefault;
-
+ }
+
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
2011-10-13 00:18:12 UTC (rev 27153)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
2011-10-13 01:02:55 UTC (rev 27154)
@@ -100,6 +100,7 @@
m_view = view;
m_inx = inx;
m_selected = false;
+ transparency = 255;
m_unselectedPaint = m_view.m_edgeDetails.segmentPaint(m_inx);
m_sourceUnselectedPaint =
m_view.m_edgeDetails.sourceArrowPaint(m_inx);
m_sourceSelectedPaint = Color.red;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/EdgeViewDefaultSupport.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/EdgeViewDefaultSupport.java
2011-10-13 00:18:12 UTC (rev 27153)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/EdgeViewDefaultSupport.java
2011-10-13 01:02:55 UTC (rev 27154)
@@ -124,8 +124,8 @@
void setTransparency(int trans) {
transparency = trans;
- setSelectedPaint(selectedPaint);
- setUnselectedPaint(unselectedPaint);
+// setSelectedPaint(selectedPaint);
+// setUnselectedPaint(unselectedPaint);
}
--
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.
