jalview.git
6 years agoJAL-2826 added action performed for hiding collapsed sequences kjvdh/features/PhylogenyViewer spikes/koen
kjvdheide [Fri, 2 Feb 2018 14:04:49 +0000 (14:04 +0000)]
JAL-2826 added action performed for hiding collapsed sequences

6 years agoJAL-2826 added isCollapsed boolean to tree nodes
kjvdheide [Fri, 2 Feb 2018 14:04:13 +0000 (14:04 +0000)]
JAL-2826 added isCollapsed boolean to tree nodes

6 years agoJAL-1953 added configuration font setters
kjvdheide [Tue, 30 Jan 2018 17:05:15 +0000 (17:05 +0000)]
JAL-1953 added configuration font setters

6 years agoJAL-1953 some more comments, moved JalviewBinding
kjvdheide [Mon, 29 Jan 2018 15:52:15 +0000 (15:52 +0000)]
JAL-1953 some more comments, moved JalviewBinding

6 years agoJAL-1953 more javadoc comments
kjvdheide [Sun, 28 Jan 2018 15:55:54 +0000 (15:55 +0000)]
JAL-1953 more javadoc comments

6 years agoJAL-1953 first pass of adding javadoc, some methods renamed
kjvdheide [Fri, 26 Jan 2018 19:05:25 +0000 (19:05 +0000)]
JAL-1953 first pass of adding javadoc, some methods renamed

6 years agoJAL-2856 added refreshing of Aptx view when tree frame gets added
kjvdheide [Fri, 26 Jan 2018 16:25:49 +0000 (16:25 +0000)]
JAL-2856 added refreshing of Aptx view when tree frame gets added

6 years agoJAL-2798 label name changed
kjvdheide [Fri, 26 Jan 2018 03:38:40 +0000 (03:38 +0000)]
JAL-2798 label name changed

6 years agoJAL-2844 allow clicks outside of the tree range again (clears selection)
kjvdheide [Thu, 25 Jan 2018 19:36:51 +0000 (19:36 +0000)]
JAL-2844 allow clicks outside of the tree range again (clears selection)

6 years agoJAL-2844 updated forester.jar for drawing partitioning line
kjvdheide [Thu, 25 Jan 2018 19:28:25 +0000 (19:28 +0000)]
JAL-2844 updated forester.jar for drawing partitioning line

6 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/featu...
kjvdheide [Thu, 25 Jan 2018 18:57:58 +0000 (18:57 +0000)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/features/PhylogenyViewer

6 years agoJAL-2844 branch colour setter improved
kjvdheide [Thu, 25 Jan 2018 13:48:28 +0000 (13:48 +0000)]
JAL-2844 branch colour setter improved

6 years agoJAL-2866 remove forester's submodule folder
kjvdheide [Wed, 24 Jan 2018 12:48:26 +0000 (12:48 +0000)]
JAL-2866 remove forester's submodule folder

6 years agoJAL-2866 remove forester from .gitmodules
kjvdheide [Wed, 24 Jan 2018 12:44:41 +0000 (12:44 +0000)]
JAL-2866 remove forester from .gitmodules

6 years agoJAL-2872 added setters for GUI sizes
kjvdheide [Wed, 24 Jan 2018 12:33:21 +0000 (12:33 +0000)]
JAL-2872 added setters for GUI sizes

6 years agoJAL-2798 added != null check for Aptx trees
kjvdheide [Wed, 24 Jan 2018 12:13:47 +0000 (12:13 +0000)]
JAL-2798 added != null check for Aptx trees

6 years agoJAL-2858 update release date and rejig what's new message
Jim Procter [Wed, 24 Jan 2018 07:36:56 +0000 (07:36 +0000)]
JAL-2858 update release date and rejig what's new message

6 years agoJAL-2858 fix what's new
Jim Procter [Tue, 23 Jan 2018 13:52:31 +0000 (13:52 +0000)]
JAL-2858 fix what's new

6 years agoJAL-2858 update latest release notes link in TOC
Jim Procter [Tue, 23 Jan 2018 12:03:37 +0000 (12:03 +0000)]
JAL-2858 update latest release notes link in TOC

6 years agoJAL-2859 release notes
Jim Procter [Tue, 23 Jan 2018 11:57:05 +0000 (11:57 +0000)]
JAL-2859 release notes

6 years agoJAL-2858 update release notes
Jim Procter [Tue, 23 Jan 2018 11:54:49 +0000 (11:54 +0000)]
JAL-2858 update release notes

6 years agoJAL-2858 release notes for 2.10.3b1 (including revision to EnsemblGenomes client...
Jim Procter [Mon, 22 Jan 2018 15:26:10 +0000 (15:26 +0000)]
JAL-2858 release notes for 2.10.3b1 (including revision to EnsemblGenomes client as per JAL-2679)

6 years agoJAL-2858 bump version number for 2.10.3b1
Jim Procter [Mon, 22 Jan 2018 15:25:23 +0000 (15:25 +0000)]
JAL-2858 bump version number for 2.10.3b1

6 years agoRevert "JAL-2890 added CIPRES client .jar"
kjvdheide [Mon, 22 Jan 2018 14:00:03 +0000 (14:00 +0000)]
Revert "JAL-2890 added CIPRES client .jar"

This reverts commit 17fdf9ce81e035bfe43695f997bb9a83dce52815.

6 years agoRevert "JAL-2890 proper .jar this time and copied cipres' example class"
kjvdheide [Mon, 22 Jan 2018 13:59:58 +0000 (13:59 +0000)]
Revert "JAL-2890 proper .jar this time and copied cipres' example class"

This reverts commit b7dca7564f78d231297a4d8be3fbea90cd572a14.

6 years agoRevert "JAL-2890 added CIPRES' javadoc .jar to Jalview lib"
kjvdheide [Mon, 22 Jan 2018 13:59:54 +0000 (13:59 +0000)]
Revert "JAL-2890 added CIPRES' javadoc .jar to Jalview lib"

This reverts commit a4824de7060a7429991c35c56252dab7be7d3cde.

6 years agoJAL-2805 small redundant method call fix
kjvdheide [Fri, 19 Jan 2018 17:14:03 +0000 (17:14 +0000)]
JAL-2805 small redundant method call fix

6 years agoJAL-2890 added CIPRES' javadoc .jar to Jalview lib
kjvdheide [Fri, 19 Jan 2018 16:48:43 +0000 (16:48 +0000)]
JAL-2890 added CIPRES' javadoc .jar to Jalview lib

6 years agoJAL-2890 proper .jar this time and copied cipres' example class
kjvdheide [Fri, 19 Jan 2018 16:19:27 +0000 (16:19 +0000)]
JAL-2890 proper .jar this time and copied cipres' example class

6 years agoJAL-2890 added CIPRES client .jar
kjvdheide [Fri, 19 Jan 2018 15:39:32 +0000 (15:39 +0000)]
JAL-2890 added CIPRES client .jar

6 years agoJAL-2810 JAL-2886 i18n
gmungoc [Thu, 18 Jan 2018 16:12:50 +0000 (16:12 +0000)]
JAL-2810 JAL-2886 i18n

6 years agoJAL-2679 update query id to actual case of retrieved gene
gmungoc [Thu, 18 Jan 2018 14:54:49 +0000 (14:54 +0000)]
JAL-2679 update query id to actual case of retrieved gene

6 years agoJAL-2805 disabled Nexus file identification(as its parser is unreliable)
kjvdheide [Thu, 18 Jan 2018 14:23:05 +0000 (14:23 +0000)]
JAL-2805 disabled Nexus file identification(as its parser is unreliable)

6 years agoJAL-1951 added comment to NexusFile clarifying Forester's broken parser
kjvdheide [Wed, 17 Jan 2018 20:13:40 +0000 (20:13 +0000)]
JAL-1951 added comment to NexusFile clarifying Forester's broken parser

6 years agoJAL-2794 tree viewer frame now has its binding object properly set
kjvdheide [Wed, 17 Jan 2018 16:51:57 +0000 (16:51 +0000)]
JAL-2794 tree viewer frame now has its binding object properly set

6 years agoJAL-2798 now added to active views when associated with Jalview as well
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

6 years agoJAL-281 added initialising trees to FileLoader if fileformat is treefile
kjvdheide [Wed, 17 Jan 2018 16:21:27 +0000 (16:21 +0000)]
JAL-281 added initialising trees to FileLoader if fileformat is treefile

6 years agoJAL-281 added isTreeFile() boolean
kjvdheide [Wed, 17 Jan 2018 16:03:51 +0000 (16:03 +0000)]
JAL-281 added isTreeFile() boolean

6 years agoJAL-2679 case-insensitive comparison of query and retrieved accession
gmungoc [Wed, 17 Jan 2018 11:37:09 +0000 (11:37 +0000)]
JAL-2679 case-insensitive comparison of query and retrieved accession

6 years agoJAL-2798 rough saving/loading a single Aptx view functionality present
kjvdheide [Tue, 16 Jan 2018 21:36:31 +0000 (21:36 +0000)]
JAL-2798 rough saving/loading a single Aptx view functionality present

6 years agoJAL-2798 comments
kjvdheide [Tue, 16 Jan 2018 20:21:13 +0000 (20:21 +0000)]
JAL-2798 comments

6 years agoJAL-2798 tree frame is now added to active views when added to Jalview
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

6 years agoJAL-2798 added methods for getting/adding external tree viewer
kjvdheide [Tue, 16 Jan 2018 17:09:25 +0000 (17:09 +0000)]
JAL-2798 added methods for getting/adding external tree viewer

6 years agoJAL-2679 use object_type=Transcript for lookup of Parent for Protein
gmungoc [Tue, 16 Jan 2018 16:27:19 +0000 (16:27 +0000)]
JAL-2679 use object_type=Transcript for lookup of Parent for Protein

6 years agoJAL-2798 added method to tree for writing to jalview project
kjvdheide [Tue, 16 Jan 2018 01:41:54 +0000 (01:41 +0000)]
JAL-2798 added method to tree for writing to jalview project

6 years agoJAL-2805 check actually works now
kjvdheide [Fri, 12 Jan 2018 18:07:45 +0000 (18:07 +0000)]
JAL-2805 check actually works now

6 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/featu...
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

6 years agoJAL-2798 Aptx is now saved to the project
kjvdheide [Fri, 12 Jan 2018 15:34:21 +0000 (15:34 +0000)]
JAL-2798 Aptx is now saved to the project

6 years agoJAL-2805 removed unused Aptx instance creation code
kjvdheide [Fri, 12 Jan 2018 15:18:27 +0000 (15:18 +0000)]
JAL-2805 removed unused Aptx instance creation code

6 years agoJAL-2805 added getter and setter for jalview association to tree frame
kjvdheide [Fri, 12 Jan 2018 15:15:33 +0000 (15:15 +0000)]
JAL-2805 added getter and setter for jalview association to tree frame

6 years agoJAL-2886 trivial unit test fix
kiramt [Fri, 12 Jan 2018 11:37:03 +0000 (11:37 +0000)]
JAL-2886 trivial unit test fix

6 years agoJAL-2754 renamed proguard.jar to include version number
gmungoc [Fri, 27 Oct 2017 11:20:28 +0000 (12:20 +0100)]
JAL-2754 renamed proguard.jar to include version number

6 years agoJAL-2754 5.3.3 update of proguard.jar
gmungoc [Fri, 27 Oct 2017 11:03:22 +0000 (12:03 +0100)]
JAL-2754 5.3.3 update of proguard.jar

6 years agoJAL-2754 update to specify Java 1.8(+)
gmungoc [Fri, 27 Oct 2017 09:52:05 +0000 (10:52 +0100)]
JAL-2754 update to specify Java 1.8(+)

6 years agoMerge remote-tracking branch 'origin/task/JAL-2662' into develop
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

6 years agoJAL-2662 Updated README task/JAL-2662
kiramt [Thu, 11 Jan 2018 14:53:00 +0000 (14:53 +0000)]
JAL-2662 Updated README

6 years agoJAL-2884 old Newick trees are now loaded in as Aptx as well
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

6 years agoJAL-2795 simplified instance creation from calculation
kjvdheide [Thu, 11 Jan 2018 13:43:41 +0000 (13:43 +0000)]
JAL-2795 simplified instance creation from calculation

6 years agoJAL-2798 alignmentviewport's current external tree is now set when a
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

6 years agoJAL-1953 named various threads
kjvdheide [Wed, 10 Jan 2018 17:01:58 +0000 (17:01 +0000)]
JAL-1953 named various threads

6 years agoJAL-2795 calculated trees are now passed along as Newick strings
kjvdheide [Wed, 10 Jan 2018 10:45:02 +0000 (10:45 +0000)]
JAL-2795 calculated trees are now passed along as Newick strings

6 years agoJAL-2795 disabled most tests for now
kjvdheide [Wed, 10 Jan 2018 10:43:34 +0000 (10:43 +0000)]
JAL-2795 disabled most tests for now

6 years agoJAL-2805 file identifying lines are turned to lowercase before matching
kjvdheide [Tue, 9 Jan 2018 23:08:29 +0000 (23:08 +0000)]
JAL-2805 file identifying lines are turned to lowercase before matching

6 years agoJAL-2805 correct nexus parser is now created
kjvdheide [Tue, 9 Jan 2018 23:07:31 +0000 (23:07 +0000)]
JAL-2805 correct nexus parser is now created

6 years agoJAL-2805 Creating jalview sequence now requires the node itself (for the
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)

6 years agoJAL-2805 added derive sequence when creating jalview sequence
kjvdheide [Tue, 9 Jan 2018 17:18:48 +0000 (17:18 +0000)]
JAL-2805 added derive sequence when creating jalview sequence

6 years agoJAL-2805 getNodeSequences returns a list now instead of array (size
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)

6 years agoJAL-2805 added check for null node sequences during parsing (such as in
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)

6 years agoJAL-2805 allow for non-xsd validating phyloxml parsing
kjvdheide [Tue, 9 Jan 2018 15:31:44 +0000 (15:31 +0000)]
JAL-2805 allow for non-xsd validating phyloxml parsing

6 years agoJAL-2805 check no longer errors if the sequence is actually null (woops)
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)

6 years agoJAL-2805 added check for sequences already being present in tree nodes
kjvdheide [Tue, 9 Jan 2018 14:23:43 +0000 (14:23 +0000)]
JAL-2805 added check for sequences already being present in tree nodes

6 years agoJAL-2805 put the sequence setting in if statement (not all nodes have
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)

6 years agoJAL-2805 added Aptx factory method reading directly from a File
kjvdheide [Tue, 9 Jan 2018 11:51:02 +0000 (11:51 +0000)]
JAL-2805 added Aptx factory method reading directly from a File

6 years agoJAL-2805 added nexus specific parser settings
kjvdheide [Tue, 9 Jan 2018 11:18:07 +0000 (11:18 +0000)]
JAL-2805 added nexus specific parser settings

6 years agoJAL-2805 broke off the phylogenetic file formats into separate classes
kjvdheide [Tue, 9 Jan 2018 10:54:54 +0000 (10:54 +0000)]
JAL-2805 broke off the phylogenetic file formats into separate classes

6 years agoJAL-2805 parser is now File based (instead of FileParse) and source is
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

6 years agoJAL-2805 Parse returns a TreeI array again
kjvdheide [Tue, 9 Jan 2018 10:53:01 +0000 (10:53 +0000)]
JAL-2805 Parse returns a TreeI array again

6 years agoJAL-2805 node sequence is now immediately filled in by the constructor
kjvdheide [Tue, 9 Jan 2018 10:52:16 +0000 (10:52 +0000)]
JAL-2805 node sequence is now immediately filled in by the constructor

6 years agoJAL-2805 added forester --> jalview sequence converter
kjvdheide [Tue, 9 Jan 2018 10:51:36 +0000 (10:51 +0000)]
JAL-2805 added forester --> jalview sequence converter

6 years agoJAL-2805 added getter in trees for retrieving all node sequences
kjvdheide [Tue, 9 Jan 2018 10:21:01 +0000 (10:21 +0000)]
JAL-2805 added getter in trees for retrieving all node sequences

6 years agoJAL-1953 moved DataConversions to Forester package
kjvdheide [Tue, 9 Jan 2018 10:20:04 +0000 (10:20 +0000)]
JAL-1953 moved DataConversions to Forester package

6 years agoJAL-2844 changed threshold from double to float
kjvdheide [Mon, 8 Jan 2018 11:10:22 +0000 (11:10 +0000)]
JAL-2844 changed threshold from double to float

6 years agoJAL-2844 start on moving tree partitioning code into Forester
kjvdheide [Mon, 8 Jan 2018 11:07:35 +0000 (11:07 +0000)]
JAL-2844 start on moving tree partitioning code into Forester

6 years agoJAL-2877 added forester as jar once again
kjvdheide [Sat, 6 Jan 2018 22:43:52 +0000 (22:43 +0000)]
JAL-2877 added forester as jar once again

6 years agoJAL-281 first line also checked for PhyloXML identification
kjvdheide [Sat, 6 Jan 2018 22:36:39 +0000 (22:36 +0000)]
JAL-281 first line also checked for PhyloXML identification

6 years agoJAL-2871 aptx Configuration now created through input stream
kjvdheide [Sat, 6 Jan 2018 22:11:18 +0000 (22:11 +0000)]
JAL-2871 aptx Configuration now created through input stream

6 years agoJAL-281 ForesterParser now extends from AlignFile
kjvdheide [Fri, 5 Jan 2018 04:00:58 +0000 (04:00 +0000)]
JAL-281 ForesterParser now extends from AlignFile

6 years agoJAL-1953 Moved config to resources folder
kjvdheide [Thu, 4 Jan 2018 20:18:36 +0000 (20:18 +0000)]
JAL-1953 Moved config to resources folder

6 years agoJAL-281 ForesterParser factory methods added
kjvdheide [Thu, 4 Jan 2018 20:17:49 +0000 (20:17 +0000)]
JAL-281 ForesterParser factory methods added

6 years agoJAL-1953 start work on storing nodes in a map per tree object instead of
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

6 years agoJAL-281 added file identify criteria for PhyloXML and Nexus
kjvdheide [Thu, 21 Dec 2017 16:25:55 +0000 (16:25 +0000)]
JAL-281 added file identify criteria for PhyloXML and Nexus

6 years agoJAL-2874 made the actionlistener slightly clearer
kjvdheide [Wed, 20 Dec 2017 18:40:31 +0000 (18:40 +0000)]
JAL-2874 made the actionlistener slightly clearer

6 years agoJAL-2838 JAL-2872 added sorting from the Aptx frame (still misbehaving
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)

6 years agoJAL-281 moved utility methods to .io package
kjvdheide [Wed, 20 Dec 2017 14:20:29 +0000 (14:20 +0000)]
JAL-281 moved utility methods to .io package

6 years agoJAL-281 split up TreeParser into separate format parsers
kjvdheide [Wed, 20 Dec 2017 13:24:41 +0000 (13:24 +0000)]
JAL-281 split up TreeParser into separate format parsers

6 years agoJAL-281 created Nexus and PhyloXML parser classes
kjvdheide [Tue, 19 Dec 2017 14:34:24 +0000 (14:34 +0000)]
JAL-281 created Nexus and PhyloXML parser classes

6 years agoJAL-281 cleared out useless tree parser class
kjvdheide [Tue, 19 Dec 2017 14:16:49 +0000 (14:16 +0000)]
JAL-281 cleared out useless tree parser class

6 years agoJAL-281 added phyloxml and nexus to jalview fileformats
kjvdheide [Tue, 19 Dec 2017 14:10:26 +0000 (14:10 +0000)]
JAL-281 added phyloxml and nexus to jalview fileformats

6 years agoJAL-1953 moved now-generic methods outside of Aptx package
kjvdheide [Mon, 18 Dec 2017 18:30:14 +0000 (18:30 +0000)]
JAL-1953 moved now-generic methods outside of Aptx package

6 years agoJAL-1953 -External from all interfaces names
kjvdheide [Mon, 18 Dec 2017 18:21:35 +0000 (18:21 +0000)]
JAL-1953 -External from all interfaces names