git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2.1 updates
[jalview.git]
/
src
/
MCview
/
Bond.java
diff --git
a/src/MCview/Bond.java
b/src/MCview/Bond.java
index
17f66bb
..
281e111
100755
(executable)
--- a/
src/MCview/Bond.java
+++ b/
src/MCview/Bond.java
@@
-24,12
+24,12
@@
import java.awt.*;
public class Bond {
\r
float[] start;
\r
float[] end;
\r
public class Bond {
\r
float[] start;
\r
float[] end;
\r
- Color startCol;
\r
- Color endCol;
\r
- public myAtom at1;
\r
- public myAtom at2;
\r
+ Color startCol = Color.lightGray;
\r
+ Color endCol= Color.lightGray;
\r
+ public Atom at1;
\r
+ public Atom at2;
\r
\r
\r
- public Bond(float[] start, float[] end, myAtom at1, myAtom at2) {
\r
+ public Bond(float[] start, float[] end, Atom at1, Atom at2) {
\r
this.start = start;
\r
this.end = end;
\r
this.startCol = at1.color;
\r
this.start = start;
\r
this.end = end;
\r
this.startCol = at1.color;
\r
@@
-38,7
+38,7
@@
public class Bond {
this.at2 = at2;
\r
}
\r
\r
this.at2 = at2;
\r
}
\r
\r
- public Bond(Bond bond) {
\r
+ /* public Bond(Bond bond) {
\r
this.start = new float[3];
\r
\r
this.start[0] = bond.start[0];
\r
this.start = new float[3];
\r
\r
this.start[0] = bond.start[0];
\r
@@
-55,12
+55,6
@@
public class Bond {
this.endCol = bond.endCol;
\r
}
\r
\r
this.endCol = bond.endCol;
\r
}
\r
\r
- public void print() {
\r
- System.out.println("Start " + start[0] + " " + start[1] + " " +
\r
- start[2]);
\r
- System.out.println("End " + end[0] + " " + end[1] + " " + end[2]);
\r
- }
\r
-
\r
public float length() {
\r
float len = ((end[0] - start[0]) * (end[0] - start[0])) +
\r
((end[1] - start[1]) * (end[1] - start[1])) +
\r
public float length() {
\r
float len = ((end[0] - start[0]) * (end[0] - start[0])) +
\r
((end[1] - start[1]) * (end[1] - start[1])) +
\r
@@
-69,7
+63,7
@@
public class Bond {
len = (float) (Math.sqrt(len));
\r
\r
return len;
\r
len = (float) (Math.sqrt(len));
\r
\r
return len;
\r
- }
\r
+ }*/
\r
\r
public void translate(float x, float y, float z) {
\r
start[0] = (start[0] + x);
\r
\r
public void translate(float x, float y, float z) {
\r
start[0] = (start[0] + x);
\r