in progress

[jalview.git] / forester / java / src / org / forester / archaeopteryx / MainFrameApplication.java

diff --git a/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java b/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java
index e6d6092..bccdd9d 100644 (file)
--- a/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java
+++ b/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java
@@ -389,8 +389,7 @@ public final class MainFrameApplication extends MainFrame {
                     _mainpanel.getCurrentTreePanel().calcParametersForPainting( _mainpanel.getCurrentTreePanel()\r
                                                                                         .getWidth(),\r
                                                                                 _mainpanel.getCurrentTreePanel()\r
-                                                                                        .getHeight(),\r
-                                                                                getOptions().isAllowFontSizeChange() );\r
+                                                                                        .getHeight() );\r
                 }\r
             }\r
         } );\r
@@ -882,6 +881,8 @@ public final class MainFrameApplication extends MainFrame {
                 setTextForPdfLineWidthChooserMenuItem( _choose_pdf_width_mi, getOptions() );\r
                 MainFrame.setCycleNodeFillMenuItem( _cycle_node_fill_mi, getOptions() );\r
                 MainFrame.setCycleNodeShapeMenuItem( _cycle_node_shape_mi, getOptions() );\r
+                \r
+                MainFrame.setCycleDataReturnMenuItem( _cycle_data_return, getOptions() );\r
                 MainFrame.setTextNodeSizeMenuItem( _choose_node_size_mi, getOptions() );\r
                 try {\r
                     getMainPanel().getControlPanel().setVisibilityOfDomainStrucureCB();\r
@@ -932,6 +933,8 @@ public final class MainFrameApplication extends MainFrame {
         _options_jmenu.add( _switch_colors_mi = new JMenuItem( "" ) );\r
         _options_jmenu.add( _choose_font_mi = new JMenuItem( "" ) );\r
         _options_jmenu.addSeparator();\r
+        _options_jmenu.add( _cycle_data_return = new JMenuItem( "Cycle Data Return" ) );\r
+        _options_jmenu.addSeparator();\r
         _options_jmenu.add( customizeMenuItemAsLabel( new JMenuItem( SEARCH_SUBHEADER ), getConfiguration() ) );\r
         _options_jmenu.add( _search_case_senstive_cbmi = new JCheckBoxMenuItem( SEARCH_CASE_SENSITIVE_LABEL ) );\r
         _options_jmenu.add( _search_whole_words_only_cbmi = new JCheckBoxMenuItem( SEARCH_TERMS_ONLY_LABEL ) );\r
@@ -998,6 +1001,8 @@ public final class MainFrameApplication extends MainFrame {
         customizeJMenuItem( _cycle_node_shape_mi );\r
         customizeJMenuItem( _cycle_node_fill_mi );\r
         customizeJMenuItem( _choose_node_size_mi );\r
+        customizeJMenuItem( _cycle_data_return);\r
+        \r
         customizeCheckBoxMenuItem( _color_labels_same_as_parent_branch, getOptions().isColorLabelsSameAsParentBranch() );\r
         customizeCheckBoxMenuItem( _color_by_taxonomic_group_cbmi, getOptions().isColorByTaxonomicGroup() );\r
         customizeCheckBoxMenuItem( _screen_antialias_cbmi, getOptions().isAntialiasScreen() );\r
@@ -1293,8 +1298,7 @@ public final class MainFrameApplication extends MainFrame {
 \r
     void writePhylogenyToGraphicsFile( final String file_name, final GraphicsExportType type ) {\r
         _mainpanel.getCurrentTreePanel().calcParametersForPainting( _mainpanel.getCurrentTreePanel().getWidth(),\r
-                                                                    _mainpanel.getCurrentTreePanel().getHeight(),\r
-                                                                    true );\r
+                                                                    _mainpanel.getCurrentTreePanel().getHeight() );\r
         String file_written_to = "";\r
         boolean error = false;\r
         try {\r
@@ -2145,8 +2149,7 @@ public final class MainFrameApplication extends MainFrame {
         }\r
         if ( !getOptions().isPrintUsingActualSize() ) {\r
             getCurrentTreePanel().calcParametersForPainting( getOptions().getPrintSizeX() - 80,\r
-                                                             getOptions().getPrintSizeY() - 140,\r
-                                                             true );\r
+                                                             getOptions().getPrintSizeY() - 140 );\r
             getCurrentTreePanel().resetPreferredSize();\r
             getCurrentTreePanel().repaint();\r
         }\r
@@ -2174,9 +2177,8 @@ public final class MainFrameApplication extends MainFrame {
 \r
     private void printPhylogenyToPdf( final String file_name ) {\r
         if ( !getOptions().isPrintUsingActualSize() ) {\r
-            getCurrentTreePanel().calcParametersForPainting( getOptions().getPrintSizeX(),\r
-                                                             getOptions().getPrintSizeY(),\r
-                                                             true );\r
+            getCurrentTreePanel()\r
+            .calcParametersForPainting( getOptions().getPrintSizeX(), getOptions().getPrintSizeY() );\r
             getCurrentTreePanel().resetPreferredSize();\r
             getCurrentTreePanel().repaint();\r
         }\r