Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25684/src/net/sourceforge/bprocessor/gl/view
Modified Files:
View.java
Log Message:
Cannot select a constructor by clicking the line
Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.128
retrieving revision 1.129
diff -C2 -d -r1.128 -r1.129
*** View.java 8 Aug 2006 12:05:05 -0000 1.128
--- View.java 8 Aug 2006 13:01:10 -0000 1.129
***************
*** 1002,1006 ****
dist = (c.getOrigin().minus(v)).length() * scale;
}
! drawGeneralConstructor(c, dist, false);
}
}
--- 1002,1006 ----
dist = (c.getOrigin().minus(v)).length() * scale;
}
! drawGeneralConstructor(c, dist, false, true);
}
}
***************
*** 1059,1063 ****
}
if (target != c && !highligts.contains(c)) {
! drawGeneralConstructor(c, dist, true);
}
}
--- 1059,1063 ----
}
if (target != c && !highligts.contains(c)) {
! drawGeneralConstructor(c, dist, true, true);
}
}
***************
*** 1074,1078 ****
dist = (c.getOrigin().distance(v)) * scale;
}
! drawGeneralConstructor(c, dist, true);
}
}
--- 1074,1078 ----
dist = (c.getOrigin().distance(v)) * scale;
}
! drawGeneralConstructor(c, dist, true, true);
}
}
***************
*** 1083,1088 ****
* @param dist The dist parameter
* @param colorize Apply color
*/
! private void drawGeneralConstructor(Constructor constructor, double dist, boolean colorize) {
if (constructor instanceof Point) {
if (colorize) {
--- 1083,1090 ----
* @param dist The dist parameter
* @param colorize Apply color
+ * @param active Draw the constructor active if active
*/
! private void drawGeneralConstructor(Constructor constructor, double dist,
! boolean colorize, boolean active) {
if (constructor instanceof Point) {
if (colorize) {
***************
*** 1098,1107 ****
drawConstructorVector(l.getOrigin(), l.getDirection(), dist);
}
! if (l.isActive()) {
drawConstructorLine(l.getOrigin(), l.getDirection(), dist);
}
} else if (constructor instanceof CoordinateSystem) {
CoordinateSystem system = (CoordinateSystem)constructor;
! drawCoordinateSystem(system, dist, colorize);
}
}
--- 1100,1109 ----
drawConstructorVector(l.getOrigin(), l.getDirection(), dist);
}
! if (l.isActive() && active) {
drawConstructorLine(l.getOrigin(), l.getDirection(), dist);
}
} else if (constructor instanceof CoordinateSystem) {
CoordinateSystem system = (CoordinateSystem)constructor;
! drawCoordinateSystem(system, dist, colorize, active);
}
}
***************
*** 1112,1117 ****
* @param dist The distance to the center of the system
* @param colorize Apply color
*/
! private void drawCoordinateSystem(CoordinateSystem cs, double dist, boolean colorize) {
Vertex i = cs.getI();
Vertex j = cs.getJ();
--- 1114,1121 ----
* @param dist The distance to the center of the system
* @param colorize Apply color
+ * @param active Draw the constructor active if active
*/
! private void drawCoordinateSystem(CoordinateSystem cs, double dist,
! boolean colorize, boolean active) {
Vertex i = cs.getI();
Vertex j = cs.getJ();
***************
*** 1122,1126 ****
drawConstructorVector(cs.getOrigin(), i, dist);
}
! if (cs.isActive()) {
drawConstructorLine(cs.getOrigin(), i, dist);
}
--- 1126,1130 ----
drawConstructorVector(cs.getOrigin(), i, dist);
}
! if (cs.isActive() && active) {
drawConstructorLine(cs.getOrigin(), i, dist);
}
***************
*** 1131,1135 ****
drawConstructorVector(cs.getOrigin(), j, dist);
}
! if (cs.isActive()) {
drawConstructorLine(cs.getOrigin(), j, dist);
}
--- 1135,1139 ----
drawConstructorVector(cs.getOrigin(), j, dist);
}
! if (cs.isActive() && active) {
drawConstructorLine(cs.getOrigin(), j, dist);
}
***************
*** 1142,1150 ****
drawConstructorVector(cs.getOrigin(), n, dist);
}
! if (cs.isActive()) {
drawConstructorLine(cs.getOrigin(), n, dist);
}
} else {
! if (cs.isActive()) {
Vertex origin = cs.getOrigin();
Vertex v = i.copy();
--- 1146,1154 ----
drawConstructorVector(cs.getOrigin(), n, dist);
}
! if (cs.isActive() && active) {
drawConstructorLine(cs.getOrigin(), n, dist);
}
} else {
! if (cs.isActive() && active) {
Vertex origin = cs.getOrigin();
Vertex v = i.copy();
***************
*** 1851,1855 ****
} else {
pushName(gl, current);
! drawGeneralConstructor(current, dist, false);
popName(gl);
}
--- 1855,1859 ----
} else {
pushName(gl, current);
! drawGeneralConstructor(current, dist, false, false);
popName(gl);
}
|
