X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmc_view%2FAppletPDBCanvas.java;fp=src%2Fmc_view%2FAppletPDBCanvas.java;h=768f1d66c5fd4c60e926818741d287db0713128f;hb=5db8e803feb3d04bf6142d25ded76473ec1cb571;hp=fe1aca1aa7bc6b545bab5bc4b6cd140e924c4804;hpb=c975128250d9596f0f8751dd832996c22255419f;p=jalview.git diff --git a/src/mc_view/AppletPDBCanvas.java b/src/mc_view/AppletPDBCanvas.java index fe1aca1..768f1d6 100644 --- a/src/mc_view/AppletPDBCanvas.java +++ b/src/mc_view/AppletPDBCanvas.java @@ -20,21 +20,6 @@ */ package mc_view; -import jalview.analysis.AlignSeq; -import jalview.appletgui.AlignmentPanel; -import jalview.appletgui.FeatureRenderer; -import jalview.appletgui.SequenceRenderer; -import jalview.datamodel.PDBEntry; -import jalview.datamodel.SequenceI; -import jalview.io.DataSourceType; -import jalview.io.StructureFile; -import jalview.renderer.seqfeatures.FeatureColourFinder; -import jalview.structure.AtomSpec; -import jalview.structure.StructureListener; -import jalview.structure.StructureMapping; -import jalview.structure.StructureSelectionManager; -import jalview.util.MessageManager; - import java.awt.Color; import java.awt.Dimension; import java.awt.Event; @@ -52,6 +37,21 @@ import java.io.PrintStream; import java.util.List; import java.util.Vector; +import jalview.analysis.AlignSeq; +import jalview.appletgui.AlignmentPanel; +import jalview.appletgui.FeatureRenderer; +import jalview.appletgui.SequenceRenderer; +import jalview.datamodel.PDBEntry; +import jalview.datamodel.SequenceI; +import jalview.io.DataSourceType; +import jalview.io.StructureFile; +import jalview.renderer.seqfeatures.FeatureColourFinder; +import jalview.structure.AtomSpec; +import jalview.structure.StructureListener; +import jalview.structure.StructureMapping; +import jalview.structure.StructureSelectionManager; +import jalview.util.MessageManager; + public class AppletPDBCanvas extends Panel implements MouseListener, MouseMotionListener, StructureListener { @@ -82,13 +82,13 @@ public class AppletPDBCanvas extends Panel Dimension prefsize; - float[] centre = new float[3]; + double[] centre = new double[3]; - float[] width = new float[3]; + double[] width = new double[3]; - float maxwidth; + double maxwidth; - float scale; + double scale; String inStr; @@ -178,7 +178,7 @@ public class AppletPDBCanvas extends Panel colourBySequence(); - float max = -10; + double max = -10; int maxchain = -1; int pdbstart = 0; int pdbend = 0; @@ -317,16 +317,16 @@ public class AppletPDBCanvas extends Panel public void findWidth() { - float[] max = new float[3]; - float[] min = new float[3]; + double[] max = new double[3]; + double[] min = new double[3]; - max[0] = (float) -1e30; - max[1] = (float) -1e30; - max[2] = (float) -1e30; + max[0] = -1e30; + max[1] = -1e30; + max[2] = -1e30; - min[0] = (float) 1e30; - min[1] = (float) 1e30; - min[2] = (float) 1e30; + min[0] = 1e30; + min[1] = 1e30; + min[2] = 1e30; for (int ii = 0; ii < pdb.getChains().size(); ii++) { @@ -418,7 +418,7 @@ public class AppletPDBCanvas extends Panel // System.out.println("Maxwidth = " + maxwidth); } - public float findScale() + public double findScale() { int dim; int width; @@ -444,14 +444,14 @@ public class AppletPDBCanvas extends Panel dim = height; } - return (float) (dim / (1.5d * maxwidth)); + return dim / (1.5d * maxwidth); } public void findCentre() { - float xtot = 0; - float ytot = 0; - float ztot = 0; + double xtot = 0; + double ytot = 0; + double ztot = 0; int bsize = 0; @@ -473,9 +473,9 @@ public class AppletPDBCanvas extends Panel } } - centre[0] = xtot / (2 * (float) bsize); - centre[1] = ytot / (2 * (float) bsize); - centre[2] = ztot / (2 * (float) bsize); + centre[0] = xtot / (2 * (double) bsize); + centre[1] = ytot / (2 * (double) bsize); + centre[2] = ztot / (2 * (double) bsize); } @Override @@ -733,7 +733,7 @@ public class AppletPDBCanvas extends Panel { if (!wire) { - if (((float) Math.abs(y2 - y1) / (float) Math.abs(x2 - x1)) < 0.5) + if (((double) Math.abs(y2 - y1) / (double) Math.abs(x2 - x1)) < 0.5) { g.drawLine(x1, y1, x2, y2); g.drawLine(x1 + 1, y1 + 1, x2 + 1, y2 + 1); @@ -767,13 +767,13 @@ public class AppletPDBCanvas extends Panel { if (evt.getKeyCode() == KeyEvent.VK_UP) { - scale = (float) (scale * 1.1); + scale = scale * 1.1; redrawneeded = true; repaint(); } else if (evt.getKeyCode() == KeyEvent.VK_DOWN) { - scale = (float) (scale * 0.9); + scale = scale * 0.9; redrawneeded = true; repaint(); }