public class FeatureSettings extends Panel implements ItemListener,\r
MouseListener, MouseMotionListener\r
{\r
- final FeatureRenderer fr;\r
- final AlignmentPanel ap;\r
- final AlignViewport av;\r
- final Frame frame;\r
+ FeatureRenderer fr;\r
+ AlignmentPanel ap;\r
+ AlignViewport av;\r
+ Frame frame;\r
Panel groupPanel;\r
Panel featurePanel = new Panel();\r
ScrollPane scrollPane;\r
+ boolean alignmentHasFeatures = false;\r
\r
public FeatureSettings(AlignViewport av, final AlignmentPanel ap)\r
{\r
this.setLayout(new BorderLayout());\r
scrollPane = new ScrollPane();\r
scrollPane.add(featurePanel);\r
- add(scrollPane, BorderLayout.CENTER);\r
+ if (alignmentHasFeatures)\r
+ add(scrollPane, BorderLayout.CENTER);\r
+\r
if(groupPanel!=null)\r
{\r
groupPanel.setLayout(\r
- new GridLayout(groupPanel.getComponentCount() / 4, 4));\r
+ new GridLayout( fr.featureGroups.size() / 4 + 1, 4));\r
groupPanel.validate();\r
\r
add(groupPanel, BorderLayout.NORTH);\r
}\r
frame = new Frame();\r
frame.add(this);\r
- int height = featurePanel.getComponentCount()*50 ;\r
- if (height>400)\r
- height = 400;\r
+ int height = featurePanel.getComponentCount()*50 +30;\r
+\r
+ height = Math.max(100, height);\r
+ height = Math.min(400, height);\r
\r
- jalview.bin.JalviewLite.addFrame(frame, "Feature Settings", 250,\r
+ jalview.bin.JalviewLite.addFrame(frame, "Feature Settings", 280,\r
height);\r
}\r
\r
+ public void paint(Graphics g)\r
+ {\r
+ g.setColor(Color.black);\r
+ g.drawString("No Features added to this alignment!!", 10, 20);\r
+ }\r
+\r
void setTableData()\r
{\r
+ alignmentHasFeatures = false;\r
+\r
if(fr.featureGroups==null)\r
fr.featureGroups = new Hashtable();\r
- else\r
- fr.featureGroups.clear();\r
\r
Vector allFeatures = new Vector();\r
+ Vector allGroups = new Vector();\r
SequenceFeature[] tmpfeatures;\r
+ String group;\r
+\r
\r
for (int i = 0; i < av.alignment.getHeight(); i++)\r
{\r
if (av.alignment.getSequenceAt(i).getSequenceFeatures() == null)\r
continue;\r
\r
+ alignmentHasFeatures = true;\r
+\r
tmpfeatures = av.alignment.getSequenceAt(i).getSequenceFeatures();\r
int index = 0;\r
while (index < tmpfeatures.length)\r
{\r
- if(tmpfeatures[index].getFeatureGroup()!=null\r
- && tmpfeatures[index].getFeatureGroup().length()>0\r
- && !fr.featureGroups.containsKey(tmpfeatures[index].getFeatureGroup()))\r
+ if(tmpfeatures[index].getFeatureGroup()!=null)\r
{\r
- fr.featureGroups.put(tmpfeatures[index].getFeatureGroup(), new Boolean(true));\r
- if(groupPanel==null)\r
- {\r
- groupPanel = new Panel();\r
- }\r
-\r
- Checkbox check = new Checkbox(tmpfeatures[index].getFeatureGroup(), true);\r
- check.setFont(new Font("Serif", Font.BOLD, 12));\r
- check.addItemListener(this);\r
- groupPanel.add(check);\r
+ group = tmpfeatures[index].featureGroup;\r
+ if(!allGroups.contains(group))\r
+ {\r
+ allGroups.addElement(group);\r
+\r
+ boolean visible = true;\r
+ if (fr.featureGroups.containsKey(group))\r
+ {\r
+ visible = ( (Boolean) fr.featureGroups.get(group)).booleanValue();\r
+ }\r
+\r
+ fr.featureGroups.put(group, new Boolean(visible));\r
+\r
+ if (groupPanel == null)\r
+ {\r
+ groupPanel = new Panel();\r
+ }\r
+\r
+ Checkbox check = new Checkbox(group, visible);\r
+ check.setFont(new Font("Serif", Font.BOLD, 12));\r
+ check.addItemListener(this);\r
+ groupPanel.add(check);\r
+ }\r
}\r
\r
if (!allFeatures.contains(tmpfeatures[index].getType()))\r
{\r
allFeatures.addElement(tmpfeatures[index].getType());\r
}\r
-\r
-\r
- index ++;\r
+ index ++;\r
}\r
}\r
\r
- resetTable();\r
- featurePanel.setLayout(new GridLayout(allFeatures.size(), 2, 10,5));\r
- featurePanel.validate();\r
+ resetTable(false);\r
}\r
\r
- void resetTable()\r
+ //This routine adds and removes checkboxes depending on\r
+ //Group selection states\r
+ void resetTable(boolean groupsChanged)\r
{\r
- featurePanel.removeAll();\r
- Enumeration groups = fr.featureGroups.keys();\r
SequenceFeature [] tmpfeatures;\r
- String group, type;\r
- Vector checksAdded = new Vector();\r
-\r
- while(groups.hasMoreElements())\r
- {\r
- group = groups.nextElement().toString();\r
- if ( !( (Boolean) fr.featureGroups.get(group)).booleanValue())\r
- continue;\r
+ String group=null, type;\r
+ Vector visibleChecks = new Vector();\r
\r
for (int i = 0; i < av.alignment.getHeight(); i++)\r
- {\r
+ {\r
if (av.alignment.getSequenceAt(i).getSequenceFeatures() == null)\r
continue;\r
\r
int index = 0;\r
while (index < tmpfeatures.length)\r
{\r
- if (tmpfeatures[index].getFeatureGroup() != null &&\r
- tmpfeatures[index].getFeatureGroup().equals(group))\r
+ group = tmpfeatures[index].featureGroup;\r
+\r
+ if (group==null || fr.featureGroups.get(group)==null ||\r
+ ((Boolean) fr.featureGroups.get(group)).booleanValue())\r
{\r
type = tmpfeatures[index].getType();\r
- if(!checksAdded.contains(type))\r
+ if(!visibleChecks.contains(type) )\r
{\r
- checksAdded.addElement(type);\r
- Checkbox check = new Checkbox(type, true);\r
- check.addMouseListener(this);\r
- check.addMouseMotionListener(this);\r
- check.setBackground(fr.getColour(type));\r
- check.addItemListener(this);\r
- featurePanel.add(check);\r
+ visibleChecks.addElement(type);\r
}\r
}\r
index++;\r
}\r
}\r
- }\r
+\r
+ Component[] comps;\r
+ int cSize = featurePanel.getComponentCount();\r
+ Checkbox check;\r
+ //This will remove any checkboxes which shouldn't be\r
+ //visible\r
+ for (int i = 0; i < cSize; i++)\r
+ {\r
+ comps = featurePanel.getComponents();\r
+ check = (Checkbox) comps[i];\r
+ if (!visibleChecks.contains(check.getLabel()))\r
+ {\r
+ featurePanel.remove(i);\r
+ cSize --;\r
+ i--;\r
+ }\r
+ }\r
+\r
+ if(fr.renderOrder!=null)\r
+ {\r
+ //First add the checks in the previous render order,\r
+ //in case the window has been closed and reopened\r
+ for(int ro=fr.renderOrder.length-1; ro>-1; ro--)\r
+ {\r
+ String item = fr.renderOrder[ro];\r
+\r
+ if(!visibleChecks.contains(item))\r
+ continue;\r
+\r
+ visibleChecks.removeElement(item);\r
+\r
+ addCheck(false, item);\r
+ }\r
+ }\r
+\r
+ // now add checkboxes which should be visible,\r
+ // if they have not already been added\r
+ Enumeration en = visibleChecks.elements();\r
+ while(en.hasMoreElements())\r
+ {\r
+ addCheck(groupsChanged, en.nextElement().toString());\r
+ }\r
+\r
+\r
+ featurePanel.setLayout(new GridLayout(featurePanel.getComponentCount(), 1, 10,5));\r
featurePanel.validate();\r
+\r
+\r
if(scrollPane!=null)\r
scrollPane.validate();\r
+\r
+ itemStateChanged(null);\r
+ }\r
+\r
+ void addCheck(boolean groupsChanged, String type)\r
+ {\r
+ boolean addCheck;\r
+ Component [] comps = featurePanel.getComponents();\r
+ Checkbox check;\r
+ addCheck = true;\r
+ for (int i = 0; i < featurePanel.getComponentCount(); i++)\r
+ {\r
+ check = (Checkbox) comps[i];\r
+ if (check.getLabel().equals(type))\r
+ {\r
+ addCheck = false;\r
+ break;\r
+ }\r
+ }\r
+\r
+ if (addCheck)\r
+ {\r
+ boolean selected = false;\r
+ if (groupsChanged || av.featuresDisplayed.containsKey(type))\r
+ {\r
+ selected = true;\r
+ }\r
+\r
+ check = new Checkbox(type, selected);\r
+ check.addMouseListener(this);\r
+ check.addMouseMotionListener(this);\r
+ check.setBackground(fr.getColour(type));\r
+ check.addItemListener(this);\r
+ featurePanel.add(check);\r
+ }\r
}\r
\r
public void itemStateChanged(ItemEvent evt)\r
if (ap.overviewPanel != null)\r
ap.overviewPanel.updateOverviewImage();\r
\r
- resetTable();\r
+ resetTable(true);\r
return;\r
}\r
}\r
for (int i = 0; i < cSize; i++)\r
{\r
Checkbox check = (Checkbox) comps[i];\r
- if(!check.getState())\r
- continue;\r
-\r
tmp[tmpSize][0] = check.getLabel();\r
tmp[tmpSize][1] = fr.getColour(check.getLabel());\r
tmp[tmpSize][2] = new Boolean(check.getState());\r
\r
int height = evt.getY()+evt.getComponent().getLocation().y;\r
\r
-\r
if(height > this.getSize().height)\r
{\r
comp = featurePanel.getComponent(featurePanel.getComponentCount()-1);\r
if(comp!=null && comp instanceof Checkbox)\r
target = (Checkbox)comp;\r
\r
- if (selectedCheck != null && target != null && selectedCheck != target)\r
+ if ( selectedCheck != null\r
+ && target != null\r
+ && selectedCheck != target)\r
{\r
int targetIndex = -1;\r
for(int i=0; i<featurePanel.getComponentCount(); i++)\r
{ targetIndex = i; break; }\r
}\r
\r
-\r
featurePanel.remove(selectedCheck);\r
featurePanel.add(selectedCheck, targetIndex);\r
featurePanel.validate();\r
}\r
}\r
\r
+ public void setUserColour(String feature, Color col)\r
+ {\r
+ fr.setColour(feature, col);\r
+ featurePanel.removeAll();\r
+ resetTable(false);\r
+ ap.repaint();\r
+ }\r
\r
public void mouseEntered(MouseEvent evt){}\r
public void mouseExited(MouseEvent evt){}\r
- public void mouseClicked(MouseEvent evt){}\r
+ public void mouseClicked(MouseEvent evt)\r
+ {\r
+ Checkbox check = (Checkbox) evt.getSource();\r
+ if(evt.getClickCount()>1)\r
+ {\r
+ new UserDefinedColours(this, check.getLabel(),\r
+ fr.getColour(check.getLabel()));\r
+ }\r
+ }\r
public void mouseMoved(MouseEvent evt){}\r
}\r
git://source.jalview.org / jalview.git / blobdiff