[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Command.java, 1.70, 1.71

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

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15709/src/net/sourceforge/bprocessor/model

Modified Files:
	Command.java 
Log Message:
simplefied frame

Index: Command.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** Command.java	18 Feb 2008 14:58:40 -0000	1.70
--- Command.java	19 Feb 2008 12:44:32 -0000	1.71
***************
*** 1586,1592 ****
      public Frame(Container net) {
        this.net = net;
!       parameters.put("outside-frame", 0.0);
!       parameters.put("inside-frame", 0.035);
!       parameters.put("interior", 0.035);
        parameters.put("depth", 0.07);
        
--- 1586,1591 ----
      public Frame(Container net) {
        this.net = net;
!       parameters.put("frame-width", 0.035);
!       parameters.put("interior-width", 0.035);
        parameters.put("depth", 0.07);
        
***************
*** 1640,1646 ****
      @Override
      public void evaluate() {
!       double outside = parameters.getDouble("outside-frame");
!       double inside = parameters.getDouble("inside-frame");
!       double delta = parameters.getDouble("interior");
        double depth = parameters.getDouble("depth");
        String frameName = (String) parameters.get("frame name");
--- 1639,1644 ----
      @Override
      public void evaluate() {
!       double inside = parameters.getDouble("frame-width");
!       double delta = parameters.getDouble("interior-width");
        double depth = parameters.getDouble("depth");
        String frameName = (String) parameters.get("frame name");
***************
*** 1676,1680 ****
        Collection<Surface> inserted = new LinkedList();
        
!       List<Edge> offset = Offset.offset(boundary, inside + outside - (delta / 2));
        Surface exterior = new Surface(simplify(offset));
        inserted.add(exterior);
--- 1674,1678 ----
        Collection<Surface> inserted = new LinkedList();
        
!       List<Edge> offset = Offset.offset(boundary, inside - (delta / 2));
        Surface exterior = new Surface(simplify(offset));
        inserted.add(exterior);
***************
*** 1997,2001 ****
      public void evaluate() {
        Container net = (Container) parameters.get("net");
!       
      }
    }
--- 1995,2002 ----
      public void evaluate() {
        Container net = (Container) parameters.get("net");
!       ParameterBlock block = net.getParameters();
!       double left = block.getDouble("left");
!       double right = block.getDouble("right");
!       double depth = block.getDouble("depth"); 
      }
    }