X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationColourChooser.java;h=39f3a1359fae067e7236841a1efa24a24c0ff17e;hb=ae216fceddd8539d20fa5425cdaef3da73aba8f0;hp=7c9a118bc20f6f54222a99f402a39bcb566e5653;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git
diff --git a/src/jalview/gui/AnnotationColourChooser.java b/src/jalview/gui/AnnotationColourChooser.java
old mode 100755
new mode 100644
index 7c9a118..39f3a13
--- a/src/jalview/gui/AnnotationColourChooser.java
+++ b/src/jalview/gui/AnnotationColourChooser.java
@@ -1,19 +1,21 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
* Copyright (C) 2014 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;
@@ -31,6 +33,8 @@ import net.miginfocom.swing.MigLayout;
import jalview.bin.Cache;
import jalview.datamodel.*;
import jalview.schemes.*;
+import jalview.util.MessageManager;
+
import java.awt.Dimension;
public class AnnotationColourChooser extends JPanel
@@ -48,8 +52,10 @@ public class AnnotationColourChooser extends JPanel
jalview.datamodel.AlignmentAnnotation currentAnnotation;
boolean adjusting = false;
+
/**
- * enabled if the user is dragging the slider - try to keep updates to a minimun
+ * enabled if the user is dragging the slider - try to keep updates to a
+ * minimun
*/
boolean sliderDragging = false;
@@ -72,7 +78,9 @@ public class AnnotationColourChooser extends JPanel
frame = new JInternalFrame();
frame.setContentPane(this);
frame.setLayer(JLayeredPane.PALETTE_LAYER);
- Desktop.addInternalFrame(frame, "Colour by Annotation", 520, 215);
+ Desktop.addInternalFrame(frame,
+ MessageManager.getString("label.colour_by_annotation"), 520,
+ 215);
slider.addChangeListener(new ChangeListener()
{
@@ -90,21 +98,22 @@ public class AnnotationColourChooser extends JPanel
@Override
public void mousePressed(MouseEvent e)
{
- sliderDragging=true;
+ sliderDragging = true;
super.mousePressed(e);
}
@Override
public void mouseDragged(MouseEvent e)
{
- sliderDragging=true;
+ sliderDragging = true;
super.mouseDragged(e);
}
+
public void mouseReleased(MouseEvent evt)
{
if (sliderDragging)
{
- sliderDragging=false;
+ sliderDragging = false;
valueChanged(true);
}
ap.paintAlignment(true);
@@ -119,24 +128,29 @@ public class AnnotationColourChooser extends JPanel
// Always get default shading from preferences.
setDefaultMinMax();
+ adjusting = true;
if (oldcs instanceof AnnotationColourGradient)
{
AnnotationColourGradient acg = (AnnotationColourGradient) oldcs;
- currentColours.setSelected(acg.predefinedColours);
- if (!acg.predefinedColours)
+ currentColours.setSelected(acg.isPredefinedColours()
+ || acg.getBaseColour() != null);
+ if (!acg.isPredefinedColours() && acg.getBaseColour() == null)
{
minColour.setBackground(acg.getMinColour());
maxColour.setBackground(acg.getMaxColour());
}
seqAssociated.setSelected(acg.isSeqAssociated());
+
}
- adjusting = true;
annotations = new JComboBox(
getAnnotationItems(seqAssociated.isSelected()));
- threshold.addItem("No Threshold");
- threshold.addItem("Above Threshold");
- threshold.addItem("Below Threshold");
+ threshold.addItem(MessageManager
+ .getString("label.threshold_feature_no_thereshold"));
+ threshold.addItem(MessageManager
+ .getString("label.threshold_feature_above_thereshold"));
+ threshold.addItem(MessageManager
+ .getString("label.threshold_feature_below_thereshold"));
if (oldcs instanceof AnnotationColourGradient)
{
@@ -145,13 +159,13 @@ public class AnnotationColourChooser extends JPanel
switch (acg.getAboveThreshold())
{
case AnnotationColourGradient.NO_THRESHOLD:
- threshold.setSelectedItem("No Threshold");
+ threshold.setSelectedIndex(0);
break;
case AnnotationColourGradient.ABOVE_THRESHOLD:
- threshold.setSelectedItem("Above Threshold");
+ threshold.setSelectedIndex(1);
break;
case AnnotationColourGradient.BELOW_THRESHOLD:
- threshold.setSelectedItem("Below Threshold");
+ threshold.setSelectedIndex(2);
break;
default:
throw new Error(
@@ -216,6 +230,7 @@ public class AnnotationColourChooser extends JPanel
System.arraycopy(anmap, 0, annmap, 0, annmap.length);
return list;
}
+
private void setDefaultMinMax()
{
minColour.setBackground(Cache.getDefaultColour("ANNOTATIONCOLOUR_MIN",
@@ -240,7 +255,7 @@ public class AnnotationColourChooser extends JPanel
minColour.setFont(JvSwingUtils.getLabelFont());
minColour.setBorder(BorderFactory.createEtchedBorder());
minColour.setPreferredSize(new Dimension(40, 20));
- minColour.setToolTipText("Minimum Colour");
+ minColour.setToolTipText(MessageManager.getString("label.min_colour"));
minColour.addMouseListener(new MouseAdapter()
{
public void mousePressed(MouseEvent e)
@@ -254,7 +269,7 @@ public class AnnotationColourChooser extends JPanel
maxColour.setFont(JvSwingUtils.getLabelFont());
maxColour.setBorder(BorderFactory.createEtchedBorder());
maxColour.setPreferredSize(new Dimension(40, 20));
- maxColour.setToolTipText("Maximum Colour");
+ maxColour.setToolTipText(MessageManager.getString("label.max_colour"));
maxColour.addMouseListener(new MouseAdapter()
{
public void mousePressed(MouseEvent e)
@@ -266,7 +281,7 @@ public class AnnotationColourChooser extends JPanel
}
});
ok.setOpaque(false);
- ok.setText("OK");
+ ok.setText(MessageManager.getString("action.ok"));
ok.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -275,7 +290,7 @@ public class AnnotationColourChooser extends JPanel
}
});
cancel.setOpaque(false);
- cancel.setText("Cancel");
+ cancel.setText(MessageManager.getString("action.cancel"));
cancel.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -284,9 +299,9 @@ public class AnnotationColourChooser extends JPanel
}
});
defColours.setOpaque(false);
- defColours.setText("Defaults");
- defColours
- .setToolTipText("Reset min and max colours to defaults from user preferences.");
+ defColours.setText(MessageManager.getString("action.set_defaults"));
+ defColours.setToolTipText(MessageManager
+ .getString("label.reset_min_max_colours_to_defaults"));
defColours.addActionListener(new ActionListener()
{
@@ -328,7 +343,8 @@ public class AnnotationColourChooser extends JPanel
thresholdValue.setColumns(7);
currentColours.setFont(JvSwingUtils.getLabelFont());
currentColours.setOpaque(false);
- currentColours.setText("Use Original Colours");
+ currentColours.setText(MessageManager
+ .getString("label.use_original_colours"));
currentColours.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -338,7 +354,8 @@ public class AnnotationColourChooser extends JPanel
});
thresholdIsMin.setBackground(Color.white);
thresholdIsMin.setFont(JvSwingUtils.getLabelFont());
- thresholdIsMin.setText("Threshold is Min/Max");
+ thresholdIsMin.setText(MessageManager
+ .getString("label.threshold_minmax"));
thresholdIsMin.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent actionEvent)
@@ -348,7 +365,8 @@ public class AnnotationColourChooser extends JPanel
});
seqAssociated.setBackground(Color.white);
seqAssociated.setFont(JvSwingUtils.getLabelFont());
- seqAssociated.setText("Per-sequence only");
+ seqAssociated.setText(MessageManager
+ .getString("label.per_sequence_only"));
seqAssociated.addActionListener(new ActionListener()
{
@@ -487,11 +505,11 @@ public class AnnotationColourChooser extends JPanel
.getSelectedIndex()]];
int aboveThreshold = -1;
- if (threshold.getSelectedItem().equals("Above Threshold"))
+ if (threshold.getSelectedIndex() == 1)
{
aboveThreshold = AnnotationColourGradient.ABOVE_THRESHOLD;
}
- else if (threshold.getSelectedItem().equals("Below Threshold"))
+ else if (threshold.getSelectedIndex() == 2)
{
aboveThreshold = AnnotationColourGradient.BELOW_THRESHOLD;
}
@@ -549,7 +567,7 @@ public class AnnotationColourChooser extends JPanel
if (currentAnnotation.graphMin == 0f
&& currentAnnotation.graphMax == 0f)
{
- acg.predefinedColours = true;
+ acg.setPredefinedColours(true);
}
acg.thresholdIsMinMax = thresholdIsMin.isSelected();
@@ -673,7 +691,8 @@ public class AnnotationColourChooser extends JPanel
{
return;
}
- // TODO: JAL-1327 only update visible annotation thresholds if allAnnotation is false, since we only need to provide a quick visual indicator
+ // TODO: JAL-1327 only update visible annotation thresholds if allAnnotation
+ // is false, since we only need to provide a quick visual indicator
float thr = currentAnnotation.threshold.value;
for (int i = 0; i < av.getAlignment().getAlignmentAnnotation().length; i++)