[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/modellor TileModellor.java, 1.19, 1.20 WallPartingModellor.java, 1.1, 1.2 InnerWallModellor.java, 1.7, 1.8 ModelBathModellor2.java, 1.7, 1.8

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

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

Modified Files:
	TileModellor.java WallPartingModellor.java 
	InnerWallModellor.java ModelBathModellor2.java 
Log Message:
Another step in ellimination Net

Index: TileModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/TileModellor.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** TileModellor.java	15 Oct 2007 12:41:24 -0000	1.19
--- TileModellor.java	2 Nov 2007 11:17:28 -0000	1.20
***************
*** 63,69 ****
    private int tileThickness = 8;
  
!   private Net net;
    
!   private Net outline;
  
    private Set<Surface> ignoredSurfaces = new HashSet<Surface>();
--- 63,69 ----
    private int tileThickness = 8;
  
!   private Space net;
    
!   private Space outline;
  
    private Set<Surface> ignoredSurfaces = new HashSet<Surface>();

Index: WallPartingModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/WallPartingModellor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** WallPartingModellor.java	24 May 2007 21:41:50 -0000	1.1
--- WallPartingModellor.java	2 Nov 2007 11:17:28 -0000	1.2
***************
*** 32,36 ****
    
    private Space space;
!   private Net net;
    private double minZ;
    private double maxZ;
--- 32,36 ----
    
    private Space space;
!   private Space net;
    private double minZ;
    private double maxZ;
***************
*** 42,46 ****
     * @param net the net outlining the walls (can be auto calculated by sending null object)
     */
!   public WallPartingModellor(Space walls, Net net) {
      this.space = walls;
      if (net != null) {
--- 42,46 ----
     * @param net the net outlining the walls (can be auto calculated by sending null object)
     */
!   public WallPartingModellor(Space walls, Space net) {
      this.space = walls;
      if (net != null) {
***************
*** 51,57 ****
    }
  
!   private Net calcNet() {
      //find bottom surface and copy outer contour from it into a new net
!     Net tmpNet = new Net("Contour");
      space.getSurfaces().iterator().next().copy(tmpNet);
      return tmpNet;
--- 51,57 ----
    }
  
!   private Space calcNet() {
      //find bottom surface and copy outer contour from it into a new net
!     Space tmpNet = new Net("Contour");
      space.getSurfaces().iterator().next().copy(tmpNet);
      return tmpNet;

Index: InnerWallModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/InnerWallModellor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** InnerWallModellor.java	23 Jul 2007 13:58:13 -0000	1.7
--- InnerWallModellor.java	2 Nov 2007 11:17:28 -0000	1.8
***************
*** 82,86 ****
    
    /** The net of the modellor */
!   private Net net;
    
    /**
--- 82,86 ----
    
    /** The net of the modellor */
!   private Space net;
    
    /**
***************
*** 159,165 ****
      if (build) {
        if (net == null) {
!         for (Space net : space.getElements()) {
!           if (net instanceof Net) {
!             net = (Net)net;
              break;
            }
--- 159,165 ----
      if (build) {
        if (net == null) {
!         for (Space current : space.getElements()) {
!           if (current.isNet()) {
!             net = current;
              break;
            }
***************
*** 185,189 ****
     * @param net a net to build the framework from
     */
!   private void buildFramework(Net net) {
      Map<Edge, Edge> edge2Run = getRuns(net.getEdges());
      Set<Edge> runs = new HashSet<Edge>(edge2Run.values());
--- 185,189 ----
     * @param net a net to build the framework from
     */
!   private void buildFramework(Space net) {
      Map<Edge, Edge> edge2Run = getRuns(net.getEdges());
      Set<Edge> runs = new HashSet<Edge>(edge2Run.values());
***************
*** 258,262 ****
    }
    
!   private void buildWoodSheets(Net net) {
      List<Edge> outline = netOutline(net);
      if  (!outline.isEmpty()) { 
--- 258,262 ----
    }
    
!   private void buildWoodSheets(Space net) {
      List<Edge> outline = netOutline(net);
      if  (!outline.isEmpty()) { 
***************
*** 349,355 ****
     * @return a net for building the framework
     */
!   private Net buildNet() {
      if (space != null && !space.getEnvelope().isEmpty()) {
!       Net net = new Net("net");
        space.add(net);
        surface = findSurface();
--- 349,355 ----
     * @return a net for building the framework
     */
!   private Space buildNet() {
      if (space != null && !space.getEnvelope().isEmpty()) {
!       Space net = new Net("net");
        space.add(net);
        surface = findSurface();
***************
*** 624,628 ****
     * @return true if all geometry in the net is in the plane, false otherwise
     */
!   private boolean getPlaneCheck(Net net, Plane p) {
      for (Edge e : net.getEdges()) {
        if (!p.contains(e)) {
--- 624,628 ----
     * @return true if all geometry in the net is in the plane, false otherwise
     */
!   private boolean getPlaneCheck(Space net, Plane p) {
      for (Edge e : net.getEdges()) {
        if (!p.contains(e)) {
***************
*** 688,692 ****
     * @return a list of connected edges making up the net outline
     */
!   private List<Edge> netOutline(Net net) {
      /*Find outer edges*/
      Set<Edge> outer = new HashSet<Edge>();
--- 688,692 ----
     * @return a list of connected edges making up the net outline
     */
!   private List<Edge> netOutline(Space net) {
      /*Find outer edges*/
      Set<Edge> outer = new HashSet<Edge>();
***************
*** 741,745 ****
     * @return the net of this modellor
     */
!   public Net getNet() {
      return net;
    }
--- 741,745 ----
     * @return the net of this modellor
     */
!   public Space getNet() {
      return net;
    }

Index: ModelBathModellor2.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/ModelBathModellor2.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ModelBathModellor2.java	10 Aug 2007 11:23:06 -0000	1.7
--- ModelBathModellor2.java	2 Nov 2007 11:17:28 -0000	1.8
***************
*** 61,65 ****
    private CoordinateSystem coord;
  
!   private Net net;
  
    private double doorHeight = 2.2;
--- 61,65 ----
    private CoordinateSystem coord;
  
!   private Space net;
  
    private double doorHeight = 2.2;
***************
*** 770,774 ****
    public void setSubContent(Map<String, Object> m) {
      space = (Space)m.get("Space");
!     net = (Net)m.get("Net");
      wallThickness = (Double)m.get("wallThickness");
      floorThickness = (Double)m.get("floorThickness");
--- 770,774 ----
    public void setSubContent(Map<String, Object> m) {
      space = (Space)m.get("Space");
!     net = (Space)m.get("Net");
      wallThickness = (Double)m.get("wallThickness");
      floorThickness = (Double)m.get("floorThickness");