[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view View.java,1.75,1.76

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8430/src/net/sourceforge/bprocessor/gl/view

Modified Files:
	View.java 
Log Message:
A large amount of changes because of the CVS outage at sourceforge.

Element-modelling now completet

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** View.java	30 Mar 2006 08:03:41 -0000	1.75
--- View.java	5 Apr 2006 09:36:17 -0000	1.76
***************
*** 900,918 ****
    private void drawEdges(GLDrawable gld) {
      drawGeneralEdges(gld, tempEdges);
      
      Space active = Project.getInstance().getActiveSpace();
      if (active != null) {
        Set edges = new HashSet();
!       Collection envelope = active.getEnvelope();
!       Iterator iter = envelope.iterator();
!       while (iter.hasNext()) {
!         Surface current = (Surface) iter.next();
!         edges.addAll(current.getEdges());
        }
        drawConstructionEdges(gld, edges);
        drawGeneralEdges(gld, active.getEdges());
      } else {
!       Collection edges = Project.getInstance().getEdges();
!       drawGeneralEdges(gld, edges);
      }
    }
--- 900,929 ----
    private void drawEdges(GLDrawable gld) {
      drawGeneralEdges(gld, tempEdges);
+     Collection all = Project.getInstance().getEdges();
      
      Space active = Project.getInstance().getActiveSpace();
      if (active != null) {
        Set edges = new HashSet();
!       {
!         Iterator iter = all.iterator();
!         while (iter.hasNext()) {
!           Edge current = (Edge) iter.next();
!           if (current.getConstructor()) {
!             edges.add(current);
!           }
!         }
!       }
!       {
!         Collection envelope = active.getEnvelope();
!         Iterator iter = envelope.iterator();
!         while (iter.hasNext()) {
!           Surface current = (Surface) iter.next();
!           edges.addAll(current.getEdges());
!         }
        }
        drawConstructionEdges(gld, edges);
        drawGeneralEdges(gld, active.getEdges());
      } else {
!       drawGeneralEdges(gld, all);
      }
    }
***************
*** 1067,1071 ****
      
      //drawing the inner conturs
!     Set innerSurfaces = s.getHoles();
      if (innerSurfaces != null) {
        Iterator innerIt = innerSurfaces.iterator();
--- 1078,1082 ----
      
      //drawing the inner conturs
!     Collection innerSurfaces = s.getHoles();
      if (innerSurfaces != null) {
        Iterator innerIt = innerSurfaces.iterator();
***************
*** 1904,1908 ****
        ray = transformation.unProject(ray);
        if (vertex != null) {
!         return new Intersection(vertex, Intersection.VERTEX, null);
        } else {
          if (edge != null) {
--- 1915,1919 ----
        ray = transformation.unProject(ray);
        if (vertex != null) {
!         return new Intersection(vertex, Intersection.VERTEX, vertex);
        } else {
          if (edge != null) {