[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool ToolFactory.java, 1.60, 1.61 SpaceTool.java, 1.45, 1.46

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

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

Modified Files:
	ToolFactory.java SpaceTool.java 
Log Message:
Implemented Space.insert(Surface)

Index: SpaceTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** SpaceTool.java	6 Oct 2006 11:45:46 -0000	1.45
--- SpaceTool.java	9 Oct 2006 14:02:05 -0000	1.46
***************
*** 718,740 ****
        Stack stack = new Stack();
        function.evaluate(env, stack);
        while (!stack.empty()) {
          Object result = stack.pop();
          if (result instanceof Vertex) {
!           result = Geometry.insertVertex((Vertex)result, true);
            Selection.primary().add(result);
          } else  if (result instanceof Edge) {
!           result = Geometry.insertEdge((Edge)result, true);
            Selection.primary().add(result);
          } else if (result instanceof Surface) {
!           Surface surface = (Surface) result;
!           Geometry.insertEdges(surface.getEdges());
!           glv.setLengthValue(result.toString());
          } else {
            glv.setLengthValue(result.toString());
          }
        }
-      
        typing = false;
-       
      } catch (Exception error) {
        log.info(error);
--- 718,738 ----
        Stack stack = new Stack();
        function.evaluate(env, stack);
+       Space space = Project.getInstance().getActiveSpace();
        while (!stack.empty()) {
          Object result = stack.pop();
          if (result instanceof Vertex) {
!           result = space.insert((Vertex)result, true);
            Selection.primary().add(result);
          } else  if (result instanceof Edge) {
!           result = space.insert((Edge)result, true);
            Selection.primary().add(result);
          } else if (result instanceof Surface) {
!           result = space.insert((Surface) result, true);
!           Selection.primary().add(result);
          } else {
            glv.setLengthValue(result.toString());
          }
        }
        typing = false;
      } catch (Exception error) {
        log.info(error);

Index: ToolFactory.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** ToolFactory.java	5 Oct 2006 12:19:59 -0000	1.60
--- ToolFactory.java	9 Oct 2006 14:02:05 -0000	1.61
***************
*** 211,214 ****
--- 211,217 ----
      this.registerTool(Tool.CONSTRUCTOR_TOOL, constructor, "Biconconstructor.gif", "Constructor");
      offBut = this.registerTool(Tool.OFFSET_TOOL, offset, "Biconoffset.gif", "Offset");
+     clipBut = this.registerTool(Tool.CLIP_TOOL, clipplane, 
+         "Bclip.gif", "Clipping");
+     
      tb.addSeparator(3);