Author: kono
Date: 2010-12-06 13:58:48 -0800 (Mon, 06 Dec 2010)
New Revision: 23100
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/LineStyle.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/DashDotStroke.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/DotStroke.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/EqualDashStroke.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/LongDashStroke.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/ShapeStroke.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/SolidStroke.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/ZeroStroke.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/ZigzagStroke.java
Log:
Edge Arrow and new line styles (strokes) are working.
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/LineStyle.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/LineStyle.java
2010-12-06 21:56:59 UTC (rev 23099)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/LineStyle.java
2010-12-06 21:58:48 UTC (rev 23100)
@@ -79,7 +79,7 @@
LONG_DASH( "dash", new LongDashStroke(1.0f)),
EQUAL_DASH( "equal_dash", new EqualDashStroke(1.0f)),
DASH_DOT( "dash_dot", new DashDotStroke(1.0f)),
- //FIXME //DOT("dot_dot", new DotStroke(1.0f)),
+ DOT("dot_dot", new DotStroke(1.0f)),
ZIGZAG("zigzag", new ZigzagStroke(1.0f)),
SINEWAVE("sinewave", new SineWaveStroke(1.0f)),
VERTICAL_SLASH("vertical_slash",new
VerticalSlashStroke(1.0f,PipeStroke.Type.VERTICAL)),
@@ -137,16 +137,14 @@
* If it doesn't match a known stroke, it will return SOLID.
* @return the LineStyle guessed from the stroke.
*/
- public static LineStyle extractLineStyle(Stroke s) {
+ public static LineStyle extractLineStyle(final Stroke s) {
if ( s instanceof WidthStroke ) {
for(LineStyle ls: values()){
- if(ls.stroke.equals(s))
+ if(ls.stroke.getClass().equals(s.getClass()))
return ls;
}
-
-
}
return SOLID;
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
2010-12-06 21:56:59 UTC (rev 23099)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
2010-12-06 21:58:48 UTC (rev 23100)
@@ -50,7 +50,9 @@
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.presentation.property.TwoDVisualLexicon;
+import org.cytoscape.ding.LineStyle;
+
class DEdgeView implements EdgeView, Label, Bend, EdgeAnchors {
static final float DEFAULT_ARROW_SIZE = 5.0f;
@@ -1432,9 +1434,15 @@
} else if (vp == TwoDVisualLexicon.EDGE_COLOR) {
setUnselectedPaint((Paint) value);
} else if (vp == DVisualLexicon.EDGE_WIDTH) {
- setStrokeWidth(((Double) value).floatValue());
+ final float currentWidth = this.getStrokeWidth();
+ final float newWidth = ((Double) value).floatValue();
+ if(currentWidth != newWidth) {
+ setStrokeWidth(newWidth);
+
setStroke(LineStyle.extractLineStyle(getStroke()).getStroke(newWidth));
+ }
} else if (vp == DVisualLexicon.EDGE_STROKE) {
- setStroke((Stroke) value);
+ final Stroke newStroke =
LineStyle.extractLineStyle((Stroke) value).getStroke(this.getStrokeWidth());
+ setStroke(newStroke);
} else if (vp ==
DVisualLexicon.EDGE_SOURCE_ARROW_SELECTED_PAINT) {
setSourceEdgeEndSelectedPaint((Paint) value);
} else if (vp ==
DVisualLexicon.EDGE_TARGET_ARROW_SELECTED_PAINT) {
@@ -1475,6 +1483,5 @@
else
m_view.hideGraphObject(this);
}
-
}
}
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/DashDotStroke.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/DashDotStroke.java
2010-12-06 21:56:59 UTC (rev 23099)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/DashDotStroke.java
2010-12-06 21:58:48 UTC (rev 23100)
@@ -2,10 +2,6 @@
import java.awt.BasicStroke;
-import org.cytoscape.ding.LineStyle;
-
-import static org.cytoscape.ding.LineStyle.DASH_DOT;
-
public class DashDotStroke extends BasicStroke implements WidthStroke {
private float width;
@@ -21,11 +17,8 @@
return new DashDotStroke(w);
}
- public LineStyle getLineStyle() {
- return DASH_DOT;
- }
public String toString() {
- return DASH_DOT + " " + Float.toString(width);
+ return this.getClass().getSimpleName() + " " +
Float.toString(width);
}
}
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/DotStroke.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/DotStroke.java
2010-12-06 21:56:59 UTC (rev 23099)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/DotStroke.java
2010-12-06 21:58:48 UTC (rev 23100)
@@ -1,18 +1,14 @@
-
package org.cytoscape.ding.impl.strokes;
import java.awt.Shape;
import java.awt.geom.Ellipse2D;
-//import static org.cytoscape.ding.LineStyle.DOT;
public class DotStroke extends ShapeStroke {
-
-
- //FIXME
public DotStroke(float width) {
- super( new Shape[] { new Ellipse2D.Float(0, 0, width, width) },
width * 2f, width );
+ super(new Shape[] { new Ellipse2D.Float(0, 0, width, width) },
+ width * 2f, width);
this.width = width;
}
@@ -20,5 +16,3 @@
return new DotStroke(w);
}
}
-
-
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/EqualDashStroke.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/EqualDashStroke.java
2010-12-06 21:56:59 UTC (rev 23099)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/EqualDashStroke.java
2010-12-06 21:58:48 UTC (rev 23100)
@@ -19,7 +19,7 @@
return new EqualDashStroke(w);
}
- public String toString() { return this.getClass().toString() + " " +
Float.toString(width); }
+ @Override public String toString() { return
this.getClass().getSimpleName() + " " + Float.toString(width); }
}
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/LongDashStroke.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/LongDashStroke.java
2010-12-06 21:56:59 UTC (rev 23099)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/LongDashStroke.java
2010-12-06 21:58:48 UTC (rev 23100)
@@ -17,7 +17,7 @@
}
- public String toString() { return this.getClass().toString() + " " +
Float.toString(width); }
+ @Override public String toString() { return
this.getClass().getSimpleName() + " " + Float.toString(width); }
}
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/ShapeStroke.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/ShapeStroke.java
2010-12-06 21:56:59 UTC (rev 23099)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/ShapeStroke.java
2010-12-06 21:58:48 UTC (rev 23100)
@@ -112,9 +112,8 @@
}
- // FIXME Is this correct?
- public String toString() {
- return this.getClass().toString() + " " +
Float.toString(width);
+ @Override public String toString() {
+ return this.getClass().getSimpleName() + " " +
Float.toString(width);
}
abstract public WidthStroke newInstanceForWidth(float w);
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/SolidStroke.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/SolidStroke.java
2010-12-06 21:56:59 UTC (rev 23099)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/SolidStroke.java
2010-12-06 21:58:48 UTC (rev 23100)
@@ -22,7 +22,7 @@
return LineStyle.SOLID;
}
- public String toString() { return LineStyle.SOLID.toString() + " " +
Float.toString(width); }
+ @Override public String toString() { return LineStyle.SOLID.toString()
+ " " + Float.toString(width); }
}
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/ZeroStroke.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/ZeroStroke.java
2010-12-06 21:56:59 UTC (rev 23099)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/ZeroStroke.java
2010-12-06 21:58:48 UTC (rev 23100)
@@ -33,7 +33,7 @@
//TODO: is this correct?
- public String toString() { return actualStroke.toString() + " 0"; }
+ @Override public String toString() { return
actualStroke.getClass().getSimpleName() + " 0.0"; }
}
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/ZigzagStroke.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/ZigzagStroke.java
2010-12-06 21:56:59 UTC (rev 23099)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/strokes/ZigzagStroke.java
2010-12-06 21:58:48 UTC (rev 23100)
@@ -115,8 +115,8 @@
return new ZigzagStroke(w);
}
- public String toString() {
- return this.getClass().toString() + " " + Float.toString(width);
+ @Override public String toString() {
+ return this.getClass().getSimpleName() + " " +
Float.toString(width);
}
}
--
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.
