jalview.git
11 years agotidy imports
jprocter [Fri, 6 Jul 2012 17:27:49 +0000 (18:27 +0100)]
tidy imports

11 years agoJAL-976 - add support for storing service parameter sets in project
jprocter [Fri, 6 Jul 2012 17:25:54 +0000 (18:25 +0100)]
JAL-976 - add support for storing service parameter sets in project

11 years agoJAL-961 allow calcId to be specified independently of alignment annotation row label
jprocter [Tue, 3 Jul 2012 15:01:26 +0000 (16:01 +0100)]
JAL-961 allow calcId to be specified independently of alignment annotation row label

11 years agoJAL-974 - broken copy of feature settings
jprocter [Tue, 3 Jul 2012 08:55:16 +0000 (09:55 +0100)]
JAL-974 - broken copy of feature settings

11 years agoJAL-1129 progress bar - this patch doesn't provide any indication of whether the...
jprocter [Mon, 2 Jul 2012 07:29:23 +0000 (08:29 +0100)]
JAL-1129 progress bar - this patch doesn't provide any indication of whether the export was successful.

11 years agoJAL-968 incremental - PNG/EPS output has annotation overlapping alignment when annota...
jprocter [Mon, 2 Jul 2012 07:27:48 +0000 (08:27 +0100)]
JAL-968 incremental - PNG/EPS output has annotation overlapping alignment when annotation scroll bar not at top of panel.

11 years agotidy imports
jprocter [Mon, 2 Jul 2012 07:23:41 +0000 (08:23 +0100)]
tidy imports

11 years agoJAL-974 create graduated feature colours for annotation with scores.
jprocter [Mon, 2 Jul 2012 06:40:33 +0000 (07:40 +0100)]
JAL-974 create graduated feature colours for annotation with scores.

11 years agoJAL-974 - use refactored methods on AlignmentPanel
jprocter [Mon, 2 Jul 2012 06:36:24 +0000 (07:36 +0100)]
JAL-974 - use refactored methods on AlignmentPanel

11 years agoJAL-974 - refactor FeatureRenderer constructor to AlignmentPanel (should probably...
jprocter [Mon, 2 Jul 2012 06:35:38 +0000 (07:35 +0100)]
JAL-974 - refactor FeatureRenderer constructor to AlignmentPanel (should probably add to AlignPanel API JAL-966)

11 years agoJAL-1117 alleviate lock starvation
jprocter [Sun, 1 Jul 2012 16:02:51 +0000 (17:02 +0100)]
JAL-1117 alleviate lock starvation

11 years agoensure all annotation dependent rendering gets refreshed
jprocter [Sun, 1 Jul 2012 15:58:21 +0000 (16:58 +0100)]
ensure all annotation dependent rendering gets refreshed

11 years agoJAL-1065 JAL-1066 ensure non-residue based schemes actually override the new findColo...
jprocter [Fri, 29 Jun 2012 15:19:19 +0000 (16:19 +0100)]
JAL-1065 JAL-1066 ensure non-residue based schemes actually override the new findColor methods

11 years agoJAL-1065 JAL-1066 allow different lookup tables for nucleotide or amino acid coloursc...
jprocter [Fri, 29 Jun 2012 15:18:41 +0000 (16:18 +0100)]
JAL-1065 JAL-1066 allow different lookup tables for nucleotide or amino acid colourschemes

11 years agoJAL-899 added groovy support to develop branch
jprocter [Tue, 26 Jun 2012 21:12:50 +0000 (22:12 +0100)]
JAL-899 added groovy support to develop branch

11 years agoformatting
jprocter [Wed, 20 Jun 2012 18:49:27 +0000 (19:49 +0100)]
formatting

11 years agoJAL-976 JAL-975 JAL-1119 - pass on any existing parameters to initialise the service...
jprocter [Tue, 19 Jun 2012 16:33:18 +0000 (17:33 +0100)]
JAL-976 JAL-975 JAL-1119 - pass on any existing parameters to initialise the service parameters dialog box

11 years agoJAL-975 JAL-1119 - prototype adjustable AACons parameters for the currrent alignment...
jprocter [Tue, 19 Jun 2012 16:30:56 +0000 (17:30 +0100)]
JAL-975 JAL-1119 - prototype adjustable AACons parameters for the currrent alignment view

11 years agoJAL-975 - doh! valid result if width matches *ungapped* input data
jprocter [Tue, 19 Jun 2012 16:28:50 +0000 (17:28 +0100)]
JAL-975 - doh! valid result if width matches *ungapped* input data

11 years agoJAL-975 - bespoke AACons settings object to save current service settings for the...
jprocter [Tue, 19 Jun 2012 16:26:57 +0000 (17:26 +0100)]
JAL-975 - bespoke AACons settings object to save current service settings for the AlignViewport

11 years agopatch for JAL-1172 ensure option's default value is set in widget so it gets saved...
jprocter [Tue, 19 Jun 2012 16:25:05 +0000 (17:25 +0100)]
patch for JAL-1172 ensure option's default value is set in widget so it gets saved in paramStore

11 years agoJAL-961 JAL-975 extend api to support removal of workers no-longer required by the...
jprocter [Tue, 19 Jun 2012 16:22:52 +0000 (17:22 +0100)]
JAL-961 JAL-975 extend api to support removal of workers no-longer required by the user

11 years agoJAL-975 - ensure we only submit ungapped, padded alignment data to AACon - otherwise...
jprocter [Tue, 19 Jun 2012 10:49:04 +0000 (11:49 +0100)]
JAL-975 - ensure we only submit ungapped, padded alignment data to AACon - otherwise jobs fail.

11 years agoformatting
jprocter [Fri, 15 Jun 2012 16:52:58 +0000 (17:52 +0100)]
formatting

11 years agoJAL-1125 option to switch between Jalview and SeqSpace PCA calculation modes
jprocter [Fri, 15 Jun 2012 16:52:37 +0000 (17:52 +0100)]
JAL-1125 option to switch between Jalview and SeqSpace PCA calculation modes

11 years agofix JAL-1122
jprocter [Fri, 15 Jun 2012 15:13:20 +0000 (16:13 +0100)]
fix JAL-1122

11 years agoJAL-1123 - make clear where off-by-one error was occuring (patched problem in previou...
jprocter [Fri, 15 Jun 2012 15:08:38 +0000 (16:08 +0100)]
JAL-1123 - make clear where off-by-one error was occuring (patched problem in previous commit)

11 years agoJAL-535 - refactored core PCA viewer code to viewmodel
jprocter [Fri, 15 Jun 2012 14:59:40 +0000 (15:59 +0100)]
JAL-535 - refactored core PCA viewer code to viewmodel
JAL-1013 - port protein/nucleotide settings to applet PCA viewer

11 years agoJAL-535 refactored core code from PCA viewer to viewmodel.
jprocter [Fri, 15 Jun 2012 14:54:28 +0000 (15:54 +0100)]
JAL-535 refactored core code from PCA viewer to viewmodel.

11 years agoJAL-1120 patch for desktop
jprocter [Fri, 15 Jun 2012 10:49:37 +0000 (11:49 +0100)]
JAL-1120 patch for desktop

11 years agopatch for JAL-1121 - reset button and slightly wider default window size
jprocter [Fri, 15 Jun 2012 10:44:21 +0000 (11:44 +0100)]
patch for JAL-1121 - reset button and slightly wider default window size

11 years agoJAL-535 refactoring todo
jprocter [Fri, 15 Jun 2012 10:36:25 +0000 (11:36 +0100)]
JAL-535 refactoring todo

11 years agoExtended IProgressIndicator with method to check if any progress bars are currently...
jprocter [Fri, 15 Jun 2012 10:35:03 +0000 (11:35 +0100)]
Extended IProgressIndicator with method to check if any progress bars are currently displayed.

11 years agoMerge branch 'JAL-1013_pca_rna_dna' into develop
jprocter [Fri, 15 Jun 2012 08:58:07 +0000 (09:58 +0100)]
Merge branch 'JAL-1013_pca_rna_dna' into develop

11 years agoJAL-975 JAL-1002 ensure custom parameters are actually passed to service
jprocter [Thu, 14 Jun 2012 13:59:31 +0000 (14:59 +0100)]
JAL-975 JAL-1002 ensure custom parameters are actually passed to service

11 years agoJAL-1115 - synchronized access to group list
jprocter [Thu, 14 Jun 2012 11:28:38 +0000 (12:28 +0100)]
JAL-1115 - synchronized access to group list

11 years agoJAL-976 - make sure annotation panel is updated to grey out any stale annotation...
jprocter [Thu, 14 Jun 2012 10:48:12 +0000 (11:48 +0100)]
JAL-976 - make sure annotation panel is updated to grey out any stale annotation rows

11 years agoJAL-961 JAL-976 kill any existing AACon job if a new AACon worker is started due...
jprocter [Thu, 14 Jun 2012 10:47:25 +0000 (11:47 +0100)]
JAL-961 JAL-976 kill any existing AACon job if a new AACon worker is started due to an alignment edit or change in parameters

11 years agoJAL-1003 visual delay when running a sequence or alignment annotation job
jprocter [Thu, 14 Jun 2012 10:45:28 +0000 (11:45 +0100)]
JAL-1003 visual delay when running a sequence or alignment annotation job

11 years agoJAL-961 JAL-976 tweaked way that AACons client is registered and started.
jprocter [Thu, 14 Jun 2012 10:44:05 +0000 (11:44 +0100)]
JAL-961 JAL-976 tweaked way that AACons client is registered and started.

11 years agoformatting
jprocter [Thu, 14 Jun 2012 10:41:42 +0000 (11:41 +0100)]
formatting

11 years agoformatting
jprocter [Thu, 14 Jun 2012 10:38:26 +0000 (11:38 +0100)]
formatting

11 years agoJAL-1118 - hack to try and get rid of flicker. consider moving greyed out image rende...
jprocter [Thu, 14 Jun 2012 10:36:03 +0000 (11:36 +0100)]
JAL-1118 - hack to try and get rid of flicker. consider moving greyed out image rendering to after we call the panel renderer.

11 years agoJAL-1118 WIP - flag to mark if image buffer has just been cleared ready for a redraw
jprocter [Thu, 14 Jun 2012 10:34:01 +0000 (11:34 +0100)]
JAL-1118 WIP - flag to mark if image buffer has just been cleared ready for a redraw

11 years agoJAL-1115 trap exception arising from race condition when alignment edited during...
jprocter [Thu, 14 Jun 2012 10:32:08 +0000 (11:32 +0100)]
JAL-1115 trap exception arising from race condition when alignment edited during calculation

11 years agoJAL-968 javadoc and return flag indicating if any of the annotation rows were being...
jprocter [Thu, 14 Jun 2012 10:30:45 +0000 (11:30 +0100)]
JAL-968 javadoc and return flag indicating if any of the annotation rows were being worked on whilst the panel was rendered.

11 years agoJAL-961 ensure we only add one instance of a worker to the registered list of workers...
jprocter [Thu, 14 Jun 2012 10:20:49 +0000 (11:20 +0100)]
JAL-961 ensure we only add one instance of a worker to the registered list of workers for an alignment.

11 years agoJAL-961 potentially helpful println statements when debugging alignment calculation...
jprocter [Thu, 14 Jun 2012 10:18:54 +0000 (11:18 +0100)]
JAL-961 potentially helpful println statements when debugging alignment calculation queue

11 years agoJAL-1115 refactor base collection for Alignment from Vector to locally synchronized...
jprocter [Wed, 13 Jun 2012 09:35:20 +0000 (10:35 +0100)]
JAL-1115 refactor base collection for Alignment from Vector to locally synchronized List<SequenceI>
(missed this one from d6509fcf3a8cc90616e18cb22cec97f85c722bb8)

11 years agoJAL-1116 - location where vamsas sync failure occurs
jprocter [Wed, 13 Jun 2012 09:28:28 +0000 (10:28 +0100)]
JAL-1116 - location where vamsas sync failure occurs

11 years agojavatidy
jprocter [Wed, 13 Jun 2012 08:09:08 +0000 (09:09 +0100)]
javatidy

11 years agoJAL-1115 refactor reordering code operating directly on Sequence collection as Alignm...
jprocter [Tue, 12 Jun 2012 11:48:03 +0000 (12:48 +0100)]
JAL-1115 refactor reordering code operating directly on Sequence collection as AlignmentI method

11 years agoJAL-1115 refactor base collection for Alignment from Vector to locally synchronized...
jprocter [Tue, 12 Jun 2012 11:35:56 +0000 (12:35 +0100)]
JAL-1115 refactor base collection for Alignment from Vector to locally synchronized List<SequenceI>

11 years agoJAL-1115 - use local reference for annotation row
jprocter [Tue, 12 Jun 2012 10:58:18 +0000 (11:58 +0100)]
JAL-1115 - use local reference for annotation row

11 years agoJAL-961, JAL-1115 - pending test to ensure only one worker waits around for another...
jprocter [Tue, 12 Jun 2012 10:57:52 +0000 (11:57 +0100)]
JAL-961, JAL-1115 - pending test to ensure only one worker waits around for another one for the same type to complete.

11 years agojavatidy
jprocter [Thu, 7 Jun 2012 17:10:32 +0000 (18:10 +0100)]
javatidy

11 years agoJAL-967, JAL-1114, JAL-1115 more concurrent access hacks
jprocter [Thu, 7 Jun 2012 17:07:46 +0000 (18:07 +0100)]
JAL-967, JAL-1114, JAL-1115 more concurrent access hacks

11 years agojavatidy
jprocter [Thu, 7 Jun 2012 17:06:49 +0000 (18:06 +0100)]
javatidy

11 years agofix for bug introduced with commit:b81d4d7d46ea8b1c89df086fb847baab6b69d427
jprocter [Thu, 7 Jun 2012 14:25:20 +0000 (15:25 +0100)]
fix for bug introduced with commit:b81d4d7d46ea8b1c89df086fb847baab6b69d427

11 years agojavatidy
jprocter [Thu, 7 Jun 2012 10:03:14 +0000 (11:03 +0100)]
javatidy

11 years agoJAL-967, JAL-1114, JAL-1115 - modified render and calculation api to work on bare...
jprocter [Thu, 7 Jun 2012 09:44:43 +0000 (10:44 +0100)]
JAL-967, JAL-1114, JAL-1115 - modified render and calculation api to work on bare array reference for current instance of data rather than via reference to container object, so as to minimise errors arising from race between rendering code and calculations triggered by alignment data edits which create new data arrays.

11 years agoJAL-976 ensure job id gets written out if there's an exception
jprocter [Mon, 4 Jun 2012 16:28:21 +0000 (17:28 +0100)]
JAL-976 ensure job id gets written out if there's an exception

11 years agojavatidy
jprocter [Mon, 4 Jun 2012 16:27:02 +0000 (17:27 +0100)]
javatidy

11 years agojavatidy
jprocter [Thu, 31 May 2012 09:41:48 +0000 (10:41 +0100)]
javatidy

11 years agoformatting
jprocter [Thu, 31 May 2012 09:40:23 +0000 (10:40 +0100)]
formatting

11 years agoJAL-969 - refactor colourscheme machinery from GUI code to core alignment view model
jprocter [Wed, 30 May 2012 18:30:41 +0000 (19:30 +0100)]
JAL-969 - refactor colourscheme machinery from GUI code to core alignment view model

11 years agoJAL-1109 JAL-1065 resolve t-coffee score scheme by name
jprocter [Wed, 30 May 2012 18:28:07 +0000 (19:28 +0100)]
JAL-1109 JAL-1065 resolve t-coffee score scheme by name

11 years agoupdated schema to store and recover belowAlignment and calcId for JAL-1109 and JAL...
jprocter [Wed, 30 May 2012 18:26:19 +0000 (19:26 +0100)]
updated schema to store and recover belowAlignment and calcId for JAL-1109 and JAL-1110

11 years agoJAL-1114 - refactor methods handling Vectors and Hashtables to Lists and Maps, and...
jprocter [Wed, 30 May 2012 18:21:25 +0000 (19:21 +0100)]
JAL-1114 - refactor methods handling Vectors and Hashtables to Lists and Maps, and use SequenceCollectionI and AnnotationCollectionI where possible to simplify code.

11 years agoformatting
jprocter [Wed, 30 May 2012 08:21:22 +0000 (09:21 +0100)]
formatting

11 years agoformatting
jprocter [Wed, 30 May 2012 08:02:19 +0000 (09:02 +0100)]
formatting

12 years agoTODO: JAL-1108
jprocter [Thu, 24 May 2012 18:53:22 +0000 (19:53 +0100)]
TODO: JAL-1108

12 years agoJAL-1078 - removed 'Load Score File' menu item and extended annotation file loader...
jprocter [Thu, 24 May 2012 18:53:06 +0000 (19:53 +0100)]
JAL-1078 - removed 'Load Score File' menu item and extended annotation file loader to recognise and load T-COFFEE files.

12 years agoJAL-1065 per sequence and per-alignment scores added to annotation
jprocter [Thu, 24 May 2012 17:52:03 +0000 (18:52 +0100)]
JAL-1065 per sequence and per-alignment scores added to annotation

12 years agoJAL-1065 - ensure null entries in annotation row so T-COFFEE annotation can be reloca...
jprocter [Thu, 24 May 2012 17:51:24 +0000 (18:51 +0100)]
JAL-1065 - ensure null entries in annotation row so T-COFFEE annotation can be relocated as alignment is edited.

12 years agotodo: JAL-1105
jprocter [Thu, 24 May 2012 17:46:16 +0000 (18:46 +0100)]
todo: JAL-1105

12 years agotodo: JAL-1108
jprocter [Thu, 24 May 2012 17:45:22 +0000 (18:45 +0100)]
todo: JAL-1108

12 years agoensure annotation isn't added twice - note - this could cause efficiency problems
jprocter [Thu, 24 May 2012 17:45:03 +0000 (18:45 +0100)]
ensure annotation isn't added twice - note - this could cause efficiency problems

12 years agoJAL-1107 - documentation explaining '*' and '+' in the conservation histogram.
jprocter [Thu, 24 May 2012 10:58:53 +0000 (11:58 +0100)]
JAL-1107 - documentation explaining '*' and '+' in the conservation histogram.

12 years agopatch for occasional NPE when applet is quit
jprocter [Thu, 24 May 2012 10:04:38 +0000 (11:04 +0100)]
patch for occasional NPE when applet is quit

12 years agoJAL-1078 - extend applet cut'n'paste features/annotation to support t-coffee file
jprocter [Wed, 23 May 2012 19:19:17 +0000 (20:19 +0100)]
JAL-1078 - extend applet cut'n'paste features/annotation to support t-coffee file
JAL-1102 - feedback for successful or unsuccessful parsing of annotation files

12 years agoJAL-1067 report any warning messages to user
jprocter [Wed, 23 May 2012 19:15:39 +0000 (20:15 +0100)]
JAL-1067 report any warning messages to user

12 years agoTODO for JAL-976
jprocter [Wed, 23 May 2012 19:09:58 +0000 (20:09 +0100)]
TODO for JAL-976

12 years agotodo for JAL-1106
jprocter [Wed, 23 May 2012 19:09:01 +0000 (20:09 +0100)]
todo for JAL-1106

12 years agoJAL-1066,JAL-1068,JAL-961 - use alignment annotation query api to get t-coffee annotation
jprocter [Wed, 23 May 2012 19:03:14 +0000 (20:03 +0100)]
JAL-1066,JAL-1068,JAL-961 - use alignment annotation query api to get t-coffee annotation

12 years agoJAL-1067, JAL-1105 - refactor parser to fit Jalview's data parsing architecture
jprocter [Wed, 23 May 2012 18:54:44 +0000 (19:54 +0100)]
JAL-1067, JAL-1105 - refactor parser to fit Jalview's data parsing architecture

12 years agoJAL-961 - annotatable datamodel objects can be queried to obtain annotation with...
jprocter [Wed, 23 May 2012 18:36:20 +0000 (19:36 +0100)]
JAL-961 - annotatable datamodel objects can be queried to obtain annotation with a particular calculation ID

12 years agoJAL-1102 todos and status updates when data is added
jprocter [Wed, 23 May 2012 18:29:40 +0000 (19:29 +0100)]
JAL-1102 todos and status updates when data is added

12 years agotodo JAL-1104 : functions to refactor
jprocter [Wed, 23 May 2012 18:25:29 +0000 (19:25 +0100)]
todo JAL-1104 : functions to refactor

12 years agotodo: blocked by JAL-1104
jprocter [Wed, 23 May 2012 18:24:09 +0000 (19:24 +0100)]
todo: blocked by JAL-1104

12 years agoJAL-958 - ensure logo is rendered even if consensus for column is at zero
jprocter [Wed, 23 May 2012 12:06:56 +0000 (13:06 +0100)]
JAL-958 - ensure logo is rendered even if consensus for column is at zero

12 years agoupdate the copy constructor
jprocter [Tue, 22 May 2012 11:33:51 +0000 (12:33 +0100)]
update the copy constructor

12 years agoJAL-1065,JAL-1066 propagated notification of colourscheme when alignment changed...
jprocter [Tue, 22 May 2012 11:33:19 +0000 (12:33 +0100)]
JAL-1065,JAL-1066 propagated notification of colourscheme when alignment changed to refactored code (SHA:677878508a8006cbf7e94e4d4e129ddcf3e3f2c2)

12 years agoJAL-1065,JAL-1066 - propagated 863467bf6c59c0bc5368c8f3a03d9d5a4f10700d to refactored...
jprocter [Tue, 22 May 2012 11:30:25 +0000 (12:30 +0100)]
JAL-1065,JAL-1066 - propagated 863467bf6c59c0bc5368c8f3a03d9d5a4f10700d to refactored renderer code.

12 years agoMerge remote-tracking branch 'origin/Tcoffee_JAL-1065' into develop
jprocter [Tue, 22 May 2012 11:20:02 +0000 (12:20 +0100)]
Merge remote-tracking branch 'origin/Tcoffee_JAL-1065' into develop
conflicts due to refactoring according to JAL-972, JAL-968, JAL-968
Conflicts:
.classpath
examples/appletParameters.html
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/AlignViewport.java
src/jalview/datamodel/SequenceGroup.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java
src/jalview/jbgui/GAlignFrame.java

12 years agowarning dialog - fixes JAL-1099
jprocter [Wed, 16 May 2012 10:48:55 +0000 (11:48 +0100)]
warning dialog - fixes JAL-1099

12 years agofixed JAL-1086: pass column index so colourscheme profile data is used to calculate...
jprocter [Wed, 16 May 2012 10:08:43 +0000 (11:08 +0100)]
fixed JAL-1086: pass column index so colourscheme profile data is used to calculate symbol colour

12 years agoJAL-958 - don't try to draw all zero profiles
jprocter [Wed, 16 May 2012 10:07:37 +0000 (11:07 +0100)]
JAL-958 - don't try to draw all zero profiles

12 years agoJAL-958 JAL-1086 formatting and remove old code
jprocter [Wed, 16 May 2012 10:06:41 +0000 (11:06 +0100)]
JAL-958 JAL-1086 formatting and remove old code

12 years agopack before displaying splashscreen to ensure its preferred size is correctly calculated
jprocter [Mon, 14 May 2012 16:54:46 +0000 (17:54 +0100)]
pack before displaying splashscreen to ensure its preferred size is correctly calculated