[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Edge.java, 1.54, 1.55 Vertex.java, 1.43, 1.44 Surface.java, 1.106, 1.107 Space.java, 1.50, 1.51

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18841/src/net/sourceforge/bprocessor/model

Modified Files:
	Edge.java Vertex.java Surface.java Space.java 
Log Message:
Fixed some problems and matbe the windowmodellor is working now

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
*** Surface.java	29 Aug 2006 09:32:26 -0000	1.106
--- Surface.java	29 Aug 2006 10:05:11 -0000	1.107
***************
*** 1178,1186 ****
        i.scale(1 / i.length());
        j = i.cross(n);
!       j.scale(1 / j.length());
!       return new CoordinateSystem(i, j, n, origin);
!     } else {
!       return null;
      }
    }
    
--- 1178,1187 ----
        i.scale(1 / i.length());
        j = i.cross(n);
!       if (j != null) {
!         j.scale(1 / j.length());
!         return new CoordinateSystem(i, j, n, origin);
!       }
      }
+     return null;
    }
    

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** Space.java	29 Aug 2006 09:32:26 -0000	1.50
--- Space.java	29 Aug 2006 10:05:11 -0000	1.51
***************
*** 954,960 ****
        }
      }
!     Space superSpace = findElement(element);
!     superSpace.elements.remove(element.getId());
!     element.setId(null);
    }
    
--- 954,962 ----
        }
      }
!     if (element != null) {
!       Space superSpace = findElement(element);
!       superSpace.elements.remove(element.getId());
!       element.setId(null);
!     }
    }
    

Index: Vertex.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Vertex.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** Vertex.java	23 Aug 2006 13:43:19 -0000	1.43
--- Vertex.java	29 Aug 2006 10:05:11 -0000	1.44
***************
*** 245,253 ****
     */
    public Vertex cross(Vertex v) {
!     Vertex cross = new Vertex();
!     cross.setX(this.getY() * v.getZ() - v.getY() * this.getZ());
!     cross.setY(this.getZ() * v.getX() - v.getZ() * this.getX());
!     cross.setZ(this.getX() * v.getY() - v.getX() * this.getY());
!     return cross;
    }
  
--- 245,256 ----
     */
    public Vertex cross(Vertex v) {
!     if (v != null) {
!       Vertex cross = new Vertex();
!       cross.setX(this.getY() * v.getZ() - v.getY() * this.getZ());
!       cross.setY(this.getZ() * v.getX() - v.getZ() * this.getX());
!       cross.setZ(this.getX() * v.getY() - v.getX() * this.getY());
!       return cross;
!     }
!     return null;
    }
  
***************
*** 466,473 ****
     */
    public Vertex projectOnto(Vertex onto) {
!     double scale = this.dot(onto) / onto.dot(onto);
!     Vertex res = onto.copy();
!     res.scale(scale);
!     return res;
    }
  }
--- 469,479 ----
     */
    public Vertex projectOnto(Vertex onto) {
!     if (onto != null) {
!       double scale = this.dot(onto) / onto.dot(onto);
!       Vertex res = onto.copy();
!       res.scale(scale);
!       return res;
!     }
!     return null;
    }
  }

Index: Edge.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Edge.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** Edge.java	28 Aug 2006 16:44:41 -0000	1.54
--- Edge.java	29 Aug 2006 10:05:11 -0000	1.55
***************
*** 538,542 ****
    /**
     * Create a offset from a list of lines and a surface
!    * PRECONDITION: all the edges have to be in the given surface
     * @param which The list of edges in inner that are going to be offset
     * @param inner The surface
--- 538,543 ----
    /**
     * Create a offset from a list of lines and a surface
!    * PRECONDITION: all the edges have to be in the given surface and the edges 
!    * in the surface have to be counter clockwise drawn.
     * @param which The list of edges in inner that are going to be offset
     * @param inner The surface
***************
*** 574,578 ****
          v2v.put(from, e.getFrom());
          res.add(new Edge(to, from));
!         if (from2edge.containsKey(e.getFrom())) {
            from2edge.put(e.getTo(), e);
            to2edge.put(e.getFrom(), e);
--- 575,579 ----
          v2v.put(from, e.getFrom());
          res.add(new Edge(to, from));
!         /*if (from2edge.containsKey(e.getFrom()) || prevEdge == null) {
            from2edge.put(e.getTo(), e);
            to2edge.put(e.getFrom(), e);
***************
*** 580,599 ****
            from2edge.put(e.getFrom(), e);
            to2edge.put(e.getTo(), e);
!         }
!         /*Vertex common = Edge.commonVertex(e, prevEdge);
!         if (common == e.getFrom() || common == null) {
            from2edge.put(e.getFrom(), e);
            to2edge.put(e.getTo(), e);
          } else {
!           from2edge.put(e.getTo(), e);
!           to2edge.put(e.getFrom(), e);
!         }*/
        } else {
!         if (from2edge.containsKey(e.getFrom())) {
!           from2edge.put(e.getTo(), e);
!           to2edge.put(e.getFrom(), e);
!         } else {
            from2edge.put(e.getFrom(), e);
            to2edge.put(e.getTo(), e);
          }
        }
--- 581,615 ----
            from2edge.put(e.getFrom(), e);
            to2edge.put(e.getTo(), e);
!         }*/
!         Vertex common = Edge.commonVertex(e, prevEdge);
!         if (common == null) {
            from2edge.put(e.getFrom(), e);
            to2edge.put(e.getTo(), e);
          } else {
!           if (from2edge.containsKey(common)) {
!             to2edge.put(common, e);
!             from2edge.put(e.otherVertex(common), e);
!           } else if (to2edge.containsKey(common)) {
!             from2edge.put(common, e);
!             to2edge.put(e.otherVertex(common), e);
!           } else {
!             log.error("common should be either from or to???");
!           }
!         }
        } else {
!         Vertex common = Edge.commonVertex(e, prevEdge);
!         if (common == null) {
            from2edge.put(e.getFrom(), e);
            to2edge.put(e.getTo(), e);
+         } else {
+           if (from2edge.containsKey(common)) {
+             to2edge.put(common, e);
+             from2edge.put(e.otherVertex(common), e);
+           } else if (to2edge.containsKey(common)) {
+             from2edge.put(common, e);
+             to2edge.put(e.otherVertex(common), e);
+           } else {
+             log.error("common should be either from or to???");
+           }
          }
        }
***************
*** 602,608 ****
      // calculate the directions
      iter = directions.values().iterator();
-     System.out.println("To size " + to2edge.size());
-     System.out.println("From size " + from2edge.size());
-     System.out.println("Vertices " + directions.size());
      while (iter.hasNext()) {
        Direction dir = (Direction)iter.next();
--- 618,621 ----