X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSliderPanel.java;h=940bab27a161d51cc861073dd64c9ca458983678;hb=1e9f882c52f5b95d198c42973e7b2b1ce2b420df;hp=ec53e93e1e96e0db1b879ff24b694a46a8674ac6;hpb=42498abb930c08393b09fc7af2564b7f210ac294;p=jalview.git diff --git a/src/jalview/gui/SliderPanel.java b/src/jalview/gui/SliderPanel.java index ec53e93..940bab2 100755 --- a/src/jalview/gui/SliderPanel.java +++ b/src/jalview/gui/SliderPanel.java @@ -44,14 +44,11 @@ import javax.swing.event.InternalFrameEvent; * @author $author$ * @version $Revision$ */ +@SuppressWarnings("serial") public class SliderPanel extends GSliderPanel { private static final String BACKGROUND = "Background"; - static JInternalFrame conservationSlider; - - static JInternalFrame PIDSlider; - AlignmentPanel ap; boolean forConservation = true; @@ -65,6 +62,11 @@ public class SliderPanel extends GSliderPanel */ public static SliderPanel getSliderPanel() { + + JInternalFrame conservationSlider = getConservationSlider(); + + JInternalFrame PIDSlider = getPIDSlider(); + if (conservationSlider != null && conservationSlider.isVisible()) { return (SliderPanel) conservationSlider.getContentPane(); @@ -99,15 +101,15 @@ public class SliderPanel extends GSliderPanel if (forConservation) { - label.setText(MessageManager - .getString("label.enter_value_increase_conservation_visibility")); + label.setText(MessageManager.getString( + "label.enter_value_increase_conservation_visibility")); slider.setMinimum(0); slider.setMaximum(100); } else { - label.setText(MessageManager - .getString("label.enter_percentage_identity_above_which_colour_residues")); + label.setText(MessageManager.getString( + "label.enter_percentage_identity_above_which_colour_residues")); slider.setMinimum(0); slider.setMaximum(100); } @@ -117,7 +119,7 @@ public class SliderPanel extends GSliderPanel @Override public void stateChanged(ChangeEvent evt) { - valueField.setText(slider.getValue() + ""); + valueField.setText(String.valueOf(slider.getValue())); valueChanged(slider.getValue()); } }); @@ -127,12 +129,12 @@ public class SliderPanel extends GSliderPanel @Override public void mouseReleased(MouseEvent evt) { - ap.paintAlignment(true); + ap.paintAlignment(true, true); } }); slider.setValue(value); - valueField.setText(value + ""); + valueField.setText(String.valueOf(value)); } /** @@ -152,25 +154,29 @@ public class SliderPanel extends GSliderPanel { SliderPanel sliderPanel = null; + JInternalFrame conservationSlider = getConservationSlider(); + if (conservationSlider == null) { sliderPanel = new SliderPanel(ap, rs.getConservationInc(), true, rs); - conservationSlider = new JInternalFrame(); + conservationSlider = Desktop + .getInstance().conservationSlider = new JInternalFrame(); conservationSlider.setContentPane(sliderPanel); conservationSlider.setLayer(JLayeredPane.PALETTE_LAYER); } else { sliderPanel = (SliderPanel) conservationSlider.getContentPane(); - sliderPanel.valueField.setText(String.valueOf(rs.getConservationInc())); + 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 == null ? BACKGROUND : source })); + "label.conservation_colour_increment", new String[] + { source == null ? BACKGROUND : source })); List groups = ap.av.getAlignment().getGroups(); if (groups != null && !groups.isEmpty()) @@ -190,12 +196,14 @@ public class SliderPanel extends GSliderPanel */ public static void hidePIDSlider() { + JInternalFrame PIDSlider = getPIDSlider(); + if (PIDSlider != null) { try { PIDSlider.setClosed(true); - PIDSlider = null; + Desktop.getInstance().PIDSlider = null; } catch (PropertyVetoException ex) { } @@ -207,12 +215,14 @@ public class SliderPanel extends GSliderPanel */ public static void hideConservationSlider() { + JInternalFrame conservationSlider = getConservationSlider(); + if (conservationSlider != null) { try { conservationSlider.setClosed(true); - conservationSlider = null; + Desktop.getInstance().conservationSlider = null; } catch (PropertyVetoException ex) { } @@ -226,19 +236,21 @@ public class SliderPanel extends GSliderPanel { hidePIDSlider(); + JInternalFrame conservationSlider = getConservationSlider(); + if (!conservationSlider.isVisible()) { Desktop.addInternalFrame(conservationSlider, - conservationSlider.getTitle(), 420, 90, false); - conservationSlider - .addInternalFrameListener(new InternalFrameAdapter() - { - @Override - public void internalFrameClosed(InternalFrameEvent e) - { - conservationSlider = null; - } - }); + conservationSlider.getTitle(), true, FRAME_WIDTH, + FRAME_HEIGHT, false, true); + conservationSlider.addInternalFrameListener(new InternalFrameAdapter() + { + @Override + public void internalFrameClosed(InternalFrameEvent e) + { + Desktop.getInstance().conservationSlider = null; + } + }); conservationSlider.setLayer(JLayeredPane.PALETTE_LAYER); } } @@ -255,17 +267,19 @@ public class SliderPanel extends GSliderPanel * * @return */ - public static int setPIDSliderSource(AlignmentPanel ap, - ResidueShaderI rs, String source) + public static int setPIDSliderSource(AlignmentPanel ap, ResidueShaderI rs, + String source) { int threshold = rs.getThreshold(); SliderPanel sliderPanel = null; + JInternalFrame PIDSlider = getPIDSlider(); + if (PIDSlider == null) { sliderPanel = new SliderPanel(ap, threshold, false, rs); - PIDSlider = new JInternalFrame(); + PIDSlider = Desktop.getInstance().PIDSlider = new JInternalFrame(); PIDSlider.setContentPane(sliderPanel); PIDSlider.setLayer(JLayeredPane.PALETTE_LAYER); } @@ -279,8 +293,8 @@ public class SliderPanel extends GSliderPanel } PIDSlider.setTitle(MessageManager.formatMessage( - "label.percentage_identity_threshold", - new String[] { source == null ? BACKGROUND : source })); + "label.percentage_identity_threshold", new String[] + { source == null ? BACKGROUND : source })); if (ap.av.getAlignment().getGroups() != null) { @@ -303,17 +317,19 @@ public class SliderPanel extends GSliderPanel { hideConservationSlider(); + JInternalFrame PIDSlider = getPIDSlider(); + if (!PIDSlider.isVisible()) { - Desktop.addInternalFrame(PIDSlider, PIDSlider.getTitle(), 420, 90, - false); + Desktop.addInternalFrame(PIDSlider, PIDSlider.getTitle(), true, + FRAME_WIDTH, FRAME_HEIGHT, false, true); PIDSlider.setLayer(JLayeredPane.PALETTE_LAYER); PIDSlider.addInternalFrameListener(new InternalFrameAdapter() { @Override public void internalFrameClosed(InternalFrameEvent e) { - PIDSlider = null; + Desktop.getInstance().PIDSlider = null; } }); PIDSlider.setLayer(JLayeredPane.PALETTE_LAYER); @@ -365,7 +381,7 @@ public class SliderPanel extends GSliderPanel } if (forConservation) { - if (!scheme.conservationApplied()) + if (!scheme.conservationApplied() && sg != null) { /* * first time the colour scheme has had Conservation shading applied @@ -396,7 +412,6 @@ public class SliderPanel extends GSliderPanel public void setAllGroupsCheckEnabled(boolean b) { allGroupsCheck.setEnabled(b); - allGroupsCheck.setSelected(ap.av.getColourAppliesToAllGroups()); } /** @@ -448,22 +463,6 @@ public class SliderPanel extends GSliderPanel } } - public static int getConservationValue() - { - return getValue(conservationSlider); - } - - static int getValue(JInternalFrame slider) - { - return slider == null ? 0 : ((SliderPanel) slider.getContentPane()) - .getValue(); - } - - public static int getPIDValue() - { - return getValue(PIDSlider); - } - /** * Answers true if the SliderPanel is for Conservation, false if it is for PID * threshold @@ -484,6 +483,9 @@ public class SliderPanel extends GSliderPanel public String getTitle() { String title = null; + JInternalFrame conservationSlider = getConservationSlider(); + JInternalFrame PIDSlider = getPIDSlider(); + if (isForConservation()) { if (conservationSlider != null) @@ -497,4 +499,63 @@ public class SliderPanel extends GSliderPanel } return title; } + + /** + * Returns the singleton instance of the Conservation slider within current + * application scope, or null if there is none + * + * @return + */ + private static JInternalFrame getConservationSlider() + { + return Desktop.getInstance().conservationSlider; + } + + /** + * Returns the singleton instance of the PID slider within current application + * scope, or null if there is none + * + * @return + */ + private static JInternalFrame getPIDSlider() + { + return Desktop.getInstance().PIDSlider; + } + + /** + * Returns the current value of the Conservation slider, or zero if there is + * no such slider + * + * @param slider + * @return + */ + public static int getConservationValue() + { + return getValue(getConservationSlider()); + } + + /** + * Returns the current value of the PID slider, or zero if there is no such + * slider + * + * @param slider + * @return + */ + public static int getPIDValue() + { + return getValue(getPIDSlider()); + } + + /** + * Returns the current value of the given slider, or zero if {@code slider} is + * null + * + * @param slider + * @return + */ + static int getValue(JInternalFrame slider) + { + return slider == null ? 0 + : ((SliderPanel) slider.getContentPane()).getValue(); + } }