jalview.git
7 years agoJAL-2844 changed Aptx config to make all cladogram branches aligned
kjvdheide [Fri, 17 Nov 2017 14:41:40 +0000 (14:41 +0000)]
JAL-2844 changed Aptx config to make all cladogram branches aligned

7 years agoMerge branch 'kjvdh/features/PhylogenyViewer' of
kjvdheide [Fri, 17 Nov 2017 13:34:22 +0000 (13:34 +0000)]
Merge branch 'kjvdh/features/PhylogenyViewer' of
https://source.jalview.org/git/jalview.git into
kjvdh/features/PhylogenyViewer

Conflicts:
src/jalview/ext/archaeopteryx/AptxBinding.java
src/jalview/ext/forester/io/ExternalTreeParserI.java
src/jalview/ext/forester/io/ForesterTreeParser.java

7 years agoJAL-2805 couple of method name changes
kjvdheide [Fri, 17 Nov 2017 13:07:27 +0000 (13:07 +0000)]
JAL-2805 couple of method name changes

7 years agoJAL-281 added menu items and listeners to load from URL/Db
kjvdheide [Fri, 17 Nov 2017 02:24:58 +0000 (02:24 +0000)]
JAL-281 added menu items and listeners to load from URL/Db

7 years agoJAL-281 changed load associated tree GUI item to menu selection
kjvdheide [Fri, 17 Nov 2017 01:49:47 +0000 (01:49 +0000)]
JAL-281 changed load associated tree GUI item to menu selection

7 years agoJAL-2805 expanded tree and treenode interfaces
kjvdheide [Thu, 16 Nov 2017 11:38:47 +0000 (11:38 +0000)]
JAL-2805 expanded tree and treenode interfaces

7 years agoJAL-2805 loads of file reorganizing, interfaces expanded
kjvdheide [Thu, 16 Nov 2017 11:30:08 +0000 (11:30 +0000)]
JAL-2805 loads of file reorganizing, interfaces expanded

7 years agoJAL-2805 functional binding on loading associated trees
kjvdheide [Wed, 15 Nov 2017 10:39:47 +0000 (10:39 +0000)]
JAL-2805 functional binding on loading associated trees

7 years agoJAL-2805 viewport is passed along to the tree parser
kjvdheide [Tue, 14 Nov 2017 17:17:50 +0000 (17:17 +0000)]
JAL-2805 viewport is passed along to the tree parser

7 years agoJAL-2795 added duplication check when calculated nodes are bound to seqs
kjvdheide [Tue, 14 Nov 2017 17:17:04 +0000 (17:17 +0000)]
JAL-2795 added duplication check when calculated nodes are bound to seqs

7 years agoJAL-2805 added getters for hashmaps filled with associated seqs/nodes
kjvdheide [Tue, 14 Nov 2017 17:15:54 +0000 (17:15 +0000)]
JAL-2805 added getters for hashmaps filled with associated seqs/nodes

7 years agoJAL-2805 added static method for logging duplications when using map.put
kjvdheide [Tue, 14 Nov 2017 16:57:36 +0000 (16:57 +0000)]
JAL-2805 added static method for logging duplications when using map.put

7 years agoJAL-2805 more sensible interface method params
kjvdheide [Tue, 14 Nov 2017 16:56:50 +0000 (16:56 +0000)]
JAL-2805 more sensible interface method params

7 years agoJAL-2805 finished up interface comments
kjvdheide [Tue, 14 Nov 2017 16:00:29 +0000 (16:00 +0000)]
JAL-2805 finished up interface comments

7 years agoJAL-2805 re-enabled one2many checks
kjvdheide [Tue, 14 Nov 2017 15:31:49 +0000 (15:31 +0000)]
JAL-2805 re-enabled one2many checks

7 years agoJAL-2805 interface comments, progress on associating leaves
kjvdheide [Tue, 14 Nov 2017 15:28:56 +0000 (15:28 +0000)]
JAL-2805 interface comments, progress on associating leaves

7 years agoJAL-2805 interface comments
kjvdheide [Mon, 13 Nov 2017 20:19:43 +0000 (20:19 +0000)]
JAL-2805 interface comments

7 years agoJAL-2805 some more name changes
kjvdheide [Mon, 13 Nov 2017 20:07:06 +0000 (20:07 +0000)]
JAL-2805 some more name changes

7 years agoJAL-2805 more name changes for clarity
kjvdheide [Mon, 13 Nov 2017 20:03:31 +0000 (20:03 +0000)]
JAL-2805 more name changes for clarity

7 years agoJAL-2805 more interface name changing
kjvdheide [Mon, 13 Nov 2017 19:56:05 +0000 (19:56 +0000)]
JAL-2805 more interface name changing

7 years agoJAL-2805 name changed of interfaces for consistency
kjvdheide [Mon, 13 Nov 2017 19:55:14 +0000 (19:55 +0000)]
JAL-2805 name changed of interfaces for consistency

7 years agoJAL-2805 Jalview sequence binding interface expanded
kjvdheide [Mon, 13 Nov 2017 19:47:19 +0000 (19:47 +0000)]
JAL-2805 Jalview sequence binding interface expanded

7 years agoJAL-2805 TreeParser now interface based
kjvdheide [Mon, 13 Nov 2017 19:46:17 +0000 (19:46 +0000)]
JAL-2805 TreeParser now interface based

7 years agoJAL-2805 Added tree building interface
kjvdheide [Mon, 13 Nov 2017 19:34:25 +0000 (19:34 +0000)]
JAL-2805 Added tree building interface

7 years agoJAL-2805 name change
kjvdheide [Mon, 13 Nov 2017 19:22:02 +0000 (19:22 +0000)]
JAL-2805 name change

7 years agoJAL-2805 deleted old Aptx class for loading just Newick files
kjvdheide [Mon, 13 Nov 2017 19:19:10 +0000 (19:19 +0000)]
JAL-2805 deleted old Aptx class for loading just Newick files

7 years agoJAL-2805 more interface work
kjvdheide [Mon, 13 Nov 2017 19:16:43 +0000 (19:16 +0000)]
JAL-2805 more interface work

7 years agoJAL-2794 removed unused interface
kjvdheide [Mon, 13 Nov 2017 19:03:58 +0000 (19:03 +0000)]
JAL-2794 removed unused interface

7 years agoJAL-2805 undid accidental double (buggy) binding, more interface support
kjvdheide [Mon, 13 Nov 2017 19:02:16 +0000 (19:02 +0000)]
JAL-2805 undid accidental double (buggy) binding, more interface support

7 years agoJAL-2805 warning messages added if Forester detects file loading issues
kjvdheide [Mon, 13 Nov 2017 15:43:56 +0000 (15:43 +0000)]
JAL-2805 warning messages added if Forester detects file loading issues

7 years agoJAL-2805 First try at loading tree through Forester by calling Aptx main
kjvdheide [Mon, 13 Nov 2017 14:22:27 +0000 (14:22 +0000)]
JAL-2805 First try at loading tree through Forester by calling Aptx main

Added file filters for Forester supported tree formats to the file
chooser window and Forester tree parser in the ActionPerformed of
loading an associated tree, also see Forester commits for more details

7 years agoJAL-2794 reorganized node select code, added subtree selection support
kjvdheide [Fri, 10 Nov 2017 15:31:40 +0000 (15:31 +0000)]
JAL-2794 reorganized node select code, added subtree selection support

7 years agoJAL-2794 comments comments comments
kjvdheide [Fri, 10 Nov 2017 14:17:18 +0000 (14:17 +0000)]
JAL-2794 comments comments comments

7 years agoJAL-2794 most method parameters/class variables made final
kjvdheide [Fri, 10 Nov 2017 13:42:50 +0000 (13:42 +0000)]
JAL-2794 most method parameters/class variables made final

7 years agoJAL-2794 comments, selected node now doesn't have to be external per se
kjvdheide [Fri, 10 Nov 2017 13:38:33 +0000 (13:38 +0000)]
JAL-2794 comments, selected node now doesn't have to be external per se

7 years agoJAL-2794 PaintRefresher support, Aptx node selection now shown on align
kjvdheide [Thu, 9 Nov 2017 16:12:00 +0000 (16:12 +0000)]
JAL-2794 PaintRefresher support, Aptx node selection now shown on align

7 years agoJAL-2794 interface comment
kjvdheide [Thu, 9 Nov 2017 16:09:23 +0000 (16:09 +0000)]
JAL-2794 interface comment

7 years agoJAL-2794 Made HashMap with Nodes as keys and sequences as values as well
kjvdheide [Thu, 9 Nov 2017 16:08:46 +0000 (16:08 +0000)]
JAL-2794 Made HashMap with Nodes as keys and sequences as values as well

7 years agoJAL-2794 Aptx instances get their parent alignment, start on binding
kjvdheide [Wed, 8 Nov 2017 17:59:24 +0000 (17:59 +0000)]
JAL-2794 Aptx instances get their parent alignment, start on binding

Binding from Alignment to Aptx is now functional (including shift and/or
ctrl presses for multiple sequences), other way around is WIP

7 years agoJAL-2794 Cleaning up tree conversion, sequences are now in the tree
kjvdheide [Wed, 8 Nov 2017 17:53:17 +0000 (17:53 +0000)]
JAL-2794 Cleaning up tree conversion, sequences are now in the tree

7 years agoJAL-2794 getters and setters for finding nodes in forester made public
kjvdheide [Wed, 8 Nov 2017 17:50:02 +0000 (17:50 +0000)]
JAL-2794 getters and setters for finding nodes in forester made public

7 years agoJAL-2795 created static class for forester conversions
kjvdheide [Wed, 8 Nov 2017 17:46:52 +0000 (17:46 +0000)]
JAL-2795 created static class for forester conversions

7 years agoJAL-2794 Interface name change (oops)
kjvdheide [Wed, 8 Nov 2017 17:45:36 +0000 (17:45 +0000)]
JAL-2794 Interface name change (oops)

7 years agoJAL-2794 made JalviewTreeViewerBinding an interface
kjvdheide [Wed, 8 Nov 2017 17:44:54 +0000 (17:44 +0000)]
JAL-2794 made JalviewTreeViewerBinding an interface

7 years agoJAL-2794 Added getter for AlignmentViewport to TreeBuilder
kjvdheide [Wed, 8 Nov 2017 17:43:44 +0000 (17:43 +0000)]
JAL-2794 Added getter for AlignmentViewport to TreeBuilder

7 years agoJAL-2794 simplified/clarified associating leaves to sequences
kjvdheide [Mon, 6 Nov 2017 18:11:50 +0000 (18:11 +0000)]
JAL-2794 simplified/clarified associating leaves to sequences

7 years agoJAL-2794 created tree viewer binding class
kjvdheide [Fri, 3 Nov 2017 09:25:23 +0000 (09:25 +0000)]
JAL-2794 created tree viewer binding class

7 years agoJAL-2795 bunch of cleanup and comments
kjvdheide [Fri, 3 Nov 2017 09:23:35 +0000 (09:23 +0000)]
JAL-2795 bunch of cleanup and comments

7 years agoJAL-2795 added back test loop for Aptx tree naming & initTreePanel
kjvdheide [Thu, 2 Nov 2017 17:58:05 +0000 (17:58 +0000)]
JAL-2795 added back test loop for Aptx tree naming & initTreePanel

7 years agoJAL-2795 Reverted code changes needed to cluster from Forester
kjvdheide [Thu, 2 Nov 2017 17:06:48 +0000 (17:06 +0000)]
JAL-2795 Reverted code changes needed to cluster from Forester

7 years agoJAL-2795 Forester now NJ-clusters the DistanceMatrix from Jalview
kjvdheide [Thu, 2 Nov 2017 16:58:50 +0000 (16:58 +0000)]
JAL-2795 Forester now NJ-clusters the DistanceMatrix from Jalview

7 years agoJAL-2795 moved matrix conversion to the ForesterMatrix class
kjvdheide [Thu, 2 Nov 2017 12:11:33 +0000 (12:11 +0000)]
JAL-2795 moved matrix conversion to the ForesterMatrix class

7 years agoJAL-2795 Sequence[] references now as SequenceI[] & deleted double class
kjvdheide [Wed, 1 Nov 2017 16:13:18 +0000 (16:13 +0000)]
JAL-2795 Sequence[] references now as SequenceI[] & deleted double class

7 years agoJAL-2795 removed sequences[] class variable, more comments
kjvdheide [Wed, 1 Nov 2017 15:54:14 +0000 (15:54 +0000)]
JAL-2795 removed sequences[] class variable, more comments

7 years agoJAL-2795 neater error message
kjvdheide [Mon, 30 Oct 2017 18:29:11 +0000 (18:29 +0000)]
JAL-2795 neater error message

7 years agoJAL-2795 added error catching for invalid identifier
kjvdheide [Mon, 30 Oct 2017 18:09:38 +0000 (18:09 +0000)]
JAL-2795 added error catching for invalid identifier

7 years agoJAL-2795 changed getting index of identifier to Stream (moved to Java 8)
kjvdheide [Mon, 30 Oct 2017 17:15:07 +0000 (17:15 +0000)]
JAL-2795 changed getting index of identifier to Stream (moved to Java 8)

Searching through with Stream prevents having to duplicate the array
with Arrays.toList

7 years agoJAL-2795 rebuilt MatrixConverter to be purely static
kjvdheide [Mon, 30 Oct 2017 16:29:31 +0000 (16:29 +0000)]
JAL-2795 rebuilt MatrixConverter to be purely static

7 years agoJAL-2795 finalized method arguments; commited forester matrix changes
kjvdheide [Mon, 30 Oct 2017 15:45:14 +0000 (15:45 +0000)]
JAL-2795 finalized method arguments; commited forester matrix changes

7 years agoJAL-2795 removed unneeded for loop (woops) and initialized identifiers[]
kjvdheide [Mon, 30 Oct 2017 15:38:35 +0000 (15:38 +0000)]
JAL-2795 removed unneeded for loop (woops) and initialized identifiers[]

7 years agoJAL-2795 implemented getting/setting identifiers
kjvdheide [Mon, 30 Oct 2017 15:33:41 +0000 (15:33 +0000)]
JAL-2795 implemented getting/setting identifiers

7 years agoJAL-2795 added comments links from ForesterMatrix to MatrixI
kjvdheide [Mon, 30 Oct 2017 13:48:16 +0000 (13:48 +0000)]
JAL-2795 added comments links from ForesterMatrix to MatrixI

7 years agoJAL-2795 removed now unneeded values variable in ForesterMatrix
kjvdheide [Mon, 30 Oct 2017 13:23:57 +0000 (13:23 +0000)]
JAL-2795 removed now unneeded values variable in ForesterMatrix

7 years agoJAL-2795 add get for all matrix values to MatrixI (and concrete classes)
kjvdheide [Mon, 30 Oct 2017 13:22:17 +0000 (13:22 +0000)]
JAL-2795 add get for all matrix values to MatrixI (and concrete classes)

7 years agoJAL-2795 foresterMatrix now stores distance values itself
kjvdheide [Mon, 30 Oct 2017 11:50:05 +0000 (11:50 +0000)]
JAL-2795 foresterMatrix now stores distance values itself

7 years agoJAL-2795 more matrix implementations
kjvdheide [Sun, 29 Oct 2017 16:51:31 +0000 (16:51 +0000)]
JAL-2795 more matrix implementations

7 years agoJAL-2795 moved ForesterMatrix to ext.forester
kjvdheide [Sat, 28 Oct 2017 19:58:37 +0000 (20:58 +0100)]
JAL-2795 moved ForesterMatrix to ext.forester

7 years agoJAL-2795 Added get and set values to the converted matrix
kjvdheide [Fri, 27 Oct 2017 15:47:28 +0000 (16:47 +0100)]
JAL-2795 Added get and set values to the converted matrix

7 years agoJAL-2795 start of Jalview's Matrix conversion
kjvdheide [Fri, 27 Oct 2017 15:42:09 +0000 (16:42 +0100)]
JAL-2795 start of Jalview's Matrix conversion

7 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/featu...
kjvdheide [Fri, 27 Oct 2017 15:33:26 +0000 (16:33 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/features/PhylogenyViewer

7 years agoJAL-2526 updated javadoc
gmungoc [Fri, 27 Oct 2017 13:15:20 +0000 (14:15 +0100)]
JAL-2526 updated javadoc

7 years agoStart of matrix converter
kjvdheide [Thu, 26 Oct 2017 22:22:42 +0000 (23:22 +0100)]
Start of matrix converter

7 years agoAdded proper title to aptx trees
kjvdheide [Thu, 26 Oct 2017 20:57:16 +0000 (21:57 +0100)]
Added proper title to aptx trees

7 years agotest name change
kjvdheide [Thu, 26 Oct 2017 20:57:01 +0000 (21:57 +0100)]
test name change

7 years agoMade FreeUpMemoryTest compatible with modified CalculationChooser
kjvdheide [Thu, 26 Oct 2017 20:37:40 +0000 (21:37 +0100)]
Made FreeUpMemoryTest compatible with modified CalculationChooser

7 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview.git
kjvdheide [Thu, 26 Oct 2017 20:36:34 +0000 (21:36 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git
into kjvdh/features/PhylogenyViewer

Conflicts:
src/jalview/gui/TreePanel.java

7 years agoJAL-2698 update version and cut release branch
Jim Procter [Thu, 26 Oct 2017 16:45:43 +0000 (17:45 +0100)]
JAL-2698 update version and cut release branch

7 years agoJAL-2546 release notes
Jim Procter [Thu, 26 Oct 2017 16:31:40 +0000 (17:31 +0100)]
JAL-2546 release notes

7 years agoJAL-2488 patch causes of NPE during testStoreAndRecoverExpandedviews Jalview2xml...
Jim Procter [Thu, 26 Oct 2017 16:18:57 +0000 (17:18 +0100)]
JAL-2488 patch causes of NPE during testStoreAndRecoverExpandedviews Jalview2xml tests.

7 years agoAdded getters for scoremodel & scoreparams in TreeBuilder
kjvdheide [Thu, 26 Oct 2017 15:58:22 +0000 (16:58 +0100)]
Added getters for scoremodel & scoreparams in TreeBuilder

7 years agoMerge branch 'feature/JAL-2488finalize' into develop
Jim Procter [Thu, 26 Oct 2017 15:26:06 +0000 (16:26 +0100)]
Merge branch 'feature/JAL-2488finalize' into develop

7 years agoTreeBuilder now stores the used ScoreModel and ScoreParams
kjvdheide [Thu, 26 Oct 2017 15:20:25 +0000 (16:20 +0100)]
TreeBuilder now stores the used ScoreModel and ScoreParams

7 years agoJAL-2036 2.10.3 release notes
Jim Procter [Thu, 26 Oct 2017 15:20:14 +0000 (16:20 +0100)]
JAL-2036 2.10.3 release notes

7 years agosmall name fixes in TreeBuilder
kjvdheide [Thu, 26 Oct 2017 15:12:17 +0000 (16:12 +0100)]
small name fixes in TreeBuilder

7 years agoAdded TreeBuilder as parameter to the converter constructor
kjvdheide [Thu, 26 Oct 2017 15:12:04 +0000 (16:12 +0100)]
Added TreeBuilder as parameter to the converter constructor

7 years agoName changed of aptx treebuilder to treeconverter
kjvdheide [Thu, 26 Oct 2017 15:10:25 +0000 (16:10 +0100)]
Name changed of aptx treebuilder to treeconverter

7 years agoadded getSeqData to TreeBuilder
kjvdheide [Thu, 26 Oct 2017 14:49:56 +0000 (15:49 +0100)]
added getSeqData to TreeBuilder

7 years agoJAL-2793 cancelling font changed dialog didn't call ap.fontChanged() to reset layout
Jim Procter [Thu, 26 Oct 2017 14:47:32 +0000 (15:47 +0100)]
JAL-2793 cancelling font changed dialog didn't call ap.fontChanged() to reset layout

7 years agoAdded full names to the tree algorithm enum
kjvdheide [Thu, 26 Oct 2017 14:46:08 +0000 (15:46 +0100)]
Added full names to the tree algorithm enum

7 years agoadded abbreviations
kjvdheide [Thu, 26 Oct 2017 14:17:58 +0000 (15:17 +0100)]
added abbreviations

7 years agoadded enum for the different tree algorithms
kjvdheide [Thu, 26 Oct 2017 14:10:58 +0000 (15:10 +0100)]
added enum for the different tree algorithms

7 years agoCouple more thread names
kjvdheide [Thu, 26 Oct 2017 13:59:22 +0000 (14:59 +0100)]
Couple more thread names

7 years agonamed most Jalview threads
kjvdheide [Thu, 26 Oct 2017 13:53:04 +0000 (14:53 +0100)]
named most Jalview threads

7 years agoJAL-2548 release notes
Jim Procter [Thu, 26 Oct 2017 13:41:34 +0000 (14:41 +0100)]
JAL-2548 release notes

7 years agoMerge branch 'bug/JAL-2776toggleGroupColour' into develop
Jim Procter [Thu, 26 Oct 2017 10:51:35 +0000 (11:51 +0100)]
Merge branch 'bug/JAL-2776toggleGroupColour' into develop

7 years agoJAL-2684 JAL-2685 release notes
Jim Procter [Thu, 26 Oct 2017 10:50:03 +0000 (11:50 +0100)]
JAL-2684 JAL-2685 release notes

7 years agoJAL-2685 tidy up html doc
Jim Procter [Thu, 26 Oct 2017 10:40:25 +0000 (11:40 +0100)]
JAL-2685 tidy up html doc

7 years agoMerge branch 'features/JAL-2685pairwiseSeqLimits' into develop
Jim Procter [Thu, 26 Oct 2017 10:14:38 +0000 (11:14 +0100)]
Merge branch 'features/JAL-2685pairwiseSeqLimits' into develop

7 years agoJAL-2392 test asserts for progressbar creation on the Swing GUI thread.
Jim Procter [Thu, 26 Oct 2017 09:57:13 +0000 (10:57 +0100)]
JAL-2392 test asserts for progressbar creation on the Swing GUI thread.

7 years agoremoved accidental added enters, commented out broken memory test line
kjvdheide [Thu, 26 Oct 2017 09:10:23 +0000 (10:10 +0100)]
removed accidental added enters, commented out broken memory test line