X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFeatureSettings.java;h=ef688f7b6327f695b76c1f89f75844cbdb25245f;hb=488e3a038c2ba1a3926f2af5eaea97ba76e028d0;hp=3979ebecf3af9e9e09bdfa72d3aeb7c894bef6cf;hpb=391968dd70ca76090306df9b5852bbef10ab4ede;p=jalview.git diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java index 3979ebe..ef688f7 100755 --- a/src/jalview/gui/FeatureSettings.java +++ b/src/jalview/gui/FeatureSettings.java @@ -1,6 +1,6 @@ /* * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -28,288 +28,293 @@ import java.awt.event.*; import javax.swing.table.*; import java.io.*; import jalview.io.JalviewFileChooser; +import java.awt.BorderLayout; +import java.awt.Font; +import java.awt.Color; public class FeatureSettings extends JPanel { + DasSourceBrowser dassourceBrowser; + JPanel settingsPane = new JPanel(); + JPanel dasSettingsPane = new JPanel(); final FeatureRenderer fr; - final AlignmentPanel ap; - final AlignViewport av; - Hashtable allFeatures; + final AlignFrame af; Object [][] originalData; final JInternalFrame frame; JScrollPane scrollPane = new JScrollPane(); JTable table; JPanel groupPanel; + JSlider transparency = new JSlider(); - public FeatureSettings(AlignViewport av, final AlignmentPanel ap) + JPanel transPanel = new JPanel(new FlowLayout()); + + public FeatureSettings(AlignFrame af) { - this.ap = ap; - this.av = av; - fr = ap.seqPanel.seqCanvas.getFeatureRenderer(); - av.alignment.getSequences(); - frame = new JInternalFrame(); - frame.setContentPane(this); - Desktop.addInternalFrame(frame, "Sequence Feature Settings", 400, 300); + this.af = af; + fr = af.getFeatureRenderer(); - setTableData(); + transparency.setMaximum( 100 - (int)(fr.transparency*100) ) ; - final JSlider transparency = new JSlider(0, 70, 0); - transparency.addChangeListener(new ChangeListener() - { - public void stateChanged(ChangeEvent evt) - { - fr.setTransparency( (float) (100 - transparency.getValue()) / 100f); - ap.repaint(); - } - }); + try + { + jbInit(); + } + catch (Exception ex) + { + ex.printStackTrace(); + } - JPanel transPanel = new JPanel(new FlowLayout()); - transPanel.add(new JLabel("Transparency")); - transPanel.add(transparency); + table = new JTable(); + table.getTableHeader().setFont(new Font("Verdana", Font.PLAIN, 12)); + table.setFont(new Font("Verdana", Font.PLAIN, 12)); + table.setDefaultRenderer(Color.class, + new ColorRenderer()); - ////////////////////////////////////////////// - //We're going to need those OK cancel buttons - JPanel buttonPanel = new JPanel(new FlowLayout()); - JButton button = new JButton("OK"); - button.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent evt) - { - try - { - frame.setClosed(true); - } - catch (Exception exe) - {} - } - }); - buttonPanel.add(button); - button = new JButton("Cancel"); - button.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent evt) - { - try - { - updateFeatureRenderer(originalData); - frame.setClosed(true); - } - catch (Exception exe) - {} - } - }); - buttonPanel.add(button); + table.setDefaultEditor(Color.class, + new ColorEditor()); - button = new JButton("Load Colours"); - button.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent evt) - { - load(); - } - }); - buttonPanel.add(button); - button = new JButton("Save Colours"); - button.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent evt) - { - save(); - } - }); - buttonPanel.add(button); + table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - this.setLayout(new BorderLayout()); - JPanel bigPanel = new JPanel(new BorderLayout()); - bigPanel.add(transPanel, BorderLayout.SOUTH); - bigPanel.add(scrollPane, BorderLayout.CENTER); - if(groupPanel!=null) - { - groupPanel.setLayout( - new GridLayout(groupPanel.getComponentCount()/3, 4)); - groupPanel.validate(); - bigPanel.add(groupPanel, BorderLayout.NORTH); - } - add(bigPanel, BorderLayout.CENTER); - add(buttonPanel, BorderLayout.SOUTH); + table.addMouseListener(new MouseAdapter() + { + public void mousePressed(MouseEvent evt) + { + selectedRow = table.rowAtPoint(evt.getPoint()); + } + }); + table.addMouseMotionListener(new MouseMotionAdapter() + { + public void mouseDragged(MouseEvent evt) + { + int newRow = table.rowAtPoint(evt.getPoint()); + if (newRow != selectedRow + && selectedRow != -1 + && newRow != -1) + { + Object[] temp = new Object[3]; + temp[0] = table.getValueAt(selectedRow, 0); + temp[1] = table.getValueAt(selectedRow, 1); + temp[2] = table.getValueAt(selectedRow, 2); - } + table.setValueAt(table.getValueAt(newRow, 0), selectedRow, 0); + table.setValueAt(table.getValueAt(newRow, 1), selectedRow, 1); + table.setValueAt(table.getValueAt(newRow, 2), selectedRow, 2); - void setTableData() - { - if (fr.featureGroups == null) - fr.featureGroups = new Hashtable(); - else - fr.featureGroups.clear(); + table.setValueAt(temp[0], newRow, 0); + table.setValueAt(temp[1], newRow, 1); + table.setValueAt(temp[2], newRow, 2); - allFeatures = new Hashtable(); - SequenceFeature[] features; + selectedRow = newRow; + } + } + }); - for (int i = 0; i < av.alignment.getHeight(); i++) - { - features = av.alignment.getSequenceAt(i).getDatasetSequence(). - getSequenceFeatures(); + scrollPane.setViewportView(table); - if (features == null) - continue; + dassourceBrowser = new DasSourceBrowser(); + dasSettingsPane.add(dassourceBrowser, BorderLayout.CENTER); - int index = 0; - while (index < features.length) - { - if(features[index].getFeatureGroup()!=null - && !fr.featureGroups.containsKey(features[index].getFeatureGroup())) - { - fr.featureGroups.put(features[index].getFeatureGroup(), new Boolean(true)); - if(groupPanel==null) - groupPanel = new JPanel(); - - final JCheckBox check = new JCheckBox(features[index].getFeatureGroup(), true); - check.setFont(new Font("Serif", Font.BOLD, 12)); - check.addItemListener(new ItemListener() - { - public void itemStateChanged(ItemEvent evt) - { - if (fr.featureGroups.containsKey(check.getText())) - { - fr.featureGroups.put(check.getText(), - new Boolean(check.isSelected())); - ap.seqPanel.seqCanvas.repaint(); - if (ap.overviewPanel != null) - ap.overviewPanel.updateOverviewImage(); - } - resetTable(); - } - }); - groupPanel.add(check); - } - if (!allFeatures.contains(features[index].getType())) - { - if(features[index].featureGroup!=null) - allFeatures.put(features[index].getType(), features[index].featureGroup); - else - allFeatures.put(features[index].getType(), "NOGROUP"); - } - index++; - } - } - if(allFeatures.size()<1) - { - try - { frame.setClosed(true); } - catch (Exception ex){} - JOptionPane.showInternalMessageDialog( - Desktop.desktop, "No features have been added to this alignment!", - "No Sequence Features", JOptionPane.WARNING_MESSAGE); - return; - } + if (af.getViewport().featuresDisplayed == null || fr.renderOrder==null) + fr.findAllFeatures(); + + setTableData(); - resetTable(); + frame = new JInternalFrame(); + frame.setContentPane(this); + Desktop.addInternalFrame(frame, "Sequence Feature Settings", 400, 450); + frame.setLayer(JLayeredPane.PALETTE_LAYER); } - void resetTable() + synchronized public void setTableData() { - int fSize = allFeatures.size(); - - String type; - boolean originalExists = false; - if (originalData != null) - originalExists = true; - else - originalData = new Object[fSize][3]; + if (fr.featureGroups == null) + fr.featureGroups = new Hashtable(); - Object[][] tmp = new Object[fSize][3]; - int tmpIndex = 0; + Vector allFeatures = new Vector(); + Vector allGroups = new Vector(); + SequenceFeature[] tmpfeatures; + String group; - Enumeration en = allFeatures.keys(); - int i=0; - while(en.hasMoreElements()) + for (int i = 0; i < af.getViewport().alignment.getHeight(); i++) { - type = en.nextElement().toString(); - Color col = fr.getColour(type); + if (af.getViewport().alignment.getSequenceAt(i).getDatasetSequence().getSequenceFeatures() == null) + continue; + tmpfeatures = af.getViewport().alignment.getSequenceAt(i).getDatasetSequence().getSequenceFeatures(); - //This will ignore any features which are in groups not shown - if(fr.featureGroups==null - || ((Boolean)fr.featureGroups.get(allFeatures.get(type))).booleanValue()) + int index = 0; + while (index < tmpfeatures.length) { - tmp[tmpIndex][0] = type; - tmp[tmpIndex][1] = col; - if (av.featuresDisplayed != null) - tmp[tmpIndex][2] = new Boolean(av.featuresDisplayed.containsKey(type)); - else - tmp[tmpIndex][2] = new Boolean(true); - - tmpIndex++; - } + if(tmpfeatures[index].begin == 0 && tmpfeatures[index].end ==0) + { + index++; + continue; + } + if(tmpfeatures[index].getFeatureGroup()!=null) + { + group = tmpfeatures[index].featureGroup; + if(!allGroups.contains(group)) + { + allGroups.addElement(group); - if (!originalExists) - { - originalData[i][0] = type; - originalData[i][1] = col; - if (av.featuresDisplayed != null) - originalData[i][2] = new Boolean(av.featuresDisplayed.contains(type)); - else - originalData[i][2] = new Boolean(true); - } - i++; + boolean visible = true; + if (fr.featureGroups.containsKey(group)) + { + visible = ( (Boolean) fr.featureGroups.get(group)).booleanValue(); + } + + if (groupPanel == null) + { + groupPanel = new JPanel(); + } + + boolean alreadyAdded = false; + for(int g=0; g-1; ro--) + { + type = fr.renderOrder[ro]; - selectedRow = newRow; - } - } - }); + if(!visibleChecks.contains(type)) + continue; + + data[dataIndex][0] = type; + data[dataIndex][1] = fr.getColour(type); + data[dataIndex][2] = new Boolean(af.getViewport().featuresDisplayed.containsKey(type)); + dataIndex++; + visibleChecks.removeElement(type); + } + } + + fSize = visibleChecks.size(); + for(int i=0; i0) + { + iSize = af.getViewport().getSelectionGroup().getSize(false); + dataset = new SequenceI[iSize]; + seqs = af.getViewport().getSelectionGroup(). + getSequencesInOrder( + af.getViewport().getAlignment()); + } + else + { + iSize = af.getViewport().getAlignment().getHeight(); + seqs = af.getViewport().getAlignment().getSequencesArray(); + } + + dataset = new SequenceI[iSize]; + for (int i = 0; i < iSize; i++) + { + dataset[i] = seqs[i].getDatasetSequence(); + } + + new jalview.io.DasSequenceFeatureFetcher( + dataset, + af, + selectedSources); + + af.getViewport().setShowSequenceFeatures(true); + af.showSeqFeatures.setSelected(true); + } + + public void saveDAS_actionPerformed(ActionEvent e) + { + dassourceBrowser.saveProperties(jalview.bin.Cache.applicationProperties); + } ///////////////////////////////////////////////////////////////////////// // http://java.sun.com/docs/books/tutorial/uiswing/components/table.html @@ -431,6 +611,11 @@ public class FeatureSettings extends JPanel return data; } + public void setData(Object[][] data) + { + this.data = data; + } + public int getColumnCount() { return columnNames.length; }