kjvdheide [Wed, 17 Jan 2018 20:13:40 +0000 (20:13 +0000)]
JAL-1951 added comment to NexusFile clarifying Forester's broken parser
kjvdheide [Wed, 17 Jan 2018 16:51:57 +0000 (16:51 +0000)]
JAL-2794 tree viewer frame now has its binding object properly set
kjvdheide [Wed, 17 Jan 2018 16:47:54 +0000 (16:47 +0000)]
JAL-2798 now added to active views when associated with Jalview as well
kjvdheide [Wed, 17 Jan 2018 16:21:27 +0000 (16:21 +0000)]
JAL-281 added initialising trees to FileLoader if fileformat is treefile
kjvdheide [Wed, 17 Jan 2018 16:03:51 +0000 (16:03 +0000)]
JAL-281 added isTreeFile() boolean
kjvdheide [Tue, 16 Jan 2018 21:36:31 +0000 (21:36 +0000)]
JAL-2798 rough saving/loading a single Aptx view functionality present
kjvdheide [Tue, 16 Jan 2018 20:21:13 +0000 (20:21 +0000)]
JAL-2798 comments
kjvdheide [Tue, 16 Jan 2018 18:02:02 +0000 (18:02 +0000)]
JAL-2798 tree frame is now added to active views when added to Jalview
kjvdheide [Tue, 16 Jan 2018 17:09:25 +0000 (17:09 +0000)]
JAL-2798 added methods for getting/adding external tree viewer
kjvdheide [Tue, 16 Jan 2018 01:41:54 +0000 (01:41 +0000)]
JAL-2798 added method to tree for writing to jalview project
kjvdheide [Fri, 12 Jan 2018 18:07:45 +0000 (18:07 +0000)]
JAL-2805 check actually works now
kjvdheide [Fri, 12 Jan 2018 15:45:47 +0000 (15:45 +0000)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/features/PhylogenyViewer
kjvdheide [Fri, 12 Jan 2018 15:34:21 +0000 (15:34 +0000)]
JAL-2798 Aptx is now saved to the project
kjvdheide [Fri, 12 Jan 2018 15:18:27 +0000 (15:18 +0000)]
JAL-2805 removed unused Aptx instance creation code
kjvdheide [Fri, 12 Jan 2018 15:15:33 +0000 (15:15 +0000)]
JAL-2805 added getter and setter for jalview association to tree frame
kiramt [Fri, 12 Jan 2018 11:37:03 +0000 (11:37 +0000)]
JAL-2886 trivial unit test fix
gmungoc [Fri, 27 Oct 2017 11:20:28 +0000 (12:20 +0100)]
JAL-2754 renamed proguard.jar to include version number
gmungoc [Fri, 27 Oct 2017 11:03:22 +0000 (12:03 +0100)]
JAL-2754 5.3.3 update of proguard.jar
gmungoc [Fri, 27 Oct 2017 09:52:05 +0000 (10:52 +0100)]
JAL-2754 update to specify Java 1.8(+)
kiramt [Thu, 11 Jan 2018 17:28:29 +0000 (17:28 +0000)]
Merge remote-tracking branch 'origin/task/JAL-2662' into develop
Conflicts:
benchmarking/README
kiramt [Thu, 11 Jan 2018 14:53:00 +0000 (14:53 +0000)]
JAL-2662 Updated README
kjvdheide [Thu, 11 Jan 2018 14:11:44 +0000 (14:11 +0000)]
JAL-2884 old Newick trees are now loaded in as Aptx as well
kjvdheide [Thu, 11 Jan 2018 13:43:41 +0000 (13:43 +0000)]
JAL-2795 simplified instance creation from calculation
kjvdheide [Thu, 11 Jan 2018 12:28:06 +0000 (12:28 +0000)]
JAL-2798 alignmentviewport's current external tree is now set when a
viewer instance gets associated
kjvdheide [Wed, 10 Jan 2018 17:01:58 +0000 (17:01 +0000)]
JAL-1953 named various threads
kjvdheide [Wed, 10 Jan 2018 10:45:02 +0000 (10:45 +0000)]
JAL-2795 calculated trees are now passed along as Newick strings
kjvdheide [Wed, 10 Jan 2018 10:43:34 +0000 (10:43 +0000)]
JAL-2795 disabled most tests for now
kjvdheide [Tue, 9 Jan 2018 23:08:29 +0000 (23:08 +0000)]
JAL-2805 file identifying lines are turned to lowercase before matching
kjvdheide [Tue, 9 Jan 2018 23:07:31 +0000 (23:07 +0000)]
JAL-2805 correct nexus parser is now created
kjvdheide [Tue, 9 Jan 2018 17:34:11 +0000 (17:34 +0000)]
JAL-2805 Creating jalview sequence now requires the node itself (for the
name)
kjvdheide [Tue, 9 Jan 2018 17:18:48 +0000 (17:18 +0000)]
JAL-2805 added derive sequence when creating jalview sequence
kjvdheide [Tue, 9 Jan 2018 17:14:11 +0000 (17:14 +0000)]
JAL-2805 getNodeSequences returns a list now instead of array (size
isn't certain beforehand)
kjvdheide [Tue, 9 Jan 2018 15:34:36 +0000 (15:34 +0000)]
JAL-2805 added check for null node sequences during parsing (such as in
internal nodes)
kjvdheide [Tue, 9 Jan 2018 15:31:44 +0000 (15:31 +0000)]
JAL-2805 allow for non-xsd validating phyloxml parsing
kjvdheide [Tue, 9 Jan 2018 14:28:37 +0000 (14:28 +0000)]
JAL-2805 check no longer errors if the sequence is actually null (woops)
kjvdheide [Tue, 9 Jan 2018 14:23:43 +0000 (14:23 +0000)]
JAL-2805 added check for sequences already being present in tree nodes
kjvdheide [Tue, 9 Jan 2018 13:59:58 +0000 (13:59 +0000)]
JAL-2805 put the sequence setting in if statement (not all nodes have
sequences)
kjvdheide [Tue, 9 Jan 2018 11:51:02 +0000 (11:51 +0000)]
JAL-2805 added Aptx factory method reading directly from a File
kjvdheide [Tue, 9 Jan 2018 11:18:07 +0000 (11:18 +0000)]
JAL-2805 added nexus specific parser settings
kjvdheide [Tue, 9 Jan 2018 10:54:54 +0000 (10:54 +0000)]
JAL-2805 broke off the phylogenetic file formats into separate classes
kjvdheide [Tue, 9 Jan 2018 10:53:43 +0000 (10:53 +0000)]
JAL-2805 parser is now File based (instead of FileParse) and source is
now properly set
kjvdheide [Tue, 9 Jan 2018 10:53:01 +0000 (10:53 +0000)]
JAL-2805 Parse returns a TreeI array again
kjvdheide [Tue, 9 Jan 2018 10:52:16 +0000 (10:52 +0000)]
JAL-2805 node sequence is now immediately filled in by the constructor
kjvdheide [Tue, 9 Jan 2018 10:51:36 +0000 (10:51 +0000)]
JAL-2805 added forester --> jalview sequence converter
kjvdheide [Tue, 9 Jan 2018 10:21:01 +0000 (10:21 +0000)]
JAL-2805 added getter in trees for retrieving all node sequences
kjvdheide [Tue, 9 Jan 2018 10:20:04 +0000 (10:20 +0000)]
JAL-1953 moved DataConversions to Forester package
kjvdheide [Mon, 8 Jan 2018 11:10:22 +0000 (11:10 +0000)]
JAL-2844 changed threshold from double to float
kjvdheide [Mon, 8 Jan 2018 11:07:35 +0000 (11:07 +0000)]
JAL-2844 start on moving tree partitioning code into Forester
kjvdheide [Sat, 6 Jan 2018 22:43:52 +0000 (22:43 +0000)]
JAL-2877 added forester as jar once again
kjvdheide [Sat, 6 Jan 2018 22:36:39 +0000 (22:36 +0000)]
JAL-281 first line also checked for PhyloXML identification
kjvdheide [Sat, 6 Jan 2018 22:11:18 +0000 (22:11 +0000)]
JAL-2871 aptx Configuration now created through input stream
kjvdheide [Fri, 5 Jan 2018 04:00:58 +0000 (04:00 +0000)]
JAL-281 ForesterParser now extends from AlignFile
kjvdheide [Thu, 4 Jan 2018 20:18:36 +0000 (20:18 +0000)]
JAL-1953 Moved config to resources folder
kjvdheide [Thu, 4 Jan 2018 20:17:49 +0000 (20:17 +0000)]
JAL-281 ForesterParser factory methods added
kjvdheide [Sun, 31 Dec 2017 18:41:49 +0000 (18:41 +0000)]
JAL-1953 start work on storing nodes in a map per tree object instead of
all together in a static map
kjvdheide [Thu, 21 Dec 2017 16:25:55 +0000 (16:25 +0000)]
JAL-281 added file identify criteria for PhyloXML and Nexus
kjvdheide [Wed, 20 Dec 2017 18:40:31 +0000 (18:40 +0000)]
JAL-2874 made the actionlistener slightly clearer
kjvdheide [Wed, 20 Dec 2017 18:04:25 +0000 (18:04 +0000)]
JAL-2838 JAL-2872 added sorting from the Aptx frame (still misbehaving
with
multiple alignment views)
kjvdheide [Wed, 20 Dec 2017 14:20:29 +0000 (14:20 +0000)]
JAL-281 moved utility methods to .io package
kjvdheide [Wed, 20 Dec 2017 13:24:41 +0000 (13:24 +0000)]
JAL-281 split up TreeParser into separate format parsers
kjvdheide [Tue, 19 Dec 2017 14:34:24 +0000 (14:34 +0000)]
JAL-281 created Nexus and PhyloXML parser classes
kjvdheide [Tue, 19 Dec 2017 14:16:49 +0000 (14:16 +0000)]
JAL-281 cleared out useless tree parser class
kjvdheide [Tue, 19 Dec 2017 14:10:26 +0000 (14:10 +0000)]
JAL-281 added phyloxml and nexus to jalview fileformats
kjvdheide [Mon, 18 Dec 2017 18:30:14 +0000 (18:30 +0000)]
JAL-1953 moved now-generic methods outside of Aptx package
kjvdheide [Mon, 18 Dec 2017 18:21:35 +0000 (18:21 +0000)]
JAL-1953 -External from all interfaces names
kjvdheide [Mon, 18 Dec 2017 18:18:33 +0000 (18:18 +0000)]
JAL-1953 attempt at changing Aptx's font to Jalview's
kjvdheide [Mon, 18 Dec 2017 18:18:03 +0000 (18:18 +0000)]
JAL-2844 cladogram no longer vertically aligned (was rather confusing)
kjvdheide [Mon, 18 Dec 2017 18:04:15 +0000 (18:04 +0000)]
Merge branch 'kjvdh/features/PhylogenyViewer' of
https://source.jalview.org/git/jalview.git into
kjvdh/features/PhylogenyViewer
kjvdheide [Mon, 18 Dec 2017 15:50:59 +0000 (15:50 +0000)]
JAL-2844 made null tree nodes return null wrappers so partitioning works
kjvdheide [Mon, 18 Dec 2017 15:37:19 +0000 (15:37 +0000)]
Merge branch 'kjvdh/features/PhylogenyViewer' into
kjvdh/features/PhylogenyViewerInterfaces
Conflicts:
src/jalview/ext/archaeopteryx/AptxFrame.java
src/jalview/ext/archaeopteryx/AptxInit.java
src/jalview/ext/archaeopteryx/AptxTreePanel.java
src/jalview/ext/archaeopteryx/JalviewBinding.java
src/jalview/ext/archaeopteryx/LoadedTreeSequenceAssociation.java
src/jalview/ext/archaeopteryx/Tree.java
src/jalview/ext/archaeopteryx/TreeNode.java
src/jalview/ext/treeviewer/ExternalTreeParserI.java
src/jalview/ext/treeviewer/ExternalTreeViewerFrameI.java
kjvdheide [Mon, 18 Dec 2017 15:08:51 +0000 (15:08 +0000)]
JAL-1953 redundant tree interface instantiation removed
kjvdheide [Fri, 15 Dec 2017 20:00:30 +0000 (20:00 +0000)]
JAL-2852 EPS saving code ported from TreePanel to Aptx.
kjvdheide [Fri, 15 Dec 2017 16:58:30 +0000 (16:58 +0000)]
JAL-1953 added Y coordinate getter method
kjvdheide [Fri, 15 Dec 2017 16:07:57 +0000 (16:07 +0000)]
JAL-2852 merged the EPS button adding from main branch into interfaces
kjvdheide [Fri, 15 Dec 2017 16:06:57 +0000 (16:06 +0000)]
JAL-1953 node comparing now includes checking node IDs to prevent false
duplicate keys in the node hashmaps
kjvdheide [Fri, 15 Dec 2017 14:54:12 +0000 (14:54 +0000)]
JAL-1953 removed deprecated interfaces
kjvdheide [Fri, 15 Dec 2017 14:53:35 +0000 (14:53 +0000)]
JAL-2852 added EPS export button to File menu
kjvdheide [Thu, 14 Dec 2017 17:00:12 +0000 (17:00 +0000)]
JAL-1953 more progress on interfaces, jalview binding still problematic
kjvdheide [Tue, 12 Dec 2017 18:40:05 +0000 (18:40 +0000)]
JAL-2874 filtering alignment now also works when just zoomed in
kjvdheide [Tue, 12 Dec 2017 18:03:37 +0000 (18:03 +0000)]
JAL-2874 added filtering when a subtree is selected
kjvdheide [Tue, 12 Dec 2017 10:51:13 +0000 (10:51 +0000)]
Merge branch 'kjvdh/features/PhylogenyViewer' of https://source.jalview.org/git/jalview.git into kjvdh/features/PhylogenyViewer
kjvdheide [Tue, 12 Dec 2017 10:37:19 +0000 (10:37 +0000)]
JAL-2877 disabled Jalview's own viewer for testing
kjvdheide [Mon, 11 Dec 2017 20:58:28 +0000 (20:58 +0000)]
JAL-2872 hide sort button in Aptx unless it's actually possible
kjvdheide [Mon, 11 Dec 2017 20:57:51 +0000 (20:57 +0000)]
JAL-2877 disabled Jalview's default tree viewer when loading files
kjvdheide [Mon, 11 Dec 2017 20:43:08 +0000 (20:43 +0000)]
JAL-1953 fixed interface misnaming
kjvdheide [Mon, 11 Dec 2017 20:34:15 +0000 (20:34 +0000)]
JAL-1953 start on making everything interface based
kjvdheide [Fri, 8 Dec 2017 17:35:06 +0000 (17:35 +0000)]
JAL-1953 renaming of concrete implementation as well
kjvdheide [Fri, 8 Dec 2017 13:47:57 +0000 (13:47 +0000)]
JAL-2844 reallow clicks to the left of the root (groups whole tree as 1)
kjvdheide [Thu, 7 Dec 2017 16:22:08 +0000 (16:22 +0000)]
JAL-2866 and .jar removed again
kjvdheide [Thu, 7 Dec 2017 15:40:54 +0000 (15:40 +0000)]
JAL-2866 forester .jar added to lib
kjvdheide [Thu, 7 Dec 2017 14:24:14 +0000 (14:24 +0000)]
JAL-2872 Redundant Aptx GUI menu items hidden, sorting item added
kjvdheide [Wed, 6 Dec 2017 16:07:42 +0000 (16:07 +0000)]
JAL-2794 disabled branch colors on selection for now
kjvdheide [Wed, 6 Dec 2017 16:03:34 +0000 (16:03 +0000)]
JAL-2871 Added check whether configuration has been loaded in
kjvdheide [Tue, 5 Dec 2017 16:08:42 +0000 (16:08 +0000)]
JAL-2838 Sorting from the alignment view menu now functional
kjvdheide [Tue, 5 Dec 2017 16:07:05 +0000 (16:07 +0000)]
JAL-2847 Rearranging and cleaning up of database query code
kjvdheide [Tue, 5 Dec 2017 15:25:02 +0000 (15:25 +0000)]
JAL-2794 associate leaves now iterates through ALL nodes (also internal)
kjvdheide [Tue, 5 Dec 2017 14:21:04 +0000 (14:21 +0000)]
JAL-2847 various error popups for db querying now have formatted strings
kjvdheide [Tue, 5 Dec 2017 13:45:24 +0000 (13:45 +0000)]
JAL-2847 Strings for the various tree databases added
kjvdheide [Tue, 5 Dec 2017 13:02:07 +0000 (13:02 +0000)]
JAL-2847 if pfam id is detected in first sequence its shown in db query
kjvdheide [Tue, 5 Dec 2017 12:39:23 +0000 (12:39 +0000)]
JAL-2847 added pfam to DBRef source name lookup
git://source.jalview.org / jalview.git / log