Author: kono
Date: 2011-12-01 11:46:07 -0800 (Thu, 01 Dec 2011)
New Revision: 27679
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:
Default mechanism fixed for arrow colors.
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-12-01 08:27:23 UTC (rev 27678)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeDetails.java
2011-12-01 19:46:07 UTC (rev 27679)
@@ -232,22 +232,23 @@
if (isSelected)
return selectedPaint(edge);
- else {
+ else
return sourceArrowUnselectedPaint(edge);
- }
}
- public Paint sourceArrowUnselectedPaint(final int edge) {
+ private Paint sourceArrowUnselectedPaint(final int edge) {
final Paint paint = this.m_sourceArrowPaints.get(edge);
if (paint == null) {
- return this.m_sourceArrowPaintDefault;
- }
-
- return paint;
+ if(m_sourceArrowPaintDefault == null)
+ return DEdgeView.DEFAULT_ARROW_PAINT;
+ else
+ return m_sourceArrowPaintDefault;
+ } else
+ return paint;
}
- void setSourceArrowPaintDefault(Paint p) {
+ void setSourceArrowPaintDefault(final Paint p) {
m_sourceArrowPaintDefault = p;
}
@@ -301,27 +302,27 @@
*/
@Override
public Paint targetArrowPaint(final int edge) {
+ final boolean isSelected = selected.contains(edge);
- boolean isSelected = selected.contains(edge);
-
if (isSelected)
return selectedPaint(edge);
- else {
+ else
return targetArrowUnselectedPaint(edge);
- }
}
- public Paint targetArrowUnselectedPaint(final int edge) {
+ private Paint targetArrowUnselectedPaint(final int edge) {
final Paint paint = this.m_targetArrowPaints.get(edge);
if (paint == null) {
- return this.m_targetArrowPaintDefault;
- }
-
- return paint;
+ if(m_targetArrowPaintDefault == null)
+ return DEdgeView.DEFAULT_ARROW_PAINT;
+ else
+ return this.m_targetArrowPaintDefault;
+ } else
+ return paint;
}
- void setTargetArrowPaintDefault(Paint p) {
+ void setTargetArrowPaintDefault(final Paint p) {
m_targetArrowPaintDefault = p;
}
@@ -337,26 +338,6 @@
}
}
- // //@Override
- // public Paint targetArrowSelectedPaint(final int edge) {
- //
- // final Paint arrowPaint = this.m_targetArrowSelectedPaints.get(edge);
- // if (arrowPaint == null)
- // if ( m_targetArrowSelectedPaintDefault == null ){
- // return super.targetArrowPaint(edge);
- // }
- // else
- // return m_targetArrowSelectedPaintDefault;
- //
- //
- // return arrowPaint;
- // }
- //
- //
- // void setTargetArrowSelectedPaintDefault(Paint p) {
- // m_targetArrowSelectedPaintDefault = p;
- // }
-
/*
* A null paint has the special meaning to remove overridden 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-12-01 08:27:23 UTC (rev 27678)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
2011-12-01 19:46:07 UTC (rev 27679)
@@ -58,7 +58,7 @@
class DEdgeView extends AbstractDViewModel<CyEdge> implements EdgeView, Label,
Bend, EdgeAnchors {
- static final float DEFAULT_ARROW_SIZE = 5.0f;
+ static final float DEFAULT_ARROW_SIZE = 8.0f;
static final Paint DEFAULT_ARROW_PAINT = Color.BLACK;
static final float DEFAULT_EDGE_THICKNESS = 1.0f;
static final Stroke DEFAULT_EDGE_STROKE = new BasicStroke();
@@ -104,9 +104,9 @@
m_inx = inx;
m_selected = false;
transparency = 255;
- m_sourceUnselectedPaint =
m_view.m_edgeDetails.sourceArrowPaint(m_inx);
+ m_sourceUnselectedPaint = DEFAULT_ARROW_PAINT;
m_sourceSelectedPaint = Color.red;
- m_targetUnselectedPaint =
m_view.m_edgeDetails.targetArrowPaint(m_inx);
+ m_targetUnselectedPaint = DEFAULT_ARROW_PAINT;
m_targetSelectedPaint = Color.red;
m_sourceEdgeEnd = GraphGraphics.ARROW_NONE;
m_targetEdgeEnd = GraphGraphics.ARROW_NONE;
--
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.
