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
If vconsensus is null, return
[jalview.git]
/
src
/
jalview
/
appletgui
/
SliderPanel.java
diff --git
a/src/jalview/appletgui/SliderPanel.java
b/src/jalview/appletgui/SliderPanel.java
index
caabbf9
..
3e23728
100755
(executable)
--- a/
src/jalview/appletgui/SliderPanel.java
+++ b/
src/jalview/appletgui/SliderPanel.java
@@
-42,11
+42,10
@@
public class SliderPanel
String source)
\r
{
\r
SliderPanel sp = null;
\r
String source)
\r
{
\r
SliderPanel sp = null;
\r
- ConservationColourScheme ccs = (ConservationColourScheme) cs;
\r
\r
if (conservationSlider == null)
\r
{
\r
\r
if (conservationSlider == null)
\r
{
\r
- sp = new SliderPanel(ap, ccs.inc, true, cs);
\r
+ sp = new SliderPanel(ap, cs.getConservationInc(), true, cs);
\r
conservationSlider = new Frame();
\r
conservationSlider.add(sp);
\r
}
\r
conservationSlider = new Frame();
\r
conservationSlider.add(sp);
\r
}
\r
@@
-217,14
+216,11
@@
public class SliderPanel
\r
if (forConservation)
\r
{
\r
\r
if (forConservation)
\r
{
\r
- if (toChange instanceof ConservationColourScheme)
\r
- {
\r
- ( (ConservationColourScheme) toChange).inc = i;
\r
- }
\r
+ toChange.setConservationInc(i);
\r
}
\r
else
\r
{
\r
}
\r
else
\r
{
\r
- ( (ResidueColourScheme) toChange).setThreshold(i);
\r
+ toChange.setThreshold(i, ap.av.getIgnoreGapsConsensus());
\r
}
\r
\r
groupIndex--;
\r
}
\r
\r
groupIndex--;
\r