[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java, 1.99, 1.100 SpaceTool.java, 1.31, 1.32

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

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

Modified Files:
	AbstractTool.java SpaceTool.java 
Log Message:
basic evaluation

Index: SpaceTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** SpaceTool.java	11 Sep 2006 20:38:59 -0000	1.31
--- SpaceTool.java	11 Sep 2006 22:57:21 -0000	1.32
***************
*** 40,46 ****
--- 40,48 ----
  import net.sourceforge.bprocessor.model.Geometry;
  import net.sourceforge.bprocessor.model.constraints.OffsetConstraint;
+ import net.sourceforge.bprocessor.model.evaluator.Function;
  import net.sourceforge.bprocessor.model.modellor.LayerModellor;
  import net.sourceforge.bprocessor.model.modellor.Modellor;
  import net.sourceforge.bprocessor.parser.ScriptLexer;
+ import net.sourceforge.bprocessor.parser.ScriptParser;
  
  /**
***************
*** 548,551 ****
--- 550,563 ----
      Reader input = new StringReader(value);
      ScriptLexer lexer = new ScriptLexer(input);
+     ScriptParser parser = new ScriptParser(lexer);
+     Function function = new Function();
+     try {
+       parser.expression(function);
+       Object result = function.evaluate();
+       glv.setLengthValue(result.toString());
+       typing = false;
+     } catch (Exception error) {
+       Project.info(error);
+     }
      return null;
    }
***************
*** 568,571 ****
--- 580,584 ----
          typing = true;
        } else {
+         Project.info(new Character(ch));
          if (event.getKeyCode() == KeyEvent.VK_ENTER) {
            evaluate(value);

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** AbstractTool.java	11 Sep 2006 12:47:32 -0000	1.99
--- AbstractTool.java	11 Sep 2006 22:57:21 -0000	1.100
***************
*** 237,257 ****
      }
      
!     if (e.getModifiers() == 0) {
!       if (e.getKeyCode() == KeyEvent.VK_UP) {
!         c.translate(new double[] {up.getX(), up.getY(), up.getZ()});
!       } else if (e.getKeyCode() == KeyEvent.VK_DOWN) {
!         c.translate(new double[] {-up.getX(), -up.getY(), -up.getZ()});
!       } else if (e.getKeyCode() == KeyEvent.VK_LEFT) {
!         c.translate(new double[] {sidewards.getX(), sidewards.getY(), sidewards.getZ()});
!       } else if (e.getKeyCode() == KeyEvent.VK_RIGHT) {
!         c.translate(new double[] {-sidewards.getX(), -sidewards.getY(), -sidewards.getZ()});
!       } else if (e.getKeyCode() == KeyEvent.VK_Z) {
!         c.zoomout();
!       } else if (e.getKeyCode() == KeyEvent.VK_X) {
!         c.zoomin();
!       } else {
!         key(e);
!       }
      }
      glv.repaint(true);
    }
--- 237,252 ----
      }
      
!     if (e.getKeyCode() == KeyEvent.VK_UP) {
!       c.translate(new double[] {up.getX(), up.getY(), up.getZ()});
!     } else if (e.getKeyCode() == KeyEvent.VK_DOWN) {
!       c.translate(new double[] {-up.getX(), -up.getY(), -up.getZ()});
!     } else if (e.getKeyCode() == KeyEvent.VK_LEFT) {
!       c.translate(new double[] {sidewards.getX(), sidewards.getY(), sidewards.getZ()});
!     } else if (e.getKeyCode() == KeyEvent.VK_RIGHT) {
!       c.translate(new double[] {-sidewards.getX(), -sidewards.getY(), -sidewards.getZ()});
!     } else {
!       key(e);
      }
+     
      glv.repaint(true);
    }