James Procter [Mon, 22 May 2023 08:54:37 +0000 (09:54 +0100)]
Merge branch 'JAL-1551_2_11_3_spotlett' into features/JAL-4134_use_annotation_row_for_colours_and_groups
James Procter [Mon, 22 May 2023 08:52:24 +0000 (09:52 +0100)]
Merge branch 'spotless_2' into JAL-1551_2_11_3_spotlett
James Procter [Mon, 22 May 2023 08:52:01 +0000 (09:52 +0100)]
JAL-1551 spotless
Ben Soares [Sun, 21 May 2023 15:45:03 +0000 (16:45 +0100)]
JAL-629 Clarify sections of arguments with --help-all (or multiple --help-...)
Ben Soares [Sat, 20 May 2023 16:53:46 +0000 (17:53 +0100)]
JAL-4187 JAL-629 JAL-3830 small adjustments after further testing in Windows
Ben Soares [Sat, 20 May 2023 16:08:06 +0000 (17:08 +0100)]
JAL-3416 Ensure setFrameIcon(null) is set for remaining JInternalFrames
Ben Soares [Sat, 20 May 2023 11:11:04 +0000 (12:11 +0100)]
JAL-3416 Removed another internal Frame icon from title bar
Ben Soares [Sat, 20 May 2023 10:45:36 +0000 (11:45 +0100)]
JAL-4187 JAL-629 JAL-3830 adjustments to Cygwin and WSL parts of bash launcher script and usage statement after testing
Ben Soares [Sat, 20 May 2023 09:59:53 +0000 (10:59 +0100)]
JAL-4160 JAL-3830 Improve jalview.bin.Launcher for launcher script launch with new ArgParser
Ben Soares [Sat, 20 May 2023 09:05:16 +0000 (10:05 +0100)]
JAL-4160 JAL-3830 Improve jalview.bin.Launcher for launcher script launch with new ArgParser
James Procter [Fri, 19 May 2023 17:07:01 +0000 (18:07 +0100)]
Merge branch 'develop' into features/JAL-4134_use_annotation_row_for_colours_and_groups
Conflicts:
src/jalview/datamodel/Alignment.java
src/jalview/datamodel/ContactMatrix.java
src/jalview/datamodel/ContactMatrixI.java
src/jalview/datamodel/SeqDistanceContactMatrix.java
src/jalview/datamodel/annotations/AnnotationRowBuilder.java
src/jalview/ext/jmol/JmolParser.java
src/jalview/gui/AnnotationLabels.java
src/jalview/gui/TreeCanvas.java
src/jalview/project/Jalview2XML.java
src/jalview/renderer/ContactMapRenderer.java
src/jalview/ws/datamodel/alphafold/PAEContactMatrix.java
src/jalview/ws/dbsources/EBIAlfaFold.java
src/jalview/xml/binding/jalview/MatrixType.java
test/jalview/analysis/AverageDistanceEngineTest.java
test/jalview/project/Jalview2xmlTests.java
Ben Soares [Fri, 19 May 2023 16:16:15 +0000 (17:16 +0100)]
JAL-4187 JAL-629 JAL-3830 Fix ArgParser to check for empty string argument. Fixed jalview.bin.Jalview to not like one empty argument. Fixed Powershell to not send a single empty argument
James Procter [Fri, 19 May 2023 16:12:31 +0000 (17:12 +0100)]
JAL-1551 spotlessApply
James Procter [Fri, 19 May 2023 16:11:26 +0000 (17:11 +0100)]
JAL-1551 spotlessApply
Ben Soares [Fri, 19 May 2023 15:50:11 +0000 (16:50 +0100)]
JAL-629 Fix missing icon for command line launch
Ben Soares [Fri, 19 May 2023 15:06:17 +0000 (16:06 +0100)]
JAL-629 Updated debian helpers for new command line
Ben Soares [Fri, 19 May 2023 15:02:48 +0000 (16:02 +0100)]
JAL-629 Updated launching scripts to 1) not insert '-open' arg and 2) tell Jalview the CONSOLEWIDTH. NEEDS TESTING IN Cygwin, WSL, Powershell 5, Powershell 7
Ben Soares [Fri, 19 May 2023 14:46:46 +0000 (15:46 +0100)]
JAL-629 Added Arg.Types and additional --help-type args to be --help with a type. Better formatting for console.
James Procter [Thu, 18 May 2023 18:44:15 +0000 (19:44 +0100)]
JAL-4134 support recovery of mapped positions for raw matrix column index in MappableContactMatrixI
James Procter [Thu, 18 May 2023 18:42:19 +0000 (19:42 +0100)]
JAL-4134 colour by annotation needs distinct annotation elements to hold colours
Ben Soares [Thu, 18 May 2023 16:16:42 +0000 (17:16 +0100)]
JAL-629 fixes to typed args
James Procter [Thu, 18 May 2023 16:12:01 +0000 (17:12 +0100)]
JAL-4134 column grouping model and methods moved to their own object held by by ContactMatrixI implementors
Ben Soares [Thu, 18 May 2023 15:28:29 +0000 (16:28 +0100)]
JAL-629 Added 'Type' to args and argvalues
Ben Soares [Thu, 18 May 2023 15:27:30 +0000 (16:27 +0100)]
JAL-629 fixes to help docs
James Procter [Thu, 18 May 2023 11:30:19 +0000 (12:30 +0100)]
JAL-4134 formatting
James Procter [Thu, 18 May 2023 11:29:25 +0000 (12:29 +0100)]
JAL-4134 properly specify BinaryNode as a typed generic container
Ben Soares [Wed, 17 May 2023 13:16:03 +0000 (14:16 +0100)]
JAL-629 Tidy up tests and replaced methods before merge to develop
Ben Soares [Wed, 17 May 2023 12:19:30 +0000 (13:19 +0100)]
JAL-629 Changed some old -arg to --arg in help docs, and some other mailing list->discussion forum changes
Ben Soares [Wed, 17 May 2023 11:27:54 +0000 (12:27 +0100)]
JAL-629 tidying the help docs
Ben Soares [Wed, 17 May 2023 11:27:37 +0000 (12:27 +0100)]
JAL-629 delete stray files
Ben Soares [Wed, 17 May 2023 10:19:49 +0000 (11:19 +0100)]
Merge branch 'develop' into features/r2_11_2_alphafold/JAL-629
James Procter [Wed, 17 May 2023 10:12:19 +0000 (11:12 +0100)]
JAL-4184 release notes
James Procter [Wed, 17 May 2023 09:58:31 +0000 (10:58 +0100)]
Merge branch 'patch/JAL-4184_description_stockholm' into develop
James Procter [Wed, 17 May 2023 09:42:43 +0000 (10:42 +0100)]
JAL-4184 export description line in stockholm
James Procter [Wed, 17 May 2023 09:26:36 +0000 (10:26 +0100)]
JAL-4184 failing test for description export and re-import from stockholm
Ben Soares [Tue, 16 May 2023 22:58:32 +0000 (23:58 +0100)]
JAL-629 Finished documentation for new command lines.
Ben Soares [Tue, 16 May 2023 22:54:00 +0000 (23:54 +0100)]
JAL-629 Ensure precedence of named linked ID values over wildcard linked ID set values. Tidying up unused methods.
James Procter [Tue, 16 May 2023 16:21:58 +0000 (17:21 +0100)]
JAL-4089 - if no centerViewOn commands are given, don’t try to execute!
Ben Soares [Mon, 15 May 2023 16:26:25 +0000 (17:26 +0100)]
JAL-629 More help text
James Procter [Mon, 15 May 2023 13:54:24 +0000 (14:54 +0100)]
JAL-4182 patch - map selection group onto sequence positions - fixes failing test..
Ben Soares [Mon, 15 May 2023 13:49:00 +0000 (14:49 +0100)]
Revert "JAL-629 Add a --threads argument to allow a limited multiple number of alignframes to be processed at once."
Threaded processing is failing tests. Have put this on a separate branch features/JAL-629_with_threads_NOT_PASSING_TESTS
This reverts commit
c59abae32801dce40b900ad3129567e5ef5fac4f.
James Procter [Mon, 15 May 2023 13:46:34 +0000 (14:46 +0100)]
JAL-4182 failing test
Ben Soares [Mon, 15 May 2023 12:03:40 +0000 (13:03 +0100)]
JAL-629 Add a --threads argument to allow a limited multiple number of alignframes to be processed at once.
James Procter [Sun, 14 May 2023 13:24:27 +0000 (14:24 +0100)]
JAL-2349 fix up tests for Java 11 compatibility and require sequence associated mappable matrix instance to have a mapping to the sequence it is associated with.
James Procter [Sun, 14 May 2023 12:36:15 +0000 (13:36 +0100)]
JAL-4134 add tree distance engine test to functional
James Procter [Sun, 14 May 2023 12:35:16 +0000 (13:35 +0100)]
JAL-2349 store/restore mappable contact matrix in project and fix up interactive fill-like selection of matrices
Ben Soares [Sun, 14 May 2023 11:22:02 +0000 (12:22 +0100)]
JAL-629 add an {extension} substitution
James Procter [Sat, 13 May 2023 15:50:47 +0000 (16:50 +0100)]
JAL-2349 JAL-3855 PAE tests covers ContactListI.getMappedPositons
James Procter [Sat, 13 May 2023 15:49:19 +0000 (16:49 +0100)]
JAL-2349 JAL-3855 helper method to make it easy to transfer a single ‘reference annotation’ to an alignment sequence
Ben Soares [Sat, 13 May 2023 11:13:24 +0000 (12:13 +0100)]
JAL-629 launcher shell script uses jalview.bin.Launcher so --jvmmmempc and --jvmmemmax work for it too.
Ben Soares [Fri, 12 May 2023 16:15:07 +0000 (17:15 +0100)]
JAL-629 More docs
James Procter [Fri, 12 May 2023 15:28:31 +0000 (16:28 +0100)]
JAL-2349 allow PAE or other contact matrices to hold a coordinate mapping allowing them to be transferred from one sequence to another - basic working but region selects are broken
Ben Soares [Fri, 12 May 2023 14:47:29 +0000 (15:47 +0100)]
JAL-629 extra test for --output open*.ext when used twice for different --open's
Ben Soares [Fri, 12 May 2023 14:34:06 +0000 (15:34 +0100)]
JAL-629 Added --opened arg which is like limiting --all to only the previously --open'ed files. With tests.
Ben Soares [Thu, 11 May 2023 21:25:59 +0000 (22:25 +0100)]
JAL-629 Add some shortnames to args. Add Opt.OUTPUT and allow --output=*.ext to be shorthand for --all --output {basename}.ext.
Ben Soares [Thu, 11 May 2023 19:39:10 +0000 (20:39 +0100)]
JAL-629 Move clarguments documentation to default. Completed clarguments summary. Most of clarguments basic
Ben Soares [Thu, 11 May 2023 19:38:04 +0000 (20:38 +0100)]
JAL-629 Fix --tempfac. Hide non-working --notempfac. Add --scale, --width, --height to PNG output. Tidy usage. Add --version. More quietness for --quiet. More consistently formatted stdout info,
Ben Soares [Thu, 11 May 2023 10:34:39 +0000 (11:34 +0100)]
JAL-629 Added linkedId to ArgValuesMap for reference. Updated Arg descriptions. Made --quiet work better.
Ben Soares [Wed, 10 May 2023 12:54:52 +0000 (13:54 +0100)]
JAL-629 Check Arg options for obtaining boolean or negative boolean arg from subvals
Ben Soares [Wed, 10 May 2023 12:31:16 +0000 (13:31 +0100)]
JAL-629 Catch a NPE, fix a test
Ben Soares [Wed, 10 May 2023 11:11:38 +0000 (12:11 +0100)]
JAL-629 More docs. Usage statement. Adjust some logging output to respect --quiet.
Ben Soares [Tue, 9 May 2023 10:19:37 +0000 (11:19 +0100)]
JAL-629 Add --seqid for non-subval use, make arg value naming more consistent in docs
Ben Soares [Tue, 9 May 2023 09:31:02 +0000 (10:31 +0100)]
JAL-629 update a subval for structureviewer in the docs
Ben Soares [Tue, 9 May 2023 09:27:02 +0000 (10:27 +0100)]
JAL-629 more docs
Ben Soares [Tue, 9 May 2023 09:26:36 +0000 (10:26 +0100)]
JAL-629 change --renderer to --textrenderer to be more specific
Ben Soares [Fri, 5 May 2023 09:42:55 +0000 (10:42 +0100)]
JAL-629 test fixes
Ben Soares [Thu, 4 May 2023 16:30:23 +0000 (17:30 +0100)]
JAL-629 Moved additional CommandLineOperationsNG tests to testTask1
Ben Soares [Thu, 4 May 2023 15:49:00 +0000 (16:49 +0100)]
JAL-629 More NG arguments: --features, --annotations, --sortbytree, --tree, --groovy. More consistent arg naming and processing of test output. Actual java process tests for ng commandline. Store BootstrapArgs in ArgParser.
Ben Soares [Wed, 3 May 2023 16:18:55 +0000 (17:18 +0100)]
JAL-629 a bit more documentation
Ben Soares [Wed, 3 May 2023 14:49:59 +0000 (15:49 +0100)]
JAL-629 added eps and imagemap. Added --output and --format with test. Adjusted BackupFiles to cope with filename with no directory path.
Ben Soares [Tue, 2 May 2023 17:22:47 +0000 (18:22 +0100)]
JAL-629 Changed --newframe and --allframes to --new and --all. More consistent --new and --open defaultLinkedId behaviour.
Ben Soares [Tue, 2 May 2023 11:29:55 +0000 (12:29 +0100)]
JAL-629 Add --renderer arg/subval for vector output and fixed annotation renderer code
Ben Soares [Mon, 1 May 2023 23:21:02 +0000 (00:21 +0100)]
JAL-629 fix lang label names after adjusting colour scheme short names
James Procter [Mon, 1 May 2023 17:23:14 +0000 (18:23 +0100)]
Merge branch 'features/JAL-4134_treeviewerforcolumns' into features/JAL-4134_use_annotation_row_for_colours_and_groups
James Procter [Mon, 1 May 2023 16:54:05 +0000 (17:54 +0100)]
JAL-4177 disable ‘Cancel’ as well - since we as yet do not support cancelling the structure view…. Inability to cancel reported under JAL-4178
James Procter [Mon, 1 May 2023 16:09:15 +0000 (17:09 +0100)]
JAL-4177 disable add/new view when an import is started.
James Procter [Mon, 1 May 2023 16:08:57 +0000 (17:08 +0100)]
JAL-4123 JAL-3914 JAL-3858 tweak wording and layout for structure chooser local pdb file UI
James Procter [Mon, 1 May 2023 14:12:18 +0000 (15:12 +0100)]
JAL-4134 double click to select column groups
James Procter [Mon, 1 May 2023 12:54:50 +0000 (13:54 +0100)]
JAL-3858 report errors when trying to parse JSON to extract PAE and raise a warning dialog when user provided PAE file cannot be read via structure chooser
James Procter [Mon, 1 May 2023 09:57:51 +0000 (10:57 +0100)]
Merge branch 'features/JAL-4134_treeviewerforcolumns' into features/JAL-4134_use_annotation_row_for_colours_and_groups
Ben Soares [Mon, 1 May 2023 00:36:51 +0000 (01:36 +0100)]
JAL-629 real life test for --allframes
Ben Soares [Sun, 30 Apr 2023 23:53:23 +0000 (00:53 +0100)]
JAL-629 Change behaviour of --open GLOB to increment defaultLinkedId to allow --allframes --output --image --close to act on each input file
Ben Soares [Sat, 29 Apr 2023 23:29:12 +0000 (00:29 +0100)]
JAL-629 Only log to console FAILED tests
Ben Soares [Sat, 29 Apr 2023 23:28:48 +0000 (00:28 +0100)]
JAL-629 Added --all arg, [*] linkedId and functionality to apply some args to all linkedIds
Ben Soares [Fri, 28 Apr 2023 21:45:01 +0000 (22:45 +0100)]
JAL-629 Fixed the argfile1 after subval separator change
Ben Soares [Fri, 28 Apr 2023 20:31:20 +0000 (21:31 +0100)]
JAL-629 Fixed the argfiletests after subval separator change
Ben Soares [Fri, 28 Apr 2023 20:14:43 +0000 (21:14 +0100)]
JAL-629 Fixed the argfile after subval separator change
Ben Soares [Fri, 28 Apr 2023 16:39:54 +0000 (17:39 +0100)]
JAL-629 Change colour scheme shortnames to something consistent and command-line friendly. Add more subval options. Change subval separator to ',' to be more command line friendly.
Ben Soares [Fri, 28 Apr 2023 10:48:20 +0000 (11:48 +0100)]
JAL-4167 Now we don't fail testTasks on No Matching Tests so that all testTasks run with --tests option given
Ben Soares [Thu, 27 Apr 2023 20:16:55 +0000 (21:16 +0100)]
JAL-629 Part-way to honouring --tests argument
Ben Soares [Thu, 27 Apr 2023 18:42:28 +0000 (19:42 +0100)]
JAL-629 start of help text
Ben Soares [Thu, 27 Apr 2023 18:41:21 +0000 (19:41 +0100)]
JAL-629 changed args in tests
Ben Soares [Thu, 27 Apr 2023 17:36:24 +0000 (18:36 +0100)]
JAL-629 Fixed appending URLs
Ben Soares [Thu, 27 Apr 2023 17:36:10 +0000 (18:36 +0100)]
JAL-629 Changed --increment to --newframe to make sense to user
Ben Soares [Thu, 27 Apr 2023 14:23:19 +0000 (15:23 +0100)]
JAL-629 allow opening URL as only argument(s)
Ben Soares [Thu, 27 Apr 2023 11:36:15 +0000 (12:36 +0100)]
JAL-4167 Added OVERALL summary to bash output
Ben Soares [Wed, 26 Apr 2023 16:39:10 +0000 (17:39 +0100)]
JAL-4167 Added colours to bash output
Ben Soares [Wed, 26 Apr 2023 13:27:50 +0000 (14:27 +0100)]
JAL-4167 Allow a test to run in multiple testTasks
Ben Soares [Wed, 26 Apr 2023 12:00:00 +0000 (13:00 +0100)]
JAL-629 shorter wait times for this test
Ben Soares [Wed, 26 Apr 2023 11:11:49 +0000 (12:11 +0100)]
JAL-4167 Adjustments to get clover to work with normal tests. Adjustment made on build server (TestNG Parser: build/reports/tests/**/testng-results.xml