[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool PencilTool.java,1.25,1.26

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

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

Modified Files:
	PencilTool.java 
Log Message:
GLView shows the GUI window when done initialising
PencilTool calls Geometry.insert(edges) to find newly created Surfaces

Index: PencilTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/PencilTool.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** PencilTool.java	18 Oct 2005 08:18:41 -0000	1.25
--- PencilTool.java	21 Oct 2005 08:43:56 -0000	1.26
***************
*** 166,189 ****
          
          if (!edges.isEmpty()) {
!           Geometry.insert(edges);
!           Surface surface = new Surface("S" + surfaceNum++, edges);
!           intern(surface);
!           if (exterior != null) {
!             exterior.addHole(surface);
!             Project.getInstance().update(exterior);
!             Project.getInstance().update(surface);
!           }
! 
!           // Do automation with spaces
!           Space sp = findSpace(surface);
!           if (sp != null) {
!             sp.addSurface(surface);
!           }
!           if (sp instanceof ConstructionSpace) {
!             Project.getInstance().update((ConstructionSpace)sp);
!           } else if (sp instanceof FunctionalSpace) {
!             Project.getInstance().update((FunctionalSpace)sp);
!           }  else {
!             //log.warn("No space was found");
            }
          }
--- 166,194 ----
          
          if (!edges.isEmpty()) {
!           Vertex from = ((Edge) edges.get(0)).getFrom();
!           Vertex to = ((Edge) edges.get(edges.size() - 1)).getTo();
!           if (from == to) {
!             Surface surface = new Surface("S" + surfaceNum++, edges);
!             intern(surface);
!             if (exterior != null) {
!               exterior.addHole(surface);
!               Project.getInstance().update(exterior);
!               Project.getInstance().update(surface);
!             }
!             
!             // Do automation with spaces
!             Space sp = findSpace(surface);
!             if (sp != null) {
!               sp.addSurface(surface);
!             }
!             if (sp instanceof ConstructionSpace) {
!               Project.getInstance().update((ConstructionSpace)sp);
!             } else if (sp instanceof FunctionalSpace) {
!               Project.getInstance().update((FunctionalSpace)sp);
!             }  else {
!               //log.warn("No space was found");
!             }
!           } else {
!             Geometry.insert(edges);
            }
          }