X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FSequenceFeature.java;h=8f82a1afd7d4b9853be493ff9b88075ae100fef9;hb=3fce1409d8d49829024e566325b6cf96008fa2a2;hp=f5a9b42bbe61aa24104b7a14f2313bd02a34fd66;hpb=705d1c84c9a03bb0378593e4d8d8a90c8a11f831;p=jalview.git

diff --git a/src/jalview/datamodel/SequenceFeature.java b/src/jalview/datamodel/SequenceFeature.java
index f5a9b42..8f82a1a 100755
--- a/src/jalview/datamodel/SequenceFeature.java
+++ b/src/jalview/datamodel/SequenceFeature.java
@@ -20,7 +20,10 @@
  */
 package jalview.datamodel;
 
+import jalview.datamodel.features.FeatureAttributeType;
 import jalview.datamodel.features.FeatureLocationI;
+import jalview.datamodel.features.FeatureSourceI;
+import jalview.datamodel.features.FeatureSources;
 import jalview.util.StringUtils;
 
 import java.util.HashMap;
@@ -52,7 +55,7 @@ public class SequenceFeature implements FeatureLocationI
   // private key for ENA location designed not to conflict with real GFF data
   private static final String LOCATION = "!Location";
 
-  private static final String ROW_DATA = "<tr><td>%s</td><td>%s</td></tr>";
+  private static final String ROW_DATA = "<tr><td>%s</td><td>%s</td><td>%s</td></tr>";
 
   /*
    * map of otherDetails special keys, and their value fields' delimiter
@@ -62,6 +65,8 @@ public class SequenceFeature implements FeatureLocationI
   static
   {
     INFO_KEYS.put("CSQ", ",");
+    // todo capture second level metadata (CSQ FORMAT)
+    // and delimiter "|" so as to report in a table within a table?
   }
 
   /*
@@ -97,6 +102,12 @@ public class SequenceFeature implements FeatureLocationI
 
   public Vector<String> links;
 
+  /*
+   * the identifier (if known) for the FeatureSource held in FeatureSources,
+   * as a provider of metadata about feature attributes 
+   */
+  private String source;
+
   /**
    * Constructs a duplicate feature. Note: Uses makes a shallow copy of the
    * otherDetails map, so the new and original SequenceFeature may reference the
@@ -168,6 +179,8 @@ public class SequenceFeature implements FeatureLocationI
     this(newType, sf.getDescription(), newBegin, newEnd, newScore,
             newGroup);
 
+    this.source = sf.source;
+
     if (sf.otherDetails != null)
     {
       otherDetails = new HashMap<String, Object>();
@@ -556,21 +569,24 @@ public class SequenceFeature implements FeatureLocationI
    */
   public String getDetailsReport()
   {
+    FeatureSourceI metadata = FeatureSources.getInstance()
+            .getSource(source);
+
     StringBuilder sb = new StringBuilder(128);
     sb.append("<br>");
     sb.append("<table>");
-    sb.append(String.format(ROW_DATA, "Type", type));
+    sb.append(String.format(ROW_DATA, "Type", type, ""));
     sb.append(String.format(ROW_DATA, "Start/end", begin == end ? begin
-            : begin + (isContactFeature() ? ":" : "-") + end));
+            : begin + (isContactFeature() ? ":" : "-") + end, ""));
     String desc = StringUtils.stripHtmlTags(description);
-    sb.append(String.format(ROW_DATA, "Description", desc));
+    sb.append(String.format(ROW_DATA, "Description", desc, ""));
     if (!Float.isNaN(score) && score != 0f)
     {
-      sb.append(String.format(ROW_DATA, "Score", score));
+      sb.append(String.format(ROW_DATA, "Score", score, ""));
     }
     if (featureGroup != null)
     {
-      sb.append(String.format(ROW_DATA, "Group", featureGroup));
+      sb.append(String.format(ROW_DATA, "Group", featureGroup, ""));
     }
 
     if (otherDetails != null)
@@ -586,24 +602,31 @@ public class SequenceFeature implements FeatureLocationI
         {
           continue; // to avoid double reporting
         }
-        sb.append("<tr><td>").append(key).append("</td><td>");
         if (INFO_KEYS.containsKey(key))
         {
           /*
            * split selected INFO data by delimiter over multiple lines
            */
-          sb.append("</td></tr>");
           String delimiter = INFO_KEYS.get(key);
           String[] values = entry.getValue().toString().split(delimiter);
           for (String value : values)
           {
-            sb.append("<tr><td>&nbsp</td><td>").append(value)
-                    .append("</td></tr>");
+            sb.append(String.format(ROW_DATA, key, "", value));
           }
         }
         else
-        {
-          sb.append(entry.getValue().toString()).append("</td></tr>");
+        { // tried <td title="key"> but it failed to provide a tooltip :-(
+          String attDesc = null;
+          if (metadata != null)
+          {
+            attDesc = metadata.getAttributeName(key);
+          }
+          String value = entry.getValue().toString();
+          if (isValueInteresting(key, value, metadata))
+          {
+            sb.append(String.format(ROW_DATA, key, attDesc == null ? ""
+                    : attDesc, value));
+          }
         }
       }
     }
@@ -612,4 +635,61 @@ public class SequenceFeature implements FeatureLocationI
     String text = sb.toString();
     return text;
   }
+
+  /**
+   * Answers true if we judge the value is worth displaying, by some heuristic
+   * rules, else false
+   * 
+   * @param key
+   * @param value
+   * @param metadata
+   * @return
+   */
+  boolean isValueInteresting(String key, String value,
+          FeatureSourceI metadata)
+  {
+    /*
+     * currently suppressing zero values as well as null or empty
+     */
+    if (value == null || "".equals(value) || ".".equals(value)
+            || "0".equals(value))
+    {
+      return false;
+    }
+
+    if (metadata == null)
+    {
+      return true;
+    }
+
+    FeatureAttributeType attType = metadata.getAttributeType(key);
+    if (attType != null
+            && (attType == FeatureAttributeType.Float || attType
+                    .equals(FeatureAttributeType.Integer)))
+    {
+      try
+      {
+        float fval = Float.valueOf(value);
+        if (fval == 0f)
+        {
+          return false;
+        }
+      } catch (NumberFormatException e)
+      {
+        // ignore
+      }
+    }
+
+    return true; // default to interesting
+  }
+
+  /**
+   * Sets the feature source identifier
+   * 
+   * @param theSource
+   */
+  public void setSource(String theSource)
+  {
+    source = theSource;
+  }
 }