You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by tv...@apache.org on 2009/04/29 21:23:15 UTC
svn commit: r769887 - in /incubator/pivot/trunk/wtk:
src/pivot/wtk/media/drawing/Ellipse.java
src/pivot/wtk/media/drawing/EllipseListener.java
src/pivot/wtk/media/drawing/Shape.java
test/pivot/wtk/media/drawing/test/simple_drawing_test.wtkx
Author: tvolkert
Date: Wed Apr 29 19:23:15 2009
New Revision: 769887
URL: http://svn.apache.org/viewvc?rev=769887&view=rev
Log:
Added Ellipse drawing
Added:
incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/EllipseListener.java
Modified:
incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Ellipse.java
incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Shape.java
incubator/pivot/trunk/wtk/test/pivot/wtk/media/drawing/test/simple_drawing_test.wtkx
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Ellipse.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Ellipse.java?rev=769887&r1=769886&r2=769887&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Ellipse.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Ellipse.java Wed Apr 29 19:23:15 2009
@@ -16,21 +16,92 @@
*/
package pivot.wtk.media.drawing;
+import java.awt.BasicStroke;
import java.awt.Graphics2D;
+import java.awt.Paint;
+import java.awt.RenderingHints;
+import java.awt.geom.Ellipse2D;
+
+import pivot.util.ListenerList;
/**
* Shape representing an ellipse.
*
- * @author gbrown
+ * @author tvolkert
*/
public class Ellipse extends Shape {
+ private static class EllipseListenerList extends ListenerList<EllipseListener>
+ implements EllipseListener {
+ public void sizeChanged(Ellipse ellipse, int previousWidth, int previousHeight) {
+ for (EllipseListener listener : this) {
+ listener.sizeChanged(ellipse, previousWidth, previousHeight);
+ }
+ }
+ }
+
+ private Ellipse2D.Double ellipse2D = new Ellipse2D.Double();
+
+ private EllipseListenerList ellipseListeners = new EllipseListenerList();
+
+ public int getWidth() {
+ return (int)ellipse2D.width;
+ }
+
+ public void setWidth(int width) {
+ setSize(width, (int)ellipse2D.height);
+ }
+
+ public int getHeight() {
+ return (int)ellipse2D.height;
+ }
+
+ public void setHeight(int height) {
+ setSize((int)ellipse2D.width, height);
+ }
+
+ public void setSize(int width, int height) {
+ int previousWidth = (int)ellipse2D.width;
+ int previousHeight = (int)ellipse2D.height;
+ if (previousWidth != width
+ || previousHeight != height) {
+ ellipse2D.width = width;
+ ellipse2D.height = height;
+ invalidate();
+ ellipseListeners.sizeChanged(this, previousWidth, previousHeight);
+ }
+ }
+
@Override
public boolean contains(int x, int y) {
- // TODO Auto-generated method stub
- return false;
+ return ellipse2D.contains(x, y);
}
public void draw(Graphics2D graphics) {
- // TODO Auto-generated method stub
+ graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_ON);
+
+ Paint fill = getFill();
+ graphics.setPaint(fill);
+ graphics.fill(ellipse2D);
+
+ Paint stroke = getStroke();
+ int strokeThickness = getStrokeThickness();
+ graphics.setPaint(stroke);
+ graphics.setStroke(new BasicStroke(strokeThickness));
+ graphics.draw(ellipse2D);
+ }
+
+ @Override
+ protected void validate() {
+ int strokeThickness = getStrokeThickness();
+ setBounds(-strokeThickness / 2, -strokeThickness / 2,
+ (int)ellipse2D.width + strokeThickness,
+ (int)ellipse2D.height + strokeThickness);
+
+ super.validate();
+ }
+
+ public ListenerList<EllipseListener> getEllipseListeners() {
+ return ellipseListeners;
}
}
Added: incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/EllipseListener.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/EllipseListener.java?rev=769887&view=auto
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/EllipseListener.java (added)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/EllipseListener.java Wed Apr 29 19:23:15 2009
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pivot.wtk.media.drawing;
+
+/**
+ * Ellipse listener interface.
+ *
+ * @author tvolkert
+ */
+public interface EllipseListener {
+ /**
+ * Called when a ellipse's size has changed.
+ *
+ * @param ellipse
+ * @param previousWidth
+ * @param previousHeight
+ */
+ public void sizeChanged(Ellipse ellipse, int previousWidth, int previousHeight);
+}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Shape.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Shape.java?rev=769887&r1=769886&r2=769887&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Shape.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Shape.java Wed Apr 29 19:23:15 2009
@@ -275,7 +275,7 @@
public Paint getFill() {
Paint fill = this.fill;
if (fill == null) {
- if (fill == null) {
+ if (parent == null) {
throw new IllegalStateException();
}
Modified: incubator/pivot/trunk/wtk/test/pivot/wtk/media/drawing/test/simple_drawing_test.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/pivot/wtk/media/drawing/test/simple_drawing_test.wtkx?rev=769887&r1=769886&r2=769887&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/pivot/wtk/media/drawing/test/simple_drawing_test.wtkx (original)
+++ incubator/pivot/trunk/wtk/test/pivot/wtk/media/drawing/test/simple_drawing_test.wtkx Wed Apr 29 19:23:15 2009
@@ -16,25 +16,39 @@
limitations under the License.
-->
-<ImageView styles="{backgroundColor:'#999999'}"
- xmlns:wtkx="http://incubator.apache.org/pivot/wtkx/1.1"
+<ScrollPane xmlns:wtkx="http://incubator.apache.org/pivot/wtkx/1.1"
xmlns:media="pivot.wtk.media"
xmlns:drawing="pivot.wtk.media.drawing"
xmlns="pivot.wtk">
- <image>
- <media:Drawing width="800" height="600" background="#ffff00">
- <canvas>
- <drawing:Canvas>
- <drawing:Rectangle x="10" y="20"
- width="320" height="240" fill="#ff0000"
- stroke="#0000ff" strokeThickness="6"/>
- <drawing:Rectangle x="360" y="20"
- width="160" height="120" fill="#0000ff"
- stroke="#00ff00" strokeThickness="4"/>
- <drawing:Line x1="0" y1="0" x2="100" y2="100"
- stroke="#00ff00" strokeThickness="8"/>
- </drawing:Canvas>
- </canvas>
- </media:Drawing>
- </image>
-</ImageView>
+ <view>
+ <ImageView styles="{backgroundColor:'#999999'}">
+ <image>
+ <media:Drawing width="640" height="480" background="#ffff00">
+ <canvas>
+ <drawing:Canvas>
+ <drawing:Rectangle x="10" y="20"
+ width="320" height="240" fill="#ff0000"
+ stroke="#0000ff" strokeThickness="6"/>
+ <drawing:Rectangle x="360" y="20"
+ width="160" height="120" fill="#0000ff"
+ stroke="#00ff00" strokeThickness="4"/>
+ <drawing:Ellipse x="50" y="50"
+ width="90" height="72"
+ stroke="#cc00cc" strokeThickness="10"/>
+ <drawing:Ellipse x="200" y="50"
+ width="90" height="72"
+ stroke="#cc00cc" strokeThickness="10"/>
+ <drawing:Line x1="140" y1="86" x2="200" y2="86"
+ stroke="#cc00cc" strokeThickness="10"/>
+ <drawing:Ellipse x="147" y="110"
+ width="46" height="46" fill="#000000"/>
+ <drawing:Ellipse x="60" y="180"
+ width="220" height="60" fill="#000000"
+ stroke="#ffaaaa" strokeThickness="15"/>
+ </drawing:Canvas>
+ </canvas>
+ </media:Drawing>
+ </image>
+ </ImageView>
+ </view>
+</ScrollPane>