Revision 26810

View differences:

branches/v2_0_0_prep/libraries/libFMap_geometries/src-test/org/gvsig/fmap/geom/primitive/EllipticArcTest.java
77 77 
		axix1End.setCoordinateAt(0, 1);
78 78 
		axix1End.setCoordinateAt(1, 1);
79 79
80 
		double radious = 1;
80 
		double axis2Dist = 1;
81 81 
		double angSt = 1;
82 82 
		double angExt = 1;
83 83
84 
		ellipticArc.setPoints(axis1Start, axix1End, radious, angSt, angExt);
84 
		ellipticArc.setPoints(axis1Start, axix1End, axis2Dist, angSt, angExt);
85 85
86
86 
		assertEquals(0, ellipticArc.getAxis1Start().getX(), 0);
87 
		assertEquals(0, ellipticArc.getAxis1Start().getY(), 0);
88 
		assertEquals(1, ellipticArc.getAxis1End().getX(), 0);
89 
		assertEquals(1, ellipticArc.getAxis1End().getY(), 0);
90 
		assertEquals(1, ellipticArc.getAxis2Dist(), axis2Dist);
91 
		assertEquals(1, ellipticArc.getAngSt(), angSt);
92 
		assertEquals(1, ellipticArc.getAngExt(), angExt);
87 93 
	}
88 94 
}
89 95 

  		












  

    
      branches/v2_0_0_prep/libraries/libFMap_geometries/src-test/org/gvsig/fmap/geom/primitive/EllipseTest.java
    
  





  77
  77
  
    
		endPoint.setCoordinateAt(0, 1);


  		




  78
  78
  
    
		endPoint.setCoordinateAt(1, 1);


  		




  79
  79
  
    
		


  		




  80
  
  
    
		double radious = 1;


  		




  
  80
  
    
		double axisLength = 1;


  		




  81
  81
  
    
		


  		




  82
  
  
    
		ellipse.setPoints(initPoint, endPoint, radious);


  		




  
  82
  
    
		ellipse.setPoints(initPoint, endPoint, axisLength);


  		




  
  83
  
    
		


  		




  
  84
  
    
		assertEquals(0, ellipse.getAxis1Start().getX(), 0);


  		




  
  85
  
    
		assertEquals(0, ellipse.getAxis1Start().getY(), 0);


  		




  
  86
  
    
		assertEquals(1, ellipse.getAxis1End().getX(), 0);


  		




  
  87
  
    
		assertEquals(1, ellipse.getAxis1End().getY(), 0);


  		




  
  88
  
    
		assertEquals(1, ellipse.getAxis2Dist(), axisLength);


  		




  
  89
  
    
	;


  		




  83
  90
  
    
	}	


  		




  84
  91
  
    
}


  		




  85
  92
  
    

  		












  

    
      branches/v2_0_0_prep/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/primitive/EllipticArc2D.java
    
  





  101
  101
  
    
		this.angSt = angSt;


  		




  102
  102
  
    
		this.angExt = angExt;


  		




  103
  103
  
    
	}


  		




  104
  
  
    
	public Point2D getAxis1Start(){


  		




  105
  
  
    
		return this.axis1Start;


  		




  
  104
  
    
	public Point getAxis1Start(){


  		




  
  105
  
    
		return new org.gvsig.fmap.geom.primitive.Point2D(axis1Start);


  		




  106
  106
  
    
	}


  		




  107
  
  
    
	public Point2D getAxis1End(){


  		




  108
  
  
    
		return this.axis1End;


  		




  
  107
  
    
	public Point getAxis1End(){


  		




  
  108
  
    
		return new org.gvsig.fmap.geom.primitive.Point2D(axis1End);


  		




  109
  109
  
    
	}


  		




  110
  110
  
    
	public double getAxis2Dist(){


  		




  111
  111
  
    
		return this.semiAxis2Length;


  		












  

    
      branches/v2_0_0_prep/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/primitive/Ellipse2D.java
    
  





  533
  533
  
    
		this.end = axis1End;


  		




  534
  534
  
    
		this.ydist = axis2Length;		


  		




  535
  535
  
    
	}


  		




  
  536
  
    

  		




  
  537
  
    
	/* (non-Javadoc)


  		




  
  538
  
    
	 * @see org.gvsig.fmap.geom.primitive.Ellipse#getAxis1End()


  		




  
  539
  
    
	 */


  		




  
  540
  
    
	public Point getAxis1End() {


  		




  
  541
  
    
		return new org.gvsig.fmap.geom.primitive.Point2D(end);


  		




  
  542
  
    
	}


  		




  
  543
  
    

  		




  
  544
  
    
	/* (non-Javadoc)


  		




  
  545
  
    
	 * @see org.gvsig.fmap.geom.primitive.Ellipse#getAxis1Start()


  		




  
  546
  
    
	 */


  		




  
  547
  
    
	public Point getAxis1Start() {


  		




  
  548
  
    
		return new org.gvsig.fmap.geom.primitive.Point2D(init);


  		




  
  549
  
    
	}


  		




  
  550
  
    

  		




  
  551
  
    
	/* (non-Javadoc)


  		




  
  552
  
    
	 * @see org.gvsig.fmap.geom.primitive.Ellipse#getAxis2Dist()


  		




  
  553
  
    
	 */


  		




  
  554
  
    
	public double getAxis2Dist() {


  		




  
  555
  
    
		return ydist;


  		




  
  556
  
    
	}


  		




  536
  557
  
    
	


  		




  537
  558
  
    
	


  		




  538
  559
  
    

  		












  

    
      branches/v2_0_0_prep/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/primitive/EllipticArc.java
    
  





  27
  27
  
    
 


  		




  28
  28
  
    
package org.gvsig.fmap.geom.primitive;


  		




  29
  29
  
    

  		




  
  30
  
    
import java.awt.geom.Point2D;


  		




  30
  31
  
    

  		




  
  32
  
    

  		




  31
  33
  
    
/**


  		




  32
  34
  
    
 * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera</a>


  		




  33
  35
  
    
 */


  		




  34
  36
  
    
public interface EllipticArc extends Surface{


  		




  35
  37
  
    

  		




  36
  
  
    
	void setPoints(Point axis1Start, Point axis1End, double semiAxis2Length, double angSt, double angExt);


  		




  
  38
  
    
	void setPoints(Point axis1Start, Point axis1End, double semiAxis2Dist, double angSt, double angExt);


  		




  37
  39
  
    
	


  		




  
  40
  
    
	Point getAxis1Start();


  		




  
  41
  
    
		


  		




  
  42
  
    
	Point getAxis1End();


  		




  
  43
  
    
		


  		




  
  44
  
    
	double getAxis2Dist();


  		




  
  45
  
    
		


  		




  
  46
  
    
	double getAngSt();


  		




  
  47
  
    
		


  		




  
  48
  
    
	double getAngExt();


  		




  
  49
  
    
		


  		




  38
  50
  
    
}


  		




  39
  51
  
    

  		












  

    
      branches/v2_0_0_prep/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/primitive/Ellipse.java
    
  





  36
  36
  
    
	


  		




  37
  37
  
    
	void setPoints(Point axis1Start, Point axis1End, double axis2Length);	


  		




  38
  38
  
    
	


  		




  
  39
  
    
	Point getAxis1Start();


  		




  
  40
  
    
	


  		




  
  41
  
    
	Point getAxis1End();


  		




  
  42
  
    
	


  		




  
  43
  
    
	double getAxis2Dist();


  		




  39
  44
  
    
}


  		




  40
  45
  
    

  		












Also available in:  Unified diff