Ben Soares [Wed, 17 Apr 2024 09:57:54 +0000 (10:57 +0100)]
JAL-4059 Updates to SwingJS and JmolJS
Ben Soares [Tue, 16 Apr 2024 20:10:10 +0000 (21:10 +0100)]
JAL-4059 JAL-4395 Updated closure-compiler. Added local_eclipse.properties for buildship
Ben Soares [Tue, 16 Apr 2024 12:09:14 +0000 (13:09 +0100)]
JAL-4059 Big improvements to jalviewjsProjectImport dependencies avoiding more unnecessary jalviewjsTranspiles
Ben Soares [Mon, 15 Apr 2024 19:52:55 +0000 (20:52 +0100)]
JAL-4059 Fixed Copy tasks merging site
Ben Soares [Fri, 5 Apr 2024 20:10:50 +0000 (21:10 +0100)]
JAL-4059 Fix jalviewjsLaunchTest for non-macos
Ben Soares [Thu, 4 Apr 2024 15:05:48 +0000 (16:05 +0100)]
JAL-4059 Fixed macOS timeoutscheduler and revert to --timeout for other OSes
Ben Soares [Tue, 2 Apr 2024 19:28:12 +0000 (20:28 +0100)]
Merge branch 'bug/JAL-4375_annotation_not_redrawn_correctly_when_scrolling_left-right_via_trackpad_in_wrap_mode' into bug/JAL-4059_update_swingJS_for_JalviewJS_2_11_2_and_2_11_3
Ben Soares [Tue, 2 Apr 2024 19:27:50 +0000 (20:27 +0100)]
JAL-4380 Improved annotation tooltips especially secondary structure tooltips
Ben Soares [Tue, 2 Apr 2024 17:16:15 +0000 (18:16 +0100)]
JAL-4059 Updated SwingJS, JmolJS libraries
Ben Soares [Tue, 2 Apr 2024 17:15:39 +0000 (18:15 +0100)]
JAL-4059 minor CSS fix
Ben Soares [Wed, 20 Mar 2024 11:45:40 +0000 (11:45 +0000)]
Merge branch 'bug/JAL-4375_annotation_not_redrawn_correctly_when_scrolling_left-right_via_trackpad_in_wrap_mode' into bug/JAL-4059_update_swingJS_for_JalviewJS_2_11_2_and_2_11_3
Ben Soares [Fri, 15 Mar 2024 17:04:36 +0000 (17:04 +0000)]
JAL-4059 Updated SwingJS and JSmol (March 2024). Fix gradle to spot new SwingJS zip.
Ben Soares [Fri, 15 Mar 2024 12:40:40 +0000 (12:40 +0000)]
Merge branch 'develop' into bug/JAL-4238_PAEs_not_being_shown_in_JalviewJS
Ben Soares [Fri, 15 Mar 2024 12:39:49 +0000 (12:39 +0000)]
JAL-4320 Improve the inputs and outputs dependencies of jalviewjs build tasks
Ben Soares [Fri, 15 Mar 2024 12:38:54 +0000 (12:38 +0000)]
JAL-3225 Force gradle version in eclipse settings
Ben Soares [Mon, 26 Feb 2024 11:07:01 +0000 (11:07 +0000)]
JAL-4381 Plausibly better division of line segment -- looks much better in SVG. Tidy of other methods.
Ben Soares [Fri, 23 Feb 2024 15:13:50 +0000 (15:13 +0000)]
JAL-4381 For lineGraph line segments that should be one colour at one end and another colour at the other, only colour one half the line one colour and the other half of the line the other colour. For best results this is achieved through drawing the line twice but clipped one side and then the other.
Ben Soares [Wed, 21 Feb 2024 17:31:58 +0000 (17:31 +0000)]
JAL-4375 JAL-4381 Removal of AnnotationColouring and associated code
Ben Soares [Tue, 20 Feb 2024 15:35:22 +0000 (15:35 +0000)]
JAL-4380 Added information to annotation tooltips when description is not present
Ben Soares [Tue, 20 Feb 2024 15:34:43 +0000 (15:34 +0000)]
JAL-4375 Add an AnnotationColouringI interface, and generic AnnotationColouringRanges to calculate changing colours between two values and specific AnnotationColouringPLDDT. Linegraph annotations can use this to drawSegmentedLine -- a line drawn multiple times clipped to different ranges in different colours. Calculations are cached.
Ben Soares [Wed, 7 Feb 2024 17:05:45 +0000 (17:05 +0000)]
JAL-4375 Pass through a flag to AnnotationRenderer.drawComponent(...) so it knows when a full width render is required, adjusting the g2dCopy.setClip(...) width accordingly
Ben Soares [Wed, 7 Feb 2024 14:20:39 +0000 (14:20 +0000)]
JAL-4375 This extra clip isn't necessary
Ben Soares [Wed, 7 Feb 2024 01:00:31 +0000 (01:00 +0000)]
JAL-4375 Clipped label text in annotations to annotation rectangle. Added property to change text antialias method. Changed translation/scaling of Graphics2D object more robust with a copy of the object.
Ben Soares [Fri, 2 Feb 2024 11:28:52 +0000 (11:28 +0000)]
JAL-4375 I don't think turning off antialiasing is necessary and possibly not appropriate
Ben Soares [Fri, 2 Feb 2024 01:11:32 +0000 (01:11 +0000)]
JAL-4375 Single width pixel artifacts appearing for PAE annotation now fixed for drawLine method. AnnotationRowRendererI adjusted to pass isVectorRendering boolean to ensure correct method to draw the matrix blocks in vector graphic export.
Ben Soares [Thu, 1 Feb 2024 15:34:09 +0000 (15:34 +0000)]
JAL-4375 fix typo in property name
Ben Soares [Thu, 1 Feb 2024 12:26:48 +0000 (12:26 +0000)]
JAL-4375 Improved trackpad user experience for wrapped format, with vertical scrolling thresholds for mousewheel/tackpad rotation and time-since-last-left-right-rotation reducing accidental up/down scrolls whilst using trackpad to scroll left/right. Thresholds can be adjusted in properties file.
Ben Soares [Wed, 31 Jan 2024 17:03:39 +0000 (17:03 +0000)]
JAL-4375 More consistent calculation for dashed threshold line
Ben Soares [Wed, 31 Jan 2024 16:08:54 +0000 (16:08 +0000)]
JAL-4375 Different way of getting mouse wheel movement for cross-platform (testing on macos and linux) sensitivity
Ben Soares [Wed, 31 Jan 2024 12:47:13 +0000 (12:47 +0000)]
JAL-4375 Fix big sideways scroll from trackpad at beginning and end of visible alignment.
Ben Soares [Wed, 31 Jan 2024 09:11:43 +0000 (09:11 +0000)]
JAL-4375 Fixed sensitivity of new more responsive left-right side scrolling
Ben Soares [Wed, 31 Jan 2024 08:24:33 +0000 (08:24 +0000)]
JAL-4375 Fixed the following when trackpad side-scrolling in wrap format: line-graph edge artifacts, ss sheet arrowhead artifact, boundary line overdraws, threshold dashed line overlay draws. Added half-line segments at both ends of line graph when neighbouring value exists, this applies to non-wrap format too.
James Procter [Tue, 23 Jan 2024 17:27:24 +0000 (17:27 +0000)]
JAL-4356 release notes
James Procter [Tue, 23 Jan 2024 17:08:28 +0000 (17:08 +0000)]
JAL-4356 update release notes for 2.11.3.3
Ben Soares [Tue, 23 Jan 2024 17:07:58 +0000 (17:07 +0000)]
Merge branch 'develop' into bug/JAL-4238_PAEs_not_being_shown_in_JalviewJS
James Procter [Tue, 23 Jan 2024 16:51:04 +0000 (16:51 +0000)]
Merge branch 'bug/JAL-4290_headless_alignment_export_with_structure_annotations_doesnt_include_secondary_structure_and_temperature_factor' into develop
James Procter [Tue, 23 Jan 2024 14:21:59 +0000 (14:21 +0000)]
Merge branch 'develop' into bug/JAL-4290_headless_alignment_export_with_structure_annotations_doesnt_include_secondary_structure_and_temperature_factor
Ben Soares [Wed, 20 Dec 2023 13:23:07 +0000 (13:23 +0000)]
JAL-4367 Limit right and top adjustments
Ben Soares [Wed, 20 Dec 2023 13:14:26 +0000 (13:14 +0000)]
JAL-4290 Fix image comparison between gui and headless output. Images are now the same
Ben Soares [Wed, 20 Dec 2023 00:08:56 +0000 (00:08 +0000)]
JAL-4290 fixed tests
Ben Soares [Tue, 19 Dec 2023 17:52:45 +0000 (17:52 +0000)]
Merge branch 'bug/JAL-4353_cannot_output_multiple_different_structure_images_for_one_alignment' into bug/JAL-4290_headless_alignment_export_with_structure_annotations_doesnt_include_secondary_structure_and_temperature_factor
Ben Soares [Thu, 14 Dec 2023 15:40:48 +0000 (15:40 +0000)]
Merge branch 'develop' into bug/JAL-4353_cannot_output_multiple_different_structure_images_for_one_alignment
James Procter [Tue, 12 Dec 2023 20:55:49 +0000 (20:55 +0000)]
Merge branch 'bug/JAL-4353_cannot_output_multiple_different_structure_images_for_one_alignment_with_renderpatch' into bug/JAL-4353_cannot_output_multiple_different_structure_images_for_one_alignment
James Procter [Tue, 12 Dec 2023 17:20:04 +0000 (17:20 +0000)]
JAL-4353 wait for files to be written fully before comparing size with older file
James Procter [Tue, 12 Dec 2023 17:18:48 +0000 (17:18 +0000)]
JAL-4353 singleThread all tests
Ben Soares [Tue, 23 Jan 2024 16:42:24 +0000 (16:42 +0000)]
Merge branch 'bug/JAL-4235_gradle_task_jalviewjsTranspile_does_not_fail_on_eclipse_error' into bug/JAL-4238_PAEs_not_being_shown_in_JalviewJS
Ben Soares [Tue, 23 Jan 2024 15:05:33 +0000 (15:05 +0000)]
Merge branch 'develop' into bug/JAL-4235_gradle_task_jalviewjsTranspile_does_not_fail_on_eclipse_error
Ben Soares [Tue, 23 Jan 2024 14:54:05 +0000 (14:54 +0000)]
Merge branch 'develop' into bug/JAL-4235_gradle_task_jalviewjsTranspile_does_not_fail_on_eclipse_error
James Procter [Wed, 10 Jan 2024 15:51:52 +0000 (15:51 +0000)]
JAL-4369 invokeAndWait to avoid hang whilst calling getFiles if a Jmol redraw is in progress
James Procter [Wed, 10 Jan 2024 10:26:26 +0000 (10:26 +0000)]
JAL-4369 uniprotkb - try to avoid another redirect response
James Procter [Tue, 9 Jan 2024 18:36:12 +0000 (18:36 +0000)]
JAL-4369 use rest.uniprot.org as fetch domain
t pu# Please enter the commit message for your changes. Lines starting
James Procter [Tue, 23 Jan 2024 13:39:04 +0000 (13:39 +0000)]
Merge branch 'bug/JAL-4373_jvmmemmax_and_jvmmempc_ignored_on_command_line_for_executable_jar_launch' into develop
James Procter [Tue, 23 Jan 2024 13:34:35 +0000 (13:34 +0000)]
Merge branch 'bug/JAL-4368_default_colourscheme_applied_to_JVP_inappropriately' into develop
Ben Soares [Fri, 19 Jan 2024 17:00:46 +0000 (17:00 +0000)]
JAL-4373 Setting the jvmmempc and jvmmemmax strings from the Arg.getName() for consistency. Updated some comments.
Ben Soares [Fri, 19 Jan 2024 16:11:14 +0000 (16:11 +0000)]
JAL-4373 Fix Main-Class and other attribute settings in the shadowJar manifest. It requires a 'dummy' Jar task with the correct settings.
Ben Soares [Fri, 5 Jan 2024 17:28:36 +0000 (17:28 +0000)]
JAL-4368 Only set a colour scheme if --colour is given or it's not a JVP file
Ben Soares [Fri, 5 Jan 2024 14:47:38 +0000 (14:47 +0000)]
JAL-4328 Example html 'form' launch in examples.html
Ben Soares [Wed, 20 Dec 2023 20:28:49 +0000 (20:28 +0000)]
JAL-4238 Marked where JalviewJS is hanging on 3DBeacons search.
Ben Soares [Wed, 20 Dec 2023 20:28:11 +0000 (20:28 +0000)]
JAL-4059 Added some more Platform.addJ2SDirectDatabaseCall web service URLs in static blocks in appropriate classes. Altered addJ2SDirectDatabaseCall to only add scheme://host:port and not path.
Ben Soares [Wed, 20 Dec 2023 14:49:27 +0000 (14:49 +0000)]
JAL-4328 Move the examples links to a sensible place. Add pae-example.jvp
Ben Soares [Tue, 19 Dec 2023 17:50:33 +0000 (17:50 +0000)]
JAL-4290 Fixed one test
Ben Soares [Mon, 18 Dec 2023 13:58:28 +0000 (13:58 +0000)]
JAL-4290 not quite working tests
Ben Soares [Mon, 18 Dec 2023 13:58:15 +0000 (13:58 +0000)]
JAL-4290 incorrect usage of main()
Ben Soares [Fri, 15 Dec 2023 21:30:13 +0000 (21:30 +0000)]
Merge branch 'bug/JAL-4290_headless_alignment_export_with_structure_annotations_doesnt_include_secondary_structure_and_temperature_factor' of https://source.jalview.org/git/jalview into bug/JAL-4290_headless_alignment_export_with_structure_annotations_doesnt_include_secondary_structure_and_temperature_factor
Ben Soares [Fri, 15 Dec 2023 21:29:59 +0000 (21:29 +0000)]
JAL-4290 Add method to allow for specific settings. Revert setting show annotations.
Ben Soares [Fri, 15 Dec 2023 15:18:23 +0000 (15:18 +0000)]
JAL-4290 Set structureSelectionManager settings more generically and when no desktop exists
Ben Soares [Fri, 15 Dec 2023 13:06:52 +0000 (13:06 +0000)]
JAL-4059 Only run this once
Ben Soares [Fri, 15 Dec 2023 12:58:03 +0000 (12:58 +0000)]
JAL-4059 Use namespaced query parameters in preference to Info.args. Report what's being used.
James Procter [Fri, 15 Dec 2023 11:31:30 +0000 (11:31 +0000)]
Merge branch 'bug/JAL-4290_headless_alignment_figure_with_sse' into bug/JAL-4290_headless_alignment_export_with_structure_annotations_doesnt_include_secondary_structure_and_temperature_factor
James Procter [Fri, 15 Dec 2023 11:30:11 +0000 (11:30 +0000)]
JAL-4290 new CommandsTest.headlessOrGuiImageOutputTest - uses CommandLineOperations.Worker to run jalview as a separate process to verify headless alignment image export should be same size as when launched with —gui
Ben Soares [Fri, 15 Dec 2023 01:08:11 +0000 (01:08 +0000)]
JAL-4290 Move some annotation visibility settings to after opening a structure. Set synchronously if in headless mode.
Ben Soares [Thu, 14 Dec 2023 16:40:02 +0000 (16:40 +0000)]
Merge branch 'develop' into bug/JAL-4238_PAEs_not_being_shown_in_JalviewJS
James Procter [Thu, 14 Dec 2023 15:39:20 +0000 (15:39 +0000)]
JAL-4356 update release notes
James Procter [Thu, 14 Dec 2023 15:28:08 +0000 (15:28 +0000)]
Merge branch 'bug/JAL-4353_cannot_output_multiple_different_structure_images_for_one_alignment' into develop
James Procter [Tue, 12 Dec 2023 20:55:49 +0000 (20:55 +0000)]
Merge branch 'bug/JAL-4353_cannot_output_multiple_different_structure_images_for_one_alignment_with_renderpatch' into bug/JAL-4353_cannot_output_multiple_different_structure_images_for_one_alignment
James Procter [Tue, 12 Dec 2023 17:20:04 +0000 (17:20 +0000)]
JAL-4353 wait for files to be written fully before comparing size with older file
James Procter [Tue, 12 Dec 2023 17:18:48 +0000 (17:18 +0000)]
JAL-4217 singleThread all tests
James Procter [Thu, 14 Dec 2023 15:24:05 +0000 (15:24 +0000)]
Merge branch 'develop' into bug/JAL-4238_PAEs_not_being_shown_in_JalviewJS
Ben Soares [Thu, 14 Dec 2023 14:25:16 +0000 (14:25 +0000)]
Merge branch 'develop' into bug/JAL-4238_PAEs_not_being_shown_in_JalviewJS
James Procter [Thu, 14 Dec 2023 14:16:38 +0000 (14:16 +0000)]
Merge branch 'bug/JAL-2934proportionalScrolling' into develop
James Procter [Thu, 14 Dec 2023 14:14:15 +0000 (14:14 +0000)]
Merge branch 'develop' into bug/JAL-2934proportionalScrolling
Ben Soares [Thu, 14 Dec 2023 12:38:15 +0000 (12:38 +0000)]
JAL-4059 Improvement to launch indicator
Ben Soares [Thu, 14 Dec 2023 12:37:35 +0000 (12:37 +0000)]
JAL-4059 Updated swingjs and removed spare library .zip
Ben Soares [Tue, 12 Dec 2023 17:49:35 +0000 (17:49 +0000)]
JAL-4353 bigger tighter test
James Procter [Tue, 12 Dec 2023 17:17:17 +0000 (17:17 +0000)]
JAL-4217 don’t try and export an image when Jmol is also trying to repaint
Ben Soares [Tue, 12 Dec 2023 17:13:45 +0000 (17:13 +0000)]
Merge branch 'bug/JAL-4353_cannot_output_multiple_different_structure_images_for_one_alignment' of https://source.jalview.org/git/jalview into bug/JAL-4353_cannot_output_multiple_different_structure_images_for_one_alignment
James Procter [Tue, 12 Dec 2023 16:02:14 +0000 (16:02 +0000)]
Merge branch 'develop' into bug/JAL-4353_cannot_output_multiple_different_structure_images_for_one_alignment
James Procter [Tue, 12 Dec 2023 15:48:32 +0000 (15:48 +0000)]
JAL-4217 close internal frame on the swing thread to avoid deadlock
Ben Soares [Tue, 12 Dec 2023 15:47:26 +0000 (15:47 +0000)]
JAL-4353 helper method and test for primary/secondary and auxiliary arguments with --structure pdb0 --structureimage png0a --bgcolour col0a --structureimagepng0b --bgcolour col0b --structure pdb1 --...
James Procter [Tue, 12 Dec 2023 12:37:04 +0000 (12:37 +0000)]
Merge branch 'bug/JAL-4353_cannot_output_multiple_different_structure_images_for_one_alignment' into develop
James Procter [Tue, 12 Dec 2023 12:36:51 +0000 (12:36 +0000)]
JAL-4353 failing test
James Procter [Tue, 12 Dec 2023 12:36:36 +0000 (12:36 +0000)]
JAL-4353 fix assert that successive test output files get bigger in structureImageOutputTest and argFilesGlobAndSubstitutionsTest
James Procter [Mon, 11 Dec 2023 17:31:38 +0000 (17:31 +0000)]
JAL-4192 more specific info about versions needed
Ben Soares [Wed, 6 Dec 2023 22:00:06 +0000 (22:00 +0000)]
JAL-4353 re-used random color code
Ben Soares [Wed, 6 Dec 2023 17:41:35 +0000 (17:41 +0000)]
JAL-4353 Preserve the user given 'linkedId' with ArgValue, to help with deciding if user deliberately set a wildcard linkedId (or --all), to inform value of sub-args.
James Procter [Wed, 6 Dec 2023 14:37:04 +0000 (14:37 +0000)]
JAL-4356 bump RELEASE
James Procter [Wed, 6 Dec 2023 14:21:11 +0000 (14:21 +0000)]
JAL-4356 new release notes and whats new for 2.11.3.3 and JAL-840 release notes
James Procter [Wed, 6 Dec 2023 14:14:12 +0000 (14:14 +0000)]
Merge branch 'patch/JAL-840_clustalx_docs_fix' into develop
James Procter [Wed, 6 Dec 2023 13:48:54 +0000 (13:48 +0000)]
Merge branch 'bug/JAL-2934proportionalScrolling' into develop
Ben Soares [Wed, 6 Dec 2023 11:02:32 +0000 (11:02 +0000)]
JAL-4353 Add a 'random' colour to produce a random colour.