kiramt [Thu, 23 Mar 2017 18:47:41 +0000 (18:47 +0000)]
JAL-2314 Tweaks to stop thread sync issues
gmungoc [Thu, 23 Mar 2017 15:10:52 +0000 (15:10 +0000)]
JAL-2464 fix cancel tree print behaviour
kiramt [Thu, 23 Mar 2017 14:56:17 +0000 (14:56 +0000)]
JAL-2314 Tidies
kiramt [Thu, 23 Mar 2017 14:17:55 +0000 (14:17 +0000)]
JAL-2314 Re-annotated unit tests using Jws2Discoverer
tcofoegbu [Thu, 23 Mar 2017 12:02:33 +0000 (12:02 +0000)]
JAL-2463 bugfix
kiramt [Wed, 22 Mar 2017 14:21:34 +0000 (14:21 +0000)]
JAL-2461 Removed DAS error stack trace, updated message
kiramt [Wed, 22 Mar 2017 14:12:50 +0000 (14:12 +0000)]
JAL-2388 Reinstated original overview checks for annotation display
kiramt [Wed, 22 Mar 2017 13:53:57 +0000 (13:53 +0000)]
Merge remote-tracking branch
'origin/bug/JAL-2436featureRendererThreading' into develop
Conflicts:
src/jalview/appletgui/OverviewPanel.java
src/jalview/gui/OverviewPanel.java
kiramt [Wed, 22 Mar 2017 12:36:24 +0000 (12:36 +0000)]
Merge remote-tracking branch 'origin/develop' into
bug/JAL-2436featureRendererThreading
Conflicts:
src/jalview/appletgui/OverviewPanel.java
src/jalview/gui/OverviewPanel.java
gmungoc [Wed, 22 Mar 2017 10:51:23 +0000 (10:51 +0000)]
JAL-2311 suppress autocalc'd annotation to isolate the 'real' failure
kiramt [Tue, 21 Mar 2017 19:42:32 +0000 (19:42 +0000)]
JAL-2307 Fixed SiftsClient unit test
gmungoc [Tue, 21 Mar 2017 12:41:01 +0000 (12:41 +0000)]
JAL-2306 assert no DAS sources
gmungoc [Tue, 21 Mar 2017 10:22:57 +0000 (10:22 +0000)]
JAL-2438 removed (non-functional) lastSeq, lastSequenceFeatures
gmungoc [Tue, 21 Mar 2017 09:44:08 +0000 (09:44 +0000)]
JAL-2243 update discovered features on opening structure in Chimera
gmungoc [Tue, 21 Mar 2017 09:43:32 +0000 (09:43 +0000)]
JAL-2438 check for null FeatureRenderer
Jim Procter [Tue, 21 Mar 2017 09:05:53 +0000 (09:05 +0000)]
Merge branch 'features/JAL-2388OverviewWindow' into develop
Jim Procter [Mon, 20 Mar 2017 16:05:00 +0000 (16:05 +0000)]
Merge branch 'bug/JAL-2421overviewboxflicker' into develop
tcofoegbu [Mon, 20 Mar 2017 15:14:27 +0000 (15:14 +0000)]
Merge JAL-2136_phyre2_integration to develop
kiramt [Mon, 20 Mar 2017 08:12:15 +0000 (08:12 +0000)]
JAL-2388 Comment typo
tcofoegbu [Fri, 17 Mar 2017 15:41:01 +0000 (15:41 +0000)]
JAL-2136 JAL-2137 Improvements: enable STRUCTMODEL annotation statement to be less stringent and backwards compatible, Link query and template sequences, transfer annotation from model to template sequence
kiramt [Fri, 17 Mar 2017 14:11:11 +0000 (14:11 +0000)]
JAL-2388 ViewportRanges unit test
kiramt [Fri, 17 Mar 2017 13:47:15 +0000 (13:47 +0000)]
JAL-2437 Synchronization corrections and unit tests
kiramt [Fri, 17 Mar 2017 07:24:00 +0000 (07:24 +0000)]
JAL-2388 Renamed column and row subtraction functions
Jim Procter [Thu, 16 Mar 2017 18:15:03 +0000 (18:15 +0000)]
Merge branch 'merges/develop_JAL2295setChimeraAttributes' into develop
Jim Procter [Thu, 16 Mar 2017 17:42:25 +0000 (17:42 +0000)]
JAL-1933 refactor parameter for code clarity
kiramt [Thu, 16 Mar 2017 17:30:14 +0000 (17:30 +0000)]
JAL-2388 Applied ViewportRanges to code
kiramt [Thu, 16 Mar 2017 13:32:40 +0000 (13:32 +0000)]
JAL-2388 Renamed viewport position props to viewport ranges
kiramt [Thu, 16 Mar 2017 12:13:05 +0000 (12:13 +0000)]
JAL-2388 Unit test update
kiramt [Thu, 16 Mar 2017 12:12:52 +0000 (12:12 +0000)]
JAL-2388 Applet update for overview panel
kiramt [Thu, 16 Mar 2017 12:12:31 +0000 (12:12 +0000)]
JAL-2439 Out-by-one in setting endRes/endSeq
gmungoc [Wed, 15 Mar 2017 16:31:28 +0000 (16:31 +0000)]
JAL-2431 show cDNA consensus after New View in split frame
kiramt [Wed, 15 Mar 2017 14:58:36 +0000 (14:58 +0000)]
JAL-2388 Unit tests and tidies
gmungoc [Wed, 15 Mar 2017 12:55:25 +0000 (12:55 +0000)]
JAL-2443 push getResidueBoxColour inside getResidueColour
gmungoc [Wed, 15 Mar 2017 12:49:51 +0000 (12:49 +0000)]
JAL-2438 corrected getFeatureRenderer()
gmungoc [Wed, 15 Mar 2017 12:47:36 +0000 (12:47 +0000)]
JAL-2442 applet feature transparency also on overview or structure
gmungoc [Wed, 15 Mar 2017 11:49:39 +0000 (11:49 +0000)]
JAL-2438 handle null FeatureRenderer in FeatureColourFinder
gmungoc [Wed, 15 Mar 2017 11:29:05 +0000 (11:29 +0000)]
JAL-2438 refactored checks for 'no features displayed'
gmungoc [Wed, 15 Mar 2017 09:19:06 +0000 (09:19 +0000)]
JAL-2438 clarify code and javadoc, reinstate updateFeatures() check
gmungoc [Wed, 15 Mar 2017 08:49:59 +0000 (08:49 +0000)]
Merge branch 'develop' into bug/JAL-2436featureRendererThreading
kiramt [Wed, 15 Mar 2017 07:54:22 +0000 (07:54 +0000)]
Merge remote-tracking branch 'origin/develop' into features/JAL-2388OverviewWindow
kiramt [Tue, 14 Mar 2017 16:42:01 +0000 (16:42 +0000)]
JAL-2388 Working overview panel
kiramt [Tue, 14 Mar 2017 16:41:33 +0000 (16:41 +0000)]
JAL-2439 Fixes to out-by-one sequence indexing in gui classes
kiramt [Tue, 14 Mar 2017 16:06:34 +0000 (16:06 +0000)]
JAL-2388 New hidden cols/seqs functions to support overview panel
tcofoegbu [Tue, 14 Mar 2017 15:35:50 +0000 (15:35 +0000)]
JAL-2136 JAL-2137 Improved STRUCTMODEL annotation syntax to reinstated fasta file specification, improved implementation to link the Fasta mapping file to Phyre2 model entry, and moved Phyre2 model info from sequence detail to PDBEntry properties
gmungoc [Tue, 14 Mar 2017 15:07:19 +0000 (15:07 +0000)]
JAL-2438 unit test, fixes, Javadoc updates
gmungoc [Tue, 14 Mar 2017 12:25:35 +0000 (12:25 +0000)]
JAL-2438 unit tests for FeatureColourFinder (transparency tbc!)
gmungoc [Tue, 14 Mar 2017 12:25:09 +0000 (12:25 +0000)]
JAL-2438 Javadoc updates
gmungoc [Tue, 14 Mar 2017 09:42:40 +0000 (09:42 +0000)]
JAL-2438 comment/Javadoc tidies
gmungoc [Mon, 13 Mar 2017 17:00:19 +0000 (17:00 +0000)]
JAL-2438 corrected handling of default colour
gmungoc [Mon, 13 Mar 2017 16:42:23 +0000 (16:42 +0000)]
JAL-2438 FeatureColourFinder refactored from FeatureRenderer, fr not
cloned for structure viewers
kiramt [Fri, 10 Mar 2017 16:11:58 +0000 (16:11 +0000)]
JAL-2437 Fixed reordering of sequences when hiding and revealing
tcofoegbu [Fri, 10 Mar 2017 14:29:21 +0000 (14:29 +0000)]
JAL-2136 JAL-2137 Modified STRUCTMODEL annotation format and added implementation to register Phyre2 model file from AnnotationFile such that it could be properly processed Phyre2 client on structure viewing.
kiramt [Fri, 10 Mar 2017 12:08:45 +0000 (12:08 +0000)]
JAL-2388 Moving some alignment panel logic into overview (in progress)
kiramt [Tue, 28 Feb 2017 12:25:11 +0000 (12:25 +0000)]
JAL-2426 Checks on conservation thread in case we are shutting down
kiramt [Tue, 28 Feb 2017 14:50:10 +0000 (14:50 +0000)]
JAL-2426 Removal of NPE in conservation thread when closing Jalview
kiramt [Thu, 9 Mar 2017 10:29:06 +0000 (10:29 +0000)]
JAL-2388 Minor fix for annotation graph, removed unit test dep on gui
gmungoc [Wed, 8 Mar 2017 14:41:45 +0000 (14:41 +0000)]
JAL-2430 colour columns hidden in alignment gray on structure
gmungoc [Wed, 8 Mar 2017 11:15:27 +0000 (11:15 +0000)]
JAL-2295 avoid quotes breaking attribute value parsing
kiramt [Tue, 7 Mar 2017 16:37:11 +0000 (16:37 +0000)]
JAL-2388 Fixed inherited&new out-by-one errors; further unit tests
gmungoc [Tue, 7 Mar 2017 15:53:30 +0000 (15:53 +0000)]
JAL-2295 status messages for Chimera attributes set and for failed
superposition
kiramt [Tue, 7 Mar 2017 14:27:58 +0000 (14:27 +0000)]
JAL-2388 Additional unit tests
kiramt [Tue, 7 Mar 2017 14:27:05 +0000 (14:27 +0000)]
JAL-2388 Missed commit
kiramt [Tue, 7 Mar 2017 10:01:14 +0000 (10:01 +0000)]
Merge remote-tracking branch 'origin/develop' into features/JAL-2388OverviewWindow
kiramt [Tue, 7 Mar 2017 10:00:37 +0000 (10:00 +0000)]
JAL-2429 Messed something up, merged conflicts
kiramt [Tue, 7 Mar 2017 09:35:14 +0000 (09:35 +0000)]
JAL-2429 findColumnPosition returns 0 for cols in region starting at 0
kiramt [Tue, 7 Mar 2017 09:35:14 +0000 (09:35 +0000)]
JAL-2429 Additional fix to ColumnSelection when hidden cols start at 0
kiramt [Mon, 6 Mar 2017 16:23:53 +0000 (16:23 +0000)]
JAL-2388 Dependency tidy
kiramt [Mon, 6 Mar 2017 16:20:18 +0000 (16:20 +0000)]
JAL-2388 Remove OverviewDimensions dependency on gui classes
kiramt [Mon, 6 Mar 2017 14:29:58 +0000 (14:29 +0000)]
JAL-2388 Corrected overview panel behaviour, updated tests
Jim Procter [Mon, 6 Mar 2017 14:28:06 +0000 (14:28 +0000)]
Merge branch 'merges/develop_JAL2295setChimeraAttributes' into features/JAL-1933_occupancy
update occupancy branch for other changes - will merge in with JAL-2295 and JAL-1933
kiramt [Fri, 3 Mar 2017 15:00:11 +0000 (15:00 +0000)]
JAL-2429 Fix to ColumnSelection::findColumnPosition
kiramt [Fri, 3 Mar 2017 09:46:08 +0000 (09:46 +0000)]
JAL-2388 Initial removal of hidden cols/seqs out of overview
gmungoc [Thu, 2 Mar 2017 10:06:13 +0000 (10:06 +0000)]
JAL-2295 tweak order and wording of Superpose menu items and tooltip
gmungoc [Thu, 2 Mar 2017 09:51:17 +0000 (09:51 +0000)]
JAL-2295 make 'Jmol' menu appear; enable/disable Superpose option for
Chimera
kiramt [Wed, 1 Mar 2017 16:40:07 +0000 (16:40 +0000)]
JAL-2388 Reverted to previous
gmungoc [Wed, 1 Mar 2017 15:19:09 +0000 (15:19 +0000)]
JAL-1264 smarter way to skip autocalc'd annotations in asserts
gmungoc [Wed, 1 Mar 2017 14:38:50 +0000 (14:38 +0000)]
Merge branch 'features/JAL-2295setChimeraAttributes' into
merges/develop_JAL2295setChimeraAttributes
Conflicts:
src/jalview/ext/rbvi/chimera/ChimeraCommands.java
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
src/jalview/gui/ChimeraViewFrame.java
test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
kiramt [Wed, 1 Mar 2017 08:46:10 +0000 (08:46 +0000)]
JAL-2388 Preliminary refactor check-in, does not compile
kiramt [Tue, 28 Feb 2017 14:50:10 +0000 (14:50 +0000)]
JAL-2426 Removal of NPE in conservation thread when closing Jalview
kiramt [Tue, 28 Feb 2017 14:48:56 +0000 (14:48 +0000)]
JAL-2388 Removing sources of non-determinism in unit tests
kiramt [Tue, 28 Feb 2017 14:48:25 +0000 (14:48 +0000)]
JAL-2388 First move of endRes etc out of AlignmentViewport (in progress)
tcofoegbu [Tue, 28 Feb 2017 12:49:20 +0000 (12:49 +0000)]
JAL-2136 added improvement to parse crudelist file instead of scrapping 'summary.html' and renamed testfiles accordingly
kiramt [Tue, 28 Feb 2017 12:25:11 +0000 (12:25 +0000)]
JAL-2426 Checks on conservation thread in case we are shutting down
kiramt [Mon, 27 Feb 2017 16:10:21 +0000 (16:10 +0000)]
JAL-2388 Make startRes,startSeq,endRes,endSeq private with get/setters
kiramt [Mon, 27 Feb 2017 11:45:30 +0000 (11:45 +0000)]
JAL-2388 Minor refactoring
kiramt [Mon, 27 Feb 2017 09:31:46 +0000 (09:31 +0000)]
JAL-2388 Unit tests take 2
kiramt [Thu, 23 Feb 2017 18:14:13 +0000 (18:14 +0000)]
JAL-2388 Unit tests for columns, take 1
kiramt [Thu, 23 Feb 2017 10:18:02 +0000 (10:18 +0000)]
JAL-2388 Unit tests in progress
kiramt [Tue, 21 Feb 2017 10:55:07 +0000 (10:55 +0000)]
Merge branch 'bug/JAL-2421overviewboxflicker' into
features/JAL-2388OverviewWindow
Conflicts:
src/jalview/gui/AlignmentPanel.java
kiramt [Tue, 21 Feb 2017 10:53:40 +0000 (10:53 +0000)]
Merge branch 'develop' into features/JAL-2388OverviewWindow
kiramt [Tue, 21 Feb 2017 10:14:01 +0000 (10:14 +0000)]
JAL-2421 Unit test
tcofoegbu [Mon, 20 Feb 2017 12:25:32 +0000 (12:25 +0000)]
JAL-2136 merged and resolved conflicts with
80edaa84d6d9beac9f0d2c71b50b7b56fd393427
Jim Procter [Mon, 20 Feb 2017 11:36:39 +0000 (11:36 +0000)]
Merge branch 'features/JAL-2379pcaMemory' into develop
tcofoegbu [Mon, 20 Feb 2017 10:17:44 +0000 (10:17 +0000)]
Merge branch 'reviews/features/JAL-2136_phyre2_integration_withJims' into merge/JAL-2136_phyre2_integration
kiramt [Fri, 17 Feb 2017 14:57:39 +0000 (14:57 +0000)]
JAL-2388 Incomplete unit tests
kiramt [Fri, 17 Feb 2017 13:17:32 +0000 (13:17 +0000)]
JAL-2421 incomplete unit test
kiramt [Fri, 17 Feb 2017 07:46:07 +0000 (07:46 +0000)]
JAL-2421 Fix to alignment panel scroll values, and start of unit test.
Jim Procter [Thu, 16 Feb 2017 11:49:57 +0000 (11:49 +0000)]
Merge branch 'bug/JAL-2374_JAL-2419_overlappinggroups_currentselection_popupmenu' into develop
Jim Procter [Wed, 15 Feb 2017 17:13:26 +0000 (17:13 +0000)]
JAL-2374 JAL-2419 - TODO suspiciously redundant nested if clauses probably need a cleanup
Jim Procter [Wed, 15 Feb 2017 17:12:02 +0000 (17:12 +0000)]
fix for JAL-2419 - don’t trash the current selection