import jalview.datamodel.SequenceGroup;
import jalview.jbgui.GSliderPanel;
-import jalview.schemes.CollectionColourSchemeI;
+import jalview.renderer.ResidueShaderI;
import jalview.util.MessageManager;
import java.awt.event.MouseAdapter;
*/
public class SliderPanel extends GSliderPanel
{
+ private static final String BACKGROUND = "Background";
+
static JInternalFrame conservationSlider;
static JInternalFrame PIDSlider;
boolean forConservation = true;
- CollectionColourSchemeI cs;
-
- private static SliderPanel sliderPanel;
+ ResidueShaderI cs;
/**
- * Returns the currently active slider panel (or null if none).
+ * Returns the currently displayed slider panel (or null if none).
*
* @return
*/
public static SliderPanel getSliderPanel()
{
- return sliderPanel;
+ if (conservationSlider != null && conservationSlider.isVisible())
+ {
+ return (SliderPanel) conservationSlider.getContentPane();
+ }
+ if (PIDSlider != null && PIDSlider.isVisible())
+ {
+ return (SliderPanel) PIDSlider.getContentPane();
+ }
+ return null;
}
/**
* DOCUMENT ME!
*/
public SliderPanel(final AlignmentPanel ap, int value,
- boolean forConserve, CollectionColourSchemeI scheme)
+ boolean forConserve, ResidueShaderI scheme)
{
this.ap = ap;
this.cs = scheme;
}
/**
- * DOCUMENT ME!
+ * Method to 'set focus' of the Conservation slider panel
*
* @param ap
- * DOCUMENT ME!
- * @param ccs
- * DOCUMENT ME!
+ * the panel to repaint on change of slider
+ * @param rs
+ * the colour scheme to update on change of slider
* @param source
- * DOCUMENT ME!
+ * a text description for the panel's title
*
- * @return DOCUMENT ME!
+ * @return
*/
public static int setConservationSlider(AlignmentPanel ap,
- CollectionColourSchemeI ccs, String source)
+ ResidueShaderI rs, String source)
{
- sliderPanel = null;
+ SliderPanel sliderPanel = null;
if (conservationSlider == null)
{
- sliderPanel = new SliderPanel(ap, ccs.getConservationInc(), true, ccs);
+ sliderPanel = new SliderPanel(ap, rs.getConservationInc(), true, rs);
conservationSlider = new JInternalFrame();
conservationSlider.setContentPane(sliderPanel);
conservationSlider.setLayer(JLayeredPane.PALETTE_LAYER);
else
{
sliderPanel = (SliderPanel) conservationSlider.getContentPane();
- sliderPanel.valueField.setText(String.valueOf(ccs.getConservationInc()));
- sliderPanel.cs = ccs;
+ sliderPanel.valueField.setText(String.valueOf(rs.getConservationInc()));
+ sliderPanel.cs = rs;
+ sliderPanel.ap = ap;
+ sliderPanel.slider.setValue(rs.getConservationInc());
}
- conservationSlider
- .setTitle(MessageManager.formatMessage(
- "label.conservation_colour_increment",
- new String[] { source }));
+ conservationSlider.setTitle(MessageManager.formatMessage(
+ "label.conservation_colour_increment",
+ new String[] { source == null ? BACKGROUND : source }));
if (ap.av.getAlignment().getGroups() != null)
{
}
/**
- * DOCUMENT ME!
+ * Method to 'set focus' of the PID slider panel
*
* @param ap
- * DOCUMENT ME!
- * @param ccs
- * DOCUMENT ME!
+ * the panel to repaint on change of slider
+ * @param rs
+ * the colour scheme to update on change of slider
* @param source
- * DOCUMENT ME!
+ * a text description for the panel's title
*
- * @return DOCUMENT ME!
+ * @return
*/
public static int setPIDSliderSource(AlignmentPanel ap,
- CollectionColourSchemeI ccs, String source)
+ ResidueShaderI rs, String source)
{
- int threshold = ccs.getThreshold();
+ int threshold = rs.getThreshold();
+
+ SliderPanel sliderPanel = null;
if (PIDSlider == null)
{
- sliderPanel = new SliderPanel(ap, threshold, false, ccs);
+ sliderPanel = new SliderPanel(ap, threshold, false, rs);
PIDSlider = new JInternalFrame();
PIDSlider.setContentPane(sliderPanel);
PIDSlider.setLayer(JLayeredPane.PALETTE_LAYER);
else
{
sliderPanel = (SliderPanel) PIDSlider.getContentPane();
- sliderPanel.cs = ccs;
- sliderPanel.valueField.setText(String.valueOf(ccs.getThreshold()));
+ sliderPanel.cs = rs;
+ sliderPanel.ap = ap;
+ sliderPanel.valueField.setText(String.valueOf(rs.getThreshold()));
+ sliderPanel.slider.setValue(rs.getThreshold());
}
- PIDSlider
- .setTitle(MessageManager.formatMessage(
- "label.percentage_identity_threshold",
- new String[] { source }));
+ PIDSlider.setTitle(MessageManager.formatMessage(
+ "label.percentage_identity_threshold",
+ new String[] { source == null ? BACKGROUND : source }));
if (ap.av.getAlignment().getGroups() != null)
{
* @param percent
* @param scheme
*/
- protected void updateColourScheme(int percent, CollectionColourSchemeI scheme)
+ protected void updateColourScheme(int percent, ResidueShaderI scheme)
{
if (scheme == null)
{