kiramt [Tue, 9 May 2017 08:09:55 +0000 (09:09 +0100)]
JAL-2388 Added checkbox to toggle hidden columns menu & updated text
kiramt [Fri, 5 May 2017 11:05:50 +0000 (12:05 +0100)]
Merge remote-tracking branch
'origin/features/JAL-2388hiddencolumnschanges' into
features/JAL-2388OverviewWindow
Conflicts:
resources/lang/Messages.properties
kiramt [Fri, 5 May 2017 09:50:22 +0000 (10:50 +0100)]
Merge remote-tracking branch 'origin/develop' into
features/JAL-2388hiddencolumnschanges
Conflicts:
src/jalview/appletgui/TreePanel.java
src/jalview/gui/AnnotationColumnChooser.java
src/jalview/gui/PCAPanel.java
src/jalview/gui/TreePanel.java
kiramt [Fri, 5 May 2017 09:35:48 +0000 (10:35 +0100)]
Merge remote-tracking branch 'origin/develop' into
features/JAL-2388hiddencolumnschanges
Conflicts:
src/jalview/gui/AnnotationColumnChooser.java
src/jalview/io/AnnotationFile.java
gmungoc [Thu, 4 May 2017 16:08:59 +0000 (17:08 +0100)]
JAL-2506 allow graduated colour as default in new Sequence Feature
dialog
gmungoc [Thu, 4 May 2017 15:13:06 +0000 (16:13 +0100)]
JAL-2510 ensure modified feature type is displayed
gmungoc [Thu, 4 May 2017 14:56:42 +0000 (15:56 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
gmungoc [Thu, 4 May 2017 14:56:32 +0000 (15:56 +0100)]
JAL-2504 allow feature type to be specified for Create Features dialog
Jim Procter [Thu, 4 May 2017 13:10:44 +0000 (14:10 +0100)]
Merge branch 'bug/JAL-2507_rnasecstrstockholmoutput' into develop
Jim Procter [Thu, 4 May 2017 13:10:03 +0000 (14:10 +0100)]
Merge branch 'features/JAL-2503_filteronquantitativeannotation' into develop
Jim Procter [Thu, 4 May 2017 13:09:44 +0000 (14:09 +0100)]
Merge branch 'features/JAL-2393customMatrices' into develop
Jim Procter [Thu, 4 May 2017 13:04:36 +0000 (14:04 +0100)]
JAL-1656 make RNAML->Stockholm round trip test pass by ignoring differences in secondary structure annotation visibility
Jim Procter [Thu, 4 May 2017 13:03:42 +0000 (14:03 +0100)]
JAL-2507 JAL-2509 allow differences in visibility of annotation rows to be ignored when comparing round-tripped alignments
Jim Procter [Thu, 4 May 2017 13:02:24 +0000 (14:02 +0100)]
JAL-2507 JAL-2509 new assert to compare secondary structure in two annotation rows
Jim Procter [Thu, 4 May 2017 12:56:11 +0000 (13:56 +0100)]
fix for JAL-2509 - don’t replace all bracket types with ()
Jim Procter [Thu, 4 May 2017 10:37:19 +0000 (11:37 +0100)]
fix for JAL-2507 - resolve stockholm per residue annotation type by annotation label or 'isRNA' RNA secondary structure annotation flag
tcofoegbu [Thu, 4 May 2017 10:06:37 +0000 (11:06 +0100)]
Merge branch 'features/JAL-2473_set-minimium-dimensions' into develop
tcofoegbu [Thu, 4 May 2017 10:03:14 +0000 (11:03 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into features/JAL-2473_set-minimium-dimensions
Jim Procter [Thu, 4 May 2017 08:53:10 +0000 (09:53 +0100)]
Merge branch 'features/JAL-2503_filteronquantitativeannotation' into develop
Jim Procter [Thu, 4 May 2017 08:52:21 +0000 (09:52 +0100)]
Merge branch 'features/JAL-2393customMatrices' into develop
Jim Procter [Wed, 3 May 2017 16:48:11 +0000 (17:48 +0100)]
JAL-2393 JAL-2416 refresh the score model menu when updating gui enabled/disabled settings
Jim Procter [Wed, 3 May 2017 16:43:55 +0000 (17:43 +0100)]
JAL-2503 show threshold slider for quantitative annotation rows
Jim Procter [Wed, 3 May 2017 16:35:47 +0000 (17:35 +0100)]
JAL-2503 AlignmentAnnotation.isQuantitative() test
gmungoc [Wed, 3 May 2017 14:51:36 +0000 (15:51 +0100)]
JAL-2246 basic sanity test of fetching example accessions
Jim Procter [Wed, 3 May 2017 11:17:56 +0000 (12:17 +0100)]
Merge branch 'features/JAL-2432_annotbypercent' into develop
Jim Procter [Wed, 3 May 2017 11:15:34 +0000 (12:15 +0100)]
JAL-1933 JAL-2501 i18n for all auto calculated descriptions
Jim Procter [Wed, 3 May 2017 10:56:47 +0000 (11:56 +0100)]
JAL-1933 show occupancy in tooltip for row
gmungoc [Wed, 3 May 2017 10:52:24 +0000 (11:52 +0100)]
JAL-2246 test a Uniprot fetch
Jim Procter [Wed, 3 May 2017 10:47:16 +0000 (11:47 +0100)]
JAL-2432 honour percentage checkbox when entering values in text box
Jim Procter [Wed, 3 May 2017 10:46:23 +0000 (11:46 +0100)]
JAL-2432 applet: only enable percent checkbox when threshold is active
Jim Procter [Wed, 3 May 2017 10:40:04 +0000 (11:40 +0100)]
JAL-2432 percentage checkbox follows threshold value field
gmungoc [Wed, 3 May 2017 09:46:10 +0000 (10:46 +0100)]
JAL-2105 Ensembl REST now at 5.0
gmungoc [Wed, 3 May 2017 09:43:52 +0000 (10:43 +0100)]
JAL-2485 JAL-2246 test Uniprot FTS summary
Jim Procter [Wed, 3 May 2017 08:47:26 +0000 (09:47 +0100)]
JAL-2432 recover state for ‘display percentage’ checkbox
Jim Procter [Wed, 3 May 2017 08:46:32 +0000 (09:46 +0100)]
JAL-2432 simplify code
Jim Procter [Tue, 2 May 2017 16:59:01 +0000 (17:59 +0100)]
JAL-1632 validate CalculationChooser when selection or alignment changes
Jim Procter [Tue, 2 May 2017 16:58:30 +0000 (17:58 +0100)]
JAL-1632 enable/disable CalculationChooser buttons on focus
Jim Procter [Tue, 2 May 2017 16:56:13 +0000 (17:56 +0100)]
JAL-1632 compare size of input against minimums for calculation and enable/disable buttons
Jim Procter [Tue, 2 May 2017 16:54:41 +0000 (17:54 +0100)]
JAL-1632 OK->Calculate, Cancel->Close buttons
Jim Procter [Tue, 2 May 2017 16:53:53 +0000 (17:53 +0100)]
JAL-1632 removed ‘tree’ option and changed dialog layout
gmungoc [Tue, 2 May 2017 14:35:39 +0000 (15:35 +0100)]
JAL-1933 Spanish for Occupancy
Jim Procter [Tue, 2 May 2017 13:17:23 +0000 (14:17 +0100)]
JAL-2424 fixme’s removed
Jim Procter [Tue, 2 May 2017 13:16:25 +0000 (14:16 +0100)]
JAL-2424 update assert to correct width for normalising similarity scores
Jim Procter [Tue, 2 May 2017 13:15:52 +0000 (14:15 +0100)]
JAL-2424 resolved, assert updated to pass (1f != 1d)
Jim Procter [Tue, 2 May 2017 12:46:06 +0000 (13:46 +0100)]
Merge branch 'develop' into features/JAL-2393customMatrices
Jim Procter [Tue, 2 May 2017 12:37:58 +0000 (13:37 +0100)]
Merge branch 'bug/JAL-2424getVisibleContigs' into develop
gmungoc [Tue, 2 May 2017 09:42:13 +0000 (10:42 +0100)]
JAL-2499 inlined two 1-line methods
gmungoc [Tue, 2 May 2017 09:30:58 +0000 (10:30 +0100)]
JAL-2499 JAL-2403 push 'configure for view' inside ScoreModels, defer
creating model for PCA/Tree, tidy Javadoc
gmungoc [Tue, 2 May 2017 08:28:30 +0000 (09:28 +0100)]
Merge branch 'develop' into features/JAL-2393customMatrices
tcofoegbu [Mon, 1 May 2017 17:16:56 +0000 (18:16 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
tcofoegbu [Mon, 1 May 2017 17:13:55 +0000 (18:13 +0100)]
JAL-2482 bug fix
tcofoegbu [Mon, 1 May 2017 17:08:05 +0000 (18:08 +0100)]
JAL-2482 unit test for bug fix
gmungoc [Mon, 1 May 2017 15:44:23 +0000 (16:44 +0100)]
JAL-2489 JAL-2371 reinstate calls to
ColourSchemeProperty.getColourName() to handle null case
gmungoc [Mon, 1 May 2017 13:18:38 +0000 (14:18 +0100)]
Merge remote-tracking branch
'origin/bug/JAL-2479unitteststoNetworkGroup' into develop
gmungoc [Fri, 28 Apr 2017 09:07:55 +0000 (10:07 +0100)]
Merge branch 'develop' into features/JAL-2393customMatrices
Jim Procter [Thu, 27 Apr 2017 17:29:17 +0000 (18:29 +0100)]
Merge branch 'features/JAL-1933_occupancy' into develop
Jim Procter [Thu, 27 Apr 2017 17:22:47 +0000 (18:22 +0100)]
JAL-1933 patch jalview/io/testProps.jvprops to show occupancy by default (allows jalview.gui.AnnotationChooserTest to pass)
Jim Procter [Thu, 27 Apr 2017 17:21:29 +0000 (18:21 +0100)]
JAL-1933 patch jalview/io/testProps.jvprops to show occupancy by default
Jim Procter [Thu, 27 Apr 2017 17:04:05 +0000 (18:04 +0100)]
Merge branch 'features/JAL-1933_occupancy' into develop
Jim Procter [Thu, 27 Apr 2017 17:02:54 +0000 (18:02 +0100)]
JAL-1933 don't show occupancy row when testing conservation thread runs even when only quality calculation is enabled in preferences (JAL-1306)
Jim Procter [Thu, 27 Apr 2017 16:49:30 +0000 (17:49 +0100)]
Merge branch 'features/JAL-1933_occupancy' into develop
Jim Procter [Thu, 27 Apr 2017 16:48:46 +0000 (17:48 +0100)]
JAL-1933 applet doc for showOccupancy parameter
Jim Procter [Thu, 27 Apr 2017 16:48:30 +0000 (17:48 +0100)]
JAL-1933 desktop documentation for show occupancy preference
Jim Procter [Thu, 27 Apr 2017 16:43:32 +0000 (17:43 +0100)]
JAL-1933 use constant for preference token
Jim Procter [Thu, 27 Apr 2017 16:40:56 +0000 (17:40 +0100)]
Merge branch 'features/JAL-1933_occupancy' into develop
Jim Procter [Thu, 27 Apr 2017 16:39:38 +0000 (17:39 +0100)]
JAL-1933 consensus calculation doesn’t depend on occupancy row being materialised
Jim Procter [Thu, 27 Apr 2017 16:34:47 +0000 (17:34 +0100)]
JAL-1933 desktop preferences for occupancy
Jim Procter [Thu, 27 Apr 2017 16:34:29 +0000 (17:34 +0100)]
JAL-1933 action and label for occupancy
Jim Procter [Thu, 27 Apr 2017 15:39:33 +0000 (16:39 +0100)]
JAL-1933 test for SHOW_OCCUPANCY .jalview_properties setting
Jim Procter [Thu, 27 Apr 2017 15:39:12 +0000 (16:39 +0100)]
JAL-1933 showOccupancy applet parameter and SHOW_OCCUPANCY .jalview_properties setting
Jim Procter [Thu, 27 Apr 2017 15:38:22 +0000 (16:38 +0100)]
JAL-1933 only create and add occupancy row to alignment view if showOccupancy viewport attribute is set
Jim Procter [Thu, 27 Apr 2017 15:34:03 +0000 (16:34 +0100)]
JAL-2494 fix: updated behaviour for SequenceGroup.findAnnotations
Jim Procter [Thu, 27 Apr 2017 15:32:53 +0000 (16:32 +0100)]
JAL-2494 fixed behaviour for null parameters in line with test
Jim Procter [Thu, 27 Apr 2017 15:25:24 +0000 (16:25 +0100)]
JAL-2494 javadoc for AnnotatedCollectionI.findAnnotations
Jim Procter [Thu, 27 Apr 2017 15:13:25 +0000 (16:13 +0100)]
JAL-2494 test to cover AnnotatedCollectionI.findAnnotations
Jim Procter [Thu, 27 Apr 2017 14:05:42 +0000 (15:05 +0100)]
Merge branch 'features/JAL-1933_occupancy' into develop
Jim Procter [Thu, 27 Apr 2017 13:58:26 +0000 (14:58 +0100)]
JAL-2432 desktop: filter/select columns by threshold as a percentage
Jim Procter [Thu, 27 Apr 2017 13:57:28 +0000 (14:57 +0100)]
JAL-1933 JAL-2432 code tidy
Jim Procter [Thu, 27 Apr 2017 13:57:13 +0000 (14:57 +0100)]
JAL-2432 left justify value shown after adjusting threshold slider
Jim Procter [Thu, 27 Apr 2017 13:56:28 +0000 (14:56 +0100)]
JAL-1933 JAL-2432 percentile filter for select/hide columns by annotation in applet
Jim Procter [Thu, 27 Apr 2017 10:57:50 +0000 (11:57 +0100)]
JAL-1933 shade occupancy from light grey to black for high -> low occupancy
Jim Procter [Thu, 27 Apr 2017 10:56:47 +0000 (11:56 +0100)]
JAL-1933 don’t show symbol counts under histogram (also loses tooltip)
Jim Procter [Thu, 27 Apr 2017 10:55:34 +0000 (11:55 +0100)]
JAL-1933 occupancy row has a space below it for counts
Jim Procter [Thu, 27 Apr 2017 10:11:48 +0000 (11:11 +0100)]
Merge branch 'develop' into features/JAL-1933_occupancy
kiramt [Wed, 26 Apr 2017 13:43:35 +0000 (14:43 +0100)]
Merge remote-tracking branch 'origin/features/JAL-2388hiddencolumnschanges' into features/JAL-2388OverviewWindow
kiramt [Wed, 26 Apr 2017 13:42:59 +0000 (14:42 +0100)]
JAL-2388 Update to hidden columns/column selection changes after merge
kiramt [Wed, 26 Apr 2017 13:41:54 +0000 (14:41 +0100)]
Merge remote-tracking branch 'origin/develop' into features/JAL-2388hiddencolumnschanges
kiramt [Wed, 26 Apr 2017 13:36:03 +0000 (14:36 +0100)]
Merge remote-tracking branch 'origin/develop' into features/JAL-2388OverviewWindow
kiramt [Wed, 26 Apr 2017 13:35:49 +0000 (14:35 +0100)]
Merge remote-tracking branch 'origin/features/JAL-2388hiddencolumnschanges' into features/JAL-2388OverviewWindow
kiramt [Wed, 26 Apr 2017 13:35:14 +0000 (14:35 +0100)]
JAL-2388 last separation of hidden columns/col selection
kiramt [Wed, 26 Apr 2017 09:55:48 +0000 (10:55 +0100)]
JAL-2388 Tidies and unit tests
tcofoegbu [Tue, 25 Apr 2017 14:17:58 +0000 (15:17 +0100)]
JAL-2489 edited unit test code comment
tcofoegbu [Tue, 25 Apr 2017 14:14:29 +0000 (15:14 +0100)]
JAL-2489 Unit test for bug
kiramt [Tue, 25 Apr 2017 13:52:45 +0000 (14:52 +0100)]
JAL-2388 Missed file from previous commit
kiramt [Tue, 25 Apr 2017 13:52:11 +0000 (14:52 +0100)]
JAL-2388 Reverted and re-did applet changes
kiramt [Tue, 25 Apr 2017 12:59:18 +0000 (13:59 +0100)]
JAL-2388 Tidies and other corrections so applet compiles
kiramt [Tue, 25 Apr 2017 12:33:37 +0000 (13:33 +0100)]
JAL-2388 And corrected OverviewCanvas for applet
kiramt [Tue, 25 Apr 2017 12:26:21 +0000 (13:26 +0100)]
JAL-2388 Updated applet to show/hide hidden regions in overview
tcofoegbu [Tue, 25 Apr 2017 11:45:44 +0000 (12:45 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
tcofoegbu [Tue, 25 Apr 2017 11:45:36 +0000 (12:45 +0100)]
JAL-2489 bug fix
git://source.jalview.org / jalview.git / log