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
JAL-1919 code improvement to make PDB sequence fetcher file format configurable....
[jalview.git]
/
src
/
MCview
/
PDBCanvas.java
diff --git
a/src/MCview/PDBCanvas.java
b/src/MCview/PDBCanvas.java
index
dfe7c8f
..
1c7a1f7
100644
(file)
--- a/
src/MCview/PDBCanvas.java
+++ b/
src/MCview/PDBCanvas.java
@@
-26,6
+26,7
@@
import jalview.datamodel.SequenceI;
import jalview.gui.AlignmentPanel;
import jalview.gui.FeatureRenderer;
import jalview.gui.SequenceRenderer;
import jalview.gui.AlignmentPanel;
import jalview.gui.FeatureRenderer;
import jalview.gui.SequenceRenderer;
+import jalview.io.StructureFile;
import jalview.structure.AtomSpec;
import jalview.structure.StructureListener;
import jalview.structure.StructureMapping;
import jalview.structure.AtomSpec;
import jalview.structure.StructureListener;
import jalview.structure.StructureMapping;
@@
-65,7
+66,7
@@
public class PDBCanvas extends JPanel implements MouseListener,
int my = 0;
int my = 0;
- public PDBfile pdb;
+ public StructureFile pdb;
PDBEntry pdbentry;
PDBEntry pdbentry;
@@
-201,11
+202,13
@@
public class PDBCanvas extends JPanel implements MouseListener,
as.traceAlignment();
PrintStream ps = new PrintStream(System.out)
{
as.traceAlignment();
PrintStream ps = new PrintStream(System.out)
{
+ @Override
public void print(String x)
{
mappingDetails.append(x);
}
public void print(String x)
{
mappingDetails.append(x);
}
+ @Override
public void println()
{
mappingDetails.append("\n");
public void println()
{
mappingDetails.append("\n");
@@
-245,6
+248,7
@@
public class PDBCanvas extends JPanel implements MouseListener,
addKeyListener(new KeyAdapter()
{
addKeyListener(new KeyAdapter()
{
+ @Override
public void keyPressed(KeyEvent evt)
{
keyPressed(evt);
public void keyPressed(KeyEvent evt)
{
keyPressed(evt);
@@
-452,6
+456,7
@@
public class PDBCanvas extends JPanel implements MouseListener,
centre[2] = ztot / (2 * (float) bsize);
}
centre[2] = ztot / (2 * (float) bsize);
}
+ @Override
public void paintComponent(Graphics g)
{
super.paintComponent(g);
public void paintComponent(Graphics g)
{
super.paintComponent(g);
@@
-745,6
+750,7
@@
public class PDBCanvas extends JPanel implements MouseListener,
}
}
}
}
+ @Override
public void mousePressed(MouseEvent e)
{
pdbAction = true;
public void mousePressed(MouseEvent e)
{
pdbAction = true;
@@
-789,6
+795,7
@@
public class PDBCanvas extends JPanel implements MouseListener,
dragging = false;
}
dragging = false;
}
+ @Override
public void mouseMoved(MouseEvent e)
{
pdbAction = true;
public void mouseMoved(MouseEvent e)
{
pdbAction = true;
@@
-824,18
+831,22
@@
public class PDBCanvas extends JPanel implements MouseListener,
}
}
}
}
+ @Override
public void mouseClicked(MouseEvent e)
{
}
public void mouseClicked(MouseEvent e)
{
}
+ @Override
public void mouseEntered(MouseEvent e)
{
}
public void mouseEntered(MouseEvent e)
{
}
+ @Override
public void mouseExited(MouseEvent e)
{
}
public void mouseExited(MouseEvent e)
{
}
+ @Override
public void mouseDragged(MouseEvent evt)
{
int x = evt.getX();
public void mouseDragged(MouseEvent evt)
{
int x = evt.getX();
@@
-885,6
+896,7
@@
public class PDBCanvas extends JPanel implements MouseListener,
repaint();
}
repaint();
}
+ @Override
public void mouseReleased(MouseEvent evt)
{
dragging = false;
public void mouseReleased(MouseEvent evt)
{
dragging = false;
@@
-1065,6
+1077,7
@@
public class PDBCanvas extends JPanel implements MouseListener,
// ////////////////////////////////
// /StructureListener
// ////////////////////////////////
// /StructureListener
+ @Override
public String[] getPdbFile()
{
return new String[] { pdbentry.getFile() };
public String[] getPdbFile()
{
return new String[] { pdbentry.getFile() };
@@
-1169,6
+1182,7
@@
public class PDBCanvas extends JPanel implements MouseListener,
// return new Color(viewer.getAtomArgb(atomIndex));
}
// return new Color(viewer.getAtomArgb(atomIndex));
}
+ @Override
public void updateColours(Object source)
{
colourBySequence();
public void updateColours(Object source)
{
colourBySequence();