X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSliderPanel.java;h=af77c48cacdf0077a610c291956273b58680b394;hb=0c608482722344e2be221a1a39405106de55d25e;hp=f53204ea8be209baab6835690ff82696c0b881f2;hpb=854fa199e6dd89266237dc803ddc88bf7ba5bdcc;p=jalview.git
diff --git a/src/jalview/gui/SliderPanel.java b/src/jalview/gui/SliderPanel.java
index f53204e..af77c48 100755
--- a/src/jalview/gui/SliderPanel.java
+++ b/src/jalview/gui/SliderPanel.java
@@ -1,33 +1,39 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.gui;
-import java.util.*;
+import jalview.datamodel.SequenceGroup;
+import jalview.jbgui.GSliderPanel;
+import jalview.schemes.ColourSchemeI;
+import jalview.util.MessageManager;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.beans.PropertyVetoException;
+import java.util.Iterator;
-import jalview.datamodel.*;
-import jalview.jbgui.*;
-import jalview.schemes.*;
-import jalview.util.MessageManager;
+import javax.swing.JInternalFrame;
+import javax.swing.JLayeredPane;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
/**
* DOCUMENT ME!
@@ -70,19 +76,22 @@ 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);
}
slider.addChangeListener(new ChangeListener()
{
+ @Override
public void stateChanged(ChangeEvent evt)
{
valueField.setText(slider.getValue() + "");
@@ -92,6 +101,7 @@ public class SliderPanel extends GSliderPanel
slider.addMouseListener(new MouseAdapter()
{
+ @Override
public void mouseReleased(MouseEvent evt)
{
ap.paintAlignment(true);
@@ -132,8 +142,10 @@ public class SliderPanel extends GSliderPanel
sp.cs = cs;
}
- conservationSlider.setTitle("Conservation Colour Increment (" + source
- + ")");
+ conservationSlider
+ .setTitle(MessageManager.formatMessage(
+ "label.conservation_colour_increment",
+ new String[] { source }));
if (ap.av.getAlignment().getGroups() != null)
{
@@ -147,6 +159,28 @@ public class SliderPanel extends GSliderPanel
return sp.getValue();
}
+ public static void hidePIDSlider()
+ {
+ try
+ {
+ PIDSlider.setClosed(true);
+ PIDSlider = null;
+ } catch (PropertyVetoException ex)
+ {
+ }
+ }
+
+ public static void hideConservationSlider()
+ {
+ try
+ {
+ conservationSlider.setClosed(true);
+ conservationSlider = null;
+ } catch (PropertyVetoException ex)
+ {
+ }
+ }
+
/**
* DOCUMENT ME!
*/
@@ -167,6 +201,7 @@ public class SliderPanel extends GSliderPanel
conservationSlider
.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()
{
+ @Override
public void internalFrameClosed(
javax.swing.event.InternalFrameEvent e)
{
@@ -209,7 +244,10 @@ public class SliderPanel extends GSliderPanel
pid.cs = cs;
}
- PIDSlider.setTitle("Percentage Identity Threshold (" + source + ")");
+ PIDSlider
+ .setTitle(MessageManager.formatMessage(
+ "label.percentage_identity_threshold",
+ new String[] { source }));
if (ap.av.getAlignment().getGroups() != null)
{
@@ -244,6 +282,7 @@ public class SliderPanel extends GSliderPanel
PIDSlider
.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()
{
+ @Override
public void internalFrameClosed(
javax.swing.event.InternalFrameEvent e)
{
@@ -283,13 +322,15 @@ public class SliderPanel extends GSliderPanel
}
else
{
- toChange.setThreshold(i, ap.av.getIgnoreGapsConsensus());
+ toChange.setThreshold(i, ap.av.isIgnoreGapsConsensus());
}
if (allGroups != null && allGroups.hasNext())
{
while ((toChange = allGroups.next().cs) == null
&& allGroups.hasNext())
+ {
;
+ }
}
else
{
@@ -297,7 +338,7 @@ public class SliderPanel extends GSliderPanel
}
}
- ap.seqPanel.seqCanvas.repaint();
+ ap.getSeqPanel().seqCanvas.repaint();
}
/**
@@ -314,24 +355,6 @@ public class SliderPanel extends GSliderPanel
/**
* DOCUMENT ME!
*
- * @param e
- * DOCUMENT ME!
- */
- public void valueField_actionPerformed(ActionEvent e)
- {
- try
- {
- int i = Integer.parseInt(valueField.getText());
- slider.setValue(i);
- } catch (NumberFormatException ex)
- {
- valueField.setText(slider.getValue() + "");
- }
- }
-
- /**
- * DOCUMENT ME!
- *
* @param value
* DOCUMENT ME!
*/
@@ -350,6 +373,7 @@ public class SliderPanel extends GSliderPanel
return Integer.parseInt(valueField.getText());
}
+ @Override
public void slider_mouseReleased(MouseEvent e)
{
if (ap.overviewPanel != null)