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
JAL-3187 set initial state of checkbox from viewport
[jalview.git]
/
src
/
jalview
/
gui
/
SliderPanel.java
diff --git
a/src/jalview/gui/SliderPanel.java
b/src/jalview/gui/SliderPanel.java
index
ec53e93
..
93a2457
100755
(executable)
--- a/
src/jalview/gui/SliderPanel.java
+++ b/
src/jalview/gui/SliderPanel.java
@@
-99,15
+99,15
@@
public class SliderPanel extends GSliderPanel
if (forConservation)
{
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
{
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.setMinimum(0);
slider.setMaximum(100);
}
@@
-127,7
+127,7
@@
public class SliderPanel extends GSliderPanel
@Override
public void mouseReleased(MouseEvent evt)
{
@Override
public void mouseReleased(MouseEvent evt)
{
- ap.paintAlignment(true);
+ ap.paintAlignment(true, true);
}
});
}
});
@@
-162,15
+162,16
@@
public class SliderPanel extends GSliderPanel
else
{
sliderPanel = (SliderPanel) conservationSlider.getContentPane();
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(
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<SequenceGroup> groups = ap.av.getAlignment().getGroups();
if (groups != null && !groups.isEmpty())
List<SequenceGroup> groups = ap.av.getAlignment().getGroups();
if (groups != null && !groups.isEmpty())
@@
-230,15
+231,14
@@
public class SliderPanel extends GSliderPanel
{
Desktop.addInternalFrame(conservationSlider,
conservationSlider.getTitle(), 420, 90, false);
{
Desktop.addInternalFrame(conservationSlider,
conservationSlider.getTitle(), 420, 90, false);
- conservationSlider
- .addInternalFrameListener(new InternalFrameAdapter()
- {
- @Override
- public void internalFrameClosed(InternalFrameEvent e)
- {
- conservationSlider = null;
- }
- });
+ conservationSlider.addInternalFrameListener(new InternalFrameAdapter()
+ {
+ @Override
+ public void internalFrameClosed(InternalFrameEvent e)
+ {
+ conservationSlider = null;
+ }
+ });
conservationSlider.setLayer(JLayeredPane.PALETTE_LAYER);
}
}
conservationSlider.setLayer(JLayeredPane.PALETTE_LAYER);
}
}
@@
-255,8
+255,8
@@
public class SliderPanel extends GSliderPanel
*
* @return
*/
*
* @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();
{
int threshold = rs.getThreshold();
@@
-279,8
+279,8
@@
public class SliderPanel extends GSliderPanel
}
PIDSlider.setTitle(MessageManager.formatMessage(
}
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)
{
if (ap.av.getAlignment().getGroups() != null)
{
@@
-365,7
+365,7
@@
public class SliderPanel extends GSliderPanel
}
if (forConservation)
{
}
if (forConservation)
{
- if (!scheme.conservationApplied())
+ if (!scheme.conservationApplied() && sg != null)
{
/*
* first time the colour scheme has had Conservation shading applied
{
/*
* first time the colour scheme has had Conservation shading applied
@@
-455,8
+455,8
@@
public class SliderPanel extends GSliderPanel
static int getValue(JInternalFrame slider)
{
static int getValue(JInternalFrame slider)
{
- return slider == null ? 0 : ((SliderPanel) slider.getContentPane())
- .getValue();
+ return slider == null ? 0
+ : ((SliderPanel) slider.getContentPane()).getValue();
}
public static int getPIDValue()
}
public static int getPIDValue()