bprocessor-commit — Commit

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model ClippingPlane.java, 1.30, 1.31

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

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

Modified Files:
	ClippingPlane.java 
Log Message:
ClippingPlane improvements

Index: ClippingPlane.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ClippingPlane.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** ClippingPlane.java	9 Sep 2008 12:15:07 -0000	1.30
--- ClippingPlane.java	9 Sep 2008 13:42:54 -0000	1.31
***************
*** 12,15 ****
--- 12,16 ----
  import java.util.ArrayList;
  import java.util.List;
+ import java.util.Map;
  import java.util.Set;
  import java.util.HashSet;
***************
*** 37,41 ****
    
    /** The edge map */
!   private HashMap toModel;
  
    /** The plane of the ClippingPlane */
--- 38,42 ----
    
    /** The edge map */
!   private Map<Edge, Edge> e2e;
  
    /** The plane of the ClippingPlane */
***************
*** 58,62 ****
      this.silhouette = new ArrayList<Edge>();
      this.corners = new ArrayList<Vertex>();
!     this.toModel = new HashMap();
      Project.getInstance().addObserver(this);
    }
--- 59,63 ----
      this.silhouette = new ArrayList<Edge>();
      this.corners = new ArrayList<Vertex>();
!     this.e2e = new HashMap();
      Project.getInstance().addObserver(this);
    }
***************
*** 164,167 ****
--- 165,179 ----
      return plane.contains(surface);
    }
+   
+   /**
+    * Returns true if edge is contained in this ClippingPlane
+    * @param edge Edge to test
+    * @return true of the edge is contained
+    */
+   public boolean contains(Edge edge) {
+     Plane plane = getPlane();
+     return plane.contains(edge);
+   }
+   
  
    /**
***************
*** 190,229 ****
     */
    public Collection<Vertex> findIntersections() {
!     toModel.clear();
      Container space = Project.getInstance().getActiveSpace();
!     Collection edges = Geometry.getActiveEdges(space);
      silhouette.clear();
!     Collection<Vertex> res = new ArrayList<Vertex>();
!     Plane plan = system.plane();
!     Iterator it = edges.iterator();
!     while (it.hasNext()) {
!       Edge e = (Edge)it.next();
!       Vertex v = plan.intersection(e);
!       if (v != null) {
!         res.add(v);
!       }
!       Vertex transTo = system.translate(e.getTo());
!       Vertex transFrom = system.translate(e.getFrom());
!       if (Math.abs(transTo.getZ()) < 0.00001 && 
!           Math.abs(transFrom.getZ()) < 0.00001) {
!         res.add(e.getTo().copy());
!         res.add(e.getFrom().copy());
!         Edge eCopy = e.copy();
!         // edges should be solid
!         eCopy.setStrippled(false);
!         toModel.put(eCopy, e);
!         silhouette.add(eCopy);
        }
      }
!     Collection surfaces = Geometry.getActiveSurfaces(space);
!     it = surfaces.iterator();
!     while (it.hasNext()) {
!       Surface s = (Surface)it.next();
!       Collection lines = s.getEdges();
!       Iterator iter = lines.iterator();
        Vertex first = null;
!       while (iter.hasNext()) {
!         Edge e = (Edge)iter.next();
!         Vertex v = plan.intersection(e);
          if (v != null) {
            if (first == null) {
--- 202,232 ----
     */
    public Collection<Vertex> findIntersections() {
!     e2e.clear();
      Container space = Project.getInstance().getActiveSpace();
!     Collection<Edge> edges = Geometry.getActiveEdges(space);
      silhouette.clear();
!     Collection<Vertex> vertices = new ArrayList<Vertex>();
!     Plane plane = system.plane();
!     for (Edge current : edges) {
!       if (plane.contains(current)) {
!         Edge edge = current.copy();
!         edge.setStrippled(false);
!         vertices.add(edge.getFrom());
!         vertices.add(edge.getTo());
!         silhouette.add(edge);
!         e2e.put(edge, current);
!       } else {
!         Vertex intersection = plane.intersection(current);
!         if (intersection != null) {
!           vertices.add(intersection);
!         }
        }
      }
!     Collection<Surface> surfaces = Geometry.getActiveSurfaces(space);
!     for (Surface current : surfaces) {
!       Collection<Edge> contour = current.getEdges();
        Vertex first = null;
!       for (Edge edge : contour) {
!         Vertex v = plane.intersection(edge);
          if (v != null) {
            if (first == null) {
***************
*** 234,238 ****
              first = null;
              silhouette.add(newE);
!             toModel.put(newE, newE);
              break;
            }
--- 237,241 ----
              first = null;
              silhouette.add(newE);
!             e2e.put(newE, newE);
              break;
            }
***************
*** 240,244 ****
        }
      }
!     return res;
    }
    
--- 243,247 ----
        }
      }
!     return vertices;
    }
    
***************
*** 393,398 ****
     */
    public Geometric toModel(Edge e) {
!     if (toModel != null) {
!       Object o = toModel.get(e);
        if (o != null) {
          return (Geometric)o;
--- 396,401 ----
     */
    public Geometric toModel(Edge e) {
!     if (e2e != null) {
!       Object o = e2e.get(e);
        if (o != null) {
          return (Geometric)o;

[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view Display.java, 1.82, 1.83

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

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

Modified Files:
	Display.java 
Log Message:
ClippingPlane improvements

Index: Display.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** Display.java	9 Sep 2008 12:15:03 -0000	1.82
--- Display.java	9 Sep 2008 13:42:51 -0000	1.83
***************
*** 919,922 ****
--- 919,934 ----
    }
    
+   private static boolean clipped(Edge edge) {
+     for (ClippingPlane current : clips) {
+       if (current.isActive()) {
+         if (current.contains(edge)) {
+           return true;
+         }
+       }
+     }
+     return false;
+   }
+   
+   
    private static boolean active(Container space) {
      if (space == null) {
***************
*** 1069,1073 ****
          for (Edge current : visible) {
            if (!hidden.contains(current)) {
!             edges.add(current);
            }
          }
--- 1081,1087 ----
          for (Edge current : visible) {
            if (!hidden.contains(current)) {
!             if (!clipped(current)) {
!               edges.add(current);
!             }
            }
          }

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model ClippingPlane.java, 1.29, 1.30

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

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

Modified Files:
	ClippingPlane.java 
Log Message:
Improved clipping

Index: ClippingPlane.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ClippingPlane.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** ClippingPlane.java	9 Sep 2008 08:01:29 -0000	1.29
--- ClippingPlane.java	9 Sep 2008 12:15:07 -0000	1.30
***************
*** 28,32 ****
  
    /** The placement of the ClippingPlane */
!   private CoordinateSystem cs;
  
    /** The corners */
--- 28,32 ----
  
    /** The placement of the ClippingPlane */
!   private CoordinateSystem system;
  
    /** The corners */
***************
*** 53,59 ****
     */
    public ClippingPlane(CoordinateSystem system) {
!     this.cs = system;
      this.isActive = true;
!     this.plane = cs.plane();
      this.silhouette = new ArrayList<Edge>();
      this.corners = new ArrayList<Vertex>();
--- 53,59 ----
     */
    public ClippingPlane(CoordinateSystem system) {
!     this.system = system;
      this.isActive = true;
!     this.plane = system.plane();
      this.silhouette = new ArrayList<Edge>();
      this.corners = new ArrayList<Vertex>();
***************
*** 67,71 ****
     */
    public ClippingPlane copy() {
!     ClippingPlane copy = new ClippingPlane(this.cs.copy());
      copy.isActive = isActive();
      return copy;
--- 67,71 ----
     */
    public ClippingPlane copy() {
!     ClippingPlane copy = new ClippingPlane(this.system.copy());
      copy.isActive = isActive();
      return copy;
***************
*** 78,87 ****
    public Plane getPlane() {
      if (plane == null) {
!       CoordinateSystem c = cs.copy();
!       Vertex n = c.getN().copy();
!       n.normalize();
!       n.scaleIt(0.00001);
!       c.move(n.getX(), n.getY(), n.getZ());
!       plane = c.plane();
      }
      return plane;
--- 78,82 ----
    public Plane getPlane() {
      if (plane == null) {
!       plane = system.plane();
      }
      return plane;
***************
*** 93,97 ****
     */
    public Vertex center() {
!     return cs.getOrigin();
    }
    
--- 88,92 ----
     */
    public Vertex center() {
!     return system.getOrigin();
    }
    
***************
*** 101,105 ****
     */
    public Vertex getNormal() {
!     return cs.getN().copy();
    }
    
--- 96,100 ----
     */
    public Vertex getNormal() {
!     return system.getN().copy();
    }
    
***************
*** 159,162 ****
--- 154,167 ----
      c.removeClipplane(this);
    }
+   
+   /**
+    * Returns true if surface is contained in this ClippingPlane
+    * @param surface Surface to test
+    * @return true of the surface is contained
+    */
+   public boolean contains(Surface surface) {
+     Plane plane = getPlane();
+     return plane.contains(surface);
+   }
  
    /**
***************
*** 190,194 ****
      silhouette.clear();
      Collection<Vertex> res = new ArrayList<Vertex>();
!     Plane plan = cs.plane();
      Iterator it = edges.iterator();
      while (it.hasNext()) {
--- 195,199 ----
      silhouette.clear();
      Collection<Vertex> res = new ArrayList<Vertex>();
!     Plane plan = system.plane();
      Iterator it = edges.iterator();
      while (it.hasNext()) {
***************
*** 198,203 ****
          res.add(v);
        }
!       Vertex transTo = cs.translate(e.getTo());
!       Vertex transFrom = cs.translate(e.getFrom());
        if (Math.abs(transTo.getZ()) < 0.00001 && 
            Math.abs(transFrom.getZ()) < 0.00001) {
--- 203,208 ----
          res.add(v);
        }
!       Vertex transTo = system.translate(e.getTo());
!       Vertex transFrom = system.translate(e.getFrom());
        if (Math.abs(transTo.getZ()) < 0.00001 && 
            Math.abs(transFrom.getZ()) < 0.00001) {
***************
*** 359,363 ****
        } else if (a.getName().equals("Flip")) {
          if ((Boolean)a.getValue() == Boolean.TRUE) {
!           cs.flip();
          }
        } else {
--- 364,368 ----
        } else if (a.getName().equals("Flip")) {
          if ((Boolean)a.getValue() == Boolean.TRUE) {
!           system.flip();
          }
        } else {
***************
*** 409,413 ****
     */
    public CoordinateSystem getCoordinateSystem() {
!     return cs;
    }
  
--- 414,418 ----
     */
    public CoordinateSystem getCoordinateSystem() {
!     return system;
    }
  
***************
*** 416,420 ****
     */
    public void setCoordinateSystem(CoordinateSystem cs) {
!     this.cs = cs;
    }
  }
--- 421,425 ----
     */
    public void setCoordinateSystem(CoordinateSystem cs) {
!     this.system = cs;
    }
  }

[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view View.java, 1.281, 1.282 Display.java, 1.81, 1.82

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

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

Modified Files:
	View.java Display.java 
Log Message:
Improved clipping

Index: Display.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** Display.java	22 Jul 2008 13:19:52 -0000	1.81
--- Display.java	9 Sep 2008 12:15:03 -0000	1.82
***************
*** 61,64 ****
--- 61,66 ----
    private static Collection<? extends Geometric> extras;
    private static Collection<GlObject> glos;
+   private static Collection<ClippingPlane> clips;
+   
    private static Map<Geometric, float[]> colors;
    private static float[] targetColor;
***************
*** 71,74 ****
--- 73,77 ----
    private static Collection<Geometric> excluded;
    
+   
    private static Project project;
    private static Camera camera;
***************
*** 344,349 ****
    
    /**
!    * Sets the glos
!    * @param value glos
     */
    public static void glos(Collection<GlObject> value) {
--- 347,352 ----
    
    /**
!    * Sets the list of GLObjects
!    * @param value List of GLObjects
     */
    public static void glos(Collection<GlObject> value) {
***************
*** 353,357 ****
    /**
     * Sets the extras geometry
!    * @param value Collection of geometrics
     */
    public static void extras(Collection<? extends Geometric> value) {
--- 356,360 ----
    /**
     * Sets the extras geometry
!    * @param value Collection of Geometric
     */
    public static void extras(Collection<? extends Geometric> value) {
***************
*** 359,362 ****
--- 362,373 ----
    }
    
+   /**
+    * Sets the clips parameter
+    * @param value List of ClippingPlanes
+    */
+   public static void clips(Collection<ClippingPlane> value) {
+     clips = value;
+   }
+   
    private static void push(Object object) {
      objects.add(object);
***************
*** 372,376 ****
     */
    private static void disableClipplanes() {
-     Collection<ClippingPlane> clips = Project.getInstance().getCurrentCamera().getClipplanes();
      for (ClippingPlane current : clips) {
        if (current.isActive()) {
--- 383,386 ----
***************
*** 387,391 ****
     */
    private static void enableClipplanes() {
-     Collection<ClippingPlane> clips = Project.getInstance().getCurrentCamera().getClipplanes();
      for (ClippingPlane current : clips) {
        if (current.isActive()) {
--- 397,400 ----
***************
*** 554,561 ****
      gl.glEnable(GL.GL_CULL_FACE);
      gl.glCullFace(GL.GL_BACK);
-     // System.out.println("-- front --");
      for (Surface current : surfaces) {
        Vertex n = current.normal();
-       // System.out.println("    normal: " + n);
        gl.glNormal3d(n.getX(), n.getY(), n.getZ());
        float[] color = frontColor(current);
--- 563,568 ----
***************
*** 566,573 ****
        }
      }
-     // System.out.println("-- back --");
      for (Surface current : surfaces) {
        Vertex n = current.normal();
-       // System.out.println("    normal: " + n);
        gl.glNormal3d(-n.getX(), -n.getY(), -n.getZ());
        float[] color = backColor(current);
--- 573,578 ----
***************
*** 903,906 ****
--- 908,922 ----
    }
    
+   private static boolean clipped(Surface surface) {
+     for (ClippingPlane current : clips) {
+       if (current.isActive()) {
+         if (current.contains(surface)) {
+           return true;
+         }
+       }
+     }
+     return false;
+   }
+   
    private static boolean active(Container space) {
      if (space == null) {
***************
*** 1027,1035 ****
            if (transparency) {
              if (!hidden.contains(current)) {
!               surfaces.add(current);
              }
            } else {
              if (!transparent(current)) {
!               surfaces.add(current);
              }
            }
--- 1043,1055 ----
            if (transparency) {
              if (!hidden.contains(current)) {
!               if (!clipped(current)) {
!                 surfaces.add(current);
!               }
              }
            } else {
              if (!transparent(current)) {
!               if (!clipped(current)) {
!                 surfaces.add(current);
!               }
              }
            }

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.281
retrieving revision 1.282
diff -C2 -d -r1.281 -r1.282
*** View.java	29 Aug 2008 12:27:40 -0000	1.281
--- View.java	9 Sep 2008 12:15:03 -0000	1.282
***************
*** 640,643 ****
--- 640,649 ----
      extras.addAll(tempVertices);
      Display.extras(extras);
+     
+     Collection<ClippingPlane> clips 
+       = Project.getInstance().getCurrentCamera().getClipplanes();
+     
+     Display.clips(clips);
+     
      Display.glos(glObjects3D);
      try {
***************
*** 655,660 ****
      
      //draw the clipping planes
!     Collection<ClippingPlane> clips 
!       = Project.getInstance().getCurrentCamera().getClipplanes();
      
      for (ClippingPlane current : clips) {
--- 661,665 ----
      
      //draw the clipping planes
!     
      
      for (ClippingPlane current : clips) {

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model ClippingPlane.java, 1.28, 1.29

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

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

Modified Files:
	ClippingPlane.java 
Log Message:
Unused serial number

Index: ClippingPlane.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ClippingPlane.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** ClippingPlane.java	9 Sep 2008 07:58:14 -0000	1.28
--- ClippingPlane.java	9 Sep 2008 08:01:29 -0000	1.29
***************
*** 21,29 ****
   */
  public class ClippingPlane extends Geometric implements Parametric, Observer {
-   /**
-    * 
-    */
-   private static final long serialVersionUID = 1L;
- 
    /** The logger */
    private static Logger log = Logger.getLogger(ClippingPlane.class);
--- 21,24 ----

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model ClippingPlane.java, 1.27, 1.28

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

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

Modified Files:
	ClippingPlane.java 
Log Message:
Spelling

Index: ClippingPlane.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ClippingPlane.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** ClippingPlane.java	17 Dec 2007 13:09:17 -0000	1.27
--- ClippingPlane.java	9 Sep 2008 07:58:14 -0000	1.28
***************
*** 18,22 ****
  import org.apache.log4j.Logger;
  /**
!  * The Clippingplane
   */
  public class ClippingPlane extends Geometric implements Parametric, Observer {
--- 18,22 ----
  import org.apache.log4j.Logger;
  /**
!  * The ClippingPlane
   */
  public class ClippingPlane extends Geometric implements Parametric, Observer {
***************
*** 32,36 ****
    private int number;
  
!   /** The placement of the clippingplane */
    private CoordinateSystem cs;
  
--- 32,36 ----
    private int number;
  
!   /** The placement of the ClippingPlane */
    private CoordinateSystem cs;
  
***************
*** 38,51 ****
    private ArrayList<Vertex> corners;
  
!   /** The silluet */
!   private ArrayList<Edge> silluet;
    
    /** The edge map */
    private HashMap toModel;
  
!   /** The plane of the clipingplane */
    private Plane plane;
  
!   /** If the clippingplane is on or off */
    private boolean isActive;
    
--- 38,51 ----
    private ArrayList<Vertex> corners;
  
!   /** The silhouette */
!   private ArrayList<Edge> silhouette;
    
    /** The edge map */
    private HashMap toModel;
  
!   /** The plane of the ClippingPlane */
    private Plane plane;
  
!   /** If the ClippingPlane is on or off */
    private boolean isActive;
    
***************
*** 55,59 ****
    /**
     * The constructor
!    * @param system The coordinatesystem the clippingplane is represented by
     */
    public ClippingPlane(CoordinateSystem system) {
--- 55,59 ----
    /**
     * The constructor
!    * @param system The CoordinateSystem the ClippingPlane is represented by
     */
    public ClippingPlane(CoordinateSystem system) {
***************
*** 61,65 ****
      this.isActive = true;
      this.plane = cs.plane();
!     this.silluet = new ArrayList<Edge>();
      this.corners = new ArrayList<Vertex>();
      this.toModel = new HashMap();
--- 61,65 ----
      this.isActive = true;
      this.plane = cs.plane();
!     this.silhouette = new ArrayList<Edge>();
      this.corners = new ArrayList<Vertex>();
      this.toModel = new HashMap();
***************
*** 68,72 ****
    
    /**
!    * Copy the clippingplane
     * @return The copy of the this
     */
--- 68,72 ----
    
    /**
!    * Copy the ClippingPlane
     * @return The copy of the this
     */
***************
*** 78,82 ****
    
    /**
!    * Getter for plan representing the clippingplane
     * @return The plane
     */
--- 78,82 ----
    
    /**
!    * Getter for plan representing the ClippingPlane
     * @return The plane
     */
***************
*** 102,106 ****
    
    /**
!    * gets the normal of the clippingplane
     * @return the normal
     */
--- 102,106 ----
    
    /**
!    * gets the normal of the ClippingPlane
     * @return the normal
     */
***************
*** 110,114 ****
    
    /**
!    * Update this clipping from the defining coordinatesystem attribute
     */
    public void update() {
--- 110,114 ----
    
    /**
!    * Update this clipping from the defining CoordinateSystem attribute
     */
    public void update() {
***************
*** 127,131 ****
    /**
     * Getter for the number attribute that represents the number 
!    * of the corrosponding clippingplane in GL
     * @return The number
     */
--- 127,131 ----
    /**
     * Getter for the number attribute that represents the number 
!    * of the corresponding ClippingPlane in GL
     * @return The number
     */
***************
*** 146,150 ****
    
    /**
!    * collects the vertices for this clipplane
     * @return the set of vertices
     */
--- 146,150 ----
    
    /**
!    * collects the vertices for this ClippingPlane
     * @return the set of vertices
     */
***************
*** 166,171 ****
  
    /**
!    * Makes a string representation of the clippingplane
!    * @return The string representing til object
     */
    public String toString() {
--- 166,171 ----
  
    /**
!    * Makes a string representation of the ClippingPlane
!    * @return The string representing this object
     */
    public String toString() {
***************
*** 175,183 ****
  
    /**
!    * Gettter for the intersected geometry
     * @return The intersection edges
     */
    public Collection<Edge> getLines() {
!     return silluet;
    }
    
--- 175,183 ----
  
    /**
!    * Getter for the intersected geometry
     * @return The intersection edges
     */
    public Collection<Edge> getLines() {
!     return silhouette;
    }
    
***************
*** 186,190 ****
    /**
     * Find intersections with all edges and return the vertices
!    * (Have sideeffects)
     * @return The set of all intersection vertices
     */
--- 186,190 ----
    /**
     * Find intersections with all edges and return the vertices
!    * (Have side effects)
     * @return The set of all intersection vertices
     */
***************
*** 193,197 ****
      Container space = Project.getInstance().getActiveSpace();
      Collection edges = Geometry.getActiveEdges(space);
!     silluet.clear();
      Collection<Vertex> res = new ArrayList<Vertex>();
      Plane plan = cs.plane();
--- 193,197 ----
      Container space = Project.getInstance().getActiveSpace();
      Collection edges = Geometry.getActiveEdges(space);
!     silhouette.clear();
      Collection<Vertex> res = new ArrayList<Vertex>();
      Plane plan = cs.plane();
***************
*** 213,217 ****
          eCopy.setStrippled(false);
          toModel.put(eCopy, e);
!         silluet.add(eCopy);
        }
      }
--- 213,217 ----
          eCopy.setStrippled(false);
          toModel.put(eCopy, e);
!         silhouette.add(eCopy);
        }
      }
***************
*** 233,237 ****
              newE.setStrippled(true);
              first = null;
!             silluet.add(newE);
              toModel.put(newE, newE);
              break;
--- 233,237 ----
              newE.setStrippled(true);
              first = null;
!             silhouette.add(newE);
              toModel.put(newE, newE);
              break;
***************
*** 388,393 ****
    
    /**
!    * Find the edge or surface the given edge corrospond to in the model
!    * @param e the Edge in the conture
     * @return The geometry in the model or null if none
     */
--- 388,393 ----
    
    /**
!    * Find the edge or surface the given edge correspond to in the model
!    * @param e the Edge in the contour
     * @return The geometry in the model or null if none
     */
***************
*** 411,415 ****
  
    /**
!    * @return Returns the cs.
     */
    public CoordinateSystem getCoordinateSystem() {
--- 411,415 ----
  
    /**
!    * @return Returns the CoordinateSystem.
     */
    public CoordinateSystem getCoordinateSystem() {
***************
*** 418,422 ****
  
    /**
!    * @param cs The cs to set.
     */
    public void setCoordinateSystem(CoordinateSystem cs) {
--- 418,422 ----
  
    /**
!    * @param cs The CoordinateSystem to set.
     */
    public void setCoordinateSystem(CoordinateSystem cs) {

[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view View.java, 1.280, 1.281

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

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

Modified Files:
	View.java 
Log Message:
display space of path

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.280
retrieving revision 1.281
diff -C2 -d -r1.280 -r1.281
*** View.java	29 Aug 2008 09:42:19 -0000	1.280
--- View.java	29 Aug 2008 12:27:40 -0000	1.281
***************
*** 888,903 ****
    }
    
!   private void drawPath(LinkedList<Container> path, boolean selection) {
      LinkedList<Label> labels = new LinkedList<Label>();
      boolean first = true;
      for (Container space : path) {
-       if (!first) {
-         labels.add(new Label(">>"));
-       } else {
-         first = false;
-       }
        labels.add(new SpaceBox(space));
      }
      
      
      {
--- 888,909 ----
    }
    
!   private void drawPath(LinkedList<Container> path, boolean selecting) {
      LinkedList<Label> labels = new LinkedList<Label>();
      boolean first = true;
      for (Container space : path) {
        labels.add(new SpaceBox(space));
+       labels.add(new Label("/"));
      }
      
+     Selection selection = Selection.primary();
+     
+     if (selection.size() == 1) {
+       Geometric geometric = selection.iterator().next();
+       if (geometric instanceof Container) {
+         Container container = (Container) geometric;
+         labels.add(new SpaceBox(container));
+         labels.add(new Label(">>"));
+       }
+     }
      
      {
***************
*** 925,933 ****
      gl.glTranslated(0, 0, 0.5);
      for (Label label : labels) {
!       if (selection) {
          pushName(gl, label);
        }
!       label.display(gl, glu, selection);
!       if (selection) {
          popName(gl);
        }
--- 931,939 ----
      gl.glTranslated(0, 0, 0.5);
      for (Label label : labels) {
!       if (selecting) {
          pushName(gl, label);
        }
!       label.display(gl, glu, selecting);
!       if (selecting) {
          popName(gl);
        }

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Selection.java, 1.18, 1.19

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

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

Modified Files:
	Selection.java 
Log Message:
display space of path

Index: Selection.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Selection.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Selection.java	14 Apr 2007 15:00:47 -0000	1.18
--- Selection.java	29 Aug 2008 12:27:32 -0000	1.19
***************
*** 23,27 ****
  public class Selection implements Collection<Geometric> {
    /** The logger */
!   private static Logger log = Logger.getLogger(Selection.class);  
  
    /** The collection of objects mark is used to test for membership */
--- 23,29 ----
  public class Selection implements Collection<Geometric> {
    /** The logger */
!   private static Logger log = Logger.getLogger(Selection.class);
!   
!   private static final boolean VERIFY = false;
  
    /** The collection of objects mark is used to test for membership */
***************
*** 70,82 ****
     */
    public boolean add(Geometric object) {
-     if (object == null) {
-       throw new Error("Null object added to selection");
-     }
-     if (!(object instanceof Geometric)) {
-       throw new Error("Illegal object added to selection " + object.getClass().getName());
-     }
      if (mark.add(object)) {
        selection.add(object);
        changed();
        return true;
      } else {
--- 72,81 ----
     */
    public boolean add(Geometric object) {
      if (mark.add(object)) {
        selection.add(object);
        changed();
+       if (VERIFY) {
+         verify();
+       }
        return true;
      } else {
***************
*** 111,118 ****
    }
    
!   /**
!    * dont call clean
!    *
!    */
    private void clean() {
      mark.clear();
--- 110,114 ----
    }
    
!   
    private void clean() {
      mark.clear();
***************
*** 231,234 ****
--- 227,233 ----
      if (touched) {
        changed();
+       if (VERIFY) {
+         verify();
+       }
        return true;
      } else {
***************
*** 268,271 ****
--- 267,282 ----
    
    /**
+    * 
+    */
+   public void verify() {
+     Container active = Project.getInstance().getActiveSpace();
+     for (Geometric current : selection) {
+       if (current.getOwner() != active) {
+         throw new Error("Selective wrongness!");
+       }
+     }
+   }
+   
+   /**
     * Calculate center of selection
     * @return Center

[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view View.java, 1.279, 1.280

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

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

Modified Files:
	View.java 
Log Message:
changed drawing of space-path

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.279
retrieving revision 1.280
diff -C2 -d -r1.279 -r1.280
*** View.java	22 Jul 2008 13:19:52 -0000	1.279
--- View.java	29 Aug 2008 09:42:19 -0000	1.280
***************
*** 709,713 ****
      }
      
!     
      
      drawSpacePath(hitdetection);
--- 709,713 ----
      }
      
!     //drawObscureBox();
      
      drawSpacePath(hitdetection);
***************
*** 843,846 ****
--- 843,891 ----
    }
    
+   private void drawObscureBox(double x, double y, 
+       double w, double h, float l, float alpha) {
+     
+     gl.glColor4f(l, l, l, alpha);
+     gl.glPushMatrix();
+     gl.glTranslated(0, 0, 0.4);
+     gl.glBegin(GL.GL_POLYGON);
+     gl.glVertex3d(x, y, 0);
+     gl.glVertex3d(x + w, y, 0);
+     gl.glVertex3d(x + w, y + h, 0);
+     gl.glVertex3d(x, y + h, 0);
+     gl.glEnd();
+     gl.glPushMatrix();
+     gl.glColor3f(1, 1, 1);
+     gl.glRasterPos3d(x + w / 2 - 10, y + h / 2, 0);
+     glut.glutBitmapString(GLUT.BITMAP_HELVETICA_12, "ABC");
+     gl.glPopMatrix();
+     gl.glPopMatrix();
+   }
+   
+   private void drawBox(double x, double y, 
+       double w, double h) {
+     gl.glBegin(GL.GL_POLYGON);
+     gl.glVertex3d(x, y, 0);
+     gl.glVertex3d(x + w, y, 0);
+     gl.glVertex3d(x + w, y + h, 0);
+     gl.glVertex3d(x, y + h, 0);
+     gl.glEnd();
+   }
+   
+   
+   private void drawObscureBox() {
+     double w = width / 10;
+     double h = height / 10;
+     for (int i = 0; i < 10; i++) {
+       for (int j = 0; j < 10; j++) {
+         double x = i * w;
+         double y = j * h;
+         float alpha = (i + 1) / 10.0f;
+         float level = (j + 1) / 10.0f;
+         drawObscureBox(x, y, w, h, level, alpha);
+       }
+     }
+   }
+   
    private void drawPath(LinkedList<Container> path, boolean selection) {
      LinkedList<Label> labels = new LinkedList<Label>();
***************
*** 855,858 ****
--- 900,916 ----
      }
      
+     
+     {
+       double w = 0;
+       for (Label label : labels) {
+         w += label.width() + 6;
+       }
+       double h = 17;
+       double x = 3;
+       double y = height - 20;
+       gl.glColor4f(0.4f, 0.4f, 0.4f, 0.7f);
+       drawBox(x, y, w, h);
+     }
+     
      int x = 5;
      int y = (int) height - 15;
***************
*** 863,867 ****
      }
      
!     gl.glColor3f(1, 0, 0);
      gl.glPushMatrix();
      gl.glTranslated(0, 0, 0.5);
--- 921,925 ----
      }
      
!     gl.glColor3f(1, 1, 1);
      gl.glPushMatrix();
      gl.glTranslated(0, 0, 0.5);
***************
*** 880,884 ****
    /** 
     * Draw the space path
!    * @param selection wherther or not we are drawing for selection
     */
    private void drawSpacePath(boolean selection) {
--- 938,942 ----
    /** 
     * Draw the space path
!    * @param selection true if drawing for hit-detection
     */
    private void drawSpacePath(boolean selection) {

[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view View.java, 1.278, 1.279 Display.java, 1.80, 1.81

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

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

Modified Files:
	View.java Display.java 
Log Message:
Select labels

Index: Display.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** Display.java	13 Feb 2008 08:43:07 -0000	1.80
--- Display.java	22 Jul 2008 13:19:52 -0000	1.81
***************
*** 430,434 ****
      gl.glEnd();
    }
!   private static void paint(Vertex vertex, float[] color, float size) {
      gl.glColor3fv(color, 0);
      gl.glPointSize(size);
--- 430,440 ----
      gl.glEnd();
    }
!   /**
!    * 
!    * @param vertex Vertex
!    * @param color Color
!    * @param size Size
!    */
!   public static void paint(Vertex vertex, float[] color, float size) {
      gl.glColor3fv(color, 0);
      gl.glPointSize(size);

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.278
retrieving revision 1.279
diff -C2 -d -r1.278 -r1.279
*** View.java	21 Jul 2008 15:54:45 -0000	1.278
--- View.java	22 Jul 2008 13:19:52 -0000	1.279
***************
*** 8,11 ****
--- 8,12 ----
  
  import net.sourceforge.bprocessor.gl.Editor;
+ import net.sourceforge.bprocessor.gl.tool.SelectTool;
  import net.sourceforge.bprocessor.gl.tool.SpaceTool;
  import net.sourceforge.bprocessor.gl.model.EdgeAttributes;
***************
*** 692,700 ****
      gl.glLoadIdentity();
      
!     if (editor.getTool() instanceof SpaceTool) {
!       drawAssignmentWidget(hitdetection);
      }
      
      
      drawSpacePath(hitdetection);
      
--- 693,714 ----
      gl.glLoadIdentity();
      
!     
!     
!     Geometric candidate = null;
!     
!     Collection<Geometric> selection = Selection.primary();
!     if (!selection.isEmpty()) {
!       candidate = selection.iterator().next();
!       if (candidate instanceof Surface) {
!         if (editor.getTool() instanceof SpaceTool) {
!           drawAssignmentWidget((Surface) candidate, hitdetection);
!         } else if (editor.getTool() instanceof SelectTool) {
!           drawSelectionWidget((Surface) candidate, hitdetection);
!         }
!       }
      }
      
      
+     
      drawSpacePath(hitdetection);
      
***************
*** 949,952 ****
--- 963,1068 ----
      frontLabelSelect = false;
    }
+   
+   /**
+    * Put labels on a Surface
+    * @param surface The Surface
+    * @param clickable if true clicking the labels brings up dialog.
+    */
+   private void drawSelectionWidget(Surface surface, boolean clickable) {
+     Transformation transformation = transformation();
+     Vertex from = surface.center();
+     Vertex front = transformation.project(from);
+     front.setZ(1);
+     Container frontDomain = surface.getFrontDomain();
+     Container backDomain = surface.getBackDomain();
+     String frontName;
+     String backName;
+ 
+     if (frontDomain != null) {
+       frontName = frontDomain.getDisplayName();
+     } else {
+       frontName = "None";
+     }
+ 
+     if (backDomain != null) {
+       backName = backDomain.getDisplayName();
+     } else {
+       backName = "None";
+     }
+ 
+     int frontWidth = glut.glutBitmapLength(GLUT.BITMAP_HELVETICA_12, frontName);
+     int backWidth = glut.glutBitmapLength(GLUT.BITMAP_HELVETICA_12, backName);
+ 
+     Vertex frontTextAnchor;
+     Vertex backTextAnchor;
+     Vertex mid;
+     
+     if (!facingFront(surface)) {
+       frontTextAnchor = new Vertex(front.getX(), 
+           front.getY(), front.getZ());
+       backTextAnchor = new Vertex(front.getX() + frontWidth + 9,
+           front.getY(), front.getZ());
+       mid = new Vertex(front.getX() + frontWidth + 4.5,
+           front.getY() + 4, front.getZ());
+     } else {
+       frontTextAnchor = new Vertex(front.getX() + backWidth + 9, 
+           front.getY(), front.getZ());
+       backTextAnchor = new Vertex(front.getX(),
+           front.getY(), front.getZ());
+       mid = new Vertex(front.getX() + backWidth + 4.5,
+           front.getY() + 4, front.getZ());
+     }
+         
+     double distance = mid.getX() - front.getX();
+     
+     mid.setX(mid.getX() - distance);
+     frontTextAnchor.setX(frontTextAnchor.getX() - distance);
+     backTextAnchor.setX(backTextAnchor.getX() - distance);
+     
+     Display.paint(mid, new float[]{0, 0, 0}, 5);
+ 
+     if (clickable) {
+       //Name must be "front"
+       drawClickBox(frontTextAnchor.getX(), frontTextAnchor.getY(),
+           frontTextAnchor.getZ(), frontWidth, 10,
+           "front");
+       //Name must be "back"
+       drawClickBox(backTextAnchor.getX(), backTextAnchor.getY(),
+           backTextAnchor.getZ(), backWidth, 10,
+           "back");
+     } else {
+       double fcb = 0;
+       if (frontLabelSelect) {
+         fcb = 0.3;
+       }
+       //draw the front domain name
+       if (frontDomain == null) {
+         gl.glColor3d(0.2 + fcb, 0.2 + fcb, 0.2 + fcb);
+       } else if (frontDomain.isFunctionalSpace()) {
+         gl.glColor3d(0.2 + fcb, 0.2 + fcb, 0.5 + fcb);
+       } else if (frontDomain.isConstructionSpace()) {
+         gl.glColor3d(0.8 + fcb, 0.2 + fcb, 0.4 + fcb);
+       }
+       drawString(frontTextAnchor.getX(), frontTextAnchor.getY(), 
+           frontTextAnchor.getZ(), frontName);
+       double bcb = 0;
+       if (backLabelSelect) {
+         bcb = 0.3;
+       }
+       //draw the back domain name
+ 
+       if (backDomain == null) {
+         gl.glColor3d(0.2 + bcb, 0.2 + bcb, 0.2 + bcb);
+       } else if (backDomain.isFunctionalSpace()) {
+         gl.glColor3d(0.2 + bcb, 0.2 + bcb, 0.5 + bcb);
+       } else if (backDomain.isConstructionSpace()) {
+         gl.glColor3d(0.8 + bcb, 0.2 + bcb, 0.4 + bcb);
+       }
+ 
+       drawString(backTextAnchor.getX(), backTextAnchor.getY(),
+           backTextAnchor.getZ(), backName);
+     }
+   }
+   
    /**
     * Put labels on a Surface
***************
*** 958,962 ****
      Vertex from = surface.center();
      Vertex front = transformation.project(from);
-     //fix for making label selection work in ortho mode
      front.setZ(1);
      Container frontDomain = surface.getFrontDomain();
--- 1074,1077 ----
***************
*** 1078,1098 ****
    }
  
- 
-   /**
-    * Put labels on the selection
-    * @param clickable if true clicking the labels brings up dialog.
-    */
-   private void drawAssignmentWidget(boolean clickable) {
-     Geometric candidate = null;
-     
-     Collection<Geometric> selection = Selection.primary();
-     if (!selection.isEmpty()) {
-       candidate = selection.iterator().next();
-       if (candidate instanceof Surface) {
-         drawAssignmentWidget((Surface) candidate, clickable);
-       }
-     }
-   }
- 
    /**
     * Draw a clippingPlane
--- 1193,1196 ----

[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool SelectTool.java, 1.72, 1.73

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

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

Modified Files:
	SelectTool.java 
Log Message:
Select labels

Index: SelectTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectTool.java,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** SelectTool.java	20 Dec 2007 11:44:40 -0000	1.72
--- SelectTool.java	22 Jul 2008 13:19:52 -0000	1.73
***************
*** 9,14 ****
--- 9,16 ----
  import net.sourceforge.bprocessor.gl.Editor;
  import net.sourceforge.bprocessor.gui.GUI;
+ import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.Geometric;
  import net.sourceforge.bprocessor.model.Selection;
+ import net.sourceforge.bprocessor.model.Surface;
  
  import java.awt.Cursor;
***************
*** 45,50 ****
     */
    protected void pressed(MouseEvent e) {
      if (e.getButton() == MouseEvent.BUTTON1) {
!       select.pressed(e);
      }
    }
--- 47,93 ----
     */
    protected void pressed(MouseEvent e) {
+     boolean done = false;
      if (e.getButton() == MouseEvent.BUTTON1) {
!       if (!(SelectTool.this instanceof SpaceTool)) {
!         if (target != null) {
!           if (target instanceof String) {
!             String side = (String)target;
!             Surface surface = null;
!             Container space = null;
! 
!             { 
!               Selection selection = Selection.primary();
!               Object candidate = null;
!               if (selection.size() == 1) {
!                 candidate = selection.iterator().next();
!               }
!               if (candidate instanceof Surface) {
!                 surface = (Surface) candidate;
!               }
!             }
! 
! 
!             if (surface != null) {
! 
!               if (surface != null) {
!                 if (side.equals("front")) {
!                   space = surface.getFrontDomain();
!                 }
!                 if (side.equals("back")) {
!                   space = surface.getBackDomain();
!                 }
!               }
!             }
! 
!             if (space != null) {
!               Selection.primary().set(space);
!               done = true;
!             }
!           }
!         }
!       }
!       if (!done) {
!         select.pressed(e);
!       }
      }
    }

[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view View.java, 1.277, 1.278

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

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

Modified Files:
	View.java 
Log Message:
Clean up of code

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.277
retrieving revision 1.278
diff -C2 -d -r1.277 -r1.278
*** View.java	15 Jan 2008 15:43:36 -0000	1.277
--- View.java	21 Jul 2008 15:54:45 -0000	1.278
***************
*** 8,12 ****
  
  import net.sourceforge.bprocessor.gl.Editor;
- import net.sourceforge.bprocessor.gl.tool.AbstractTool;
  import net.sourceforge.bprocessor.gl.tool.SpaceTool;
  import net.sourceforge.bprocessor.gl.model.EdgeAttributes;
--- 8,11 ----
***************
*** 43,48 ****
  
  import java.awt.Toolkit;
- import java.awt.event.ActionEvent;
- import java.awt.event.ActionListener;
  import java.nio.IntBuffer;
  
--- 42,45 ----
***************
*** 53,57 ****
  import javax.media.opengl.glu.GLU;
  import javax.media.opengl.glu.GLUquadric;
- import javax.swing.Timer;
  
  import org.apache.log4j.Logger;
--- 50,53 ----
***************
*** 94,101 ****
    public static final float[] BACKGROUND_COLOR = new float[] {1.0f, 1.0f, 1.0f, 0.0f};
  
!   /** the std line color*/
    public static final float[] STD_LINE_COLOR = new float[] {0.1f, 0.1f, 0.1f};
  
!   /** the std line color*/
    public static final float[] GREY_LINE_COLOR = new float[] {0.7f, 0.7f, 0.7f};
  
--- 90,97 ----
    public static final float[] BACKGROUND_COLOR = new float[] {1.0f, 1.0f, 1.0f, 0.0f};
  
!   /** the standard line color*/
    public static final float[] STD_LINE_COLOR = new float[] {0.1f, 0.1f, 0.1f};
  
!   /** the standard line color*/
    public static final float[] GREY_LINE_COLOR = new float[] {0.7f, 0.7f, 0.7f};
  
***************
*** 178,184 ****
    /** Flag for the solid style of view (no lighting) */
    public static final int SOLID_MODE = 1;
!   /** Flag for the wireframe style of view */
    public static final int WIREFRAME_MODE = 2;
!   /** Flag for the "space assignmened only" style of view. 
     *  This style of view will only show those surfaces that 
     *  have some space assignment*/
--- 174,180 ----
    /** Flag for the solid style of view (no lighting) */
    public static final int SOLID_MODE = 1;
!   /** Flag for the wire frame style of view */
    public static final int WIREFRAME_MODE = 2;
!   /** Flag for the "space assignment only" style of view. 
     *  This style of view will only show those surfaces that 
     *  have some space assignment*/
***************
*** 272,281 ****
    private EdgeAttributes currentEdgeAttributes;
    
-   
-   /**
-    * Currently labeled surface
-    */
-   private Surface labelSurface;
-   
    /**
     * Keeps track of the current stippling
--- 268,271 ----
***************
*** 353,359 ****
  
    private List<Integer> deletedLists = new LinkedList<Integer>();
-   
-   private Timer tickler;
-   private static final boolean TICKLE = false;
  
    static {
--- 343,346 ----
***************
*** 454,463 ****
      glObjects3D = new HashSet<GlObject>();
      widgets = new LinkedList<Widget>();
-     tickler = new Timer(300, new ActionListener() {
-       public void actionPerformed(ActionEvent e) {
-         View.this.editor.repaint();
-       }
-     });
-     tickler.setRepeats(false);
      enabled = true;
    }
--- 441,444 ----
***************
*** 712,716 ****
      
      if (editor.getTool() instanceof SpaceTool) {
!       labelSelection(hitdetection);
      }
      
--- 693,697 ----
      
      if (editor.getTool() instanceof SpaceTool) {
!       drawAssignmentWidget(hitdetection);
      }
      
***************
*** 973,977 ****
     * @param clickable if true clicking the labels brings up dialog.
     */
!   private void labelSurface(Surface surface, boolean clickable) {
      Transformation transformation = transformation();
      Vertex from = surface.center();
--- 954,958 ----
     * @param clickable if true clicking the labels brings up dialog.
     */
!   private void drawAssignmentWidget(Surface surface, boolean clickable) {
      Transformation transformation = transformation();
      Vertex from = surface.center();
***************
*** 1102,1139 ****
     * @param clickable if true clicking the labels brings up dialog.
     */
!   private void labelSelection(boolean clickable) {
      Geometric candidate = null;
      
      Collection<Geometric> selection = Selection.primary();
!     if (selection.size() == 0) {
!       if (target instanceof Geometric) {
!         candidate = (Geometric) target;
!       }
!     } else {
        candidate = selection.iterator().next();
!     }
!     if (candidate instanceof Surface) {
!       if (TICKLE) {
!         long time = System.currentTimeMillis();
!         long elapsed = time - AbstractTool.getPressedTime();
!         long delay = 0;
!         if (labelSurface == null) {
!           delay = 120;
!         }
!         if (elapsed >= delay) {
!           labelSurface = (Surface) candidate;
!           labelSurface(labelSurface, clickable);
!         } else {
!           int when = (int) (delay - elapsed);
!           tickler.stop();
!           tickler.setDelay(when);
!           tickler.start();
!         }
!       } else {
!         labelSurface = (Surface) candidate;
!         labelSurface(labelSurface, clickable);
        }
-     } else {
-       labelSurface = null;
      }
    }
--- 1083,1095 ----
     * @param clickable if true clicking the labels brings up dialog.
     */
!   private void drawAssignmentWidget(boolean clickable) {
      Geometric candidate = null;
      
      Collection<Geometric> selection = Selection.primary();
!     if (!selection.isEmpty()) {
        candidate = selection.iterator().next();
!       if (candidate instanceof Surface) {
!         drawAssignmentWidget((Surface) candidate, clickable);
        }
      }
    }

[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java, 1.146, 1.147

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

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

Modified Files:
	AbstractTool.java 
Log Message:
Improvement to scrollwheel

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -d -r1.146 -r1.147
*** AbstractTool.java	16 May 2008 11:48:53 -0000	1.146
--- AbstractTool.java	2 Jun 2008 11:53:44 -0000	1.147
***************
*** 210,214 ****
     * @return The cursor
     */
!   public Cursor getCursor() {
      return cursor;
    }
--- 210,214 ----
     * @return The cursor
     */
!   public Cursor getCursor() {   
      return cursor;
    }

[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui MaterialView.java, 1.1, 1.2

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

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

Modified Files:
	MaterialView.java 
Log Message:
problem with scroll wheel fixed (zoom while pan)

Index: MaterialView.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/MaterialView.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MaterialView.java	8 May 2008 10:22:02 -0000	1.1
--- MaterialView.java	16 May 2008 11:48:56 -0000	1.2
***************
*** 15,21 ****
--- 15,23 ----
  import javax.swing.JPanel;
  import javax.swing.JScrollPane;
+ import javax.swing.tree.TreePath;
  
  import net.sourceforge.bprocessor.gui.attrview.AttributeView;
  import net.sourceforge.bprocessor.gui.treeview.MaterialTreeView;
+ import net.sourceforge.bprocessor.gui.treeview.GenericTreeView.EntityNode;
  import net.sourceforge.bprocessor.model.Material;
  import net.sourceforge.bprocessor.model.Project;
***************
*** 70,74 ****
        Project.getInstance().checkpoint();
      } else if (which == remove) {
!       System.out.println("REMOVE");
      }
    }
--- 72,85 ----
        Project.getInstance().checkpoint();
      } else if (which == remove) {
!       TreePath path = content.getSelectionPath();
!       if (path != null) {
!         Object object = path.getLastPathComponent();
!         if (object instanceof EntityNode) {
!           EntityNode node = (EntityNode) object;
!           Material material = (Material) node.getUserObject();
!           Project.getInstance().remove(material);
!           Project.getInstance().changed(Project.getInstance());
!         }
!       }
      }
    }

[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java, 1.145, 1.146

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

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

Modified Files:
	AbstractTool.java 
Log Message:
problem with scroll wheel fixed (zoom while pan)

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -d -r1.145 -r1.146
*** AbstractTool.java	13 Dec 2007 12:00:49 -0000	1.145
--- AbstractTool.java	16 May 2008 11:48:53 -0000	1.146
***************
*** 219,231 ****
     */
    public void mouseWheelMoved(MouseWheelEvent e) {
!     int rotation = e.getWheelRotation();
!     Camera cam = Project.getInstance().getCurrentCamera();
!     if (rotation > 0) {
!       cam.zoomout();
!     } else {
!       cam.zoomin();
      }
-     editor.setFactor((int)cam.getFactor());
-     editor.repaint(false);
    }
    
--- 219,233 ----
     */
    public void mouseWheelMoved(MouseWheelEvent e) {
!     if (activeStrategy == null) {
!       int rotation = e.getWheelRotation();
!       Camera cam = Project.getInstance().getCurrentCamera();
!       if (rotation > 0) {
!         cam.zoomout();
!       } else {
!         cam.zoomin();
!       }
!       editor.setFactor((int)cam.getFactor());
!       editor.repaint(false);
      }
    }
    

[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/treeview LibraryTreeView.java, 1.4, 1.5

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

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28158/src/net/sourceforge/bprocessor/gui/treeview

Modified Files:
	LibraryTreeView.java 
Log Message:
problem with scroll wheel fixed (zoom while pan)

Index: LibraryTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/LibraryTreeView.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LibraryTreeView.java	19 Nov 2007 09:27:00 -0000	1.4
--- LibraryTreeView.java	16 May 2008 11:48:56 -0000	1.5
***************
*** 15,19 ****
  public class LibraryTreeView extends GenericTreeView {
    /**
!    * Constrcutor
     */
    public LibraryTreeView() {
--- 15,19 ----
  public class LibraryTreeView extends GenericTreeView {
    /**
!    * Constructor
     */
    public LibraryTreeView() {

[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui MaterialView.java, NONE, 1.1 GUI.java, 1.99, 1.100

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

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

Modified Files:
	GUI.java 
Added Files:
	MaterialView.java 
Log Message:
materials in their own tab

--- NEW FILE: MaterialView.java ---
//---------------------------------------------------------------------------------
// $Id: MaterialView.java,v 1.1 2008/05/08 10:22:02 henryml Exp $
//
// Copyright (c) 2005      The BProcessor Team (http://bprocessor.sourceforge.net) 
// Released under the Lesser GNU Public License v2.1
//---------------------------------------------------------------------------------
package net.sourceforge.bprocessor.gui;

import java.awt.BorderLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;

import javax.swing.BoxLayout;
import javax.swing.JButton;
import javax.swing.JPanel;
import javax.swing.JScrollPane;

import net.sourceforge.bprocessor.gui.attrview.AttributeView;
import net.sourceforge.bprocessor.gui.treeview.MaterialTreeView;
import net.sourceforge.bprocessor.model.Material;
import net.sourceforge.bprocessor.model.Project;

/**
 * A component for displaying views
 *
 */
public class MaterialView extends JPanel implements ActionListener {
  private JButton add;
  private JButton remove;
  
  private MaterialTreeView content;
  
  /**
   * The constructor
   *
   */
  public MaterialView() {
    super();
    setSize(100, 500);
    this.setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
    
    content = new MaterialTreeView();
    add(new JScrollPane(content), BorderLayout.CENTER);
    JPanel panel = new JPanel();
    panel.setLayout(new BoxLayout(panel, BoxLayout.LINE_AXIS));
    add = new JButton("+");
    remove = new JButton("-");
    add.addActionListener(this);
    remove.addActionListener(this);
    panel.add(add);
    panel.add(remove);
    this.add(panel, BorderLayout.SOUTH);
  }
  
  

  /**
   * Handle the actions on plus and minus
   * @param a The actionevent
   */
  public void actionPerformed(ActionEvent a) {
    Object which = a.getSource();
    Project p = Project.getInstance();
    if (which == add) {
      Material m = new Material();
      m.setName("new material");
      Project.getInstance().add(m);
      AttributeView.instance().display(m);
      Project.getInstance().changed(Project.getInstance());
      Project.getInstance().checkpoint();
    } else if (which == remove) {
      System.out.println("REMOVE");
    }
  }
}

Index: GUI.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** GUI.java	1 Apr 2008 13:37:15 -0000	1.99
--- GUI.java	8 May 2008 10:22:03 -0000	1.100
***************
*** 751,754 ****
--- 751,755 ----
      tree.addTab("Project", new JScrollPane (new SpaceTreeView()));
      tree.addTab("Views", new CameraView());
+     tree.addTab("Materials", new MaterialView());
      tree.addTab("Library", new JScrollPane (new LibraryTreeView()));
      tree.addTab("DBK", new JScrollPane (new DBKTreeView()));

[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/treeview MaterialTreeView.java, NONE, 1.1 SpaceTreeView.java, 1.31, 1.32 CameraTreeView.java, 1.12, 1.13

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

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17502/src/net/sourceforge/bprocessor/gui/treeview

Modified Files:
	SpaceTreeView.java CameraTreeView.java 
Added Files:
	MaterialTreeView.java 
Log Message:
materials in their own tab

Index: CameraTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/CameraTreeView.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CameraTreeView.java	19 Sep 2007 14:45:18 -0000	1.12
--- CameraTreeView.java	8 May 2008 10:22:03 -0000	1.13
***************
*** 32,36 ****
    public CameraTreeView() {
      super();
!     setShowsRootHandles(true);
      getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
      //this.addTreeSelectionListener(new SelectionListener());
--- 32,36 ----
    public CameraTreeView() {
      super();
!     //setShowsRootHandles(true);
      getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
      //this.addTreeSelectionListener(new SelectionListener());

--- NEW FILE: MaterialTreeView.java ---
//---------------------------------------------------------------------------------
// $Id: MaterialTreeView.java,v 1.1 2008/05/08 10:22:03 henryml Exp $
//
// Copyright (c) 2005      The BProcessor Team (http://bprocessor.sourceforge.net) 
// Released under the Lesser GNU Public License v2.1
//---------------------------------------------------------------------------------
package net.sourceforge.bprocessor.gui.treeview;

import net.sourceforge.bprocessor.model.Project;

/**
 *
 */
public class MaterialTreeView extends GenericTreeView {
  /**
   * Constructor
   */
  public MaterialTreeView() {
    super();
    root = new MaterialContainer("Materials", Project.getInstance().getMaterials(), true);
    model.setRoot(root);
  }
  
  /** {@inheritDoc} */
  @Override
  public void update() {
    root = new MaterialContainer("Materials", Project.getInstance().getMaterials(), true);
    model.setRoot(root);
  }
}

Index: SpaceTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/SpaceTreeView.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** SpaceTreeView.java	5 Feb 2008 13:34:27 -0000	1.31
--- SpaceTreeView.java	8 May 2008 10:22:03 -0000	1.32
***************
*** 35,39 ****
        root.add(new ProjectNode(p));
        root.add(new ConstructorContainer("Constructors", p.getConstructors()));
-       root.add(new MaterialContainer("Materials", p.getMaterials(), true));
        root.add(new ComponentContainer("Catalog", p.getCatalogObjects()));
        model.nodeStructureChanged(root);
--- 35,38 ----
***************
*** 52,57 ****
        ((GenericNode)root.getChildAt(0)).update(p);
        ((GenericNode)root.getChildAt(1)).update(p.getConstructors());
!       ((GenericNode)root.getChildAt(2)).update(p.getMaterials());
!       ((GenericNode)root.getChildAt(3)).update(p.getCatalogObjects());
      } catch (ArrayIndexOutOfBoundsException e) {
        log.error("There were a inconsistent number of nodes attached to " +
--- 51,55 ----
        ((GenericNode)root.getChildAt(0)).update(p);
        ((GenericNode)root.getChildAt(1)).update(p.getConstructors());
!       ((GenericNode)root.getChildAt(2)).update(p.getCatalogObjects());
      } catch (ArrayIndexOutOfBoundsException e) {
        log.error("There were a inconsistent number of nodes attached to " +

[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view PopupMenu.java, 1.21, 1.22

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

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

Modified Files:
	PopupMenu.java 
Log Message:
Started Work on Spere

Index: PopupMenu.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/PopupMenu.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** PopupMenu.java	27 Mar 2008 14:49:18 -0000	1.21
--- PopupMenu.java	21 Apr 2008 12:23:15 -0000	1.22
***************
*** 759,762 ****
--- 759,771 ----
        menu.add(action);
      }
+     { 
+       AbstractAction action = new AbstractAction("Sphere...") {
+         public void actionPerformed(ActionEvent event) {
+           Command command = new Command.Sphere();
+           AttributeView.instance().display(command);
+         }
+       };
+       menu.add(action);
+     }
      {
        AbstractAction action = new AbstractAction("Cylinder...") {

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Command.java, 1.74, 1.75

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

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

Modified Files:
	Command.java 
Log Message:
Started Work on Spere

Index: Command.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** Command.java	27 Mar 2008 14:49:22 -0000	1.74
--- Command.java	21 Apr 2008 12:23:08 -0000	1.75
***************
*** 1155,1158 ****
--- 1155,1204 ----
    }
    
+   /**
+    * Sphere
+    */
+   public static class Sphere extends Shape {
+     /**
+      * 
+      */
+     public Sphere() {
+       parameters.add(new Attribute("radius", 1.0));
+     }
+     /** {@inheritDoc} */
+     public String title() {
+       return "Create Sphere";
+     }
+     /**
+      * {@inheritDoc}
+      */
+     @Override
+     public void evaluate() {
+       double radius = parameters.getDouble("radius");
+       CoordinateSystem system = Project.getInstance().getActiveCoordinateSystem();
+       int stacks = 8;
+       int slices = 6;
+       
+       Collection<Vertex> vertices = new ArrayList();
+       for (int stackNumber = 0; stackNumber <= stacks; stackNumber++) {
+         for (int sliceNumber = 0; sliceNumber < slices; sliceNumber++) {
+           double theta = stackNumber * Math.PI / stacks;
+           double phi = sliceNumber * 2 * Math.PI / slices;
+           double sinTheta = Math.sin(theta);
+           double sinPhi = Math.sin(phi);
+           double cosTheta = Math.cos(theta);
+           double cosPhi = Math.cos(phi);
+           double x = radius * cosPhi * sinTheta;
+           double y = radius * sinPhi * sinTheta;
+           double z = radius * cosTheta;
+           vertices.add(new Vertex(x, y, z));
+         }
+       }
+       Container union = new Container("Sphere", Container.CONSTRUCTION, true);
+       for (Vertex current : vertices) {
+         union.add(current);
+       }
+       Project.getInstance().getActiveSpace().add(union);
+     }
+   }
    
    /**

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Surface.java, 1.219, 1.220 Defaults.java, 1.3, 1.4 Space.java, 1.233, 1.234

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

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

Modified Files:
	Surface.java Defaults.java Space.java 
Log Message:
Materializing

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.219
retrieving revision 1.220
diff -C2 -d -r1.219 -r1.220
*** Surface.java	25 Jan 2008 13:06:02 -0000	1.219
--- Surface.java	7 Apr 2008 11:20:31 -0000	1.220
***************
*** 1332,1336 ****
    
    /**
!    * Returs the material to be used on the back side
     * 
     * @return back material
--- 1332,1336 ----
    
    /**
!    * Returns the material to be used on the back side
     * 
     * @return back material
***************
*** 1340,1344 ****
        return backMaterial;
      } else {
!       return backDomain.material();
      }
    }
--- 1340,1344 ----
        return backMaterial;
      } else {
!       return frontDomain.material();
      }
    }
***************
*** 1368,1372 ****
        return frontMaterial;
      } else {
!       return frontDomain.material();
      }
    }
--- 1368,1372 ----
        return frontMaterial;
      } else {
!       return backDomain.material();
      }
    }

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.233
retrieving revision 1.234
diff -C2 -d -r1.233 -r1.234
*** Space.java	23 Jan 2008 14:49:33 -0000	1.233
--- Space.java	7 Apr 2008 11:20:31 -0000	1.234
***************
*** 51,55 ****
    /** The name */
    protected String name;
!   /** The Discription */
    protected Description description; 
    /** The envelope (a set of surfaces) */
--- 51,55 ----
    /** The name */
    protected String name;
!   /** The description */
    protected Description description; 
    /** The envelope (a set of surfaces) */
***************
*** 59,63 ****
    protected int type;
    
!   /** If the constructionspace is transparent */
    protected boolean transparent;
    
--- 59,63 ----
    protected int type;
    
!   /** If the space is transparent */
    protected boolean transparent;
    
***************
*** 81,84 ****
--- 81,87 ----
    protected Container empty;
    
+   /** The material */
+   private Material material;
+   
    
    /** The modellor */
***************
*** 199,207 ****
    
    /**
     * Returns the material for this space
     * @return material to used for this space
     */
    public Material material() {
!     if (isVoid()) {
        return Defaults.getVoidMaterial();
      } else if (isFunctionalSpace()) {
--- 202,228 ----
    
    /**
+    * Sets material
+    * @param material The new material
+    */
+   public void setMaterial(Material material) {
+     this.material = material;
+   }
+   
+   /**
+    * Returns the material
+    * @return Material
+    */
+   public Material getMaterial() {
+     return material;
+   }
+   
+   /**
     * Returns the material for this space
     * @return material to used for this space
     */
    public Material material() {
!     if (material != null) {
!       return material;
!     } else if (isVoid()) {
        return Defaults.getVoidMaterial();
      } else if (isFunctionalSpace()) {
***************
*** 478,491 ****
        } else  if (a.getName().equals("Description")) {
          setDescription(((String)a.getValue().toString()));
!       } else {
!         if (!changedType && getClassificationType() != null) {
!           if (getClassificationType().getParameter(a.getName()) != null && 
!               !getClassificationType().getParameter(a.getName()).getValue().equals(a.getValue())) {
!             setOwnParameter(a.getName(), a.getValue());
!           }
          }
        }
      }
    }
    
    /**
--- 499,517 ----
        } else  if (a.getName().equals("Description")) {
          setDescription(((String)a.getValue().toString()));
!       } else if (a.getName().equals("Material")) {
!         Material material = (Material) ((Reference) a.getValue()).getObject();
!         if (material != material()) {
!           setMaterial(material);
!         }
!       } else if (!changedType && getClassificationType() != null) {
!         if (getClassificationType().getParameter(a.getName()) != null && 
!             !getClassificationType().getParameter(a.getName()).getValue().equals(a.getValue())) {
!           setOwnParameter(a.getName(), a.getValue());
          }
        }
      }
    }
+ 
+ 
    
    /**
***************
*** 495,498 ****
--- 521,526 ----
    public List<Attribute> getAttributes() {
      ArrayList<Attribute> res = new ArrayList<Attribute>();
+     List<Material> materials = new LinkedList(Project.getInstance().getMaterials());
+     
      res.add(new Attribute("Name", getName()));
      if (getOwner() == Project.getInstance().world()) {
***************
*** 540,543 ****
--- 568,572 ----
        }
      }
+     res.add(new Attribute("Material", new Reference(material(), materials)));
      res.add(new Attribute("Euler", Double.valueOf(eulerCharacteristic())));
      res.add(new Attribute("Description", getDescription()));

Index: Defaults.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Defaults.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Defaults.java	17 Dec 2007 14:20:37 -0000	1.3
--- Defaults.java	7 Apr 2008 11:20:31 -0000	1.4
***************
*** 14,22 ****
  
    private static Material constructionMaterial 
!     = new Material("Construction", new float[] {0.90f, 0.90f, 0.90f});
    private static Material voidMaterial 
      = new Material("Void", new float[] {255f / 280, 228f / 280, 225f / 280});
    private static Material functionalMaterial 
!     = new Material("Functional", new float[] {0.96f, 0.87f, 0.70f});
    
    
--- 14,22 ----
  
    private static Material constructionMaterial 
!     = new Material("Construction", new float[] {0.96f, 0.87f, 0.70f});
    private static Material voidMaterial 
      = new Material("Void", new float[] {255f / 280, 228f / 280, 225f / 280});
    private static Material functionalMaterial 
!     = new Material("Functional", new float[] {0.90f, 0.90f, 0.90f});
    
    

[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/actions ImportFileReader.java, 1.17, 1.18 FileImportActionListener.java, 1.20, 1.21

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

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17807/src/net/sourceforge/bprocessor/gui/actions

Modified Files:
	ImportFileReader.java FileImportActionListener.java 
Log Message:
very basic design file import

Index: FileImportActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/FileImportActionListener.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** FileImportActionListener.java	1 Apr 2008 13:37:15 -0000	1.20
--- FileImportActionListener.java	3 Apr 2008 14:01:18 -0000	1.21
***************
*** 47,50 ****
--- 47,52 ----
    private FileFilter csvFilter;
    
+   private FileFilter dgnFilter;
+   
    /** The xy axis is the basis plane */
    public static final int XY = 0;
***************
*** 83,88 ****
--- 85,101 ----
        }
      };
+     dgnFilter = new FileFilter() {
+       @Override
+       public boolean accept(File f) {
+         return f.isDirectory() || f.getName().endsWith(".dgn");
+       }
+       @Override
+       public String getDescription() {
+         return "dgn - Microstation format";
+       }
+     };
      loadChooser.addChoosableFileFilter(csvFilter);
      loadChooser.addChoosableFileFilter(objFilter);
+     loadChooser.addChoosableFileFilter(dgnFilter);
      loadChooser.setFileFilter(csvFilter);
    }
***************
*** 120,123 ****
--- 133,145 ----
            log.error("Could not open file: " + lfile, ex);
          }
+       } else if (lfile.getName().endsWith(".dgn")) {
+         try {
+           Container result = ImportFileReader.importDgnFormat(lfile);
+           Project.getInstance().world().add(result);
+           Project.getInstance().changed(Project.getInstance());
+           Project.getInstance().checkpoint();
+         } catch (Exception ex) {
+           log.error("Could not open file: " + lfile, ex);
+         }
        }
        loadChooser.revalidate();

Index: ImportFileReader.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/ImportFileReader.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ImportFileReader.java	13 Dec 2007 12:00:55 -0000	1.17
--- ImportFileReader.java	3 Apr 2008 14:01:18 -0000	1.18
***************
*** 12,15 ****
--- 12,16 ----
  import java.io.FileNotFoundException;
  import java.io.IOException;
+ import java.io.InputStream;
  import java.io.InputStreamReader;
  import java.util.ArrayList;
***************
*** 530,532 ****
--- 531,623 ----
      }
    }
+   
+   
+   private static class DgnReader {
+     private InputStream input;
+     private Container output;
+     public DgnReader(InputStream input) {
+       this.input = input;
+     }
+     private int read() throws IOException {
+       return input.read();
+     }
+     
+     private int readShort() throws IOException {
+       int b0 = read();
+       int b1 = read();
+       return (b1 << 8) | b0;
+     }
+     
+     private int readLong() throws IOException {
+       int result = 0;
+       int b0 = read();
+       int b1 = read();
+       int b2 = read();
+       int b3 = read();
+       result = (b1 << 24) | (b0 << 16) | b3 << 8 | b2;
+       return result;
+     }
+     
+     private void skip(int size) throws IOException {
+       for (int i = 0; i < size; i++) {
+         read();
+       }
+     }
+     
+     private void readElement() throws IOException {
+       int token = read();
+       int type = read();
+       int size = readShort();
+       System.out.println("type " + type);
+       switch (type) {
+       case 3: {
+         int xlow = readLong();
+         int ylow = readLong();
+         int zlow = readLong();
+         int xhigh = readLong();
+         int yhigh = readLong();
+         int zhigh = readLong();
+         skip(8);
+         int x0 = readLong();
+         int y0 = readLong();
+         int x1 = readLong();
+         int y1 = readLong();
+         Vertex v0 = new Vertex(x0 / 1000.0, y0 / 1000.0, 0);
+         Vertex v1 = new Vertex(x1 / 1000.0, y1 / 1000.0, 0);
+         output.add(v0);
+         output.add(v1);
+         output.add(new Edge(v0, v1));
+         skip(size * 2 - (12 * 4));
+       }
+         break;
+       default:
+         skip(size * 2);
+       }
+     }
+     
+     /**
+      * 
+      * @return Container
+      * @throws IOException
+      */
+     public Container readFile() throws IOException {
+       output = new Container("Design", Container.CONSTRUCTION, true);
+       while (input.available() > 0) {
+         readElement();
+       }
+       return output;
+     }
+   }
+   /**
+    * 
+    * @param file File
+    * @return Container
+    * @throws IOException IOException
+    */
+   public static Container importDgnFormat(File file) throws IOException {
+     InputStream stream = new FileInputStream(file);
+     DgnReader reader = new DgnReader(stream);
+     Container result = reader.readFile();
+     return result;
+   }
  }

[Bprocessor-commit] bprocessor/src/etc/bridge_1 outline.bp, NONE, 1.1

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

Update of /cvsroot/bprocessor/bprocessor/src/etc/bridge_1
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10004/src/etc/bridge_1

Added Files:
	outline.bp 
Log Message:
bridge

--- NEW FILE: outline.bp ---
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<bmodel>
    <active>1</active>
    <cs>296</cs>
    <name>new project</name>
    <space voidref="2" union="false" name="World" transparent="true" type="1" net="false" progid="0" id="1">
        <description/>
        <Classification>unassigned</Classification>
        <constructor xsi:type="CoordinateSystemType" onlyplane="false" active="true" editable="true" progid="1" id="296" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
            <vertex y="0.0" x="0.0" z="0.0" id="297"/>
            <ijn>
                <vertex y="0.0" x="1.0" z="0.0" id="293"/>
                <vertex y="1.0" x="0.0" z="0.0" id="294"/>
                <vertex y="0.0" x="0.0" z="1.0" id="295"/>
            </ijn>
        </constructor>
        <space union="false" name="Void" transparent="true" type="1" net="false" progid="1" id="2">
            <description/>
            <Classification>unassigned</Classification>
[...1590 lines suppressed...]
    <global>
        <key>pi</key>
        <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
            <double>3.141592653589793</double>
        </value>
    </global>
    <global>
        <key>roof</key>
        <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
            <double>0.07</double>
        </value>
    </global>
    <global>
        <key>wall</key>
        <value xsi:type="DoubleType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
            <double>0.15</double>
        </value>
    </global>
</bmodel>

[Bprocessor-commit] bprocessor/src/etc/bridge_1 - New directory

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

Update of /cvsroot/bprocessor/bprocessor/src/etc/bridge_1
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9992/src/etc/bridge_1

Log Message:
Directory /cvsroot/bprocessor/bprocessor/src/etc/bridge_1 added to the repository

[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui GUI.java, 1.98, 1.99

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

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

Modified Files:
	GUI.java 
Log Message:
o rly

Index: GUI.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** GUI.java	20 Feb 2008 15:20:26 -0000	1.98
--- GUI.java	1 Apr 2008 13:37:15 -0000	1.99
***************
*** 563,567 ****
      
      file.addSeparator();
! 
      JMenuItem fileImport = new JMenuItem("Import");
      fileImport.addActionListener(new FileImportActionListener());
--- 563,567 ----
      
      file.addSeparator();
!     
      JMenuItem fileImport = new JMenuItem("Import");
      fileImport.addActionListener(new FileImportActionListener());