X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Farchaeopteryx%2FOptions.java;h=184e79505187526d43f07987698b73bd50f4cc4e;hb=f6b29c53c14e1ef16e4cd614c7f9465e0073309e;hp=114328871c10e8e99df309f1bd7be372c2888c49;hpb=f7f0102d3e7eb2fd254f7d22d75a88495133449c;p=jalview.git

diff --git a/forester/java/src/org/forester/archaeopteryx/Options.java b/forester/java/src/org/forester/archaeopteryx/Options.java
index 1143288..184e795 100644
--- a/forester/java/src/org/forester/archaeopteryx/Options.java
+++ b/forester/java/src/org/forester/archaeopteryx/Options.java
@@ -41,7 +41,7 @@ import org.forester.util.ForesterUtil;
 final public class Options {
 
     public static enum CLADOGRAM_TYPE {
-        EXT_NODE_SUM_DEP, NON_LINED_UP, TOTAL_NODE_SUM_DEP;
+        LINED_UP, NON_LINED_UP;
     }
 
     public static enum NODE_LABEL_DIRECTION {
@@ -119,7 +119,10 @@ final public class Options {
     private boolean                           _line_up_renderable_node_data;
     private boolean                           _right_align_domains;
     private boolean                           _color_all_found_nodes_when_coloring_subtree;
-
+    private boolean                           _parse_beast_style_extended_nexus_tags;
+    private boolean                           _collapsed_with_average_height;
+    private boolean                           _show_abbreviated_labels_for_collapsed_nodes;
+    
     private Options() {
         init();
     }
@@ -195,6 +198,7 @@ final public class Options {
         _show_default_node_shapes_external = false;
         _show_default_node_shapes_for_marked_nodes = false;
         _color_all_found_nodes_when_coloring_subtree = false;
+        _parse_beast_style_extended_nexus_tags= true;
         _min_confidence_value = MIN_CONFIDENCE_DEFAULT;
         _print_black_and_white = false;
         _phylogeny_graphics_type = PHYLOGENY_GRAPHICS_TYPE.RECTANGULAR;
@@ -222,6 +226,8 @@ final public class Options {
         _ext_desc_data_to_return = NodeDataField.UNKNOWN;
         _line_up_renderable_node_data = true;
         _right_align_domains = false;
+        _collapsed_with_average_height = true;
+        _show_abbreviated_labels_for_collapsed_nodes = true;
     }
 
     final private void setNumberOfDigitsAfterCommaForBranchLength( final short number_of_digits_after_comma_for_branch_length_values ) {
@@ -591,4 +597,31 @@ final public class Options {
     final void setColorAllFoundNodesWhenColoringSubtree( final boolean color_all_found_nodes_when_coloring_subtree ) {
         _color_all_found_nodes_when_coloring_subtree = color_all_found_nodes_when_coloring_subtree;
     }
+
+    final boolean isParseBeastStyleExtendedNexusTags() {
+        return _parse_beast_style_extended_nexus_tags;
+    }
+
+    final void setParseBeastStyleExtendedNexusTags( final boolean parse_beast_style_extended_nexus_tags ) {
+        _parse_beast_style_extended_nexus_tags = parse_beast_style_extended_nexus_tags;
+    }
+    
+    final boolean isCollapsedWithAverageHeigh() {
+        return _collapsed_with_average_height;
+    }
+
+    final void setCollapsedWithAverageHeigh( final boolean collapsed_with_average_height ) {
+        _collapsed_with_average_height = collapsed_with_average_height;
+    }
+
+    final boolean isShowAbbreviatedLabelsForCollapsedNodes() {
+        return _show_abbreviated_labels_for_collapsed_nodes;
+    }
+    
+    final void setShowAbbreviatedLabelsForCollapsedNodes(final boolean show_abbreviated_labels_for_collapsed_nodes) {
+        _show_abbreviated_labels_for_collapsed_nodes =  show_abbreviated_labels_for_collapsed_nodes;
+    }
+    
+   
+    
 }