James Procter [Thu, 19 Oct 2023 13:03:37 +0000 (14:03 +0100)]
Merge branch 'develop' into releases/Release_2_11_3_Branch
James Procter [Wed, 18 Oct 2023 09:39:50 +0000 (10:39 +0100)]
Merge branch 'doc/JAL-4090_Release_2_11_3_0' into develop
James Procter [Wed, 18 Oct 2023 09:39:13 +0000 (10:39 +0100)]
JAL-4090 JAL-4303 as known defect
James Procter [Tue, 17 Oct 2023 16:30:08 +0000 (17:30 +0100)]
Merge branch 'bug/JAL-4302_treeheightrendererbroke' into develop
James Procter [Tue, 17 Oct 2023 16:29:49 +0000 (17:29 +0100)]
Merge branch 'doc/JAL-4090_Release_2_11_3_0' into develop
James Procter [Tue, 17 Oct 2023 16:27:14 +0000 (17:27 +0100)]
JAL-4090 JAL-4302 marked as known defect
James Procter [Tue, 17 Oct 2023 16:26:56 +0000 (17:26 +0100)]
JAL-4134 TODO printNode update for columnTrees
James Procter [Tue, 17 Oct 2023 16:25:28 +0000 (17:25 +0100)]
JAL-4134 JAL-4302 remove unnecessary casts
James Procter [Tue, 17 Oct 2023 15:11:15 +0000 (16:11 +0100)]
JAL-4090 JAL-4089 document use of selected columns for superposition, and add links to Pymol for individual viewer capabilities
James Procter [Tue, 17 Oct 2023 10:40:18 +0000 (11:40 +0100)]
Merge branch 'bug/JAL-4089_selectedcolshiddenregions' into develop
James Procter [Tue, 17 Oct 2023 09:53:13 +0000 (10:53 +0100)]
JAL-4089 selected columns are reported in absolute column numbers, not visible columns
James Procter [Mon, 16 Oct 2023 13:41:28 +0000 (14:41 +0100)]
Merge branch 'bug/JAL-4295_hangjmolandmouseovers' into develop
James Procter [Fri, 13 Oct 2023 16:45:17 +0000 (17:45 +0100)]
JAL-4295 concatenate all mouseover highlights into one call to jmolScript - so we don’t need to invoke scriptWait and risk blocking UI
James Procter [Thu, 5 Oct 2023 07:07:55 +0000 (08:07 +0100)]
Merge branch 'develop' into releases/Release_2_11_3_Branch
James Procter [Thu, 5 Oct 2023 07:07:25 +0000 (08:07 +0100)]
Merge branch 'doc/JAL-4090_Release_2_11_3_0' into develop
James Procter [Thu, 5 Oct 2023 07:05:32 +0000 (08:05 +0100)]
Merge branch 'develop' into releases/Release_2_11_3_Branch
James Procter [Thu, 5 Oct 2023 07:04:49 +0000 (08:04 +0100)]
JAL-4090 JAL-3858 paedocs
Ben Soares [Tue, 3 Oct 2023 17:31:08 +0000 (18:31 +0100)]
JAL-4001 Only use acquireDialogQueue and releaseDialogQueue when SplashScreen is transient. Fixes macOS About dialog
James Procter [Sat, 30 Sep 2023 14:04:11 +0000 (15:04 +0100)]
JAL-4217 move CommandsTest to testTask3 involving structure image export and random NPE in commandsOpen test on osx
James Procter [Tue, 3 Oct 2023 12:19:02 +0000 (13:19 +0100)]
Merge branch 'patch/JAL-4062_sort_and_merge_contiguousregions' into develop
James Procter [Tue, 3 Oct 2023 12:18:02 +0000 (13:18 +0100)]
JAL-4090 fix up release notes and what’s new (inc removing 2.11.2 cruft from template)
James Procter [Tue, 3 Oct 2023 11:12:37 +0000 (12:12 +0100)]
Merge branch 'develop' into doc/JAL-4090_Release_2_11_3_0
James Procter [Tue, 3 Oct 2023 10:45:55 +0000 (11:45 +0100)]
JAL-4061 JAL-4062 update find box image and docs in help
James Procter [Tue, 3 Oct 2023 06:57:40 +0000 (07:57 +0100)]
Merge branch 'develop' into doc/JAL-4090_Release_2_11_3_0
James Procter [Tue, 3 Oct 2023 06:57:14 +0000 (07:57 +0100)]
Merge branch 'bug/JAL-244_interactingpngexportnotwysiwig' into develop
James Procter [Tue, 3 Oct 2023 06:56:37 +0000 (07:56 +0100)]
JAL-4090 tweak pae doc
jprocter [Mon, 2 Oct 2023 19:33:59 +0000 (20:33 +0100)]
JAL-4090 more JAL-3858 docs
jprocter [Mon, 2 Oct 2023 14:36:53 +0000 (15:36 +0100)]
Merge branch 'develop' into doc/JAL-4090_Release_2_11_3_0
James Procter [Sun, 1 Oct 2023 19:29:49 +0000 (20:29 +0100)]
JAL-4090 JAL-3855 updated figure and doc.. a little
James Procter [Sun, 1 Oct 2023 19:06:28 +0000 (20:06 +0100)]
JAL-244 ensure background is completely filled with white
James Procter [Sun, 1 Oct 2023 16:42:42 +0000 (17:42 +0100)]
JAL-4090 JAL-4291 disable failing test and note as new knowndefect
James Procter [Sun, 1 Oct 2023 16:06:47 +0000 (17:06 +0100)]
JAL-244 attempt to fix broken test - still needs to be fixed!
James Procter [Sun, 1 Oct 2023 16:06:27 +0000 (17:06 +0100)]
JAL-244 export image with full width IDs regardless of UI
James Procter [Sun, 1 Oct 2023 13:03:57 +0000 (14:03 +0100)]
JAL-244 JAL-4091 allow calculation of label id width off screen including sequence ids for sequence associated annotation
James Procter [Sun, 1 Oct 2023 12:26:54 +0000 (13:26 +0100)]
JAL-244 JAL-4091 FIXME for JAL-3362 patch testCalculateIdWidth_withMaxWidth test for new annotation label marks
James Procter [Sun, 1 Oct 2023 12:24:08 +0000 (13:24 +0100)]
JAL-4160 update args used in test suite for new CLI framework
James Procter [Fri, 29 Sep 2023 17:25:10 +0000 (18:25 +0100)]
Merge branch 'bug/JAL-244_interactingpngexportnotwysiwig' into develop
James Procter [Fri, 29 Sep 2023 17:23:06 +0000 (18:23 +0100)]
JAL-629 JAL-4265 JAL-4286 report the filename for the exported structure image like we do for exported alignment images
James Procter [Fri, 29 Sep 2023 16:59:02 +0000 (17:59 +0100)]
JAL-4090 JAL-629 FER1+SPIOL -> FER1_SPIOL in command line example
James Procter [Fri, 29 Sep 2023 16:57:41 +0000 (17:57 +0100)]
JAL-244 JAL-4090 use current IdWidth when exporting unwrapped alignment image.
James Procter [Fri, 29 Sep 2023 12:46:36 +0000 (13:46 +0100)]
JAL-4090 figures in paematrix doc
James Procter [Fri, 29 Sep 2023 12:46:36 +0000 (13:46 +0100)]
JAL-4288 fix up gradle generated getdown launch jvl for bamboo channel builds
James Procter [Fri, 29 Sep 2023 11:59:53 +0000 (12:59 +0100)]
JAL-4090 fix url to new cli docs
James Procter [Fri, 29 Sep 2023 11:09:05 +0000 (12:09 +0100)]
JAL-4153 move JvCacheableInputBoxTest to testTask2
James Procter [Fri, 29 Sep 2023 07:28:03 +0000 (08:28 +0100)]
JAL-3858 fix check annotation row and column positioning in case we have been called during an annotation height change operation
James Procter [Thu, 28 Sep 2023 17:06:30 +0000 (18:06 +0100)]
JAL-4090 JAL-3855 figure showing PAEs for epas1 homolog structures
James Procter [Thu, 28 Sep 2023 17:05:17 +0000 (18:05 +0100)]
JAL-1556 JAL-4090 colour by annotation options on annotation label popup menu
James Procter [Thu, 28 Sep 2023 16:59:17 +0000 (17:59 +0100)]
JAL-3858 don’t divide if we only had one value to count
James Procter [Thu, 28 Sep 2023 16:57:54 +0000 (17:57 +0100)]
JAL-3858 check annotation row and column positioning in case we have been called during an annotation height change operation
James Procter [Thu, 28 Sep 2023 16:39:51 +0000 (17:39 +0100)]
JAL-3858 improved contactInterval computation and added detailed test coverage for ContactGeometry
- contactInterval.cStart/cEnd and pStart/pEnd are now base-0 inclusive ranges, always less than contactHeight and graphHeight
- change in mapFor behaviour so cStart/cEnd and pStart/pEnd are always just one mapped range, not as many as requested to cover mapFor(pFrom,pTo)
James Procter [Tue, 26 Sep 2023 10:59:56 +0000 (11:59 +0100)]
JAL-3858 JAL-4090 pae matrix docs. WIP
James Procter [Tue, 26 Sep 2023 10:59:08 +0000 (11:59 +0100)]
JAL-3858 JAL-4090 avoid NPE when given out of bound column ranges when requesting ContactList
James Procter [Mon, 25 Sep 2023 16:55:38 +0000 (17:55 +0100)]
JAL-3858 JAL-4090 PAE documentation..
James Procter [Mon, 25 Sep 2023 16:55:15 +0000 (17:55 +0100)]
JAL-3858 minimum value for a range is used to shade ranges in PAE map
James Procter [Mon, 25 Sep 2023 16:54:44 +0000 (17:54 +0100)]
JAL-3858 javadoc and slightly revised green linear shading - still not a perfect match to EBI AlphaFold
James Procter [Mon, 25 Sep 2023 16:40:54 +0000 (17:40 +0100)]
JAL-3858 report PAE range with sensible precision
James Procter [Fri, 22 Sep 2023 15:56:42 +0000 (16:56 +0100)]
JAL-4090 fix link...
James Procter [Fri, 22 Sep 2023 15:57:04 +0000 (16:57 +0100)]
Merge branch 'develop' into releases/Release_2_11_3_Branch
James Procter [Fri, 22 Sep 2023 15:56:42 +0000 (16:56 +0100)]
fix link...
James Procter [Fri, 22 Sep 2023 11:05:07 +0000 (12:05 +0100)]
JAL-4090 smaller associate PDB file panel image in docs
James Procter [Thu, 21 Sep 2023 16:32:49 +0000 (17:32 +0100)]
Merge branch 'develop' into releases/Release_2_11_3_Branch
James Procter [Thu, 21 Sep 2023 16:27:46 +0000 (17:27 +0100)]
JAL-4090 what’s new and additional help docs for JAL-3858 JAL-3855
James Procter [Thu, 21 Sep 2023 16:26:48 +0000 (17:26 +0100)]
JAL-4090 JAL-4262 JAL-4265 release notes
James Procter [Thu, 21 Sep 2023 16:25:48 +0000 (17:25 +0100)]
JAL-1551 javadoc for mapUtils
James Procter [Thu, 21 Sep 2023 16:20:27 +0000 (17:20 +0100)]
JAL-3855 disable the AlphaFold DB entry in Sequence Fetcher - see JAL-4287 for an alternative (and perhaps preferred way) of fetching proteins with alphafold structures.
James Procter [Thu, 21 Sep 2023 16:17:01 +0000 (17:17 +0100)]
JAL-3858 JAL-3855 documentation for import and display PAE from alphafold and JSON format flat files for Import 3D structure from file
James Procter [Thu, 21 Sep 2023 11:44:19 +0000 (12:44 +0100)]
Merge branch 'merge/JAL-4262+JAL-4265+JAL-4269+JAL-4274+JAL-4277+JAL-4285' into develop
Ben Soares [Thu, 21 Sep 2023 08:57:22 +0000 (09:57 +0100)]
JAL-4265 Use ColourUtils.parseColourString() for consistency with the rest of Jalview (and it's better). Change documentation to match new hexstring format
Ben Soares [Thu, 21 Sep 2023 08:29:39 +0000 (09:29 +0100)]
Merge branch 'develop' into merge/JAL-4262+JAL-4265+JAL-4269+JAL-4274+JAL-4277+JAL-4285
Ben Soares [Wed, 20 Sep 2023 17:09:45 +0000 (18:09 +0100)]
JAL-4265 Use ColorUtils.parseColourString() and adjust documentation to use un-hashed hex-string for consistency with other Jalview uses of parseColourString(). When adding 2 structures and 2 structureimages I am now getting a NPE for String[] files = getStructureFiles(); in AAStructureBindingModel, and when using bgcolour for the first structureimage, losing the residues in the second structure image. Will need to investigate when I'm back
James Procter [Wed, 20 Sep 2023 17:03:37 +0000 (18:03 +0100)]
JAL-4285 don’t say you are reporting warnings/errors when there are none..
James Procter [Wed, 20 Sep 2023 17:02:41 +0000 (18:02 +0100)]
JAL-4265 JAL-4286 reinstated explicit restoreSession method because Jmol’s LOAD files command does not behave the same way as restore STATE. Also added defensive check for unexpected exceptions if the state restore trashes the Jmol/Jalview binding
James Procter [Wed, 20 Sep 2023 16:59:26 +0000 (17:59 +0100)]
JAL-4265 JAL-4267 added a ‘restoreSession’ StructureViewer.getBinding() method that allows a snapshot to be explicitly reloaded in place.
James Procter [Wed, 20 Sep 2023 15:42:28 +0000 (16:42 +0100)]
JAL-4195 JAL-1069 JAL-4160 errors in Cache should go to Console.stderr
James Procter [Wed, 20 Sep 2023 15:36:48 +0000 (16:36 +0100)]
Merge branch 'reviews/merge/JAL-4262+JAL-4265+JAL-4269+JAL-4274+JAL-4277+JAL-4285' into develop
James Procter [Wed, 20 Sep 2023 14:14:05 +0000 (15:14 +0100)]
JAL-4217 - try to invokeAndWait on Desktop.closeAll() to avoid Jmol redraw blocking close
James Procter [Wed, 20 Sep 2023 13:23:09 +0000 (14:23 +0100)]
JAL-4274 fix test failure message typo
James Procter [Wed, 20 Sep 2023 13:22:11 +0000 (14:22 +0100)]
JAL-4265 bail early when attempting to export a view from other viewers than Jmol, and use viewType independent methods as much as possible.
James Procter [Wed, 20 Sep 2023 13:13:57 +0000 (14:13 +0100)]
JAL-4265 JAL-4267 allow injection of custom commands outside of Viewer binding model
James Procter [Wed, 20 Sep 2023 13:13:07 +0000 (14:13 +0100)]
JAL-4265 back out redundant ‘saveState’ and ‘restoreState’ StructureCommandsI methods.
Ben Soares [Wed, 20 Sep 2023 11:17:17 +0000 (12:17 +0100)]
JAL-4265 Added saveState and restoreState to interface with no-op methods in abstract class
Ben Soares [Wed, 20 Sep 2023 10:41:27 +0000 (11:41 +0100)]
JAL-629 Explanation of \{m\} in case anyone actually wants it
Ben Soares [Wed, 20 Sep 2023 10:23:05 +0000 (11:23 +0100)]
JAL-629 Add link and example for BioJS image output
Ben Soares [Wed, 20 Sep 2023 10:19:59 +0000 (11:19 +0100)]
JAL-629 Make arguments appear correctly using all non-breaking hyphens
Ben Soares [Wed, 20 Sep 2023 10:15:57 +0000 (11:15 +0100)]
JAL-629 Added/corrected/tidied documentation
Ben Soares [Tue, 19 Sep 2023 23:42:34 +0000 (00:42 +0100)]
JAL-629 JAL-4265 JAL-4269 Updated help Documentation
Ben Soares [Tue, 19 Sep 2023 23:32:46 +0000 (00:32 +0100)]
JAL-629 JAL-4265 JAL-4269 Updated help Documentation
Ben Soares [Tue, 19 Sep 2023 21:36:19 +0000 (22:36 +0100)]
JAL-4265 Change to use JmolCommands
Ben Soares [Tue, 19 Sep 2023 09:48:29 +0000 (10:48 +0100)]
JAL-629 Allow multiple structure images for multiple structure files for the one alignment. Add a {structurebasename} etc and {m} substitution which must be handled differently (on the fly) to other substitutions.
Ben Soares [Sat, 16 Sep 2023 20:14:42 +0000 (21:14 +0100)]
JAL-4250 Fixed blue arrows in drawStemAnnot()
Ben Soares [Sat, 16 Sep 2023 15:56:54 +0000 (16:56 +0100)]
JAL-629 Fix a test and omit an incorrect error message for structureviewer=none
Ben Soares [Sat, 16 Sep 2023 12:28:53 +0000 (13:28 +0100)]
JAL-4265 Added --bgcolour for --structureimage output. Saves and restores Jmol state before and after colour changes and export. Added 'set antialiasdisplay on' by default for all Jmol viewers.
Ben Soares [Sat, 16 Sep 2023 11:24:31 +0000 (12:24 +0100)]
JAL-4269 Now using --width, --height, --scale for both --image and --structureimage. Multiple --image and --structureimage can be specified with --imagecolour allowing changes of colour. --width etc only apply to that particular image.
Ben Soares [Thu, 14 Sep 2023 13:16:17 +0000 (14:16 +0100)]
Merge branch 'develop' into feature/JAL-4274_configurable_bitmap_export_preferences
Ben Soares [Wed, 13 Sep 2023 19:33:20 +0000 (20:33 +0100)]
JAL-4274 comments to help follow the tests
Ben Soares [Wed, 13 Sep 2023 19:26:38 +0000 (20:26 +0100)]
JAL-4274 Tests for BIS defaults and overrides
Ben Soares [Wed, 13 Sep 2023 16:28:11 +0000 (17:28 +0100)]
JAL-4274 Use Cache BITMAP_* if no other image restrictions given
Ben Soares [Wed, 13 Sep 2023 12:32:33 +0000 (13:32 +0100)]
JAL-4262 Made deprecation warning properly modal
Ben Soares [Tue, 12 Sep 2023 11:32:00 +0000 (12:32 +0100)]
JAL-4262 Allow HTML in the dialog box for link to CLI documentation
Ben Soares [Tue, 12 Sep 2023 10:17:16 +0000 (11:17 +0100)]
JAL-4277 No longer using getCanonicalPath() for parent dir -- fix test