Author: pwang
Date: 2011-10-14 16:58:46 -0700 (Fri, 14 Oct 2011)
New Revision: 27198
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:
Fixed the selected color of source/target arrow
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-14 21:30:02 UTC (rev 27197)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeDetails.java
2011-10-14 23:58:46 UTC (rev 27198)
@@ -231,17 +231,34 @@
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public Paint sourceArrowPaint(final int edge) {
- final Paint arrowPaint = m_sourceArrowPaints.get(edge);
- if (arrowPaint == null)
- if ( m_sourceArrowPaintDefault == null )
- return super.sourceArrowPaint(edge);
- else
- return m_sourceArrowPaintDefault;
- return arrowPaint;
+ boolean isSelected = selected.contains(edge);
+
+ if (isSelected)
+ return selectedPaint(edge);
+ else {
+ return sourceArrowUnselectedPaint(edge);
+ }
}
+
+ public Paint sourceArrowUnselectedPaint(final int edge){
+ final Paint paint = this.m_sourceArrowPaints.get(edge);
+
+ if (paint == null){
+ return this.m_sourceArrowPaintDefault;
+ }
+
+ return paint;
+ }
+
+
void setSourceArrowPaintDefault(Paint p) {
m_sourceArrowPaintDefault = p;
}
@@ -297,16 +314,28 @@
*/
@Override
public Paint targetArrowPaint(final int edge) {
- final Paint arrowPaint = m_targetArrowPaints.get(edge);
- if (arrowPaint == null)
- if ( m_targetArrowPaintDefault == null )
- return super.targetArrowPaint(edge);
- else
- return m_targetArrowPaintDefault;
- return arrowPaint;
+ boolean isSelected = selected.contains(edge);
+
+ if (isSelected)
+ return selectedPaint(edge);
+ else {
+ return targetArrowUnselectedPaint(edge);
+ }
}
+
+ public Paint targetArrowUnselectedPaint(final int edge){
+ final Paint paint = this.m_targetArrowPaints.get(edge);
+
+ if (paint == null){
+ return this.m_targetArrowPaintDefault;
+ }
+
+ return paint;
+ }
+
+
void setTargetArrowPaintDefault(Paint p) {
m_targetArrowPaintDefault = p;
}
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-14 21:30:02 UTC (rev 27197)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
2011-10-14 23:58:46 UTC (rev 27198)
@@ -357,8 +357,6 @@
m_sourceUnselectedPaint = paint;
if (!isSelected()) {
-
m_view.m_edgeDetails.overrideSourceArrowPaint(m_inx,
- m_sourceUnselectedPaint);
m_view.m_contentChanged = true;
}
}
@@ -378,8 +376,6 @@
m_targetUnselectedPaint = paint;
if (!isSelected()) {
-
m_view.m_edgeDetails.overrideTargetArrowPaint(m_inx,
- m_targetUnselectedPaint);
m_view.m_contentChanged = true;
}
}
@@ -405,11 +401,6 @@
m_selected = true;
m_view.m_edgeDetails.select(m_inx);
- m_view.m_edgeDetails.overrideSourceArrowPaint(m_inx,
- m_sourceSelectedPaint);
- m_view.m_edgeDetails.overrideTargetArrowPaint(m_inx,
- m_targetSelectedPaint);
-
m_view.m_selectedEdges.insert(m_inx);
for (int j = 0; j < numHandles(); j++) {
@@ -452,11 +443,6 @@
m_selected = false;
m_view.m_edgeDetails.unselect(m_inx);
- m_view.m_edgeDetails.overrideSourceArrowPaint(m_inx,
- m_sourceUnselectedPaint);
- m_view.m_edgeDetails.overrideTargetArrowPaint(m_inx,
- m_targetUnselectedPaint);
-
m_view.m_selectedEdges.delete(m_inx);
for (int j = 0; j < numHandles(); j++) {
--
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.
