Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23501/src/net/sourceforge/bprocessor/model
Modified Files:
Line.java Point.java CoordinateSystem.java
Log Message:
Added getName and filled out the attributes for coordinatesystem
Index: Point.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Point.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Point.java 23 Jul 2006 09:17:36 -0000 1.5
--- Point.java 27 Jul 2006 08:05:21 -0000 1.6
***************
*** 76,78 ****
--- 76,83 ----
return "Point";
}
+
+ /** @see net.sourceforge.bprocessor.model.Geometric#getName() */
+ public String getName() {
+ return "P-" + getId();
+ }
}
Index: CoordinateSystem.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/CoordinateSystem.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** CoordinateSystem.java 24 Jul 2006 12:06:09 -0000 1.18
--- CoordinateSystem.java 27 Jul 2006 08:05:21 -0000 1.19
***************
*** 252,261 ****
public void setAttributes(List attributes) {
Vertex orig = new Vertex(0, 0, 0);
-
orig.setX(((Double)(((Attribute)attributes.get(1)).getValue())).doubleValue());
orig.setY(((Double)(((Attribute)attributes.get(2)).getValue())).doubleValue());
orig.setZ(((Double)(((Attribute)attributes.get(3)).getValue())).doubleValue());
setOrigin(orig);
! setActive(((Boolean)(((Attribute)attributes.get(4)).getValue())).booleanValue());
}
--- 252,287 ----
public void setAttributes(List attributes) {
Vertex orig = new Vertex(0, 0, 0);
orig.setX(((Double)(((Attribute)attributes.get(1)).getValue())).doubleValue());
orig.setY(((Double)(((Attribute)attributes.get(2)).getValue())).doubleValue());
orig.setZ(((Double)(((Attribute)attributes.get(3)).getValue())).doubleValue());
setOrigin(orig);
! Vertex i = new Vertex(0, 0, 0);
! i.setX(((Double)(((Attribute)attributes.get(5)).getValue())).doubleValue());
! i.setY(((Double)(((Attribute)attributes.get(6)).getValue())).doubleValue());
! i.setZ(((Double)(((Attribute)attributes.get(7)).getValue())).doubleValue());
! if (i.length() > 0) {
! this.i = i;
! }
! Vertex j = new Vertex(0, 0, 0);
! j.setX(((Double)(((Attribute)attributes.get(9)).getValue())).doubleValue());
! j.setY(((Double)(((Attribute)attributes.get(10)).getValue())).doubleValue());
! j.setZ(((Double)(((Attribute)attributes.get(11)).getValue())).doubleValue());
! if (j.length() > 0) {
! this.j = j;
! }
! if (onlyPlane) {
! setActive(((Boolean)(((Attribute)attributes.get(12)).getValue())).booleanValue());
! onlyPlane(((Boolean)(((Attribute)attributes.get(13)).getValue())).booleanValue());
! } else {
! Vertex n = new Vertex(0, 0, 0);
! n.setX(((Double)(((Attribute)attributes.get(13)).getValue())).doubleValue());
! n.setY(((Double)(((Attribute)attributes.get(14)).getValue())).doubleValue());
! n.setZ(((Double)(((Attribute)attributes.get(15)).getValue())).doubleValue());
! if (n.length() > 0) {
! this.n = n;
! }
! setActive(((Boolean)(((Attribute)attributes.get(16)).getValue())).booleanValue());
! onlyPlane(((Boolean)(((Attribute)attributes.get(17)).getValue())).booleanValue());
! }
}
***************
*** 265,272 ****
public List getAttributes() {
ArrayList res = new ArrayList();
! res.add(new Attribute("name", "Origin", false));
! res.add(new Attribute("X", new Double(getOrigin().getX())));
! res.add(new Attribute("Y", new Double(getOrigin().getY())));
! res.add(new Attribute("Z", new Double(getOrigin().getZ())));
if (isActive()) {
res.add(new Attribute("Active", Boolean.TRUE));
--- 291,312 ----
public List getAttributes() {
ArrayList res = new ArrayList();
! res.add(new Attribute("Origin", "", false));
! res.add(new Attribute("x", new Double(getOrigin().getX())));
! res.add(new Attribute("y", new Double(getOrigin().getY())));
! res.add(new Attribute("z", new Double(getOrigin().getZ())));
! res.add(new Attribute("I", "", false));
! res.add(new Attribute("x", new Double(getI().getX())));
! res.add(new Attribute("y", new Double(getI().getY())));
! res.add(new Attribute("z", new Double(getI().getZ())));
! res.add(new Attribute("J", "", false));
! res.add(new Attribute("x", new Double(getJ().getX())));
! res.add(new Attribute("y", new Double(getJ().getY())));
! res.add(new Attribute("z", new Double(getJ().getZ())));
! if (!onlyPlane()) {
! res.add(new Attribute("K (Normal)", "", false));
! res.add(new Attribute("x", new Double(getN().getX())));
! res.add(new Attribute("y", new Double(getN().getY())));
! res.add(new Attribute("z", new Double(getN().getZ())));
! }
if (isActive()) {
res.add(new Attribute("Active", Boolean.TRUE));
***************
*** 274,277 ****
--- 314,322 ----
res.add(new Attribute("Active", Boolean.FALSE));
}
+ if (onlyPlane()) {
+ res.add(new Attribute("Only plane", Boolean.TRUE));
+ } else {
+ res.add(new Attribute("Only plane", Boolean.FALSE));
+ }
return res;
}
***************
*** 331,333 ****
--- 376,383 ----
return surface;
}
+
+ /** @see net.sourceforge.bprocessor.model.Geometric#getName() */
+ public String getName() {
+ return "CS-" + getId();
+ }
}
Index: Line.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Line.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Line.java 23 Jul 2006 09:17:36 -0000 1.14
--- Line.java 27 Jul 2006 08:05:21 -0000 1.15
***************
*** 251,253 ****
--- 251,258 ----
}
}
+
+ /** @see net.sourceforge.bprocessor.model.Geometric#getName() */
+ public String getName() {
+ return "L-" + getId();
+ }
}
|
