[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model ClippingPlane.java, 1.27, 1.28
Status: Pre-Alpha
Brought to you by:
henryml
From: Michael L. <he...@us...> - 2008-09-09 07:58:06
|
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) { |