X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2FMCview%2FAppletPDBCanvas.java;h=d0c7da86f0a4993d0edac204655fead035f2ace0;hb=a581135c768ce6c60c38bbd47003477f8c557eea;hp=e11e5583402d86e07e4893d783fb85f680367e9f;hpb=4741fc6fc72b7c5ffd75af5b1bc17070fef448f9;p=jalview.git diff --git a/src/MCview/AppletPDBCanvas.java b/src/MCview/AppletPDBCanvas.java index e11e558..d0c7da8 100755 --- a/src/MCview/AppletPDBCanvas.java +++ b/src/MCview/AppletPDBCanvas.java @@ -1,17 +1,17 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle - * + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4) + * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * * This program 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 2 * of the License, or (at your option) any later version. - * + * * This program 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 this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA @@ -589,12 +589,12 @@ public class AppletPDBCanvas xstart = (int) ( ( (tmpBond.start[0] - centre[0]) * scale) + (getSize().width / 2)); - ystart = (int) ( ( (tmpBond.start[1] - centre[1]) * scale) + + ystart = (int) ( ( (centre[1] - tmpBond.start[1] ) * scale) + (getSize().height / 2)); xend = (int) ( ( (tmpBond.end[0] - centre[0]) * scale) + (getSize().width / 2)); - yend = (int) ( ( (tmpBond.end[1] - centre[1]) * scale) + + yend = (int) ( ( (centre[1] - tmpBond.end[1] ) * scale) + (getSize().height / 2)); xmid = (xend + xstart) / 2; @@ -834,7 +834,7 @@ public class AppletPDBCanvas } else { - objmat.rotatex( (float) ( (my - omy))); + objmat.rotatex( (float) ( (omy - my))); objmat.rotatey( (float) ( (omx - mx))); } @@ -915,7 +915,7 @@ public class AppletPDBCanvas { int xstart = (int) ( ( (b.start[0] - centre[0]) * scale) + (getSize().width / 2)); - int ystart = (int) ( ( (b.start[1] - centre[1]) * scale) + + int ystart = (int) ( ( (centre[1] - b.start[1]) * scale) + (getSize().height / 2)); g.setColor(Color.red); @@ -926,7 +926,7 @@ public class AppletPDBCanvas { int xstart = (int) ( ( (b.end[0] - centre[0]) * scale) + (getSize().width / 2)); - int ystart = (int) ( ( (b.end[1] - centre[1]) * scale) + + int ystart = (int) ( ( (centre[1] - b.end[1]) * scale) + (getSize().height / 2)); g.setColor(Color.red); @@ -960,7 +960,7 @@ public class AppletPDBCanvas if (Math.abs(truex - x) <= 2) { - int truey = (int) ( ( (tmpBond.start[1] - centre[1]) * scale) + + int truey = (int) ( ( (centre[1] - tmpBond.start[1] ) * scale) + (getSize().height / 2)); if (Math.abs(truey - y) <= 2)