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

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

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

Modified Files:
	View.java 
Log Message:
Experimenting with space-selection

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -d -r1.146 -r1.147
*** View.java	29 Aug 2006 08:49:20 -0000	1.146
--- View.java	30 Aug 2006 09:53:09 -0000	1.147
***************
*** 1820,1824 ****
    private void drawSelectionMode(GLDrawable gld) {
      Space space = Project.getInstance().getActiveSpace();
!     Collection surfaces = space.getSurfaces();
      Collection edges = new LinkedList();
      edges.addAll(space.getEdges());
--- 1820,1830 ----
    private void drawSelectionMode(GLDrawable gld) {
      Space space = Project.getInstance().getActiveSpace();
!     
!     Collection surfaces = new LinkedList();
!     //space.collectSurfaces(surfaces);
!     surfaces.addAll(space.getSurfaces());
!     surfaces.addAll(tempSurfaces);
!     
!     
      Collection edges = new LinkedList();
      edges.addAll(space.getEdges());
***************
*** 1861,1887 ****
      }
      if (selectMode == SURFACES || selectMode == ALL) {
!       if (space != null) {
!         Set ss = new HashSet();
!         Collection surfs = space.getSurfaces();
!         ss.addAll(surfs);
!         Iterator it = ss.iterator();
!         while (it.hasNext()) {
!           Surface s = (Surface)it.next();
!           pushName(gl, s);
!           drawSurface(s);
!           popName(gl);
!         }
!       } else {
!         Iterator it = surfaces.iterator();
!         while (it.hasNext()) {
!           Surface s = (Surface)it.next();
!           pushName(gl, s);
!           drawSurface(s);
!           popName(gl);
!         }
!       }
!       Iterator tempSurfaceIt = tempSurfaces.iterator();
!       while (tempSurfaceIt.hasNext()) {
!         Surface s = (Surface)tempSurfaceIt.next();
          pushName(gl, s);
          drawSurface(s);
--- 1867,1873 ----
      }
      if (selectMode == SURFACES || selectMode == ALL) {
!       Iterator it = surfaces.iterator();
!       while (it.hasNext()) {
!         Surface s = (Surface)it.next();
          pushName(gl, s);
          drawSurface(s);