James Procter [Fri, 24 Mar 2023 13:29:40 +0000 (13:29 +0000)]
JAL-4134 - store colours in annotation row, so colour by annotation can be used to shade sequence or alignment by PAE groups. Not working - see comments
James Procter [Fri, 24 Mar 2023 07:02:13 +0000 (07:02 +0000)]
JAL-4158 first attempt at stashing colours for contact matrix groups and allowing them to be overlayed on the contact matrix visual. NEEDS TESTS!
James Procter [Mon, 20 Mar 2023 17:43:46 +0000 (17:43 +0000)]
JAL-4134 override default hasTree so PAE tree is saved!
James Procter [Mon, 20 Mar 2023 16:33:27 +0000 (16:33 +0000)]
JAL-4134 - missing Jalview project JAXB class - st. patricks day commit curse
James Procter [Mon, 20 Mar 2023 16:28:41 +0000 (16:28 +0000)]
Merge branch 'develop' into features/JAL-4134_treeviewerforcolumns
James Procter [Mon, 20 Mar 2023 16:26:18 +0000 (16:26 +0000)]
JAL-4150 test and quick patch copying code from AlignFrame.paste() to Desktop.paste() so internal paste works from popup menu
James Procter [Mon, 20 Mar 2023 15:30:39 +0000 (15:30 +0000)]
JAL-2349 JAL-4134 Console log messages for contact matrix selection
James Procter [Mon, 20 Mar 2023 15:29:34 +0000 (15:29 +0000)]
JAL-4134 propagate column selection changes in tree and alignment views
James Procter [Mon, 20 Mar 2023 15:28:52 +0000 (15:28 +0000)]
JAL-4134 fix off-by-one in selection
James Procter [Mon, 20 Mar 2023 15:28:33 +0000 (15:28 +0000)]
JAL-4134 fix NPEs when matrix not resolved or alignment view is closed
James Procter [Mon, 20 Mar 2023 15:25:17 +0000 (15:25 +0000)]
JAL-4134 better popup menu name ‘Tree for Contact Matrix’
James Procter [Mon, 20 Mar 2023 15:23:50 +0000 (15:23 +0000)]
JAL-2349 test TODOs
James Procter [Mon, 20 Mar 2023 15:23:38 +0000 (15:23 +0000)]
JAL-2349 fix off by one when resolving columns for sequence associated contact matrix
James Procter [Fri, 17 Mar 2023 17:33:05 +0000 (17:33 +0000)]
JAL-4134 fix up column selection when hidden regions are present. Needs tests!
James Procter [Fri, 17 Mar 2023 17:32:40 +0000 (17:32 +0000)]
JAL-4134 store/restore Newick tree for PAE annotation row
James Procter [Wed, 15 Mar 2023 17:30:48 +0000 (17:30 +0000)]
JAL-4091 JAL-4147 - revised annotation label display so consecutive runs of rows with the same label have their description shown instead of the bare label
James Procter [Wed, 15 Mar 2023 17:28:43 +0000 (17:28 +0000)]
JAL-4091 JAL-629 ‘Add Reference Annotations’ takes description into account when looking for potential addees - reverts change in
8fce85002e6f6a5957dc95662c6a3d80fcce8e82 so PAEContactMatrix annotation labels are consistent.
James Procter [Wed, 15 Mar 2023 10:56:34 +0000 (10:56 +0000)]
JAL-2349 don’t clobber existing label/description for an annotation when associating it with a contact matrix
James Procter [Wed, 15 Mar 2023 10:54:19 +0000 (10:54 +0000)]
JAL-4134 JAL-3855 store/restore groups, tree and threshold used to cluster a PAE matrix
James Procter [Wed, 8 Mar 2023 15:08:57 +0000 (15:08 +0000)]
JAL-2349 handle matrix_clicked on mouse_release rather than mouse_pressed so click-drag to resize the annotation row doesn’t trigger a selection event as well.
James Procter [Wed, 8 Mar 2023 13:45:11 +0000 (13:45 +0000)]
Merge branch 'features/r2_11_2_alphafold/JAL-629' into features/JAL-4134_treeviewerforcolumns
Ben Soares [Wed, 8 Mar 2023 13:32:44 +0000 (13:32 +0000)]
JAL-629 Fix --headless for new args. Fix progressbar for non-headless commands. Add an --argfile=... feature
Ben Soares [Wed, 8 Mar 2023 13:31:23 +0000 (13:31 +0000)]
JAL-629 stash some TFType and PAEFile info into a PDBEntry
Ben Soares [Mon, 6 Mar 2023 20:43:45 +0000 (20:43 +0000)]
JAL-629 Fix null AlignPanel. More descriptive label of pAE Matrix allows 'Add reference annotation' to be enabled for subsequent PDB+PAE files.
Ben Soares [Fri, 3 Mar 2023 22:59:11 +0000 (22:59 +0000)]
JAL-629 Improved consistency of ArgParser classes (use of ArgValuesMap). Added setting, checking and fetching ID value for ArgValues to allow easier linking of arguments. Added argIndex for boolean Args. Made noDuplicates (no duplicate values) an Arg Option.
Ben Soares [Thu, 2 Mar 2023 23:02:27 +0000 (23:02 +0000)]
JAL-629 slight tidy up
Ben Soares [Thu, 2 Mar 2023 22:22:09 +0000 (22:22 +0000)]
JAL-629 Removal of unnecessary methods. Set pLTTD tempfac for EBIAlfafold. Simplify adding cmannot.
Ben Soares [Thu, 2 Mar 2023 13:31:03 +0000 (13:31 +0000)]
JAL-629 Some refactoring to allow more flexible use of PAE files. Not working as desired yet
James Procter [Wed, 1 Mar 2023 17:31:26 +0000 (17:31 +0000)]
JAL-4134 hold ctrl to select groups containing rows and columns under mouse over a PAE
Ben Soares [Tue, 28 Feb 2023 18:29:20 +0000 (18:29 +0000)]
JAL-629 Firm up bootstrapArgs. Correct '-colour' in test. Separate --headless and -headless for now to avoid premature exit for -headless (fixes tests).
Ben Soares [Mon, 27 Feb 2023 23:54:45 +0000 (23:54 +0000)]
JAL-629 add AF examples for FER1_SPIOL. Link and display PAE matrix annotation
James Procter [Mon, 27 Feb 2023 18:51:21 +0000 (18:51 +0000)]
JAL-2349 TODO consider caching contactRanges from getContactRange to improve efficiency
James Procter [Mon, 27 Feb 2023 18:44:12 +0000 (18:44 +0000)]
JAL-4134 tree panel shouldn’t try to redraw before tree is calculated..
James Procter [Mon, 27 Feb 2023 18:43:58 +0000 (18:43 +0000)]
JAL-4134 fix more of the egregious SeqNode/BinaryNode casting
James Procter [Mon, 27 Feb 2023 18:43:23 +0000 (18:43 +0000)]
JAL-4134 leaves marked when columns are selected - doesn’t refresh automatically from alignment yet (only when tree panel repainted)
James Procter [Mon, 27 Feb 2023 17:58:09 +0000 (17:58 +0000)]
JAL-4134 TODO: alternative way of performing interactive picking using threshold
James Procter [Mon, 27 Feb 2023 17:57:44 +0000 (17:57 +0000)]
JAL-4134 use average distance between PAE elements as distance for tree calculation
James Procter [Mon, 27 Feb 2023 17:27:44 +0000 (17:27 +0000)]
JAL-4134 display tree for columns - selecting an internal node selects column in alignment
James Procter [Mon, 27 Feb 2023 17:26:46 +0000 (17:26 +0000)]
JAL-4134 compute normalised dot product for contact matrix similarities
James Procter [Mon, 27 Feb 2023 17:18:44 +0000 (17:18 +0000)]
JAL-4134 allow tree groups to be stored/recovered on contact matrix for groupwise column selection
Ben Soares [Mon, 27 Feb 2023 15:05:09 +0000 (15:05 +0000)]
JAL-629 Fix Exceptions when running with CLI not headless
Ben Soares [Mon, 27 Feb 2023 14:16:00 +0000 (14:16 +0000)]
JAL-629 Guesstimate whether to set pLDDT with PDB file
Ben Soares [Mon, 27 Feb 2023 10:04:43 +0000 (10:04 +0000)]
JAL-629 JAL-4124 JAL-3855 remove deleted debugging test file from tests
Ben Soares [Mon, 27 Feb 2023 09:52:13 +0000 (09:52 +0000)]
Merge branch 'develop' into features/r2_11_2_alphafold/JAL-629
Ben Soares [Mon, 27 Feb 2023 09:47:23 +0000 (09:47 +0000)]
JAL-629 removed debug prints. added .cif. added some comments/code-markers
James Procter [Mon, 27 Feb 2023 09:28:31 +0000 (09:28 +0000)]
Merge branch 'develop' into features/JAL-4134_treeviewerforcolumns
Ben Soares [Sun, 26 Feb 2023 19:43:10 +0000 (19:43 +0000)]
JAL-629 PAE matrix file guesstimate from filename
Ben Soares [Fri, 24 Feb 2023 17:23:52 +0000 (17:23 +0000)]
JAL-629 Position GUI widgets for PDF file options. Remove icon from StructureChooser frame.
James Procter [Fri, 24 Feb 2023 17:10:02 +0000 (17:10 +0000)]
JAL-629 JAL-4124 JAL-3855 test to check we can import PAE matrices in a variety of formats - additional test case
James Procter [Fri, 24 Feb 2023 16:44:48 +0000 (16:44 +0000)]
JAL-629 JAL-4124 JAL-3855 test to check we can import PAE matrices in a variety of formats - and fix up a casting issue (again?)
Ben Soares [Fri, 24 Feb 2023 16:23:09 +0000 (16:23 +0000)]
Merge branch 'develop' into features/r2_11_2_alphafold/JAL-629
Ben Soares [Fri, 24 Feb 2023 15:54:38 +0000 (15:54 +0000)]
JAL-629 add widgets to StructureChooser for tempfac choice and pae matrix file
James Procter [Fri, 24 Feb 2023 15:26:30 +0000 (15:26 +0000)]
Merge branch 'features/JAL-3858_PAEsInProjects' into develop
James Procter [Fri, 24 Feb 2023 15:13:37 +0000 (15:13 +0000)]
Merge branch 'features/r2_11_2_alphafold/JAL-629' into features/JAL-3858_PAEsInProjects
Conflicts:
src/jalview/bin/Jalview.java
Ben Soares [Fri, 24 Feb 2023 14:43:38 +0000 (14:43 +0000)]
JAL-629 helper function for getting sensible structure (or other arg value)
Ben Soares [Fri, 24 Feb 2023 12:54:35 +0000 (12:54 +0000)]
JAL-629 better test fixes. --props=... instead of --debug
Ben Soares [Fri, 24 Feb 2023 11:52:19 +0000 (11:52 +0000)]
JAL-629 Made ArgValuesMap helper class, simplifies readability/writing of the code and will allow arg position lookups
Ben Soares [Thu, 23 Feb 2023 19:21:24 +0000 (19:21 +0000)]
JAL-629 test fixing
James Procter [Thu, 23 Feb 2023 17:01:13 +0000 (17:01 +0000)]
JAL-4134 group columns using a tree cut - seems to work after more egregiousness
Ben Soares [Thu, 23 Feb 2023 17:01:05 +0000 (17:01 +0000)]
JAL-629 Add debug messages for more failing tests
James Procter [Thu, 23 Feb 2023 16:38:04 +0000 (16:38 +0000)]
JAL-4134 - brutal hack to build a tree clustering columns of PAE Matrix
Ben Soares [Thu, 23 Feb 2023 16:21:49 +0000 (16:21 +0000)]
JAL-629 fixed a Log4j test by adding --debug arg
Ben Soares [Thu, 23 Feb 2023 16:21:19 +0000 (16:21 +0000)]
JAL-629 bootstrap args and properties. Remember index of args for 'previous structure' defaulting of other args
Ben Soares [Thu, 23 Feb 2023 16:19:25 +0000 (16:19 +0000)]
JAL-629 nf-core sample alignment files and a2m versions
Ben Soares [Thu, 23 Feb 2023 16:18:40 +0000 (16:18 +0000)]
JAL-629 fix a PAEMatrix casting error
James Procter [Thu, 23 Feb 2023 12:24:39 +0000 (12:24 +0000)]
JAL-4134 tidied up refactoring and fix compilation errrors
James Procter [Thu, 23 Feb 2023 12:10:53 +0000 (12:10 +0000)]
Merge branch 'features/JAL-3858_PAEsInProjects' into features/JAL-4134_treeviewerforcolumns
James Procter [Thu, 23 Feb 2023 12:08:00 +0000 (12:08 +0000)]
JAL-3858 new MatrixType JAX-RI POJO
James Procter [Thu, 23 Feb 2023 12:06:43 +0000 (12:06 +0000)]
JAL-4134 - refactor tree calculation code to work with binaryNode base type.
James Procter [Thu, 23 Feb 2023 11:58:09 +0000 (11:58 +0000)]
JAL-4133 update validChar width when font is changed so characters are suppressed for small widths
James Procter [Wed, 22 Feb 2023 22:14:15 +0000 (22:14 +0000)]
JAL-4133 store/restore alignment view’s charWidth and charHeight in Jalview project
James Procter [Wed, 22 Feb 2023 22:02:20 +0000 (22:02 +0000)]
JAL-3858 persist PAE matrix (only so far) as serialised floats in element on dataset sequence annotation. Rudimentary tests.
James Procter [Wed, 22 Feb 2023 14:24:04 +0000 (14:24 +0000)]
JAL-1551 source formatting
James Procter [Wed, 22 Feb 2023 14:23:56 +0000 (14:23 +0000)]
JAL-3858 simple test for PAE matrix recovery
James Procter [Wed, 22 Feb 2023 14:23:15 +0000 (14:23 +0000)]
JAL-3858 construct a PAE direct from float array
Ben Soares [Wed, 22 Feb 2023 14:04:25 +0000 (14:04 +0000)]
Merge branch 'develop' into features/r2_11_2_alphafold/JAL-629
Ben Soares [Wed, 22 Feb 2023 14:04:03 +0000 (14:04 +0000)]
JAL-4064 JAL-4054 Corrected the tgz top-level dir from './Contents' to 'Contents' for mac JRE bundles for install4j (not strictly used, but might be in the future).
James Procter [Wed, 22 Feb 2023 13:34:54 +0000 (13:34 +0000)]
JAL-629 make sure we show GUI when not driven programmatically
James Procter [Wed, 22 Feb 2023 12:43:25 +0000 (12:43 +0000)]
JAL-4095 slightly better threshold setting and todos for improvement
James Procter [Wed, 22 Feb 2023 12:42:58 +0000 (12:42 +0000)]
JAL-4095 magic fill behaviour is PAE specific
Ben Soares [Wed, 22 Feb 2023 12:40:43 +0000 (12:40 +0000)]
Merge branch 'develop' into features/r2_11_2_alphafold/JAL-629
James Procter [Wed, 22 Feb 2023 12:38:00 +0000 (12:38 +0000)]
JAL-3858 JAL-2381 allow different linear shading schemes for selected/non-selected regions of contact matrix heat map
James Procter [Wed, 22 Feb 2023 12:05:22 +0000 (12:05 +0000)]
JAL-4027 JAL-3858 rename CUSTOM_RENDERER to CONTACT_MATRIX annotation.graph type, with actual matrix type stored in calcId
Ben Soares [Tue, 21 Feb 2023 13:41:37 +0000 (13:41 +0000)]
JAL-4088 Updated j8libs/*.jar in THIRDPARTYLIBS
Ben Soares [Mon, 20 Feb 2023 23:04:09 +0000 (23:04 +0000)]
JAL-3416 Turn off (partial) flatlaf scaling for HiDPI in Linux and Java 8 - Some GUI parts unusable
Ben Soares [Mon, 20 Feb 2023 17:48:16 +0000 (17:48 +0000)]
JAL-4064 JAL-4054 Correct names of mac arch installer DMG files
Ben Soares [Mon, 20 Feb 2023 15:42:14 +0000 (15:42 +0000)]
Merge branch 'develop' into improvement/JAL-4111_suffixed_DEVELOP_channels
Ben Soares [Mon, 20 Feb 2023 10:46:11 +0000 (10:46 +0000)]
JAL-4128 Catch RasterFormatException caused whilst resizing Overview window, recalculate OverviewDimensions od instead. Prevent negative OverviewDimensions being set to avoid problem with vertically fully shrunk overview window 'losing' the alignement canvas.
Ben Soares [Mon, 20 Feb 2023 10:09:46 +0000 (10:09 +0000)]
Merge branch 'develop' into bug/JAL-4125_flatlaf_quithandler_warning_doesnt_display_properly
James Procter [Thu, 16 Feb 2023 13:14:11 +0000 (13:14 +0000)]
Merge branch 'features/r2_11_2_alphafold/JAL-629' into features/JAL-3858_PAEsInProjects
Conflicts:
src/jalview/bin/Jalview.java
James Procter [Thu, 16 Feb 2023 12:25:41 +0000 (12:25 +0000)]
JAL-1713 don’t close an automatically created overview window for projects from Jalview versions older than 2.11.3
James Procter [Wed, 15 Feb 2023 15:25:53 +0000 (15:25 +0000)]
Merge branch 'develop' into feature/JAL-1713_overviewInProject
James Procter [Wed, 15 Feb 2023 14:43:32 +0000 (14:43 +0000)]
Passing test for JAL-4127 failing on the JAL-1713 branch
James Procter [Wed, 15 Feb 2023 13:59:29 +0000 (13:59 +0000)]
JAL-4090 move 2.11.3 series release notes to 2.11.3.0 release and premptively list issues already or nearly addressed in this version
Ben Soares [Mon, 13 Feb 2023 22:42:58 +0000 (22:42 +0000)]
Merge branch 'develop' into bug/JAL-4125_flatlaf_quithandler_warning_doesnt_display_properly
Ben Soares [Mon, 13 Feb 2023 22:41:51 +0000 (22:41 +0000)]
JAL-4125 Spanish translations
Ben Soares [Mon, 13 Feb 2023 20:18:00 +0000 (20:18 +0000)]
Merge branch 'merge/JAL-1988_JAL-3772+JAL-3416+JAL-4054+JAL-4064' into bug/JAL-4125_flatlaf_quithandler_warning_doesnt_display_properly
Ben Soares [Mon, 13 Feb 2023 19:16:08 +0000 (19:16 +0000)]
JAL-4125 Move confirmation of closing external viewer windows into the quit handler, and allow all to close or not in closeViewer whilst quitting.
James Procter [Mon, 13 Feb 2023 17:28:45 +0000 (17:28 +0000)]
Merge branch 'develop' into feature/JAL-1713_overviewInProject
James Procter [Fri, 10 Feb 2023 17:05:30 +0000 (17:05 +0000)]
JAL-3077 broken conflict resolve resulted in failing test (nb - still not resolved the issue of (promoted) dbrefs!)