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

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

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

Modified Files:
	View.java 
Log Message:
More supporting edges when editing space

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.169
retrieving revision 1.170
diff -C2 -d -r1.169 -r1.170
*** View.java	2 Jan 2007 17:45:39 -0000	1.169
--- View.java	9 Jan 2007 10:12:06 -0000	1.170
***************
*** 839,888 ****
    public Collection collectSupportingEdges(Space active) {
      Collection edges = new HashSet();
!     if (active != Project.getInstance().world()) {
!       Space empty = active.getOwner().getEmpty();
!       Collection envelope = active.getEnvelope();
!       Set spaces = new HashSet();
!       {
!         Iterator iter = envelope.iterator();
!         while (iter.hasNext()) {
!           Surface current = (Surface) iter.next();
!           Space other;
!           if (current.getFrontDomain() == active) {
!             other = current.getBackDomain();
!           } else {
!             other = current.getFrontDomain();
            }
!           if (other != empty) {
!             spaces.add(other);
            }
          }
!       }
!       Set surfaces = new HashSet();
!       surfaces.addAll(envelope);
!       {
!         Iterator iter = spaces.iterator();
!         while (iter.hasNext()) {
!           Space current = (Space) iter.next();
!           surfaces.addAll(current.getEnvelope());
          }
        }
        {
!         Set holes = new HashSet();
!         Iterator iter = surfaces.iterator();
          while (iter.hasNext()) {
!           Surface current = (Surface) iter.next();
!           holes.addAll(current.getHoles());
!         }
!         surfaces.addAll(holes);
!       }
!       edges.addAll(Surface.edges(surfaces));
!     }
!     {
!       Iterator iter = Selection.primary().iterator();
!       while (iter.hasNext()) {
!         Geometric current = (Geometric) iter.next();
!         if (current instanceof Space) {
!           Space space = (Space) current;
!           edges.addAll(space.getEdges());
          }
        }
--- 839,899 ----
    public Collection collectSupportingEdges(Space active) {
      Collection edges = new HashSet();
!     
!     if (DRAW_ALL) {
!       if (active != Project.getInstance().world()) {
!         Space current = active;
!         while (current != null) {
!           edges.addAll(current.getEdges());
!           current = current.getOwner();
!         }
!       }
!     } else {
!       if (active != Project.getInstance().world()) {
!         Space empty = active.getOwner().getEmpty();
!         Collection envelope = active.getEnvelope();
!         Set spaces = new HashSet();
!         {
!           Iterator iter = envelope.iterator();
!           while (iter.hasNext()) {
!             Surface current = (Surface) iter.next();
!             Space other;
!             if (current.getFrontDomain() == active) {
!               other = current.getBackDomain();
!             } else {
!               other = current.getFrontDomain();
!             }
!             if (other != empty) {
!               spaces.add(other);
!             }
            }
!         }
!         Set surfaces = new HashSet();
!         surfaces.addAll(envelope);
!         {
!           Iterator iter = spaces.iterator();
!           while (iter.hasNext()) {
!             Space current = (Space) iter.next();
!             surfaces.addAll(current.getEnvelope());
            }
          }
!         {
!           Set holes = new HashSet();
!           Iterator iter = surfaces.iterator();
!           while (iter.hasNext()) {
!             Surface current = (Surface) iter.next();
!             holes.addAll(current.getHoles());
!           }
!           surfaces.addAll(holes);
          }
+         edges.addAll(Surface.edges(surfaces));
        }
        {
!         Iterator iter = Selection.primary().iterator();
          while (iter.hasNext()) {
!           Geometric current = (Geometric) iter.next();
!           if (current instanceof Space) {
!             Space space = (Space) current;
!             edges.addAll(space.getEdges());
!           }
          }
        }
***************
*** 1976,1982 ****
    private void drawSelectionMode(GLAutoDrawable gld) {
      Space space = Project.getInstance().getActiveSpace();
- 
      Collection surfaces = new LinkedList();
!     //space.collectSurfaces(surfaces);
      surfaces.addAll(space.getSurfaces());
      surfaces.addAll(tempSurfaces);
--- 1987,1992 ----
    private void drawSelectionMode(GLAutoDrawable gld) {
      Space space = Project.getInstance().getActiveSpace();
      Collection surfaces = new LinkedList();
!     
      surfaces.addAll(space.getSurfaces());
      surfaces.addAll(tempSurfaces);