X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Farchaeopteryx%2Ftools%2FPhyloInferenceDialog.java;h=9eab0246ac7adb900b4496491c0f21f52b9b0678;hb=a9cc2cc5c9cda0ab49f26ccfb7a1aa30531e6ecf;hp=399c521d89ee0d4a137cc4a54a47b68bcafe65c2;hpb=def5f3c9ca461176f1188d0adfd744726a56e6ed;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 399c521..9eab024 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,16 +78,13 @@ 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 _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; @@ -130,15 +127,9 @@ 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( _mafft_cb = new JCheckBox( "MAFFT") ); + inputfile_pnl_3.add( _mafft_cb = new JCheckBox( "MAFFT" ) ); inputfile_pnl_3.add( new JLabel( "Parameters: " ) ); 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 ); @@ -151,11 +142,8 @@ 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 ); - _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 ); @@ -286,7 +274,7 @@ public class PhyloInferenceDialog extends JDialog implements ActionListener { _value = JOptionPane.CANCEL_OPTION; if ( from_unaligned_seqs ) { updateSeqsItems(); - } + } else { updateMsaItems(); } @@ -398,7 +386,7 @@ public class PhyloInferenceDialog extends JDialog implements ActionListener { } private void readInputSeqsFile() { - getParentFrame().readSeqsFromFile(); + getParentFrame().readSeqsFromFileforPI(); updateSeqsItems(); }