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
static convenience methods for constructing and calculating conservation
[jalview.git]
/
src
/
jalview
/
appletgui
/
FeatureSettings.java
diff --git
a/src/jalview/appletgui/FeatureSettings.java
b/src/jalview/appletgui/FeatureSettings.java
index
e137416
..
4a0ae16
100755
(executable)
--- a/
src/jalview/appletgui/FeatureSettings.java
+++ b/
src/jalview/appletgui/FeatureSettings.java
@@
-1,6
+1,6
@@
/*
* Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
/*
* Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-118,8
+118,10
@@
public class FeatureSettings extends Panel implements ItemListener,
if (groupPanel != null)
{
if (groupPanel != null)
{
- groupPanel.setLayout(new GridLayout(fr.featureGroups.size() / 4 + 1,
- 4));
+ groupPanel
+ .setLayout(new GridLayout(
+ (fr.featureGroups.size() - fr.hiddenGroups.size()) / 4 + 1,
+ 4));
groupPanel.validate();
add(groupPanel, BorderLayout.NORTH);
groupPanel.validate();
add(groupPanel, BorderLayout.NORTH);
@@
-261,7
+263,7
@@
public class FeatureSettings extends Panel implements ItemListener,
rdrw = true;
groupPanel.removeAll();
}
rdrw = true;
groupPanel.removeAll();
}
-
+ // TODO: JAL-964 - smoothly incorporate new group entries if panel already displayed and new groups present
Enumeration gps = fr.featureGroups.keys();
while (gps.hasMoreElements())
{
Enumeration gps = fr.featureGroups.keys();
while (gps.hasMoreElements())
{
@@
-273,6
+275,7
@@
public class FeatureSettings extends Panel implements ItemListener,
check.addMouseListener(this);
check.setFont(new Font("Serif", Font.BOLD, 12));
check.addItemListener(this);
check.addMouseListener(this);
check.setFont(new Font("Serif", Font.BOLD, 12));
check.addItemListener(this);
+ check.setVisible(fr.hiddenGroups.contains(group));
groupPanel.add(check);
}
if (rdrw)
groupPanel.add(check);
}
if (rdrw)