[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Command.java, 1.81, 1.82 Project.java, 1.185, 1.186

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

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv10124/src/net/sourceforge/bprocessor/model

Modified Files:
	Command.java Project.java 
Log Message:


Index: Command.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** Command.java	12 Feb 2010 11:44:28 -0000	1.81
--- Command.java	25 Feb 2010 14:43:48 -0000	1.82
***************
*** 2154,2280 ****
     * 
     */
-   public static class InitializeFrame extends Command {
- 
-     /**
-      * Initialize Net
-      * @param net Container
-      */
-     public InitializeFrame(Space net) {
-       parameters.put("net", net);
-       parameters.put("frame-width", 0.4);
-       parameters.put("interior-width", 0.1);
-       parameters.put("depth", 1.0);
-     }
- 
-     /** {@inheritDoc} */
-     @Override
-     public void evaluate() {
-       Space net = (Space) parameters.get("net");
-       double frameWidth = parameters.getDouble("frame-width");
-       double interiorWidth = parameters.getDouble("interior-width");
-       double depth = parameters.getDouble("depth");
-       ParameterBlock block = new ParameterBlock();
-       block.put("frame-width", frameWidth);
-       block.put("interior-width", interiorWidth);
-       block.put("depth", depth);
-       net.setParameters(block);
-       Collection<Surface> surfaces = net.getSurfaces();
-       Collection<Edge> edges = Surface.edges(surfaces);
-       Inverse inv = new Inverse(surfaces);
-       List<Edge> frame = new LinkedList();
-       List<Edge> interior = new LinkedList();
-       for (Edge current : edges) {
-         List<Surface> adjacent = inv.surfaces(current);
-         if (adjacent.size() == 1) {
-           frame.add(current);
-         } else {
-           interior.add(current);
-         }
-       }
-       for (Edge current : frame) {
-         ParameterBlock parms = new ParameterBlock();
-         parms.put("width", frameWidth);
-         current.setParameters(parms);
-       }
-       for (Edge current : interior) {
-         ParameterBlock parms = new ParameterBlock();
-         parms.put("width", interiorWidth);
-         current.setParameters(parms);
-       }
-     }
-   }
- 
-   /**
-    *
-    */
-   public static class RenderFrame extends Command {
- 
-     /**
-      * Render Frame
-      * @param net Container
-      */
-     public RenderFrame(Space net) {
-       parameters.put("net", net);
-     }
- 
-     /** {@inheritDoc} */
-     @Override
-     public void evaluate() {
-       Space net = (Space) parameters.get("net");
-       ParameterBlock block = net.getParameters();
-       System.out.println("block " + block);
- 
-       Collection<Surface> surfaces = net.getSurfaces();
-       Inverse inv = new Inverse(surfaces);
-       List<Edge> boundary = new LinkedList();
-       for (Edge current : inv.edges()) {
-         List<Surface> adjacent = inv.surfaces(current);
-         if (adjacent.size() == 1) {
-           boundary.add(current);
-         }
-       }
-       boundary = Offset.order(boundary);
-       Map map = new HashMap();
- 
-       List<Edge> edges = new LinkedList();
-       for (Edge current : boundary) {
-         edges.add((Edge) current.copy(map));
-       }
- 
-       Map<Edge, Double> distances = new HashMap();
-       {
-         double distance = block.getDouble("frame-width");
-         for (Edge current : boundary) {
-           ParameterBlock params = current.getParameters();
-           double d = distance;
-           if (params != null) {
-             Double param = (Double) params.get("width");
-             if (param != null) {
-               d = param.doubleValue();
-             }
-           }
-           Edge edge = (Edge) map.get(current);
-           distances.put(edge, d);
-         }
-       }
-       Offset.offsetIt(edges, distances);
- 
-       Collection<Vertex> vertices = Edge.vertices(edges);
- 
-       Space union = Item.createUnion("Frame");
-       for (Vertex current : vertices) {
-         union.add(current);
-       }
-       for (Edge current : edges) {
-         union.add(current);
-       }
-       Project.getInstance().getActiveSpace().add(union);
-       Project.getInstance().changed(Project.getInstance());
-     }
-   }
- 
-   /**
-    * 
-    */
    public static class InsertFrame extends Command {
  
--- 2154,2157 ----

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.185
retrieving revision 1.186
diff -C2 -d -r1.185 -r1.186
*** Project.java	12 Feb 2010 11:44:28 -0000	1.185
--- Project.java	25 Feb 2010 14:43:48 -0000	1.186
***************
*** 49,56 ****
  import net.sourceforge.bprocessor.model.brunata.io.XMLDocument;
  import net.sourceforge.bprocessor.model.brunata.io.DocumentParser;
- import net.sourceforge.bprocessor.model.modellor.InnerWallModellor;
- import net.sourceforge.bprocessor.model.modellor.ModelBathModellor2;
- import net.sourceforge.bprocessor.model.modellor.Modellor;
- import net.sourceforge.bprocessor.model.modellor.TileModellor;
  import net.sourceforge.bprocessor.model.sense.SensorItem;
  import net.sourceforge.bprocessor.model.xml.Bmodel;
--- 49,52 ----
***************
*** 512,518 ****
      globals.putDouble("brick", 0.12);
      globals.putDouble("roof", 0.07);
-     Modellor.registerModellor(new TileModellor(null));
-     Modellor.registerModellor(new InnerWallModellor());
-     Modellor.registerModellor(new ModelBathModellor2());
      sensor = new Sensor();
      if (SENSE) {
--- 508,511 ----