ngb/zeichenmaschine
1
0
Fork 0
mirror of https://github.com/jneug/zeichenmaschine.git synced 2026-04-14 14:43:33 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

arc / pie Methoden arbeiten nun auch mir Radius und nicht Durchmesser

Browse Source
This commit is contained in:
ngb
2022-01-05 17:19:04 +01:00
parent 8fd1514fb4
commit 5b08851ae9
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/schule/ngb/zm/DrawingLayer.java
View File

@@ -217,12 +217,12 @@ public class DrawingLayer extends Layer {
circle(x - 1, y - 1, 2); circle(x - 1, y - 1, 2);
} }
public void circle( double x, double y, double d ) { public void circle( double x, double y, double r ) {
ellipse(x, y, d, d, default_anchor); ellipse(x, y, r+r, r+r, default_anchor);
} }
public void circle( double x, double y, double d, Options.Direction anchor ) { public void circle( double x, double y, double r, Options.Direction anchor ) {
ellipse(x, y, d, d, anchor); ellipse(x, y, r+r, r+r, anchor);
} }
public void ellipse( double x, double y, double w, double h ) { public void ellipse( double x, double y, double w, double h ) {
@@ -237,10 +237,14 @@ public class DrawingLayer extends Layer {
drawShape(ellipse); drawShape(ellipse);
} }
public void arc( double x, double y, double d, double angle1, double angle2 ) { public void arc( double x, double y, double r, double angle1, double angle2 ) {
arc(x, y, r+r, r+r, angle1, angle2);
}
public void arc( double x, double y, double w, double h, double angle1, double angle2 ) {
while( angle2 < angle1 ) angle2 += 360.0; while( angle2 < angle1 ) angle2 += 360.0;
Point2D.Double anchorPoint = getAnchorPoint(x, y, d, d, CENTER); Point2D.Double anchorPoint = getAnchorPoint(x, y, w, h, CENTER);
/*Shape arc = new Arc2D.Double( /*Shape arc = new Arc2D.Double(
anchorPoint.x, anchorPoint.x,
anchorPoint.y, anchorPoint.y,
@@ -250,17 +254,20 @@ public class DrawingLayer extends Layer {
);*/ );*/
arc.setArc( arc.setArc(
anchorPoint.x, anchorPoint.y, anchorPoint.x, anchorPoint.y,
d, d, w, h,
angle1, angle2 - angle1, //Math.toRadians(angle1), Math.toRadians(angle2 - angle1),
angle1, angle2-angle1,
Arc2D.OPEN Arc2D.OPEN
); );
drawShape(arc); drawShape(arc);
} }
public void pie( double x, double y, double d, double angle1, double angle2 ) { public void pie( double x, double y, double r, double angle1, double angle2 ) {
while( angle2 < angle1 ) angle2 += 360.0; while( angle2 < angle1 ) angle2 += 360.0;
double d = r+r;
Point2D.Double anchorPoint = getAnchorPoint(x, y, d, d, CENTER); Point2D.Double anchorPoint = getAnchorPoint(x, y, d, d, CENTER);
/*Shape arc = new Arc2D.Double( /*Shape arc = new Arc2D.Double(
anchorPoint.x, anchorPoint.x,