[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Edge.java, 1.71, 1.72
Status: Pre-Alpha
Brought to you by:
henryml
|
From: Nordholt <nor...@us...> - 2007-02-16 10:37:44
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28265/src/net/sourceforge/bprocessor/model Modified Files: Edge.java Log Message: safty check Index: Edge.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Edge.java,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** Edge.java 22 Jan 2007 15:40:16 -0000 1.71 --- Edge.java 16 Feb 2007 09:28:35 -0000 1.72 *************** *** 697,701 **** Line l1 = new Line(org1, dir1); Line l2 = new Line(org2, dir2); ! mainDir = work.minus(l1.intersection(l2)); } else { //If the edges are parallel the offset must be the same --- 697,708 ---- Line l1 = new Line(org1, dir1); Line l2 = new Line(org2, dir2); ! Vertex intersect = l1.intersection(l2); ! if (intersect != null) { ! mainDir = work.minus(intersect); ! } else { ! log.warn("offset lines does not intersect," + ! " l1: " + l1 + " l2: " + l2); ! mainDir = new Vertex(0, 0, 0); ! } } else { //If the edges are parallel the offset must be the same |