X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fapi%2FAlignViewportI.java;h=e3478ea5539b0e12ac490179c0d54c35aadaf365;hb=cc3341f9d1465b0226d184be4216d022a62e5cee;hp=2a82a32d0c4e81cf5a6116b92f79e4d3251e4ba7;hpb=5c1262f120d4fca072bc8fd9800a1a856cc46843;p=jalview.git

diff --git a/src/jalview/api/AlignViewportI.java b/src/jalview/api/AlignViewportI.java
index 2a82a32..e3478ea 100644
--- a/src/jalview/api/AlignViewportI.java
+++ b/src/jalview/api/AlignViewportI.java
@@ -23,9 +23,12 @@ package jalview.api;
 import jalview.analysis.Conservation;
 import jalview.analysis.TreeModel;
 import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.AlignmentExportData;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.AlignmentView;
 import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.ContactListI;
+import jalview.datamodel.ContactMatrixI;
 import jalview.datamodel.ProfilesI;
 import jalview.datamodel.SearchResultsI;
 import jalview.datamodel.SequenceCollectionI;
@@ -108,9 +111,9 @@ public interface AlignViewportI extends ViewStyleI
    * 
    * @return
    */
-  Hashtable[] getComplementConsensusHash();
+  Hashtable<String, Object>[] getComplementConsensusHash();
 
-  Hashtable[] getRnaStructureConsensusHash();
+  Hashtable<String, Object>[] getRnaStructureConsensusHash();
 
   boolean isIgnoreGapsConsensus();
 
@@ -178,7 +181,7 @@ public interface AlignViewportI extends ViewStyleI
    * 
    * @param hconsensus
    */
-  void setComplementConsensusHash(Hashtable[] hconsensus);
+  void setComplementConsensusHash(Hashtable<String, Object>[] hconsensus);
 
   /**
    * 
@@ -192,7 +195,8 @@ public interface AlignViewportI extends ViewStyleI
    * 
    * @param hStrucConsensus
    */
-  void setRnaStructureConsensusHash(Hashtable[] hStrucConsensus);
+  void setRnaStructureConsensusHash(
+          Hashtable<String, Object>[] hStrucConsensus);
 
   /**
    * Sets the colour scheme for the background alignment (as distinct from
@@ -268,15 +272,6 @@ public interface AlignViewportI extends ViewStyleI
   AlignmentView getAlignmentView(boolean selectedOnly, boolean markGroups);
 
   /**
-   * @return an alignment view, optionally without a complement view
-   * @param selectedOnly
-   * @param markGroups
-   * @param withComplement - false if no complement view required
-   */
-  AlignmentView getAlignmentViewWithComplement(boolean selectedOnly,
-          boolean markGroups, boolean withComplement);
-
-  /**
    * This method returns the visible alignment as text, as seen on the GUI, ie
    * if columns are hidden they will not be returned in the result. Use this for
    * calculating trees, PCA, redundancy etc on views which contain hidden
@@ -483,6 +478,13 @@ public interface AlignViewportI extends ViewStyleI
   SearchResultsI getSearchResults();
 
   /**
+   * Retrieve a ContactListI corresponding to column in an annotation row in an alignment.
+   * @param _aa - annotation with associated matrix data
+   * @param column - column in alignment where _aa is associated
+   */
+  ContactListI getContactList(AlignmentAnnotation _aa, int column);
+
+  /**
    * Updates view settings with the given font. You may need to call
    * AlignmentPanel.fontChanged to update the layout geometry.
    * 
@@ -507,9 +509,18 @@ public interface AlignViewportI extends ViewStyleI
   @Override
   void setProteinFontAsCdna(boolean b);
 
-  public abstract TreeModel getCurrentTree();
+  TreeModel getCurrentTree();
 
-  public abstract void setCurrentTree(TreeModel tree);
+  void setCurrentTree(TreeModel tree);
+
+  /**
+   * Answers a data bean containing data for export as configured by the
+   * supplied options
+   * 
+   * @param options
+   * @return
+   */
+  AlignmentExportData getAlignExportData(AlignExportSettingsI options);
 
   /**
    * @param update
@@ -544,10 +555,12 @@ public interface AlignViewportI extends ViewStyleI
    * regions of the alignment
    * 
    * @param selectedRegionOnly
-   *                             if true, and the view has a selection region,
-   *                             then only the intersection of visible columns
-   *                             with the selection region is returned
+   *          if true, and the view has a selection region, then only the
+   *          intersection of visible columns with the selection region is
+   *          returned
    * @return
    */
   Iterator<int[]> getViewAsVisibleContigs(boolean selectedRegionOnly);
+
+  ContactMatrixI getContactMatrix(AlignmentAnnotation alignmentAnnotation);
 }