/*\r
* Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
*\r
* This program is free software; you can redistribute it and/or\r
* modify it under the terms of the GNU General Public License\r
public class FeatureSettings extends JPanel\r
{\r
DasSourceBrowser dassourceBrowser;\r
+ jalview.io.DasSequenceFeatureFetcher dasFeatureFetcher;\r
JPanel settingsPane = new JPanel();\r
JPanel dasSettingsPane = new JPanel();\r
\r
final FeatureRenderer fr;\r
- final AlignFrame af;\r
+ public final AlignFrame af;\r
Object [][] originalData;\r
final JInternalFrame frame;\r
JScrollPane scrollPane = new JScrollPane();\r
JSlider transparency = new JSlider();\r
\r
JPanel transPanel = new JPanel(new FlowLayout());\r
- boolean alignmentHasFeatures = false;\r
\r
public FeatureSettings(AlignFrame af)\r
{\r
ex.printStackTrace();\r
}\r
\r
+ table = new JTable();\r
+ table.getTableHeader().setFont(new Font("Verdana", Font.PLAIN, 12));\r
+ table.setFont(new Font("Verdana", Font.PLAIN, 12));\r
+ table.setDefaultRenderer(Color.class,\r
+ new ColorRenderer());\r
+\r
+ table.setDefaultEditor(Color.class,\r
+ new ColorEditor());\r
+\r
+ table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
+\r
+ table.addMouseListener(new MouseAdapter()\r
+ {\r
+ public void mousePressed(MouseEvent evt)\r
+ {\r
+ selectedRow = table.rowAtPoint(evt.getPoint());\r
+ }\r
+ });\r
+\r
+ table.addMouseMotionListener(new MouseMotionAdapter()\r
+ {\r
+ public void mouseDragged(MouseEvent evt)\r
+ {\r
+ int newRow = table.rowAtPoint(evt.getPoint());\r
+ if (newRow != selectedRow\r
+ && selectedRow != -1\r
+ && newRow != -1)\r
+ {\r
+ Object[] temp = new Object[3];\r
+ temp[0] = table.getValueAt(selectedRow, 0);\r
+ temp[1] = table.getValueAt(selectedRow, 1);\r
+ temp[2] = table.getValueAt(selectedRow, 2);\r
+\r
+ table.setValueAt(table.getValueAt(newRow, 0), selectedRow, 0);\r
+ table.setValueAt(table.getValueAt(newRow, 1), selectedRow, 1);\r
+ table.setValueAt(table.getValueAt(newRow, 2), selectedRow, 2);\r
+\r
+ table.setValueAt(temp[0], newRow, 0);\r
+ table.setValueAt(temp[1], newRow, 1);\r
+ table.setValueAt(temp[2], newRow, 2);\r
+\r
+ selectedRow = newRow;\r
+ }\r
+ }\r
+ });\r
+\r
+ scrollPane.setViewportView(table);\r
+\r
dassourceBrowser = new DasSourceBrowser();\r
dasSettingsPane.add(dassourceBrowser, BorderLayout.CENTER);\r
\r
if (af.getViewport().featuresDisplayed == null || fr.renderOrder==null)\r
fr.findAllFeatures();\r
\r
-\r
setTableData();\r
\r
frame = new JInternalFrame();\r
frame.setLayer(JLayeredPane.PALETTE_LAYER);\r
}\r
\r
- public void setTableData()\r
+ synchronized public void setTableData()\r
{\r
- alignmentHasFeatures = false;\r
-\r
if (fr.featureGroups == null)\r
fr.featureGroups = new Hashtable();\r
\r
if (af.getViewport().alignment.getSequenceAt(i).getDatasetSequence().getSequenceFeatures() == null)\r
continue;\r
\r
- alignmentHasFeatures = true;\r
-\r
tmpfeatures = af.getViewport().alignment.getSequenceAt(i).getDatasetSequence().getSequenceFeatures();\r
\r
int index = 0;\r
{\r
visible = ( (Boolean) fr.featureGroups.get(group)).booleanValue();\r
}\r
- else\r
- {\r
- fr.featureGroups.put(group, new Boolean(visible));\r
+\r
if (groupPanel == null)\r
{\r
groupPanel = new JPanel();\r
}\r
\r
+ boolean alreadyAdded = false;\r
+ for(int g=0; g<groupPanel.getComponentCount(); g++)\r
+ {\r
+ if(((JCheckBox)groupPanel.getComponent(g))\r
+ .getText().equals(group))\r
+ {\r
+ alreadyAdded = true;\r
+ break;\r
+ }\r
+ }\r
+\r
+ if(alreadyAdded)\r
+ continue;\r
+\r
+ fr.featureGroups.put(group, new Boolean(visible));\r
+\r
final JCheckBox check = new JCheckBox(group, visible);\r
check.setFont(new Font("Serif", Font.BOLD, 12));\r
check.addItemListener(new ItemListener()\r
});\r
groupPanel.add(check);\r
}\r
- }\r
-\r
}\r
\r
if (!allFeatures.contains(tmpfeatures[index].getType()))\r
}\r
}\r
\r
-\r
- if(!alignmentHasFeatures)\r
- {\r
- // try\r
- // { frame.setClosed(true); }\r
- // catch (Exception ex){}\r
-\r
- // JOptionPane.showInternalMessageDialog(\r
- /// Desktop.desktop, "No features have been added to this alignment!",\r
- //\r
- // return;\r
- }\r
-\r
resetTable(false);\r
+\r
+ validate();\r
}\r
\r
\r
data[dataIndex][0] = type;\r
\r
data[dataIndex][1] = fr.getColour(type);\r
+ if (data[dataIndex][1] == null)\r
+ {\r
+ //"Colour has been updated in another view!!"\r
+ fr.renderOrder = null;\r
+ return;\r
+ }\r
+\r
data[dataIndex][2] = new Boolean(true);\r
dataIndex++;\r
}\r
System.arraycopy(data,0,originalData,0,data.length);\r
}\r
\r
- table = new JTable(new FeatureTableModel(data));\r
- scrollPane.setViewportView(table);\r
- table.getTableHeader().setFont(new Font("Verdana", Font.PLAIN, 12));\r
- table.setFont(new Font("Verdana", Font.PLAIN, 12));\r
- table.setDefaultRenderer(Color.class,\r
- new ColorRenderer());\r
-\r
- table.setDefaultEditor(Color.class,\r
- new ColorEditor());\r
-\r
+ table.setModel(new FeatureTableModel(data));\r
table.getColumnModel().getColumn(0).setPreferredWidth(200);\r
\r
- table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
-\r
- table.addMouseListener(new MouseAdapter()\r
- {\r
- public void mousePressed(MouseEvent evt)\r
- {\r
- selectedRow = table.rowAtPoint(evt.getPoint());\r
- }\r
- });\r
-\r
- table.addMouseMotionListener(new MouseMotionAdapter()\r
- {\r
- public void mouseDragged(MouseEvent evt)\r
- {\r
- int newRow = table.rowAtPoint(evt.getPoint());\r
- if(newRow!=selectedRow\r
- && selectedRow!=-1\r
- && newRow!=-1)\r
- {\r
- Object[] temp = new Object[3];\r
- temp[0] = table.getValueAt(selectedRow, 0);\r
- temp[1] = table.getValueAt(selectedRow, 1);\r
- temp[2] = table.getValueAt(selectedRow, 2);\r
-\r
- table.setValueAt(table.getValueAt(newRow, 0), selectedRow, 0);\r
- table.setValueAt(table.getValueAt(newRow, 1), selectedRow, 1);\r
- table.setValueAt(table.getValueAt(newRow, 2), selectedRow, 2);\r
-\r
- table.setValueAt(temp[0], newRow, 0);\r
- table.setValueAt(temp[1], newRow, 1);\r
- table.setValueAt(temp[2], newRow, 2);\r
-\r
- selectedRow = newRow;\r
- }\r
- }\r
- });\r
\r
if (groupPanel != null)\r
{\r
JPanel dasButtonPanel = new JPanel();\r
JButton fetchDAS = new JButton();\r
JButton saveDAS = new JButton();\r
+ JButton cancelDAS = new JButton();\r
private void jbInit()\r
throws Exception\r
{\r
});\r
dasButtonPanel.setBorder(BorderFactory.createEtchedBorder());\r
dasSettingsPane.setBorder(null);\r
+ cancelDAS.setEnabled(false);\r
+ cancelDAS.setText("Cancel Fetch");\r
+ cancelDAS.addActionListener(new ActionListener()\r
+ {\r
+ public void actionPerformed(ActionEvent e)\r
+ {\r
+ cancelDAS_actionPerformed(e);\r
+ }\r
+ });\r
this.add(tabbedPane, java.awt.BorderLayout.CENTER);\r
- tabbedPane.addTab("Display Settings", settingsPane );\r
+ tabbedPane.addTab("Feature Settings", settingsPane );\r
tabbedPane.addTab("DAS Settings", dasSettingsPane);\r
bigPanel.add(transPanel, java.awt.BorderLayout.SOUTH);\r
transPanel.add(transparency);\r
bigPanel.add(scrollPane, java.awt.BorderLayout.CENTER);\r
dasSettingsPane.add(dasButtonPanel, java.awt.BorderLayout.SOUTH);\r
dasButtonPanel.add(fetchDAS);\r
+ dasButtonPanel.add(cancelDAS);\r
dasButtonPanel.add(saveDAS);\r
settingsPane.add(bigPanel, java.awt.BorderLayout.CENTER);\r
settingsPane.add(buttonPanel, java.awt.BorderLayout.SOUTH);\r
\r
public void fetchDAS_actionPerformed(ActionEvent e)\r
{\r
+ fetchDAS.setEnabled(false);\r
+ cancelDAS.setEnabled(true);\r
Vector selectedSources = dassourceBrowser.getSelectedSources();\r
\r
SequenceI [] dataset, seqs ;\r
int iSize;\r
\r
if(af.getViewport().getSelectionGroup()!=null\r
- && af.getViewport().getSelectionGroup().getSize(false)>0)\r
+ && af.getViewport().getSelectionGroup().getSize()>0)\r
{\r
- iSize = af.getViewport().getSelectionGroup().getSize(false);\r
+ iSize = af.getViewport().getSelectionGroup().getSize();\r
dataset = new SequenceI[iSize];\r
seqs = af.getViewport().getSelectionGroup().\r
getSequencesInOrder(\r
dataset[i] = seqs[i].getDatasetSequence();\r
}\r
\r
- new jalview.io.DasSequenceFeatureFetcher(\r
+ dasFeatureFetcher =\r
+ new jalview.io.DasSequenceFeatureFetcher(\r
dataset,\r
- af,\r
+ this,\r
selectedSources);\r
\r
af.getViewport().setShowSequenceFeatures(true);\r
dassourceBrowser.saveProperties(jalview.bin.Cache.applicationProperties);\r
}\r
\r
+ public void complete()\r
+ {\r
+ fetchDAS.setEnabled(true);\r
+ cancelDAS.setEnabled(false);\r
+ }\r
+\r
+ public void cancelDAS_actionPerformed(ActionEvent e)\r
+ {\r
+ dasFeatureFetcher.cancel();\r
+ fetchDAS.setEnabled(true);\r
+ cancelDAS.setEnabled(false);\r
+ }\r
+\r
/////////////////////////////////////////////////////////////////////////\r
// http://java.sun.com/docs/books/tutorial/uiswing/components/table.html\r
/////////////////////////////////////////////////////////////////////////\r
git://source.jalview.org / jalview.git / blobdiff