git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
work on: add ability to perform GSDI in applets
[jalview.git]
/
forester
/
java
/
src
/
org
/
forester
/
archaeopteryx
/
ControlPanel.java
diff --git
a/forester/java/src/org/forester/archaeopteryx/ControlPanel.java
b/forester/java/src/org/forester/archaeopteryx/ControlPanel.java
index
e25ef2c
..
8c80f0c
100644
(file)
--- a/
forester/java/src/org/forester/archaeopteryx/ControlPanel.java
+++ b/
forester/java/src/org/forester/archaeopteryx/ControlPanel.java
@@
-20,7
+20,7
@@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
//
// Contact: phylosoft @ gmail . com
// 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;
package org.forester.archaeopteryx;
@@
-1277,17
+1277,17
@@
final class ControlPanel extends JPanel implements ActionListener {
_mainpanel.getCurrentTreePanel().updateOvSettings();
_mainpanel.getCurrentTreePanel().validate();
_mainpanel.validate();
_mainpanel.getCurrentTreePanel().updateOvSettings();
_mainpanel.getCurrentTreePanel().validate();
_mainpanel.validate();
- _mainpanel.getCurrentTreePanel().setParametersForPainting( _mainpanel.getSizeOfViewport().width,
- _mainpanel.getSizeOfViewport().height,
- true );
+ _mainpanel.getCurrentTreePanel().calcParametersForPainting( _mainpanel.getSizeOfViewport().width,
+ _mainpanel.getSizeOfViewport().height,
+ true );
_mainpanel.getCurrentTreePanel().resetPreferredSize();
_mainpanel.adjustJScrollPane();
_mainpanel.getCurrentTreePanel().repaint();
_mainpanel.getCurrentTreePanel().validate();
_mainpanel.validate();
_mainpanel.getCurrentTreePanel().resetPreferredSize();
_mainpanel.adjustJScrollPane();
_mainpanel.getCurrentTreePanel().repaint();
_mainpanel.getCurrentTreePanel().validate();
_mainpanel.validate();
- _mainpanel.getCurrentTreePanel().setParametersForPainting( _mainpanel.getSizeOfViewport().width,
- _mainpanel.getSizeOfViewport().height,
- true );
+ _mainpanel.getCurrentTreePanel().calcParametersForPainting( _mainpanel.getSizeOfViewport().width,
+ _mainpanel.getSizeOfViewport().height,
+ true );
_mainpanel.getCurrentTreePanel().resetPreferredSize();
_mainpanel.adjustJScrollPane();
_mainpanel.getCurrentTreePanel().repaint();
_mainpanel.getCurrentTreePanel().resetPreferredSize();
_mainpanel.adjustJScrollPane();
_mainpanel.getCurrentTreePanel().repaint();
@@
-1298,9
+1298,9
@@
final class ControlPanel extends JPanel implements ActionListener {
for( final TreePanel tree_panel : _mainpanel.getTreePanels() ) {
if ( tree_panel != null ) {
tree_panel.validate();
for( final TreePanel tree_panel : _mainpanel.getTreePanels() ) {
if ( tree_panel != null ) {
tree_panel.validate();
- tree_panel.setParametersForPainting( _mainpanel.getSizeOfViewport().width,
- _mainpanel.getSizeOfViewport().height,
- true );
+ tree_panel.calcParametersForPainting( _mainpanel.getSizeOfViewport().width,
+ _mainpanel.getSizeOfViewport().height,
+ true );
tree_panel.resetPreferredSize();
tree_panel.repaint();
}
tree_panel.resetPreferredSize();
tree_panel.repaint();
}
@@
-1615,7
+1615,7
@@
final class ControlPanel extends JPanel implements ActionListener {
}
}
if ( ( nodes != null ) && ( nodes.size() > 0 ) ) {
}
}
if ( ( nodes != null ) && ( nodes.size() > 0 ) ) {
- main_panel.getCurrentTreePanel().setFoundNodes( new HashSet<Integer>() );
+ main_panel.getCurrentTreePanel().setFoundNodes( new HashSet<Long>() );
for( final PhylogenyNode node : nodes ) {
main_panel.getCurrentTreePanel().getFoundNodes().add( node.getId() );
}
for( final PhylogenyNode node : nodes ) {
main_panel.getCurrentTreePanel().getFoundNodes().add( node.getId() );
}
@@
-1746,6
+1746,9
@@
final class ControlPanel extends JPanel implements ActionListener {
case SEQUENCE_MOL_SEQ:
s = "Molecular Sequence";
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 SEQUENCE_NAME:
s = "Sequence Names";
break;