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
optimize repaints
[jalview.git]
/
src
/
jalview
/
gui
/
AppJMol.java
diff --git
a/src/jalview/gui/AppJMol.java
b/src/jalview/gui/AppJMol.java
index
3f2d895
..
d8ef11a
100644
(file)
--- a/
src/jalview/gui/AppJMol.java
+++ b/
src/jalview/gui/AppJMol.java
@@
-396,7
+396,7
@@
public synchronized void addSequence(SequenceI [] seq)
public void seqColour_actionPerformed(ActionEvent actionEvent)
{
colourBySequence = seqColour.isSelected();
public void seqColour_actionPerformed(ActionEvent actionEvent)
{
colourBySequence = seqColour.isSelected();
- colourBySequence(ap);
+ colourBySequence(ap.alignFrame.alignPanel);
}
public void chainColour_actionPerformed(ActionEvent actionEvent)
}
public void chainColour_actionPerformed(ActionEvent actionEvent)
@@
-599,9
+599,17
@@
public synchronized void addSequence(SequenceI [] seq)
//End StructureListener
////////////////////////////
//End StructureListener
////////////////////////////
+ String lastCommand;
FeatureRenderer fr=null;
public void colourBySequence(AlignmentPanel ap)
{
FeatureRenderer fr=null;
public void colourBySequence(AlignmentPanel ap)
{
+
+ if(ap.alignFrame.getCurrentView()!=ap.av)
+ {
+ System.out.println("RETURN");
+ return;
+ }
+
if(!colourBySequence)
return;
if(!colourBySequence)
return;
@@
-611,7
+619,7
@@
public synchronized void addSequence(SequenceI [] seq)
if (mapping.length < 1)
return;
if (mapping.length < 1)
return;
- SequenceRenderer sr = ap.seqPanel.seqCanvas.getSequenceRenderer();
+ SequenceRenderer sr = new SequenceRenderer(ap.av);
boolean showFeatures = false;
boolean showFeatures = false;
@@
-679,7
+687,11
@@
public synchronized void addSequence(SequenceI [] seq)
}
}
}
}
- viewer.evalStringQuiet(command.toString());
+ if (lastCommand != null && !lastCommand.equals(command.toString()))
+ {
+ viewer.evalStringQuiet(command.toString());
+ }
+ lastCommand = command.toString();
}
StringBuffer condenseCommand(StringBuffer command, int pos)
}
StringBuffer condenseCommand(StringBuffer command, int pos)