Font.PLAIN,
9 );
private static final String RETURN_TO_SUPER_TREE_TEXT = "Back to Super Tree";
+ private static final String SEARCH_TIP_TEXT = "Enter text to search for. Use ',' for logical OR and '+' for logical AND (not used in this manner for regular expression searches).";
private static final long serialVersionUID = -8463483932821545633L;
private NodeClickAction _action_when_node_clicked;
private int _add_new_node_item;
private int _paste_subtree_item;
private int _reroot_cb_item;
private JButton _return_to_super_tree;
- // Search
+ // Search
private JLabel _search_found_label_0;
private JLabel _search_found_label_1;
private JButton _search_reset_button_0;
}
displayedPhylogenyMightHaveChanged( true );
}
- else if ( e.getSource() == _show_domain_architectures ) {
+ else if ( e.getSource() == _show_domain_architectures ) {
search0();
search1();
displayedPhylogenyMightHaveChanged( true );
}
+
else if ( ( tp != null ) && ( tp.getPhylogeny() != null ) ) {
if ( e.getSource() == getDisplayAsPhylogramCb() ) {
setDrawPhylogram( getDisplayAsPhylogramCb().isSelected() );
displayedPhylogenyMightHaveChanged( true );
}
else if ( e.getSource() == _decr_domain_structure_evalue_thr ) {
- _mainpanel.getCurrentTreePanel().decreaseDomainStructureEvalueThreshold();
+ _mainpanel.getCurrentTreePanel().decreaseDomainStructureEvalueThresholdExp();
+ search0();
+ search1();
displayedPhylogenyMightHaveChanged( true );
}
else if ( e.getSource() == _incr_domain_structure_evalue_thr ) {
- _mainpanel.getCurrentTreePanel().increaseDomainStructureEvalueThreshold();
+ _mainpanel.getCurrentTreePanel().increaseDomainStructureEvalueThresholdExp();
+ search0();
+ search1();
displayedPhylogenyMightHaveChanged( true );
}
else if ( e.getSource() == _search_tf_0 ) {
/**
* Indicates what action should be execute when a node is clicked
- *
+ *
* @return the click-on action
*/
NodeClickAction getActionWhenNodeClicked() {
_sequence_colors = sequence_colors;
}
- /* GUILHEM_END */
- /*
- * Set up the controls from the config settings. 11/26/05
- */
void setupControls() {
// The tree display options:
setupDisplayCheckboxes();
}
void setupSearchTools0() {
- final String tip = "Enter text to search for. Use ',' for multiple searches (logical OR) and '+' for logical AND.";
final JLabel search_label = new JLabel( "Search (A):" );
search_label.setFont( ControlPanel.jcb_bold_font );
if ( !getConfiguration().isUseNativeUI() ) {
search_label.setForeground( getConfiguration().getGuiCheckboxTextColor() );
}
add( search_label );
- search_label.setToolTipText( tip );
+ search_label.setToolTipText( SEARCH_TIP_TEXT );
_search_found_label_0 = new JLabel();
getSearchFoundCountsLabel0().setVisible( false );
_search_found_label_0.setFont( ControlPanel.jcb_bold_font );
_search_found_label_0.setForeground( getConfiguration().getGuiCheckboxTextColor() );
}
_search_tf_0 = new JTextField( 3 );
- _search_tf_0.setToolTipText( tip );
+ _search_tf_0.setToolTipText( SEARCH_TIP_TEXT );
_search_tf_0.setEditable( true );
if ( !getConfiguration().isUseNativeUI() ) {
_search_tf_0.setForeground( getConfiguration().getGuiMenuBackgroundColor() );
}
void setupSearchTools1() {
- final String tip = "Enter text to search for. Use ',' for multiple searches (logical OR) and '+' for logical AND.";
final JLabel search_label = new JLabel( "Search (B):" );
search_label.setFont( ControlPanel.jcb_bold_font );
if ( !getConfiguration().isUseNativeUI() ) {
search_label.setForeground( getConfiguration().getGuiCheckboxTextColor() );
}
add( search_label );
- search_label.setToolTipText( tip );
+ search_label.setToolTipText( SEARCH_TIP_TEXT );
_search_found_label_1 = new JLabel();
getSearchFoundCountsLabel1().setVisible( false );
_search_found_label_1.setFont( ControlPanel.jcb_bold_font );
_search_found_label_1.setForeground( getConfiguration().getGuiCheckboxTextColor() );
}
_search_tf_1 = new JTextField( 3 );
- _search_tf_1.setToolTipText( tip );
+ _search_tf_1.setToolTipText( SEARCH_TIP_TEXT );
_search_tf_1.setEditable( true );
if ( !getConfiguration().isUseNativeUI() ) {
_search_tf_1.setForeground( getConfiguration().getGuiMenuBackgroundColor() );
_mainpanel.getCurrentTreePanel().validate();
_mainpanel.validate();
_mainpanel.getCurrentTreePanel().calcParametersForPainting( _mainpanel.getSizeOfViewport().width,
- _mainpanel.getSizeOfViewport().height,
- true );
+ _mainpanel.getSizeOfViewport().height );
_mainpanel.getCurrentTreePanel().resetPreferredSize();
_mainpanel.adjustJScrollPane();
_mainpanel.getCurrentTreePanel().repaint();
_mainpanel.getCurrentTreePanel().validate();
_mainpanel.validate();
_mainpanel.getCurrentTreePanel().calcParametersForPainting( _mainpanel.getSizeOfViewport().width,
- _mainpanel.getSizeOfViewport().height,
- true );
+ _mainpanel.getSizeOfViewport().height );
_mainpanel.getCurrentTreePanel().resetPreferredSize();
_mainpanel.adjustJScrollPane();
_mainpanel.getCurrentTreePanel().repaint();
if ( tree_panel != null ) {
tree_panel.validate();
tree_panel.calcParametersForPainting( _mainpanel.getSizeOfViewport().width,
- _mainpanel.getSizeOfViewport().height,
- true );
+ _mainpanel.getSizeOfViewport().height );
tree_panel.resetPreferredSize();
tree_panel.repaint();
}
void updateDomainStructureEvaluethresholdDisplay() {
if ( _domain_structure_evalue_thr_tf != null ) {
_domain_structure_evalue_thr_tf.setText( "10^"
- + getMainPanel().getCurrentTreePanel().getDomainStructureEvalueThreshold() );
+ + getMainPanel().getCurrentTreePanel().getDomainStructureEvalueThresholdExp() );
}
}
getSearchResetButton0().setVisible( true );
String[] queries = null;
List<PhylogenyNode> nodes = null;
- if ( query_str.indexOf( ',' ) >= 0 ) {
+ if ( ( query_str.indexOf( ',' ) >= 0 ) && !getOptions().isSearchWithRegex() ) {
queries = query_str.split( ",+" );
}
else {
continue;
}
query = query.trim();
- if ( query.indexOf( '+' ) >= 0 ) {
+ if ( ( query.indexOf( '+' ) >= 0 ) && !getOptions().isSearchWithRegex() ) {
nodes.addAll( PhylogenyMethods.searchDataLogicalAnd( query.split( "\\++" ),
tree,
getOptions().isSearchCaseSensitive(),
isShowDomainArchitectures() ) );
}
else {
+ final TreePanel tp = getMainPanel().getCurrentTreePanel();
+
+
nodes.addAll( PhylogenyMethods.searchData( query,
tree,
getOptions().isSearchCaseSensitive(),
!getOptions().isMatchWholeTermsOnly(),
- isShowDomainArchitectures() ) );
+ getOptions().isSearchWithRegex(),
+ isShowDomainArchitectures(),
+ tp != null ? Math.pow( 10, tp.getDomainStructureEvalueThresholdExp() ) : 0 ) );
}
}
if ( getOptions().isInverseSearchResult() ) {
getSearchResetButton1().setVisible( true );
String[] queries = null;
List<PhylogenyNode> nodes = null;
- if ( query_str.indexOf( ',' ) >= 0 ) {
+ if ( ( query_str.indexOf( ',' ) >= 0 ) && !getOptions().isSearchWithRegex() ) {
queries = query_str.split( ",+" );
}
else {
continue;
}
query = query.trim();
- if ( query.indexOf( '+' ) >= 0 ) {
+ if ( ( query.indexOf( '+' ) >= 0 ) && !getOptions().isSearchWithRegex() ) {
nodes.addAll( PhylogenyMethods.searchDataLogicalAnd( query.split( "\\++" ),
tree,
getOptions().isSearchCaseSensitive(),
isShowDomainArchitectures() ) );
}
else {
+ final TreePanel tp = getMainPanel().getCurrentTreePanel();
nodes.addAll( PhylogenyMethods.searchData( query,
tree,
getOptions().isSearchCaseSensitive(),
!getOptions().isMatchWholeTermsOnly(),
- isShowDomainArchitectures() ) );
+ getOptions().isSearchWithRegex(),
+ isShowDomainArchitectures(),
+ tp != null ? Math.pow( 10, tp.getDomainStructureEvalueThresholdExp() ) : 0 ) );
}
}
if ( getOptions().isInverseSearchResult() ) {
_get_ext_desc_data = cb_index;
if ( !ForesterUtil.isEmpty( getConfiguration().getLabelForGetExtDescendentsData() ) ) {
addClickToOption( Configuration.get_ext_desc_data, getConfiguration()
- .getLabelForGetExtDescendentsData() );
+ .getLabelForGetExtDescendentsData() );
}
else {
- String s = ";";
- switch ( getConfiguration().getExtDescNodeDataToReturn() ) {
- case NODE_NAME:
- s = "Node Names";
- break;
- case SEQUENCE_ACC:
- s = "Sequence Accessors";
- break;
- case SEQUENCE_MOL_SEQ:
- s = "Molecular Sequence";
- break;
- case SEQUENCE_MOL_SEQ_FASTA:
- s = "Molecular Sequence (Fasta)";
- break;
- case SEQUENCE_NAME:
- s = "Sequence Names";
- break;
- case GENE_NAME:
- s = "Gene Names";
- break;
- case SEQUENCE_SYMBOL:
- s = "Sequence Symbols";
- break;
- case TAXONOMY_CODE:
- s = "Taxonomy Codes";
- break;
- case TAXONOMY_COMM0N_NAME:
- s = "Taxonomy Common Names";
- break;
- case TAXONOMY_SCIENTIFIC_NAME:
- s = "Scientific Names";
- break;
- case UNKNOWN:
- s = "User Selected Data";
- break;
- default:
- throw new IllegalStateException( "dont know how to deal with "
- + getConfiguration().getExtDescNodeDataToReturn() );
- }
- final String label = _configuration.getClickToTitle( Configuration.get_ext_desc_data ) + " " + s;
- addClickToOption( Configuration.get_ext_desc_data, label );
+
+ addClickToOption( Configuration.get_ext_desc_data,
+ getConfiguration().getClickToTitle( Configuration.get_ext_desc_data ) );
}
+
if ( default_option == Configuration.get_ext_desc_data ) {
selected_index = cb_index;
}