Attachment #85304 for bug #212460




/*******************************************************************************
 * Copyright (c) 2000, 2007 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 * @param copy Point from which the initial values are taken
 */
public PrecisionPoint(Point copy) {
	preciseX = copy.preciseX();
	preciseY = copy.preciseY();
	updateInts();
		preciseY = precPt.preciseY;
		updateInts();
	} else {
		preciseX = x = copy.x;
		preciseY = y = copy.y;
	}
}

/**

 * @param y Y value
 */
public PrecisionPoint(double x, double y) {
	super(x, y);
	preciseX = x;
	preciseY = y;
	updateInts();
}

/**

public void performScale(double factor) {
	preciseX = preciseX * factor;
	preciseY = preciseY * factor;
	updateInts();
	y = (int)Math.floor(preciseY + 0.000000001);	
}

/**

public void performTranslate(int dx, int dy) {
	preciseX += dx;
	preciseY += dy;
	updateInts();
	y = (int)Math.floor(preciseY + 0.000000001);
}

/**
 * @see org.eclipse.draw2d.geometry.Point#setLocation(Point)
 */
public Point setLocation(Point pt) {
	preciseX = pt.preciseX();
	preciseY = pt.preciseY();
	updateInts();
	} else {
		preciseX = pt.x;
		preciseY = pt.y;
	}
	x = (int)Math.floor(preciseX + 0.000000001);
	y = (int)Math.floor(preciseY + 0.000000001);
	return this;
}


	y = (int)Math.floor(preciseY + 0.000000001);
}

double preciseX() {
	return preciseX;
}

double preciseY() {
	return preciseY;
}

}

Lines 1-5 Link Here

(-)src/org/eclipse/draw2d/geometry/Rectangle.java (-3 / +19 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2005 IBM Corporation and others.	2	* Copyright (c) 2000, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 882-888 Link Here
882	* @param p Point to be unioned with this Rectangle	882	* @param p Point to be unioned with this Rectangle
883	* @since 2.0	883	* @since 2.0
884	*/	884	*/
885	public final void union(Point p) {	885	public void union(Point p) {
886	union(p.x, p.y);	886	union(p.x, p.y);
887	}	887	}
888		888
Lines 894-900 Link Here
894	* @param rect Rectangle to be unioned with this Rectangle	894	* @param rect Rectangle to be unioned with this Rectangle
895	* @since 2.0	895	* @since 2.0
896	*/	896	*/
897	public final Rectangle union(Rectangle rect) {	897	public Rectangle union(Rectangle rect) {
898	if (rect == null)	898	if (rect == null)
899	return this;	899	return this;
900	return union(rect.x, rect.y, rect.width, rect.height);	900	return union(rect.x, rect.y, rect.width, rect.height);
Lines 921-924 Link Here
921	return this;	921	return this;
922	}	922	}
923		923
		924	double preciseX() {
		925	return x;
		926	}
		927
		928	double preciseY() {
		929	return y;
		930	}
		931
		932	double preciseWidth() {
		933	return width;
		934	}
		935
		936	double preciseHeight() {
		937	return height;
		938	}
		939
924	}	940	}




/*******************************************************************************
 * Copyright (c) 2003, 2007 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 * @param d the reference dimension
 */
public PrecisionDimension(Dimension d) {
	preciseHeight = d.preciseHeight();
	preciseWidth = d.preciseWidth();
	updateInts();
}

/**

	height = (int)Math.floor(preciseHeight + 0.000000001);	
}

double preciseWidth() {
	return preciseWidth;
}

double preciseHeight() {
	return preciseHeight;
}

}

Lines 1-5 Link Here

(-)src/org/eclipse/draw2d/geometry/Dimension.java (-1 / +9 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2005 IBM Corporation and others.	2	* Copyright (c) 2000, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 435-438 Link Here
435	return this;	435	return this;
436	}	436	}
437		437
		438	double preciseWidth() {
		439	return width;
		440	}
		441
		442	double preciseHeight() {
		443	return height;
		444	}
		445
438	}	446	}

Lines 1-5 Link Here

(-)src/org/eclipse/draw2d/geometry/Point.java (-1 / +9 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2005 IBM Corporation and others.	2	* Copyright (c) 2000, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 395-398 Link Here
395	return this;	395	return this;
396	}	396	}
397		397
		398	double preciseX() {
		399	return x;
		400	}
		401
		402	double preciseY() {
		403	return y;
		404	}
		405
398	}	406	}




/*******************************************************************************
 * Copyright (c) 2003, 2007 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 *******************************************************************************/
package org.eclipse.draw2d.geometry;


/**
 * A Rectangle implementation using floating point values which are truncated into the inherited
 * integer fields. The use of floating point prevents rounding errors from accumulating.

 * @param rect the base rectangle
 */
public PrecisionRectangle(Rectangle rect) {
	preciseX = rect.preciseX();
	preciseY = rect.preciseY();
	preciseWidth = rect.preciseWidth();
	preciseHeight = rect.preciseHeight();
		preciseWidth = rectangle.preciseWidth;
		preciseHeight = rectangle.preciseHeight;
	} else {
		preciseX = rect.x;
		preciseY = rect.y;
		preciseWidth = rect.width;
		preciseHeight = rect.height;
	}
	updateInts();
}


 * @see org.eclipse.draw2d.geometry.Rectangle#resize(org.eclipse.draw2d.geometry.Dimension)
 */
public Rectangle resize(Dimension sizeDelta) {
	preciseWidth += sizeDelta.preciseWidth();
	preciseHeight += sizeDelta.preciseHeight();
		preciseWidth += pd.preciseWidth;
		preciseHeight += pd.preciseHeight;
	} else {
		preciseWidth += sizeDelta.width;
		preciseHeight += sizeDelta.height;
	}
	updateInts();
	return this;
}

 * @see org.eclipse.draw2d.geometry.Rectangle#translate(org.eclipse.draw2d.geometry.Point)
 */
public Rectangle translate(Point p) {
	preciseX += p.preciseX();
	preciseY += p.preciseY();
		preciseX += pp.preciseX;
		preciseY += pp.preciseY;
	} else {
		preciseX += p.x;
		preciseY += p.y;
	}
	updateInts();
	return this;
}

 * @since 3.0
 * @param other the rectangle being unioned
 * @return <code>this</code> for convenience
 * @deprecated
 * Use {@link #union(Rectangle)} instead
 */
public PrecisionRectangle union(PrecisionRectangle other) {
	double newright = Math.max(preciseRight(), other.preciseRight());

}

/**
 * @see org.eclipse.draw2d.geometry.Rectangle#union(org.eclipse.draw2d.geometry.Rectangle)
 */
public Rectangle union(Rectangle other) {
	double newright = Math.max(preciseRight(), other.preciseX() + other.preciseWidth());
	double newbottom = Math.max(preciseBottom(), other.preciseY() + other.preciseHeight());
	preciseX = Math.min(preciseX, other.preciseX());
	preciseY = Math.min(preciseY, other.preciseY());
	preciseWidth = newright - preciseX;
	preciseHeight = newbottom - preciseY;
	updateInts();
	
	return this;
}

/**
 * Updates the integer values based on the current precise values.  The integer values ar
 * the floor of the double values.  This is called automatically when calling api which is
 * overridden in this class.

	height = (int)Math.floor(preciseHeight + preciseY + 0.000000001) - y;
}

/**
 * @see org.eclipse.draw2d.geometry.Rectangle#union(org.eclipse.draw2d.geometry.Point)
 */
public void union(Point p) {
	if (p.preciseX() < preciseX) {
		preciseWidth += (preciseX - p.preciseX());
		preciseX = p.preciseX();
	} else {
		double right = preciseX + preciseWidth;
		if (p.preciseX() > right) {
			preciseWidth = p.preciseX() - preciseX;
		}
	}
	if (p.preciseY() < preciseY) {
		preciseHeight += (preciseY - p.preciseY());
		preciseY = p.preciseY();
	} else {
		double bottom = preciseY + preciseHeight;
		if (p.preciseY() > bottom) {
			preciseHeight = p.preciseY() - preciseY;
		}
	}
	updateInts();
}

/**
 * @see org.eclipse.draw2d.geometry.Rectangle#transpose()
 */
public Rectangle transpose() {
	double temp = preciseX;
	preciseX = preciseY;
	preciseY = temp;
	temp = preciseWidth;
	preciseWidth = preciseHeight;
	preciseHeight = temp;
	super.transpose();
	return this;
}

/**
 * @see org.eclipse.draw2d.geometry.Rectangle#setLocation(org.eclipse.draw2d.geometry.Point)
 */
public Rectangle setLocation(Point loc) {
	preciseX = loc.preciseX();
	preciseY = loc.preciseY();
	updateInts();
	return this;
}

/**
 * Returns the precise geometric centre of the rectangle
 * 
 * @return <code>PrecisionPoint</code> geometric center of the rectangle
 * @since 3.4
 */
public PrecisionPoint getPreciseCenter() {
	return new PrecisionPoint(preciseX + preciseWidth / 2.0, preciseY + preciseHeight / 2.0);
}

/**
 * Shrinks the sides of this Rectangle by the horizontal and vertical values 
 * provided as input, and returns this Rectangle for convenience. The center of 
 * this Rectangle is kept constant.
 *
 * @param h  Horizontal reduction amount
 * @param v  Vertical reduction amount
 * @return  <code>this</code> for convenience
 * @since 3.4
 */
public Rectangle shrink(double h, double v) {
	preciseX += h; 
	preciseWidth -= (h + h);
	preciseY += v; 
	preciseHeight -= (v + v);
	updateInts();
	return this;
}

/**
 * Expands the horizontal and vertical sides of this Rectangle with the values 
 * provided as input, and returns this for convenience. The location of its 
 * center is kept constant.
 * 
 * @param h  Horizontal increment
 * @param v  Vertical increment
 * @return  <code>this</code> for convenience
 * @since 3.4
 */
public Rectangle expand(double h, double v) {
	return shrink(-h, -v);
}

/**
 * @see org.eclipse.draw2d.geometry.Rectangle#shrink(int, int)
 */
public Rectangle shrink(int h, int v) {
	return shrink((double)h, (double)v);
}

/**
 * @see org.eclipse.draw2d.geometry.Rectangle#contains(org.eclipse.draw2d.geometry.Point)
 */
public boolean contains(Point p) {
	return preciseX <= p.preciseX() && p.preciseX() <= preciseX + preciseWidth
	&& preciseY <= p.preciseY() && p.preciseY() <= preciseY + preciseHeight;
}

double preciseX() {
	return preciseX;
}

double preciseY() {
	return preciseY;
}

double preciseWidth() {
	return preciseWidth;
}

double preciseHeight() {
	return preciseHeight;
}

}

Return to bug 212460

Lines 1-5 Link Here

(-)src/org/eclipse/draw2d/geometry/PrecisionDimension.java (-4 / +12 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2003, 2005 IBM Corporation and others.	2	* Copyright (c) 2003, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 47-55 Link Here
47	* @param d the reference dimension	47	* @param d the reference dimension
48	*/	48	*/
49	public PrecisionDimension(Dimension d) {	49	public PrecisionDimension(Dimension d) {
50	super(d);	50	preciseHeight = d.preciseHeight();
51	preciseHeight = d.height;	51	preciseWidth = d.preciseWidth();
52	preciseWidth = d.width;	52	updateInts();
53	}	53	}
54		54
55	/**	55	/**
Lines 69-72 Link Here
69	height = (int)Math.floor(preciseHeight + 0.000000001);	69	height = (int)Math.floor(preciseHeight + 0.000000001);
70	}	70	}
71		71
		72	double preciseWidth() {
		73	return preciseWidth;
		74	}
		75
		76	double preciseHeight() {
		77	return preciseHeight;
		78	}
		79
72	}	80	}