private JCheckBoxMenuItem _abbreviate_scientific_names;
private JCheckBoxMenuItem _screen_antialias_cbmi;
private JCheckBoxMenuItem _background_gradient_cbmi;
+ private JCheckBoxMenuItem _color_by_taxonomic_group_cbmi;
private JRadioButtonMenuItem _non_lined_up_cladograms_rbmi;
private JRadioButtonMenuItem _uniform_cladograms_rbmi;
private JRadioButtonMenuItem _ext_node_dependent_cladogram_rbmi;
private JMenuItem _cycle_node_shape_mi;
private JMenuItem _cycle_node_fill_mi;
private JMenuItem _choose_node_size_mi;
- private JCheckBoxMenuItem _taxonomy_colorize_node_shapes_cbmi;
private JCheckBoxMenuItem _show_confidence_stddev_cbmi;
private final LinkedList<TextFrame> _textframes = new LinkedList<TextFrame>();
private JMenu _analysis_menu;
}
else if ( o == _search_case_senstive_cbmi ) {
updateOptions( getOptions() );
- getMainPanel().getControlPanel().search();
+ getMainPanel().getControlPanel().search0();
+ getMainPanel().getControlPanel().search1();
}
else if ( o == _search_whole_words_only_cbmi ) {
updateOptions( getOptions() );
- getMainPanel().getControlPanel().search();
+ getMainPanel().getControlPanel().search0();
+ getMainPanel().getControlPanel().search1();
}
else if ( o == _inverse_search_result_cbmi ) {
updateOptions( getOptions() );
- getMainPanel().getControlPanel().search();
+ getMainPanel().getControlPanel().search0();
+ getMainPanel().getControlPanel().search1();
}
else if ( o == _show_scale_cbmi ) {
updateOptions( getOptions() );
else if ( o == _show_default_node_shapes_external_cbmi ) {
updateOptions( getOptions() );
}
- else if ( o == _taxonomy_colorize_node_shapes_cbmi ) {
- updateOptions( getOptions() );
- }
else if ( o == _about_item ) {
MainFrame.about();
}
ForesterUtil.printErrorMessage( Constants.PRG_NAME, e1.toString() );
}
}
+ else if ( o == _color_by_taxonomic_group_cbmi ) {
+ updateOptions( getOptions() );
+ }
repaint();
}
setConfiguration( configuration );
setOptions( Options.createInstance( configuration ) );
setupUI();
- URL phys_url = null;
- Phylogeny[] phys = null;
final String tree_url_str = getParameter( Constants.APPLET_PARAM_NAME_FOR_URL_OF_TREE_TO_LOAD );
+ if ( ForesterUtil.isEmpty( tree_url_str ) ) {
+ ForesterUtil.printErrorMessage( NAME, "could not get tree URL from "
+ + Constants.APPLET_PARAM_NAME_FOR_URL_OF_TREE_TO_LOAD );
+ JOptionPane.showMessageDialog( this, NAME + ": could not get tree URL from "
+ + Constants.APPLET_PARAM_NAME_FOR_URL_OF_TREE_TO_LOAD, "Failed get URL", JOptionPane.ERROR_MESSAGE );
+ return;
+ }
AptxUtil.printAppletMessage( NAME, "URL for phylogenies is " + tree_url_str );
// Get URL to tree file
- if ( tree_url_str != null ) {
- try {
- phys_url = new URL( tree_url_str );
- }
- catch ( final Exception e ) {
- ForesterUtil.printErrorMessage( NAME, "error: " + e );
- e.printStackTrace();
- JOptionPane.showMessageDialog( this, NAME + ": Could not create URL from: \"" + tree_url_str
- + "\"\nException: " + e, "Failed to create URL", JOptionPane.ERROR_MESSAGE );
- }
+ URL phys_url = null;
+ try {
+ phys_url = new URL( tree_url_str );
+ }
+ catch ( final Exception e ) {
+ ForesterUtil.printErrorMessage( NAME, "error: " + e );
+ e.printStackTrace();
+ JOptionPane.showMessageDialog( this, NAME + ": Could not create URL from: \"" + tree_url_str
+ + "\"\nException: " + e, "Failed to create URL", JOptionPane.ERROR_MESSAGE );
+ }
+ if ( phys_url == null ) {
+ ForesterUtil.printErrorMessage( NAME, "failed to get tree URL from "
+ + Constants.APPLET_PARAM_NAME_FOR_URL_OF_TREE_TO_LOAD );
+ JOptionPane.showMessageDialog( this,
+ NAME + ": Could not create URL from: \"" + tree_url_str,
+ "Failed to create URL",
+ JOptionPane.ERROR_MESSAGE );
+ return;
}
// Load the tree from URL
- if ( phys_url != null ) {
- try {
- phys = AptxUtil.readPhylogeniesFromUrl( phys_url,
- getConfiguration().isValidatePhyloXmlAgainstSchema(),
- getConfiguration().isReplaceUnderscoresInNhParsing(),
- getConfiguration().isInternalNumberAreConfidenceForNhParsing(),
- getConfiguration().getTaxonomyExtraction(),
- getConfiguration().isMidpointReroot() );
- }
- catch ( final Exception e ) {
- ForesterUtil.printErrorMessage( NAME, e.toString() );
- e.printStackTrace();
- JOptionPane.showMessageDialog( this,
- NAME + ": Failed to read phylogenies: " + "\nException: " + e,
- "Failed to read phylogenies",
- JOptionPane.ERROR_MESSAGE );
- }
+ Phylogeny[] phys = null;
+ try {
+ phys = AptxUtil.readPhylogeniesFromUrl( phys_url,
+ getConfiguration().isValidatePhyloXmlAgainstSchema(),
+ getConfiguration().isReplaceUnderscoresInNhParsing(),
+ getConfiguration().isInternalNumberAreConfidenceForNhParsing(),
+ getConfiguration().getTaxonomyExtraction(),
+ getConfiguration().isMidpointReroot() );
+ }
+ catch ( final Exception e ) {
+ ForesterUtil.printErrorMessage( NAME, e.toString() );
+ e.printStackTrace();
+ JOptionPane.showMessageDialog( this,
+ NAME + ": Failed to read phylogenies: " + "\nException: " + e,
+ "Failed to read phylogenies",
+ JOptionPane.ERROR_MESSAGE );
}
- if ( ( phys == null ) || ( phys.length < 1 ) ) {
- ForesterUtil.printErrorMessage( NAME, "phylogenies from [" + phys_url + "] are null or empty" );
+ if ( phys == null ) {
+ ForesterUtil.printErrorMessage( NAME, "phylogenies from [" + phys_url + "] are null" );
JOptionPane.showMessageDialog( this,
- NAME + ": phylogenies from [" + phys_url + "] are null or empty",
+ NAME + ": phylogenies from [" + phys_url + "] are null",
+ "Failed to read phylogenies",
+ JOptionPane.ERROR_MESSAGE );
+ return;
+ }
+ else if ( phys.length < 1 ) {
+ ForesterUtil.printErrorMessage( NAME, "phylogenies from [" + phys_url + "] are empty" );
+ JOptionPane.showMessageDialog( this,
+ NAME + ": phylogenies from [" + phys_url + "] are empty",
"Failed to read phylogenies",
JOptionPane.ERROR_MESSAGE );
return;
setName( NAME );
getMainPanel().getControlPanel().showWholeAll();
getMainPanel().getControlPanel().showWhole();
- System.gc();
- AptxUtil.printAppletMessage( NAME, "successfully initialized" );
/* GUILHEM_BEG */
getCurrentTreePanel().getControlPanel().getSequenceRelationTypeBox().removeAllItems();
for( final SequenceRelation.SEQUENCE_RELATION_TYPE type : getMainPanel().getCurrentPhylogeny()
getCurrentTreePanel().getControlPanel().getSequenceRelationBox().setSelectedItem( default_sequence );
}
/* GUILHEM_END */
+ System.gc();
+ AptxUtil.printAppletMessage( NAME, "successfully initialized" );
setVisible( true );
}
_radio_group_1.add( _ext_node_dependent_cladogram_rbmi );
_radio_group_1.add( _uniform_cladograms_rbmi );
_radio_group_1.add( _non_lined_up_cladograms_rbmi );
+ /////
_options_jmenu.add( _show_overview_cbmi = new JCheckBoxMenuItem( MainFrame.SHOW_OVERVIEW_LABEL ) );
_options_jmenu.add( _show_scale_cbmi = new JCheckBoxMenuItem( MainFrame.DISPLAY_SCALE_LABEL ) );
_options_jmenu
.add( _show_branch_length_values_cbmi = new JCheckBoxMenuItem( MainFrame.DISPLAY_BRANCH_LENGTH_VALUES_LABEL ) );
- _options_jmenu.add( _show_confidence_stddev_cbmi = new JCheckBoxMenuItem( MainFrame.SHOW_CONF_STDDEV_LABEL ) );
_options_jmenu
.add( _show_default_node_shapes_internal_cbmi = new JCheckBoxMenuItem( MainFrame.DISPLAY_NODE_BOXES_LABEL_INT ) );
_options_jmenu
.add( _show_default_node_shapes_external_cbmi = new JCheckBoxMenuItem( MainFrame.DISPLAY_NODE_BOXES_LABEL_EXT ) );
+ if ( getConfiguration().doDisplayOption( Configuration.show_domain_architectures ) ) {
+ _options_jmenu.add( _show_domain_labels = new JCheckBoxMenuItem( MainFrame.SHOW_DOMAIN_LABELS_LABEL ) );
+ }
+ _options_jmenu.add( _show_annotation_ref_source = new JCheckBoxMenuItem( MainFrame.SHOW_ANN_REF_SOURCE_LABEL ) );
+ _options_jmenu.add( _show_confidence_stddev_cbmi = new JCheckBoxMenuItem( MainFrame.SHOW_CONF_STDDEV_LABEL ) );
_options_jmenu
- .add( _taxonomy_colorize_node_shapes_cbmi = new JCheckBoxMenuItem( MainFrame.TAXONOMY_COLORIZE_NODE_SHAPES_LABEL ) );
- _options_jmenu.add( _cycle_node_shape_mi = new JMenuItem( MainFrame.CYCLE_NODE_SHAPE_LABEL ) );
- _options_jmenu.add( _cycle_node_fill_mi = new JMenuItem( MainFrame.CYCLE_NODE_FILL_LABEL ) );
- _options_jmenu.add( _choose_node_size_mi = new JMenuItem( MainFrame.CHOOSE_NODE_SIZE_LABEL ) );
- _options_jmenu.add( _label_direction_cbmi = new JCheckBoxMenuItem( MainFrame.LABEL_DIRECTION_LABEL ) );
+ .add( _color_by_taxonomic_group_cbmi = new JCheckBoxMenuItem( MainFrame.COLOR_BY_TAXONOMIC_GROUP ) );
_options_jmenu
.add( _color_labels_same_as_parent_branch = new JCheckBoxMenuItem( MainFrame.COLOR_LABELS_LABEL ) );
_color_labels_same_as_parent_branch.setToolTipText( MainFrame.COLOR_LABELS_TIP );
_options_jmenu.add( _abbreviate_scientific_names = new JCheckBoxMenuItem( MainFrame.ABBREV_SN_LABEL ) );
+ _options_jmenu.add( _label_direction_cbmi = new JCheckBoxMenuItem( MainFrame.LABEL_DIRECTION_LABEL ) );
_label_direction_cbmi.setToolTipText( MainFrame.LABEL_DIRECTION_TIP );
_options_jmenu.add( _screen_antialias_cbmi = new JCheckBoxMenuItem( MainFrame.SCREEN_ANTIALIAS_LABEL ) );
_options_jmenu.add( _background_gradient_cbmi = new JCheckBoxMenuItem( MainFrame.BG_GRAD_LABEL ) );
- if ( getConfiguration().doDisplayOption( Configuration.show_domain_architectures ) ) {
- _options_jmenu.add( _show_domain_labels = new JCheckBoxMenuItem( MainFrame.SHOW_DOMAIN_LABELS_LABEL ) );
- }
+ _options_jmenu.add( _cycle_node_shape_mi = new JMenuItem( MainFrame.CYCLE_NODE_SHAPE_LABEL ) );
+ _options_jmenu.add( _cycle_node_fill_mi = new JMenuItem( MainFrame.CYCLE_NODE_FILL_LABEL ) );
+ _options_jmenu.add( _choose_node_size_mi = new JMenuItem( MainFrame.CHOOSE_NODE_SIZE_LABEL ) );
_options_jmenu.add( _choose_minimal_confidence_mi = new JMenuItem( "" ) );
_options_jmenu.add( _overview_placment_mi = new JMenuItem( "" ) );
_options_jmenu.add( _switch_colors_mi = new JMenuItem( "" ) );
_options_jmenu.add( _choose_font_mi = new JMenuItem( "" ) );
+ /////
_options_jmenu.addSeparator();
_options_jmenu.add( MainFrame.customizeMenuItemAsLabel( new JMenuItem( MainFrame.SEARCH_SUBHEADER ),
getConfiguration() ) );
customizeJMenuItem( _choose_minimal_confidence_mi );
customizeJMenuItem( _switch_colors_mi );
customizeJMenuItem( _overview_placment_mi );
+ customizeCheckBoxMenuItem( _color_by_taxonomic_group_cbmi, getOptions().isColorByTaxonomicGroup() );
customizeCheckBoxMenuItem( _label_direction_cbmi,
getOptions().getNodeLabelDirection() == NODE_LABEL_DIRECTION.RADIAL );
customizeCheckBoxMenuItem( _screen_antialias_cbmi, getOptions().isAntialiasScreen() );
.isShowDefaultNodeShapesExternal() );
customizeCheckBoxMenuItem( _show_default_node_shapes_internal_cbmi, getOptions()
.isShowDefaultNodeShapesInternal() );
- customizeCheckBoxMenuItem( _taxonomy_colorize_node_shapes_cbmi, getOptions().isTaxonomyColorizeNodeShapes() );
customizeJMenuItem( _cycle_node_shape_mi );
customizeJMenuItem( _cycle_node_fill_mi );
customizeJMenuItem( _choose_node_size_mi );
_view_jmenu
.add( _display_basic_information_item = new JMenuItem( MainFrame.SHOW_BASIC_TREE_INFORMATION_LABEL ) );
_view_jmenu.addSeparator();
- _view_jmenu.add( _view_as_XML_item = new JMenuItem( "View as phyloXML" ) );
- _view_jmenu.add( _view_as_NH_item = new JMenuItem( "View as Newick" ) );
- _view_jmenu.add( _view_as_nexus_item = new JMenuItem( "View as Nexus" ) );
+ _view_jmenu.add( _view_as_XML_item = new JMenuItem( "as phyloXML" ) );
+ _view_jmenu.add( _view_as_NH_item = new JMenuItem( "as Newick" ) );
+ _view_jmenu.add( _view_as_nexus_item = new JMenuItem( "as Nexus" ) );
customizeJMenuItem( _display_basic_information_item );
customizeJMenuItem( _view_as_NH_item );
customizeJMenuItem( _view_as_XML_item );
if ( ( getMainPanel().getCurrentPhylogeny() != null ) && !getMainPanel().getCurrentPhylogeny().isEmpty() ) {
String title = "Basic Information";
if ( !ForesterUtil.isEmpty( getMainPanel().getCurrentPhylogeny().getName() ) ) {
- title = getMainPanel().getCurrentPhylogeny().getName() + " " + title;
+ title = title + " for \"" + _mainpanel.getCurrentPhylogeny().getName() + "\"";
}
- showTextFrame( AptxUtil.createBasicInformation( getMainPanel().getCurrentPhylogeny() ), title );
+ showTextFrame( AptxUtil.createBasicInformation( getMainPanel().getCurrentPhylogeny(), null ), title );
}
}
&& _show_default_node_shapes_internal_cbmi.isSelected() );
options.setShowDefaultNodeShapesExternal( ( _show_default_node_shapes_external_cbmi != null )
&& _show_default_node_shapes_external_cbmi.isSelected() );
- options.setTaxonomyColorizeNodeShapes( ( _taxonomy_colorize_node_shapes_cbmi != null )
- && _taxonomy_colorize_node_shapes_cbmi.isSelected() );
if ( ( _non_lined_up_cladograms_rbmi != null ) && ( _non_lined_up_cladograms_rbmi.isSelected() ) ) {
options.setCladogramType( CLADOGRAM_TYPE.NON_LINED_UP );
}
else if ( ( _circular_type_cbmi != null ) && _circular_type_cbmi.isSelected() ) {
options.setPhylogenyGraphicsType( PHYLOGENY_GRAPHICS_TYPE.CIRCULAR );
}
+ if ( ( _color_by_taxonomic_group_cbmi != null ) && _color_by_taxonomic_group_cbmi.isEnabled() ) {
+ options.setColorByTaxonomicGroup( _color_by_taxonomic_group_cbmi.isSelected() );
+ }
}
void updateTypeCheckboxes( final Options options, final Object o ) {
if ( ( getMainPanel().getCurrentPhylogeny() != null ) && !getMainPanel().getCurrentPhylogeny().isEmpty() ) {
String title = "Nexus";
if ( !ForesterUtil.isEmpty( getMainPanel().getCurrentPhylogeny().getName() ) ) {
- title = getMainPanel().getCurrentPhylogeny().getName() + " " + title;
+ title = "\"" + getMainPanel().getCurrentPhylogeny().getName() + "\" in " + title;
}
showTextFrame( getMainPanel().getCurrentPhylogeny().toNexus( getOptions()
.getNhConversionSupportValueStyle() ),
if ( ( getMainPanel().getCurrentPhylogeny() != null ) && !getMainPanel().getCurrentPhylogeny().isEmpty() ) {
String title = "New Hampshire";
if ( !ForesterUtil.isEmpty( getMainPanel().getCurrentPhylogeny().getName() ) ) {
- title = getMainPanel().getCurrentPhylogeny().getName() + " " + title;
+ title = "\"" + getMainPanel().getCurrentPhylogeny().getName() + "\" in " + title;
}
showTextFrame( getMainPanel().getCurrentPhylogeny()
.toNewHampshire( false, getOptions().getNhConversionSupportValueStyle() ),
if ( ( getMainPanel().getCurrentPhylogeny() != null ) && !getMainPanel().getCurrentPhylogeny().isEmpty() ) {
String title = "phyloXML";
if ( !ForesterUtil.isEmpty( getMainPanel().getCurrentPhylogeny().getName() ) ) {
- title = getMainPanel().getCurrentPhylogeny().getName() + " " + title;
+ title = "\"" + getMainPanel().getCurrentPhylogeny().getName() + "\" in " + title;
}
showTextFrame( getMainPanel().getCurrentPhylogeny().toPhyloXML( 0 ), title );
}
git://source.jalview.org / jalview.git / blobdiff