X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFeatureSettings.java;h=ad9ad1dd3f49f7f1ffd15f43cee105b1bb814315;hb=ef36c8bbd6c5eef95e4d1a2cff57ea772af5110b;hp=ec5176fd14acab8cdc77c851728bdadfefe67ced;hpb=566b164f60df39a2fcb35a9d174273a043691931;p=jalview.git

diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java
index ec5176f..ad9ad1d 100755
--- a/src/jalview/gui/FeatureSettings.java
+++ b/src/jalview/gui/FeatureSettings.java
@@ -28,128 +28,64 @@ 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;
+import org.biojava.dasobert.dasregistry.DasSource;
+import org.biojava.dasobert.dasregistry.DasCoordinateSystem;
 
 public class FeatureSettings extends JPanel
 {
+  DasSourceBrowser dassourceBrowser;
+  JPanel settingsPane = new JPanel();
+  JPanel dasSettingsPane = new JPanel();
 
   final FeatureRenderer fr;
-  final AlignmentPanel ap;
-  final AlignViewport av;
+  final AlignFrame af;
   Object [][] originalData;
   final JInternalFrame frame;
   JScrollPane scrollPane = new JScrollPane();
   JTable table;
   JPanel groupPanel;
+  JSlider transparency = new JSlider();
 
+  JPanel transPanel = new JPanel(new FlowLayout());
   boolean alignmentHasFeatures = false;
 
-  public FeatureSettings(AlignViewport av, final AlignmentPanel ap)
+  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);
-    frame.setLayer(JLayeredPane.PALETTE_LAYER);
+    this.af = af;
+    fr = af.getFeatureRenderer();
 
-    setTableData();
+    transparency.setMaximum( 100 - (int)(fr.transparency*100) ) ;
 
-    final JSlider transparency = new JSlider(0, 70, 100 - (int)(fr.transparency*100)   );
-    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);
-    JButton button = new JButton("Invert Selection");
-    transPanel.add(button);
-    button.addActionListener(new ActionListener()
-        {
-          public void actionPerformed(ActionEvent evt)
-          {
-            invertSelection();
-          }
-        });
+    dassourceBrowser = new DasSourceBrowser();
+    dasSettingsPane.add(dassourceBrowser, BorderLayout.CENTER);
 
-    //////////////////////////////////////////////
-    //We're going to need those OK cancel buttons
-    JPanel buttonPanel = new JPanel(new FlowLayout());
-    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);
 
-    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);
 
-    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(fr.featureGroups.size() / 4 + 1, 4));
+    if (af.getViewport().featuresDisplayed == null || fr.renderOrder==null)
+       fr.findAllFeatures();
 
-      groupPanel.validate();
-      bigPanel.add(groupPanel, BorderLayout.NORTH);
-    }
-    add(bigPanel, BorderLayout.CENTER);
-    add(buttonPanel, BorderLayout.SOUTH);
 
+    setTableData();
 
+    frame = new JInternalFrame();
+    frame.setContentPane(this);
+    Desktop.addInternalFrame(frame, "Sequence Feature Settings", 400, 450);
+    frame.setLayer(JLayeredPane.PALETTE_LAYER);
   }
 
-  void setTableData()
+  public void setTableData()
   {
     alignmentHasFeatures = false;
 
@@ -161,14 +97,14 @@ public class FeatureSettings extends JPanel
     SequenceFeature[] tmpfeatures;
     String group;
 
-    for (int i = 0; i < av.alignment.getHeight(); i++)
+    for (int i = 0; i < af.getViewport().alignment.getHeight(); i++)
     {
-      if (av.alignment.getSequenceAt(i).getDatasetSequence().getSequenceFeatures() == null)
+      if (af.getViewport().alignment.getSequenceAt(i).getDatasetSequence().getSequenceFeatures() == null)
         continue;
 
       alignmentHasFeatures = true;
 
-      tmpfeatures = av.alignment.getSequenceAt(i).getDatasetSequence().getSequenceFeatures();
+      tmpfeatures = af.getViewport().alignment.getSequenceAt(i).getDatasetSequence().getSequenceFeatures();
 
       int index = 0;
       while (index < tmpfeatures.length)
@@ -191,31 +127,31 @@ public class FeatureSettings extends JPanel
              {
                visible = ( (Boolean) fr.featureGroups.get(group)).booleanValue();
              }
-
-             fr.featureGroups.put(group, new Boolean(visible));
-
-             if (groupPanel == null)
+             else
              {
-               groupPanel = new JPanel();
-             }
-
-             final JCheckBox check = new JCheckBox(group, visible);
-             check.setFont(new Font("Serif", Font.BOLD, 12));
-             check.addItemListener(new ItemListener()
-             {
-               public void itemStateChanged(ItemEvent evt)
+               fr.featureGroups.put(group, new Boolean(visible));
+               if (groupPanel == null)
                {
-                 fr.featureGroups.put(check.getText(),
-                                      new Boolean(check.isSelected()));
-                 ap.seqPanel.seqCanvas.repaint();
-                 if (ap.overviewPanel != null)
-                   ap.overviewPanel.updateOverviewImage();
-
-                 resetTable(true);
+                 groupPanel = new JPanel();
                }
-             });
-             groupPanel.add(check);
 
+               final JCheckBox check = new JCheckBox(group, visible);
+               check.setFont(new Font("Serif", Font.BOLD, 12));
+               check.addItemListener(new ItemListener()
+               {
+                 public void itemStateChanged(ItemEvent evt)
+                 {
+                   fr.featureGroups.put(check.getText(),
+                                        new Boolean(check.isSelected()));
+                   af.alignPanel.seqPanel.seqCanvas.repaint();
+                   if (af.alignPanel.overviewPanel != null)
+                     af.alignPanel.overviewPanel.updateOverviewImage();
+
+                   resetTable(true);
+                 }
+               });
+               groupPanel.add(check);
+             }
            }
 
        }
@@ -231,20 +167,20 @@ public class FeatureSettings extends JPanel
 
     if(!alignmentHasFeatures)
      {
-       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;
+    //   try
+     //  { frame.setClosed(true);  }
+    //   catch (Exception ex){}
+
+    //   JOptionPane.showInternalMessageDialog(
+    ///       Desktop.desktop, "No features have been added to this alignment!",
+    //
+   //    return;
      }
 
      resetTable(false);
   }
 
+
   void resetTable(boolean groupsChanged)
   {
    SequenceFeature [] tmpfeatures;
@@ -253,12 +189,13 @@ public class FeatureSettings extends JPanel
 
    //Find out which features should be visible depending on which groups
    //are selected / deselected
-    for (int i = 0; i < av.alignment.getHeight(); i++)
+    for (int i = 0; i < af.getViewport().alignment.getHeight(); i++)
     {
-        if (av.alignment.getSequenceAt(i).getDatasetSequence().getSequenceFeatures() == null)
+
+        tmpfeatures = af.getViewport().alignment.getSequenceAt(i).getDatasetSequence().getSequenceFeatures();
+        if (tmpfeatures == null)
           continue;
 
-        tmpfeatures = av.alignment.getSequenceAt(i).getDatasetSequence().getSequenceFeatures();
         int index = 0;
         while (index < tmpfeatures.length)
         {
@@ -300,7 +237,7 @@ public class FeatureSettings extends JPanel
 
            data[dataIndex][0] = type;
            data[dataIndex][1] = fr.getColour(type);
-           data[dataIndex][2] = new Boolean(av.featuresDisplayed.containsKey(type));
+           data[dataIndex][2] = new Boolean(af.getViewport().featuresDisplayed.containsKey(type));
            dataIndex++;
            visibleChecks.removeElement(type);
       }
@@ -374,6 +311,15 @@ public class FeatureSettings extends JPanel
           }
     });
 
+    if (groupPanel != null)
+    {
+      groupPanel.setLayout(
+          new GridLayout(fr.featureGroups.size() / 4 + 1, 4));
+
+      groupPanel.validate();
+      bigPanel.add(groupPanel, BorderLayout.NORTH);
+    }
+
     updateFeatureRenderer(data);
 
   }
@@ -410,11 +356,11 @@ public class FeatureSettings extends JPanel
          }
 
          setTableData();
-         ap.repaint();
+         af.alignPanel.repaint();
        }
        catch (Exception ex)
        {
-         System.out.println("Error loading User ColourFile\n" + ex);
+         System.out.println("Error loading User Colour File\n" + ex);
        }
      }
   }
@@ -470,20 +416,185 @@ public class FeatureSettings extends JPanel
           new Boolean(!value.booleanValue()),
                        i,2);
     }
+  }
+
+  public void close()
+  {
+    try
+    {
+      frame.setClosed(true);
+    }
+    catch (Exception exe)
+    {}
 
   }
 
   public void updateFeatureRenderer(Object [][] data)
   {
     fr.setFeaturePriority( data );
-    ap.repaint();
+    af.alignPanel.repaint();
 
-    if(ap.overviewPanel!=null)
-      ap.overviewPanel.updateOverviewImage();
+    if(af.alignPanel.overviewPanel!=null)
+      af.alignPanel.overviewPanel.updateOverviewImage();
   }
 
   int selectedRow =-1;
+  JTabbedPane tabbedPane = new JTabbedPane();
+  BorderLayout borderLayout1 = new BorderLayout();
+  BorderLayout borderLayout2 = new BorderLayout();
+  BorderLayout borderLayout3 = new BorderLayout();
+  JPanel bigPanel = new JPanel();
+  BorderLayout borderLayout4 = new BorderLayout();
+  JButton invert = new JButton();
+  JPanel buttonPanel = new JPanel();
+  JButton cancel = new JButton();
+  JButton ok = new JButton();
+  JButton loadColours = new JButton();
+  JButton saveColours = new JButton();
+  JPanel dasButtonPanel = new JPanel();
+  JButton fetchDAS = new JButton();
+  JButton saveDAS = new JButton();
+  private void jbInit()
+      throws Exception
+  {
+    this.setLayout(borderLayout1);
+    settingsPane.setLayout(borderLayout2);
+    dasSettingsPane.setLayout(borderLayout3);
+    bigPanel.setLayout(borderLayout4);
+    invert.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
+    invert.setText("Invert Selection");
+    invert.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        invertSelection();
+      }
+    });
+    cancel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
+    cancel.setText("Cancel");
+    cancel.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+          updateFeatureRenderer(originalData);
+          close();
+      }
+    });
+    ok.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
+    ok.setText("OK");
+    ok.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        close();
+      }
+    });
+    loadColours.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
+    loadColours.setText("Load Colours");
+    loadColours.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        load();
+      }
+    });
+    saveColours.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
+    saveColours.setText("Save Colours");
+    saveColours.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        save();
+      }
+    });
+    transparency.addChangeListener(new ChangeListener()
+    {
+      public void stateChanged(ChangeEvent evt)
+      {
+        fr.setTransparency( (float) (100 - transparency.getValue()) / 100f);
+        af.alignPanel.repaint();
+      }
+    });
+
+
+    transparency.setMaximum(70);
+    fetchDAS.setText("Fetch DAS Features");
+    fetchDAS.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        fetchDAS_actionPerformed(e);
+      }
+    });
+    saveDAS.setText("Save as default");
+    saveDAS.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        saveDAS_actionPerformed(e);
+      }
+    });
+    dasButtonPanel.setBorder(BorderFactory.createEtchedBorder());
+    dasSettingsPane.setBorder(null);
+    this.add(tabbedPane, java.awt.BorderLayout.CENTER);
+    tabbedPane.addTab("Display Settings", settingsPane );
+    tabbedPane.addTab("DAS Settings", dasSettingsPane);
+    bigPanel.add(transPanel, java.awt.BorderLayout.SOUTH);
+    transPanel.add(transparency);
+    transPanel.add(invert);
+    buttonPanel.add(ok);
+    buttonPanel.add(cancel);
+    buttonPanel.add(loadColours);
+    buttonPanel.add(saveColours);
+    bigPanel.add(scrollPane, java.awt.BorderLayout.CENTER);
+    dasSettingsPane.add(dasButtonPanel, java.awt.BorderLayout.SOUTH);
+    dasButtonPanel.add(fetchDAS);
+    dasButtonPanel.add(saveDAS);
+    settingsPane.add(bigPanel, java.awt.BorderLayout.CENTER);
+    settingsPane.add(buttonPanel, java.awt.BorderLayout.SOUTH);
+  }
+
+  public void fetchDAS_actionPerformed(ActionEvent e)
+  {
+    Vector selectedSources = dassourceBrowser.getSelectedSources();
+
+    SequenceI [] dataset, seqs ;
+    int iSize;
+
+    if(af.getViewport().getSelectionGroup()!=null
+      && af.getViewport().getSelectionGroup().getSize(false)>0)
+    {
+      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