X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2FMCview%2FBond.java;h=195d3c73805d544dfd8b4e97f2b0f268805eee9d;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=a71ca0ed1e3c968e42d0c52182288f50d43a8ae9;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git diff --git a/src/MCview/Bond.java b/src/MCview/Bond.java index a71ca0e..195d3c7 100755 --- a/src/MCview/Bond.java +++ b/src/MCview/Bond.java @@ -1,23 +1,26 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5) - * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * * Jalview is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - * + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. + * * Jalview is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty * of MERCHANTABILITY or FITNESS FOR A PARTICULAR * PURPOSE. See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with Jalview. If not, see . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package MCview; -import java.awt.*; +import java.awt.Color; public class Bond { @@ -33,10 +36,10 @@ public class Bond public Atom at2; - public Bond(float[] start, float[] end, Atom at1, Atom at2) + public Bond(Atom at1, Atom at2) { - this.start = start; - this.end = end; + this.start = new float[] { at1.x, at1.y, at1.z }; + this.end = new float[] { at2.x, at2.y, at2.z }; this.startCol = at1.color; this.endCol = at2.color; this.at1 = at1; @@ -67,13 +70,13 @@ public class Bond public void translate(float x, float y, float z) { - start[0] = (start[0] + x); - end[0] = (end[0] + x); + start[0] = start[0] + x; + end[0] = end[0] + x; - start[1] = (start[1] + y); - end[1] = (end[1] + y); + start[1] = start[1] + y; + end[1] = end[1] + y; - start[2] = (start[2] + z); - end[2] = (end[2] + z); + start[2] = start[2] + z; + end[2] = end[2] + z; } }