jalview.git
21 months agoJAL-840 updated docs - thanks to AMW for verifying by independent implementation...
James Procter [Fri, 10 Feb 2023 15:28:28 +0000 (15:28 +0000)]
JAL-840 updated docs - thanks to AMW for verifying by independent implementation over at https://swissmodel.expasy.org/docs/help#clustalColours

21 months agoJAL-840 generate fragments of clustal.html documentation via ClustalxColurSchemeTest...
James Procter [Fri, 10 Feb 2023 15:19:06 +0000 (15:19 +0000)]
JAL-840 generate fragments of clustal.html documentation via ClustalxColurSchemeTest.testDocString()

21 months agoJAL-1551 remove temp file in src
James Procter [Fri, 3 Feb 2023 14:18:44 +0000 (14:18 +0000)]
JAL-1551 remove temp file in src

21 months agoMerge branch 'develop' into features/r2_11_2_alphafold/JAL-2349_JAL-3855
James Procter [Fri, 3 Feb 2023 14:14:49 +0000 (14:14 +0000)]
Merge branch 'develop' into features/r2_11_2_alphafold/JAL-2349_JAL-3855

21 months agoJAL-4118 remove unnecessary sleep from QuitHandlerTest
Ben Soares [Thu, 26 Jan 2023 17:06:40 +0000 (17:06 +0000)]
JAL-4118 remove unnecessary sleep from QuitHandlerTest

21 months agoJAL-4118 fix a small buglet in BackupFiles exhibited in tests on build server. Possib...
Ben Soares [Thu, 26 Jan 2023 16:44:51 +0000 (16:44 +0000)]
JAL-4118 fix a small buglet in BackupFiles exhibited in tests on build server. Possible problem with filename with dirs in passed to BackupFiles.

21 months agoJAL-1988 Add a sleep to file save test to give time for file to save
Ben Soares [Thu, 26 Jan 2023 11:49:36 +0000 (11:49 +0000)]
JAL-1988 Add a sleep to file save test to give time for file to save

22 months agoJAL-4116 relegate the failed to promote warning to Console.debug so most users won...
James Procter [Wed, 25 Jan 2023 15:28:48 +0000 (15:28 +0000)]
JAL-4116 relegate the failed to promote warning to Console.debug so most users won’t even see it (or be slowed down by it).

22 months agoMerge branch 'new_feature/JAL-4019_ambiguous_base_colourscheme' into develop
James Procter [Wed, 25 Jan 2023 13:05:54 +0000 (13:05 +0000)]
Merge branch 'new_feature/JAL-4019_ambiguous_base_colourscheme' into develop

22 months agoJAL-4090 Release 2.11.3.0 release notes and version bump
James Procter [Tue, 24 Jan 2023 18:20:55 +0000 (18:20 +0000)]
JAL-4090 Release 2.11.3.0 release notes and version bump

22 months agoMerge branch 'merge/JAL-1988_JAL-3772+JAL-3416+JAL-4054+JAL-4064' into develop
James Procter [Tue, 24 Jan 2023 17:41:02 +0000 (17:41 +0000)]
Merge branch 'merge/JAL-1988_JAL-3772+JAL-3416+JAL-4054+JAL-4064' into develop

22 months agoMerge branch 'develop' (JAL-4102 2.11.2.6 patch release) into features/r2_11_2_alphaf... features/r2_11_2_alphafold/JAL-2349_JAL-3855
James Procter [Tue, 24 Jan 2023 06:26:15 +0000 (06:26 +0000)]
Merge branch 'develop' (JAL-4102 2.11.2.6 patch release) into features/r2_11_2_alphafold/JAL-2349_JAL-3855

22 months agoJAL-4104 JAL-4102 update help docs with script to add jalview command line tool to... Release_2_11_2_6
James Procter [Mon, 23 Jan 2023 20:17:42 +0000 (20:17 +0000)]
JAL-4104 JAL-4102 update help docs with script to add jalview command line tool to osx path

22 months agoJAL-4102 whatsNew for 2.11.2.6
Jim Procter [Mon, 23 Jan 2023 09:32:43 +0000 (09:32 +0000)]
JAL-4102 whatsNew for 2.11.2.6

22 months agoMerge branch 'patch/JAL-4114_updated_3dbeacons_api' into develop
Jim Procter [Fri, 20 Jan 2023 23:40:08 +0000 (23:40 +0000)]
Merge branch 'patch/JAL-4114_updated_3dbeacons_api' into develop

22 months agoJAL-4114 model_page_url not required in v2.0 response patch/JAL-4114_updated_3dbeacons_api
Jim Procter [Fri, 20 Jan 2023 23:39:28 +0000 (23:39 +0000)]
JAL-4114 model_page_url not required in v2.0 response

22 months agoJAL-4102 update date and release notes for 2.11.2.6
Jim Procter [Fri, 20 Jan 2023 23:03:12 +0000 (23:03 +0000)]
JAL-4102 update date and release notes for 2.11.2.6

22 months agoMerge branch 'patch/JAL-4114_updated_3dbeacons_api' into develop
Jim Procter [Fri, 20 Jan 2023 22:53:26 +0000 (22:53 +0000)]
Merge branch 'patch/JAL-4114_updated_3dbeacons_api' into develop

22 months agoMerge branch 'patch/Release_2_11_2_6_Branch' into develop
Jim Procter [Fri, 20 Jan 2023 22:52:55 +0000 (22:52 +0000)]
Merge branch 'patch/Release_2_11_2_6_Branch' into develop

22 months agoJAL-2353 primary ref candidates that should be promoted should preserve original... patch/Release_2_11_2_6_Branch
Jim Procter [Fri, 20 Jan 2023 20:48:43 +0000 (20:48 +0000)]
JAL-2353 primary ref candidates that should be promoted should preserve original version string

22 months agoJAL-4114 missing mock server response
Jim Procter [Fri, 20 Jan 2023 20:44:47 +0000 (20:44 +0000)]
JAL-4114 missing mock server response

22 months agoJAL-4114 only rank model qualities that are computed with the same method, and uprank...
Jim Procter [Fri, 20 Jan 2023 17:53:48 +0000 (17:53 +0000)]
JAL-4114 only rank model qualities that are computed with the same method, and uprank models with pLDDT over other types of models in the same model type category

22 months agoJAL-4114 alphafold now marked as AB-INITIO so adjust ranking in categories
Jim Procter [Fri, 20 Jan 2023 17:52:52 +0000 (17:52 +0000)]
JAL-4114 alphafold now marked as AB-INITIO so adjust ranking in categories

22 months agoJAL-4114 additional warnings when PDBe doesn’t return as many responses as queries...
Jim Procter [Fri, 20 Jan 2023 17:50:53 +0000 (17:50 +0000)]
JAL-4114 additional warnings when PDBe doesn’t return as many responses as queries made to it when adding in additional metadata

22 months agoJAL-4114 patch REST client for changed JSON schema in 3D beacons v2 API
Jim Procter [Fri, 20 Jan 2023 17:49:38 +0000 (17:49 +0000)]
JAL-4114 patch REST client for changed JSON schema in 3D beacons v2 API

22 months agoJAL-4114 formatting
Jim Procter [Fri, 20 Jan 2023 17:49:16 +0000 (17:49 +0000)]
JAL-4114 formatting

22 months agoJAL-4114 updated mock tests and responses for v2.0 api
Jim Procter [Fri, 20 Jan 2023 17:48:04 +0000 (17:48 +0000)]
JAL-4114 updated mock tests and responses for v2.0 api

22 months agoJAL-3416 More explicit setting of FlatLaf macOS theme
Ben Soares [Fri, 6 Jan 2023 17:36:42 +0000 (17:36 +0000)]
JAL-3416 More explicit setting of FlatLaf macOS theme

22 months agoJAL-3416 Upgraded FlatLaf to 3.0 and added macOS theme for macOS
Ben Soares [Fri, 6 Jan 2023 17:09:11 +0000 (17:09 +0000)]
JAL-3416 Upgraded FlatLaf to 3.0 and added macOS theme for macOS

22 months agoJAL-3416 remove a missed panel titlebar icon in TreePanel
Ben Soares [Fri, 6 Jan 2023 16:50:24 +0000 (16:50 +0000)]
JAL-3416 remove a missed panel titlebar icon in TreePanel

22 months agoJAL-3416 Fix file permissions on bundled macOS JREs
Ben Soares [Fri, 6 Jan 2023 16:16:02 +0000 (16:16 +0000)]
JAL-3416 Fix file permissions on bundled macOS JREs

23 months agoJAL-4102 bump version number
Jim Procter [Wed, 30 Nov 2022 11:51:02 +0000 (11:51 +0000)]
JAL-4102 bump version number

23 months agoJAL-4102 2.11.2.6 hotfix release notes - JAL-4101 JAL-2353
Jim Procter [Wed, 30 Nov 2022 11:34:45 +0000 (11:34 +0000)]
JAL-4102 2.11.2.6 hotfix release notes - JAL-4101 JAL-2353

23 months agoJAL-4101 Updated Rfam* tests
Ben Soares [Tue, 29 Nov 2022 13:20:54 +0000 (13:20 +0000)]
JAL-4101 Updated Rfam* tests

23 months agoJAL-4101 Updated DEFAULT_RFAM_BASEURL
Ben Soares [Tue, 29 Nov 2022 13:15:32 +0000 (13:15 +0000)]
JAL-4101 Updated DEFAULT_RFAM_BASEURL

23 months agoJAL-2353 patch for Ensembl refs from uniprot - needs test and checking !
Jim Procter [Sun, 30 Oct 2022 23:19:57 +0000 (23:19 +0000)]
JAL-2353 patch for Ensembl refs from uniprot - needs test and checking !

23 months agoJAL-4101 Updated Rfam* tests
Ben Soares [Tue, 29 Nov 2022 13:20:54 +0000 (13:20 +0000)]
JAL-4101 Updated Rfam* tests

23 months agoJAL-4101 Updated DEFAULT_RFAM_BASEURL
Ben Soares [Tue, 29 Nov 2022 13:15:32 +0000 (13:15 +0000)]
JAL-4101 Updated DEFAULT_RFAM_BASEURL

2 years agoJAL-4019 Clarification of position on 'X' in help text
Ben Soares [Thu, 17 Nov 2022 09:39:38 +0000 (09:39 +0000)]
JAL-4019 Clarification of position on 'X' in help text

2 years agoMerge branch 'improvement/JAL-3416_default_to_LIVE_DRAG_MODE_for_flatlaf' into merge...
Ben Soares [Wed, 16 Nov 2022 11:52:30 +0000 (11:52 +0000)]
Merge branch 'improvement/JAL-3416_default_to_LIVE_DRAG_MODE_for_flatlaf' into merge/JAL-1988_JAL-3772+JAL-3416+JAL-4054+JAL-4064

2 years agoJAL-3416 make flatlaf default for linux improvement/JAL-3416_default_to_LIVE_DRAG_MODE_for_flatlaf
Ben Soares [Wed, 16 Nov 2022 11:23:00 +0000 (11:23 +0000)]
JAL-3416 make flatlaf default for linux

2 years agoJAL-4019 finalised a boolean option and tidied some comments
Ben Soares [Wed, 16 Nov 2022 09:27:49 +0000 (09:27 +0000)]
JAL-4019 finalised a boolean option and tidied some comments

2 years agoJAL-4019 Put original test back
Ben Soares [Mon, 14 Nov 2022 20:38:04 +0000 (20:38 +0000)]
JAL-4019 Put original test back

2 years agoJAL-4019 Make diagnostic message debug level
Ben Soares [Mon, 14 Nov 2022 09:07:32 +0000 (09:07 +0000)]
JAL-4019 Make diagnostic message debug level

2 years agoJAL-4019 small colour fix for X in the documentation
Ben Soares [Sun, 13 Nov 2022 20:35:13 +0000 (20:35 +0000)]
JAL-4019 small colour fix for X in the documentation

2 years agoJAL-4019 attribution to Suzanne
Ben Soares [Sun, 13 Nov 2022 20:31:51 +0000 (20:31 +0000)]
JAL-4019 attribution to Suzanne

2 years agoJAL-4019 Help pages for Nucleotide Ambiguity colour scheme
Ben Soares [Sun, 13 Nov 2022 10:51:22 +0000 (10:51 +0000)]
JAL-4019 Help pages for Nucleotide Ambiguity colour scheme

2 years agoJAL-4019 small but important corrections to array order, and X colour
Ben Soares [Sun, 13 Nov 2022 10:50:57 +0000 (10:50 +0000)]
JAL-4019 small but important corrections to array order, and X colour

2 years agoJAL-4019 Added tests for new Nucleotide sequence detection
Ben Soares [Sun, 13 Nov 2022 00:54:09 +0000 (00:54 +0000)]
JAL-4019 Added tests for new Nucleotide sequence detection

2 years agoJAL-4019 improvement to short sequence nucleotide detection, and some tidying of...
Ben Soares [Sun, 13 Nov 2022 00:53:27 +0000 (00:53 +0000)]
JAL-4019 improvement to short sequence nucleotide detection, and some tidying of unused parameters

2 years agoJAL-4019 Nucleotide Ambiguity Colour Scheme added. Test for nucleotide sequence adapt...
Ben Soares [Thu, 10 Nov 2022 15:21:08 +0000 (15:21 +0000)]
JAL-4019 Nucleotide Ambiguity Colour Scheme added. Test for nucleotide sequence adapted to recognise nucleotide sequences with (more than 15%) ambiguity codes. Two tests fixed.

2 years agoJAL-3416 Add necessary logo to non-internal Frames
Ben Soares [Wed, 9 Nov 2022 18:11:42 +0000 (18:11 +0000)]
JAL-3416 Add necessary logo to non-internal Frames

2 years agoMerge branch 'improvement/JAL-3416_default_to_LIVE_DRAG_MODE_for_flatlaf' into merge...
Ben Soares [Wed, 9 Nov 2022 18:10:20 +0000 (18:10 +0000)]
Merge branch 'improvement/JAL-3416_default_to_LIVE_DRAG_MODE_for_flatlaf' into merge/JAL-1988_JAL-3772+JAL-3416+JAL-4054+JAL-4064

2 years agoJAL-3416 Add necessary logo to non-internal Frames
Ben Soares [Wed, 9 Nov 2022 18:10:10 +0000 (18:10 +0000)]
JAL-3416 Add necessary logo to non-internal Frames

2 years agoMerge branch 'improvement/JAL-3416_default_to_LIVE_DRAG_MODE_for_flatlaf' into merge...
Ben Soares [Wed, 9 Nov 2022 17:47:59 +0000 (17:47 +0000)]
Merge branch 'improvement/JAL-3416_default_to_LIVE_DRAG_MODE_for_flatlaf' into merge/JAL-1988_JAL-3772+JAL-3416+JAL-4054+JAL-4064

2 years agoJAL-3416 Remove all JFrame/JInternalFrame icons (set to null)
Ben Soares [Wed, 9 Nov 2022 17:45:21 +0000 (17:45 +0000)]
JAL-3416 Remove all JFrame/JInternalFrame icons (set to null)

2 years agoMerge branch 'bug/JAL-1988_JAL-3772_improved_quit_handling' into merge/JAL-1988_JAL...
Ben Soares [Wed, 9 Nov 2022 15:30:29 +0000 (15:30 +0000)]
Merge branch 'bug/JAL-1988_JAL-3772_improved_quit_handling' into merge/JAL-1988_JAL-3772+JAL-3416+JAL-4054+JAL-4064

2 years agoJAL-1988 JAL-3772 Test for FORCE_QUIT whilst saving a file bug/JAL-1988_JAL-3772_improved_quit_handling
Ben Soares [Wed, 9 Nov 2022 15:30:09 +0000 (15:30 +0000)]
JAL-1988 JAL-3772 Test for FORCE_QUIT whilst saving a file

2 years agoMerge branch 'bug/JAL-1988_JAL-3772_improved_quit_handling' into ben-big-merge
Ben Soares [Tue, 8 Nov 2022 17:47:25 +0000 (17:47 +0000)]
Merge branch 'bug/JAL-1988_JAL-3772_improved_quit_handling' into ben-big-merge

2 years agoJAL-1988 JAL-3776 Formatting JvOptionPane
Ben Soares [Tue, 8 Nov 2022 17:47:14 +0000 (17:47 +0000)]
JAL-1988 JAL-3776 Formatting JvOptionPane

2 years agoJAL-1988 JAL-3772 Tests for various quitting scenarios
Ben Soares [Tue, 8 Nov 2022 17:42:33 +0000 (17:42 +0000)]
JAL-1988 JAL-3772 Tests for various quitting scenarios

2 years agoJAL-1988 JAL-3772 Fixes highlighted by tests
Ben Soares [Tue, 8 Nov 2022 17:39:30 +0000 (17:39 +0000)]
JAL-1988 JAL-3772 Fixes highlighted by tests

2 years agoMerge branch 'merge/JAL-4054+JAL-4064' into ben-big-merge
Ben Soares [Fri, 4 Nov 2022 17:58:36 +0000 (17:58 +0000)]
Merge branch 'merge/JAL-4054+JAL-4064' into ben-big-merge

2 years agoJAL-3416 Added logoIcon to quit (and potentially other) dialogs
Ben Soares [Fri, 4 Nov 2022 17:54:14 +0000 (17:54 +0000)]
JAL-3416 Added logoIcon to quit (and potentially other) dialogs

2 years agoJAL-1998 JAL-3772 JAL-3416 Merge conflict resolution of JalviewFileChooser and JvOpti...
Ben Soares [Fri, 4 Nov 2022 17:53:36 +0000 (17:53 +0000)]
JAL-1998 JAL-3772 JAL-3416 Merge conflict resolution of JalviewFileChooser and JvOptionPane

2 years agoJAL-4064 JAL-4054 Combined install4j10 template with new architectures. Added scheme... improvement/JAL-4064_Addition_of_macOS_AARCH64_native_DMG
Ben Soares [Fri, 4 Nov 2022 09:58:02 +0000 (09:58 +0000)]
JAL-4064 JAL-4054 Combined install4j10 template with new architectures. Added scheme associations for macOS.

2 years agoJAL-4054 Altered file association templates and generated install4j xml and Info...
Ben Soares [Wed, 2 Nov 2022 21:36:46 +0000 (21:36 +0000)]
JAL-4054 Altered file association templates and generated install4j xml and Info.plist snippets.

2 years agoJAL-3416 File Chooser iconified, JvOptionPanes iconified, other internal frames and...
Ben Soares [Thu, 3 Nov 2022 19:53:56 +0000 (19:53 +0000)]
JAL-3416 File Chooser iconified, JvOptionPanes iconified, other internal frames and dialogs iconified

2 years agoJAL-3855 JAL-4095 simple picking of ranges adjacent to a clicked region of the pAE...
Jim Procter [Thu, 3 Nov 2022 16:27:10 +0000 (16:27 +0000)]
JAL-3855 JAL-4095 simple picking of ranges adjacent to a clicked region of the pAE that score less than the max pAE observed under the mouse

2 years agoJAL-1988 JAL-3772 Allow other window closing dialogs to cancel quit handling
Ben Soares [Thu, 3 Nov 2022 13:26:20 +0000 (13:26 +0000)]
JAL-1988 JAL-3772 Allow other window closing dialogs to cancel quit handling

2 years agoJAL-3416 More JInternalFrame icons
Ben Soares [Thu, 3 Nov 2022 13:14:43 +0000 (13:14 +0000)]
JAL-3416 More JInternalFrame icons

2 years agoJAL-1988 JAL-3772 Tidying of unspecified Callable declarations. Use SwingUtilities...
Ben Soares [Thu, 3 Nov 2022 09:10:24 +0000 (09:10 +0000)]
JAL-1988 JAL-3772 Tidying of unspecified Callable declarations. Use SwingUtilities.getAncestorOfClass()

2 years agoJAL-3416 Start to add JInternalFrame icons (to replace default java Duke icon in...
Ben Soares [Thu, 3 Nov 2022 08:29:30 +0000 (08:29 +0000)]
JAL-3416 Start to add JInternalFrame icons (to replace default java Duke icon in frame decoration)

2 years agoJAL-1988 JAL-3772 Moving packages to somewhere more obvious (jbgui -> gui)
Ben Soares [Wed, 2 Nov 2022 14:34:11 +0000 (14:34 +0000)]
JAL-1988 JAL-3772 Moving packages to somewhere more obvious (jbgui -> gui)

2 years agoJAL-3416 set flatlaf default drag mode to LIVE_DRAG_MODE
Ben Soares [Tue, 1 Nov 2022 18:29:09 +0000 (18:29 +0000)]
JAL-3416 set flatlaf default drag mode to LIVE_DRAG_MODE

2 years agoJAL-1988 JAL-3772 Change default alignmentviewport saved status and set to true when...
Ben Soares [Tue, 1 Nov 2022 16:50:36 +0000 (16:50 +0000)]
JAL-1988 JAL-3772 Change default alignmentviewport saved status and set to true when loaded from file

2 years agoJAL-4064 tidying build.gradle
Ben Soares [Tue, 1 Nov 2022 14:22:21 +0000 (14:22 +0000)]
JAL-4064 tidying build.gradle

2 years agoJAL-4064 re-added bundled macOS JREs as Filesets, which is the only way to get them...
Ben Soares [Tue, 1 Nov 2022 14:21:19 +0000 (14:21 +0000)]
JAL-4064 re-added bundled macOS JREs as Filesets, which is the only way to get them in the DMG where we want them

2 years agoJAL-4064 Cleaned up file sets in install4j template. New media installers for AARCH64...
Ben Soares [Tue, 1 Nov 2022 11:17:16 +0000 (11:17 +0000)]
JAL-4064 Cleaned up file sets in install4j template. New media installers for AARCH64 JVMs for macOS and Linux in install4j template.  New variables passed to install4j by gradle.

2 years agoJAL-4064 Download JRE/JDKs from Azul if not os/arch combination not available from...
Ben Soares [Tue, 1 Nov 2022 11:16:06 +0000 (11:16 +0000)]
JAL-4064 Download JRE/JDKs from Azul if not os/arch combination not available from Adoptium

2 years agoJAL-2349 JAL-3855 bizarre resizing exception when resizing protein alignment for...
Jim Procter [Sun, 30 Oct 2022 23:22:32 +0000 (23:22 +0000)]
JAL-2349 JAL-3855 bizarre resizing exception when resizing protein alignment for a linked CDS protein alignment

2 years agoJAL-4091 lines to associate rows sharing same sequence ref - needs some work still...
Jim Procter [Sun, 30 Oct 2022 23:21:38 +0000 (23:21 +0000)]
JAL-4091 lines to associate rows sharing same sequence ref - needs some work still ! (And would be great to have more interactivity!)

2 years agoJAL-2353 patch for Ensembl refs from uniprot - needs test and checking !
Jim Procter [Sun, 30 Oct 2022 23:19:57 +0000 (23:19 +0000)]
JAL-2353 patch for Ensembl refs from uniprot - needs test and checking !

2 years agoJAL-1988 JAL-3772 removed a debugging log line
Ben Soares [Sat, 29 Oct 2022 18:38:23 +0000 (19:38 +0100)]
JAL-1988 JAL-3772 removed a debugging log line

2 years agoJAL-4094 shift+click drag up/down to resize all annotation rows with matching calcId...
Jim Procter [Sat, 29 Oct 2022 14:11:58 +0000 (15:11 +0100)]
JAL-4094 shift+click drag up/down to resize all annotation rows with matching calcId and label.


2 years agoJAL-4091 - noodling about including the names for sequences associated with annotatio...
Jim Procter [Sat, 29 Oct 2022 12:08:47 +0000 (13:08 +0100)]
JAL-4091 - noodling about including the names for sequences associated with annotation rows in the annotation row label area

2 years agoJAL-4090 bump version and set up release notes for 2.11.3
Jim Procter [Sat, 29 Oct 2022 11:20:09 +0000 (12:20 +0100)]
JAL-4090 bump version and set up release notes for 2.11.3

2 years agoMerge branch 'features/JAL-4061_and_JAL-4062_findselectfeatures' into features/r2_11_...
Jim Procter [Sat, 29 Oct 2022 11:16:14 +0000 (12:16 +0100)]
Merge branch 'features/JAL-4061_and_JAL-4062_findselectfeatures' into features/r2_11_2_alphafold/JAL-2349_JAL-3855

2 years agoJAL-1988 JAL-3772 Removed 'Wait' button from waitDialog, no iterations for GUI. Added...
Ben Soares [Fri, 28 Oct 2022 23:16:20 +0000 (00:16 +0100)]
JAL-1988 JAL-3772 Removed 'Wait' button from waitDialog, no iterations for GUI. Added bulletpoint to files saving list. Added use of passed in button objects to modal JvOptionPane, so buttons can be controlled (e.g. setEnabled, setVisible) outside of JvOptionPane.

2 years agoMerge branch 'bug/JAL-4083_exceptions_for_multiple_residue_highlights_in_jmol' into...
Jim Procter [Fri, 28 Oct 2022 15:30:06 +0000 (16:30 +0100)]
Merge branch 'bug/JAL-4083_exceptions_for_multiple_residue_highlights_in_jmol' into features/r2_11_2_alphafold/JAL-2349_JAL-3855

2 years agoJAL-2349 allow contact matrix to provide labels for its annotation row
Jim Procter [Fri, 28 Oct 2022 15:27:00 +0000 (16:27 +0100)]
JAL-2349 allow contact matrix to provide labels for its annotation row

2 years agoJAL-4086 commented out attempt to create measurement lines between aligned residues...
Jim Procter [Fri, 28 Oct 2022 14:49:34 +0000 (15:49 +0100)]
JAL-4086 commented out attempt to create measurement lines between aligned residues in different chains

2 years agoJAL-4089 use column selection to superpose if 4 or more selected
Jim Procter [Fri, 28 Oct 2022 14:48:32 +0000 (15:48 +0100)]
JAL-4089 use column selection to superpose if 4 or more selected

2 years agoJAL-2961 centerViewOn command for structure viewers - called after superposition
Jim Procter [Fri, 28 Oct 2022 14:45:22 +0000 (15:45 +0100)]
JAL-2961 centerViewOn command for structure viewers - called after superposition

2 years agoMerge branch 'features/r2_11_2_alphafold/JAL-2349_JAL-3855' into bug/JAL-4083_excepti...
Jim Procter [Fri, 28 Oct 2022 12:21:41 +0000 (13:21 +0100)]
Merge branch 'features/r2_11_2_alphafold/JAL-2349_JAL-3855' into bug/JAL-4083_exceptions_for_multiple_residue_highlights_in_jmol

2 years agoJAL-1988 JAL-3772 Fixed wait between waitDialog appearances, ensuring all files savin...
Ben Soares [Fri, 28 Oct 2022 11:48:56 +0000 (12:48 +0100)]
JAL-1988 JAL-3772 Fixed wait between waitDialog appearances, ensuring all files saving will quit straight away. Goodbye message to user if waitDialog still visible.

2 years agoJAL-1988 Allow generic Container object in JvOptionPane showDialog. Fix dynamically...
Ben Soares [Thu, 27 Oct 2022 17:51:22 +0000 (18:51 +0100)]
JAL-1988 Allow generic Container object in JvOptionPane showDialog. Fix dynamically saving files in the wait for save dialog

2 years agoMerge branch 'develop' into bug/JAL-1988_JAL-3772_improved_quit_handling
Ben Soares [Thu, 27 Oct 2022 15:20:14 +0000 (16:20 +0100)]
Merge branch 'develop' into bug/JAL-1988_JAL-3772_improved_quit_handling

2 years agoJAL-4083 don't need globalUseScriptWait after all, just a couple of calls to jmolHist... bug/JAL-4083_exceptions_for_multiple_residue_highlights_in_jmol
Ben Soares [Thu, 27 Oct 2022 13:43:59 +0000 (14:43 +0100)]
JAL-4083 don't need globalUseScriptWait after all, just a couple of calls to jmolHistory need the flag too

2 years agoJAL-4083 only set globalUseScriptWait if needed
Ben Soares [Thu, 27 Oct 2022 12:23:16 +0000 (13:23 +0100)]
JAL-4083 only set globalUseScriptWait if needed