[Bprocessor-commit] facade/src/net/sourceforge/bprocessor/facade/modellor NetFacadeModellor.java, 1.9, 1.10

[Nordholt <nor...@us...>]

Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4040/src/net/sourceforge/bprocessor/facade/modellor

Modified Files:
	NetFacadeModellor.java 
Log Message:
Used selector attributes to make it possible to choose between 4 kinds of field in the net.

Index: NetFacadeModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/NetFacadeModellor.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** NetFacadeModellor.java	2 Jan 2007 17:47:05 -0000	1.9
--- NetFacadeModellor.java	29 Jan 2007 18:12:12 -0000	1.10
***************
*** 22,25 ****
--- 22,26 ----
  import net.sourceforge.bprocessor.model.ParameterBlock;
  import net.sourceforge.bprocessor.model.Project;
+ import net.sourceforge.bprocessor.model.Selector;
  import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
***************
*** 143,146 ****
--- 144,148 ----
      List attributes = new LinkedList();
      attributes.add(new Attribute("Net", net, true));
+     attributes.add(new Attribute("Front", front, true));
      attributes.add(new Attribute("Framewidth", new Double(frameWidth), true));
      attributes.add(new Attribute("Depth", new Double(depth), true));
***************
*** 166,169 ****
--- 168,182 ----
        } else if (att.getName().equals("Single")) {
          setSingle(((Boolean)att.getValue()).booleanValue());
+       } else if (att.getName().equals("Front")) {
+         Iterator sit = Project.getInstance().getActiveSpace().getSurfaces().iterator();
+         while (sit.hasNext()) {          
+           Surface s = (Surface)sit.next();
+           if (s.getName().equals(att.getValue())) {
+             if (front != s) {
+               this.setFront(s);
+               this.setNet(createNet(front));
+             }
+           }
+         }
        }
      }
***************
*** 261,266 ****
        Surface s = (Surface)itS.next();
        Map env = s.getParameters().environment();
!       if (env.get("openable") == null) {
!         s.getParameters().put("openable", false);
        }
      }
--- 274,286 ----
        Surface s = (Surface)itS.next();
        Map env = s.getParameters().environment();
!       if (env.get("type") == null) {
!         List options = new LinkedList();
!         options.add("Empty");
!         options.add("Glass");
!         options.add("Window");
!         options.add("Door");
!         Selector sel = new Selector(options);
!         sel.setCurrentValue("Glass");
!         s.getParameters().put(new Attribute("type", sel));
        }
      }
***************
*** 332,338 ****
            Iterator fieldEdges = field.getEdges().iterator();
            Map envF = field.getParameters().environment();
!           boolean openable = false;
!           if (envF.get("openable") != null) {
!             openable = (Boolean)envF.get("openable");
            } 
            while (fieldEdges.hasNext()) {
--- 352,369 ----
            Iterator fieldEdges = field.getEdges().iterator();
            Map envF = field.getParameters().environment();
!           Double extraFrame = 0.0;
!           if (envF.get("type") instanceof Selector) {
!             Selector sel = (Selector)envF.get("type");
!             if (sel.getCurrentValue() == null) {
!               log.info("current null...strange");              
!             } else if (sel.getCurrentValue().equals("Empty")) {
!               extraFrame = 0.0;              
!             } else if (sel.getCurrentValue().equals("Glass")) {
!               extraFrame = 0.0;
!             } else if (sel.getCurrentValue().equals("Window")) {
!               extraFrame = 0.05;
!             } else if (sel.getCurrentValue().equals("Door")) {
!               extraFrame = 0.12;
!             }            
            } 
            while (fieldEdges.hasNext()) {
***************
*** 340,350 ****
              Map envE = e.getParameters().environment();
              double width = ((Double)envE.get("width")).doubleValue();
-             if (openable) {
-               width *= 2;
-             }
              if (outline.contains(e)) {
!               offsetMap.put(e, Double.valueOf(-width));
              } else {
!               offsetMap.put(e, Double.valueOf(-width / 2));
              }
            }
--- 371,378 ----
              Map envE = e.getParameters().environment();
              double width = ((Double)envE.get("width")).doubleValue();
              if (outline.contains(e)) {
!               offsetMap.put(e, Double.valueOf(-(width + extraFrame)));
              } else {
!               offsetMap.put(e, Double.valueOf(-((width / 2) + extraFrame)));
              }
            }
***************
*** 422,429 ****
     * @return a new net
     */
!   private Net createNet(Surface front) {
      Net n = new Net("Facade net");
      if (front != null) { 
!       Surface s = front.copyall(n);
      }
      return n;
--- 450,457 ----
     * @return a new net
     */
!   private  Net createNet(Surface front) {
      Net n = new Net("Facade net");
      if (front != null) { 
!       front.copyall(n);
      }
      return n;