X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Farchaeopteryx%2Ftools%2FPhyloInferenceDialog.java;h=d750a43e2163560d63827c5d04cf2670e9e45fd6;hb=ae9764d1d2d667c26a90543b553f2ada548f1bcf;hp=fbfd4c20ebbc35cc990f10730e5d825f80d279bc;hpb=5958d8c92c06f76da04a466ef7636e93a640b6a3;p=jalview.git

diff --git a/forester/java/src/org/forester/archaeopteryx/tools/PhyloInferenceDialog.java b/forester/java/src/org/forester/archaeopteryx/tools/PhyloInferenceDialog.java
index fbfd4c2..d750a43 100644
--- a/forester/java/src/org/forester/archaeopteryx/tools/PhyloInferenceDialog.java
+++ b/forester/java/src/org/forester/archaeopteryx/tools/PhyloInferenceDialog.java
@@ -21,7 +21,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 //
 // Contact: phylosoft @ gmail . com
-// WWW: www.phylosoft.org/forester
+// WWW: https://sites.google.com/site/cmzmasek/home/software/forester
 
 package org.forester.archaeopteryx.tools;
 
@@ -78,13 +78,15 @@ public class PhyloInferenceDialog extends JDialog implements ActionListener {
     private JTextField                         _input_seqs_min_length_tf;
     private JTextField                         _input_seqs_max_length_tf;
     private JTextField                         _input_seqs_type_tf;
-    private JTextField                         _input_seqs_msa_program_name_tf;
-    private JTextField                         _input_seqs_msa_paramenters_tf;
+    private JTextField                         _mafft_paramenters_tf;
+    private JTextField                         _clustalo_paramenters_tf;
     private JTextField                         _msa_processing_max_allowed_gap_ratio_tf;
     private JTextField                         _msa_processing_min_allowed_length_tf;
     private JTextField                         _random_seed_tf;
     private JCheckBox                          _execute_msa_processing_cb;
     private JCheckBox                          _msa_processing_remove_all_gap_columns_cb;
+    private JCheckBox                          _mafft_cb;
+    private JCheckBox                          _clustalo_cb;
     private JCheckBox                          _save_pwd_file_cb;
     private JCheckBox                          _save_processed_msa_cb;
     private JCheckBox                          _save_original_msa_cb;
@@ -108,9 +110,11 @@ public class PhyloInferenceDialog extends JDialog implements ActionListener {
             final JPanel inputfile_pnl_1 = new JPanel();
             final JPanel inputfile_pnl_2 = new JPanel();
             final JPanel inputfile_pnl_3 = new JPanel();
+            final JPanel inputfile_pnl_4 = new JPanel();
             inputfile_pnl_1.setLayout( new FlowLayout() );
             inputfile_pnl_2.setLayout( new FlowLayout() );
             inputfile_pnl_3.setLayout( new FlowLayout() );
+            inputfile_pnl_4.setLayout( new FlowLayout() );
             inputfile_pnl_1.add( new JLabel( "Input Sequence File:" ) );
             inputfile_pnl_1.add( _input_seqs_tf = new JTextField() );
             inputfile_pnl_1.add( _select_input_seqs_btn = new JButton( "Select Input File" ) );
@@ -125,11 +129,12 @@ public class PhyloInferenceDialog extends JDialog implements ActionListener {
             inputfile_pnl_2.add( _input_seqs_max_length_tf = new JTextField() );
             inputfile_pnl_2.add( new JLabel( "Type:" ) );
             inputfile_pnl_2.add( _input_seqs_type_tf = new JTextField() );
-            inputfile_pnl_3.add( new JLabel( "Mutiple Sequence Alignment: " ) );
-            inputfile_pnl_3.add( new JLabel( "Program: " ) );
-            inputfile_pnl_3.add( _input_seqs_msa_program_name_tf = new JTextField() );
+            inputfile_pnl_3.add( _mafft_cb = new JCheckBox( "MAFFT" ) );
             inputfile_pnl_3.add( new JLabel( "Parameters: " ) );
-            inputfile_pnl_3.add( _input_seqs_msa_paramenters_tf = new JTextField() );
+            inputfile_pnl_3.add( _mafft_paramenters_tf = new JTextField() );
+            inputfile_pnl_4.add( _clustalo_cb = new JCheckBox( "ClustalO" ) );
+            inputfile_pnl_4.add( new JLabel( "Parameters: " ) );
+            inputfile_pnl_4.add( _clustalo_paramenters_tf = new JTextField() );
             _input_seqs_median_length_tf.setColumns( 4 );
             _input_seqs_min_length_tf.setColumns( 4 );
             _input_seqs_max_length_tf.setColumns( 4 );
@@ -142,12 +147,15 @@ public class PhyloInferenceDialog extends JDialog implements ActionListener {
             _input_seqs_max_length_tf.setEditable( false );
             _input_seqs_number_tf.setEditable( false );
             _input_seqs_type_tf.setEditable( false );
-            _input_seqs_msa_program_name_tf.setEditable( false );
-            _input_seqs_msa_paramenters_tf.setColumns( 26 );
+            _mafft_paramenters_tf.setColumns( 26 );
+            _mafft_paramenters_tf.setText( "--maxiterate 1000 --localpair" );
+            _clustalo_paramenters_tf.setColumns( 26 );
+            _clustalo_paramenters_tf.setText( "clustalo options" );
             _select_input_seqs_btn.addActionListener( this );
             _pnl.add( inputfile_pnl_1 );
             _pnl.add( inputfile_pnl_2 );
             _pnl.add( inputfile_pnl_3 );
+            _pnl.add( inputfile_pnl_4 );
         }
         else {
             setTitle( "Phylogenetic Inference (from already aligned sequences) " );
@@ -273,8 +281,6 @@ public class PhyloInferenceDialog extends JDialog implements ActionListener {
         _value = JOptionPane.CANCEL_OPTION;
         if ( from_unaligned_seqs ) {
             updateSeqsItems();
-            _input_seqs_msa_program_name_tf.setText( getPhylogeneticInferenceOptions().getMsaPrg() );
-            _input_seqs_msa_paramenters_tf.setText( getPhylogeneticInferenceOptions().getMsaPrgParameters() );
         }
         else {
             updateMsaItems();
@@ -376,8 +382,8 @@ public class PhyloInferenceDialog extends JDialog implements ActionListener {
     }
 
     private void processMsaPrgParameters() {
-        if ( _input_seqs_msa_paramenters_tf != null ) {
-            getPhylogeneticInferenceOptions().setMsaPrgParameters( _input_seqs_msa_paramenters_tf.getText() );
+        if ( _mafft_paramenters_tf != null ) {
+            getPhylogeneticInferenceOptions().setMsaPrgParameters( _mafft_paramenters_tf.getText() );
         }
     }