jalview.git
7 years agoJAL-2491 Missed port to applet from JAL-1691 bug/JAL-2491
kiramt [Fri, 26 May 2017 21:11:00 +0000 (22:11 +0100)]
JAL-2491 Missed port to applet from JAL-1691

7 years agoMerge branch 'develop' into bug/JAL-2491
kiramt [Tue, 16 May 2017 09:15:40 +0000 (10:15 +0100)]
Merge branch 'develop' into bug/JAL-2491

7 years agoJAL-2491 Better merge
kiramt [Tue, 16 May 2017 09:10:03 +0000 (10:10 +0100)]
JAL-2491 Better merge

7 years agoMerge branch 'bug/JAL-2507_rnasecstrstockholm' into develop
Jim Procter [Tue, 16 May 2017 08:48:31 +0000 (09:48 +0100)]
Merge branch 'bug/JAL-2507_rnasecstrstockholm' into develop

7 years agoJAL-2507 fix test: knockon from capitalisation on secondary structure from stockholm... bug/JAL-2507_rnasecstrstockholm
Jim Procter [Mon, 15 May 2017 18:23:56 +0000 (19:23 +0100)]
JAL-2507 fix test: knockon from capitalisation on secondary structure from stockholm file

7 years agoMerge branch 'bug/JAL-2507_rnasecstrstockholm' into develop
Jim Procter [Mon, 15 May 2017 16:37:43 +0000 (17:37 +0100)]
Merge branch 'bug/JAL-2507_rnasecstrstockholm' into develop

7 years agoJAL-2311 disable and relocate Jared service tests to Network (prior to their removal)
Jim Procter [Mon, 15 May 2017 16:37:17 +0000 (17:37 +0100)]
JAL-2311 disable and relocate Jared service tests to Network (prior to their removal)

7 years agoJAL-2507 capitalisation for annotation lines generated from stockholm annotation
Jim Procter [Mon, 15 May 2017 16:26:53 +0000 (17:26 +0100)]
JAL-2507 capitalisation for annotation lines generated from stockholm annotation

7 years agoJAL-2507 case insensitive recognition of annotation type
Jim Procter [Mon, 15 May 2017 15:56:06 +0000 (16:56 +0100)]
JAL-2507 case insensitive recognition of annotation type

7 years agoJAL-2507 - required callers to specify exact ignore flags for StockholmFileTest.testA...
Jim Procter [Mon, 15 May 2017 15:43:12 +0000 (16:43 +0100)]
JAL-2507 - required callers to specify exact ignore flags for StockholmFileTest.testAlignmentEquivalent asserts

7 years agoJAL-2535 quick hack to implement posterior probabilities parsing. 0-9 parsed as 0...
Jim Procter [Mon, 15 May 2017 15:26:02 +0000 (16:26 +0100)]
JAL-2535 quick hack to implement posterior probabilities parsing. 0-9 parsed as 0..9, ‘*’ or any other non-whitespace symbol parsed as ’10’.

7 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
kiramt [Mon, 15 May 2017 14:50:28 +0000 (15:50 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop

7 years agoJAL-2388 Add missed optimisation
kiramt [Mon, 15 May 2017 14:50:07 +0000 (15:50 +0100)]
JAL-2388 Add missed optimisation

7 years agoJAL-2491 Better merge but not quite right yet
kiramt [Mon, 15 May 2017 11:27:53 +0000 (12:27 +0100)]
JAL-2491 Better merge but not quite right yet

7 years agoMerge branch 'features/JAL-2376_add-horizontal-bar' into develop
Jim Procter [Mon, 15 May 2017 11:14:20 +0000 (12:14 +0100)]
Merge branch 'features/JAL-2376_add-horizontal-bar' into develop

7 years agoJAL-2371 create a default ResidueShader when constructing the viewport
Jim Procter [Mon, 15 May 2017 11:07:39 +0000 (12:07 +0100)]
JAL-2371 create a default ResidueShader when constructing the viewport

7 years agoMerge remote-tracking branch 'origin/develop' into bug/JAL-2491
kiramt [Mon, 15 May 2017 10:42:01 +0000 (11:42 +0100)]
Merge remote-tracking branch 'origin/develop' into bug/JAL-2491
(not working yet)

Conflicts:
src/jalview/appletgui/AlignmentPanel.java
src/jalview/appletgui/OverviewPanel.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/OverviewPanel.java
src/jalview/gui/SeqPanel.java
src/jalview/viewmodel/OverviewDimensions.java
src/jalview/viewmodel/ViewportRanges.java
test/jalview/viewmodel/OverviewDimensionsTest.java

7 years agoJAL-2491 Tests
kiramt [Mon, 15 May 2017 08:42:17 +0000 (09:42 +0100)]
JAL-2491 Tests

7 years agoJAL-2491 Tidies
kiramt [Mon, 15 May 2017 08:23:59 +0000 (09:23 +0100)]
JAL-2491 Tidies

7 years agoJAL-2491 Tidy
kiramt [Fri, 12 May 2017 18:33:43 +0000 (19:33 +0100)]
JAL-2491 Tidy

7 years agoJAL-2491 Tidies to Overview panel calls in light of new code
kiramt [Fri, 12 May 2017 18:32:32 +0000 (19:32 +0100)]
JAL-2491 Tidies to Overview panel calls in light of new code

7 years agoMerge branch 'features/JAL-2435splitScreenFont' into develop
Jim Procter [Fri, 12 May 2017 14:48:16 +0000 (15:48 +0100)]
Merge branch 'features/JAL-2435splitScreenFont' into develop

7 years agoJAL-2418 broken help ref
Jim Procter [Fri, 12 May 2017 14:47:10 +0000 (15:47 +0100)]
JAL-2418 broken help ref

7 years agoJAL-2435 documentation and what’s new
Jim Procter [Fri, 12 May 2017 14:46:27 +0000 (15:46 +0100)]
JAL-2435 documentation and what’s new

7 years agoJAL-2435 mention new checkbox in linked cDNA/Protein view documentation
Jim Procter [Fri, 12 May 2017 14:42:17 +0000 (15:42 +0100)]
JAL-2435 mention new checkbox in linked cDNA/Protein view documentation

7 years agoJAL-2435 mirror antiAlias setting between cDNA and Protein
Jim Procter [Fri, 12 May 2017 14:41:45 +0000 (15:41 +0100)]
JAL-2435 mirror antiAlias setting between cDNA and Protein

7 years agoMerge branch 'features/JAL-2388OverviewWindow' into develop
Jim Procter [Fri, 12 May 2017 14:09:45 +0000 (15:09 +0100)]
Merge branch 'features/JAL-2388OverviewWindow' into develop

7 years agoJAL-2388 mention overview popup in documentation
Jim Procter [Fri, 12 May 2017 14:01:17 +0000 (15:01 +0100)]
JAL-2388 mention overview popup in documentation

7 years agoJAL-2388 checkbox in overview popup for applet
Jim Procter [Fri, 12 May 2017 13:56:21 +0000 (14:56 +0100)]
JAL-2388 checkbox in overview popup for applet

7 years agoMerge branch 'features/JAL-2228_efficient_featurecounts' into develop
Jim Procter [Fri, 12 May 2017 13:29:46 +0000 (14:29 +0100)]
Merge branch 'features/JAL-2228_efficient_featurecounts' into develop

7 years agoJAL-2228 updated script in help docs, renamed docs, and added note about non-backward...
Jim Procter [Fri, 12 May 2017 13:29:28 +0000 (14:29 +0100)]
JAL-2228 updated script in help docs, renamed docs, and added note about non-backwards compatibility of feature counter script

7 years agoJAL-2491 Renamed comp scrolling flag for consistency; small tweaks
kiramt [Fri, 12 May 2017 12:43:16 +0000 (13:43 +0100)]
JAL-2491 Renamed comp scrolling flag for consistency; small tweaks

7 years agoJAL-2491 Added adjustment methods to be called directly
kiramt [Fri, 12 May 2017 08:39:19 +0000 (09:39 +0100)]
JAL-2491 Added adjustment methods to be called directly

7 years agoJAL-2491 Unit test updates
kiramt [Fri, 12 May 2017 08:35:52 +0000 (09:35 +0100)]
JAL-2491 Unit test updates

7 years agoJAL-2491 Tweaks for applet
kiramt [Fri, 12 May 2017 07:13:06 +0000 (08:13 +0100)]
JAL-2491 Tweaks for applet

7 years agoJAL-2491 First port to applet
kiramt [Thu, 11 May 2017 16:24:20 +0000 (17:24 +0100)]
JAL-2491 First port to applet

7 years agoJAL-2491 First port to applet
kiramt [Thu, 11 May 2017 16:23:37 +0000 (17:23 +0100)]
JAL-2491 First port to applet

7 years agoMerge branch 'bug/JAL-2507_rnasecstrstockholm' into develop
Jim Procter [Thu, 11 May 2017 15:21:14 +0000 (16:21 +0100)]
Merge branch 'bug/JAL-2507_rnasecstrstockholm' into develop

7 years agoJAL-2509 JAL-2507 allow whitespace in GS annotation lines (removed old code for proce...
Jim Procter [Thu, 11 May 2017 15:20:29 +0000 (16:20 +0100)]
JAL-2509 JAL-2507 allow whitespace in GS annotation lines (removed old code for processing GS column annotation into features)

7 years agoJAL-2507 JAL-2509 allow whitespace==null for annotation row comparison, and test...
Jim Procter [Thu, 11 May 2017 15:17:29 +0000 (16:17 +0100)]
JAL-2507 JAL-2509 allow whitespace==null for annotation row comparison, and test coverage for Annotation equivalence asserts

7 years agoJAL-2507 test if an annotation is ‘whitespace’
Jim Procter [Thu, 11 May 2017 14:29:00 +0000 (15:29 +0100)]
JAL-2507 test if an annotation is ‘whitespace’

7 years agoJAL-2507 Annotation.EMPTY_ANNOTATION - non-null whitespace annotation
Jim Procter [Thu, 11 May 2017 14:28:24 +0000 (15:28 +0100)]
JAL-2507 Annotation.EMPTY_ANNOTATION - non-null whitespace annotation

7 years agoJAL-2491 Unit tests and updates
kiramt [Thu, 11 May 2017 13:30:49 +0000 (14:30 +0100)]
JAL-2491 Unit tests and updates

7 years agoJAL-2491 Make it work with cursor movement
kiramt [Wed, 10 May 2017 13:53:54 +0000 (14:53 +0100)]
JAL-2491 Make it work with cursor movement

7 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
kiramt [Wed, 10 May 2017 13:29:07 +0000 (14:29 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop

7 years agoJAL-2522 Fix to cursor scrolling
kiramt [Wed, 10 May 2017 13:28:50 +0000 (14:28 +0100)]
JAL-2522 Fix to cursor scrolling

7 years agoJAL-2491 Cursor scrolling
kiramt [Wed, 10 May 2017 10:45:44 +0000 (11:45 +0100)]
JAL-2491 Cursor scrolling

7 years agoJAL-2507 spit out tests for ‘{‘ WUSS io from ‘[‘ WUSS io (which may be causing proble...
Jim Procter [Tue, 9 May 2017 17:18:27 +0000 (18:18 +0100)]
JAL-2507 spit out tests for ‘{‘ WUSS io from ‘[‘ WUSS io (which may be causing problems via JAL-1863)

7 years agoJAL-2509 verify stockholm parser’s bracket regex is working for all WUSS notation
Jim Procter [Tue, 9 May 2017 16:58:52 +0000 (17:58 +0100)]
JAL-2509 verify stockholm parser’s bracket regex is working for all WUSS notation

7 years agoJAL-2509 extend set of brackets recognised by stockholm parser
Jim Procter [Tue, 9 May 2017 16:58:27 +0000 (17:58 +0100)]
JAL-2509 extend set of brackets recognised by stockholm parser

7 years agoJAL-2507 JAL-2509 extend test to cover round trip of full range of WUSS RNA secondary...
Jim Procter [Tue, 9 May 2017 16:57:20 +0000 (17:57 +0100)]
JAL-2507 JAL-2509 extend test to cover round trip of full range of WUSS RNA secondary structure

7 years agoJAL-2507 unpaired RNA marked as ‘ ‘ in Stockholm SS line
Jim Procter [Tue, 9 May 2017 15:55:14 +0000 (16:55 +0100)]
JAL-2507 unpaired RNA marked as ‘ ‘ in Stockholm SS line

7 years agoJAL-2507 output secondary structure regardless of presence of dataset sequence
Jim Procter [Tue, 9 May 2017 15:54:15 +0000 (16:54 +0100)]
JAL-2507 output secondary structure regardless of presence of dataset sequence

7 years agoJAL-2507 simplify round trip test via AppletFormatAdapter
Jim Procter [Tue, 9 May 2017 15:51:46 +0000 (16:51 +0100)]
JAL-2507 simplify round trip test via AppletFormatAdapter

7 years agoJAL-2491 Tidies and more refactoring
kiramt [Tue, 9 May 2017 15:14:50 +0000 (16:14 +0100)]
JAL-2491 Tidies and more refactoring

7 years agoJAL-2507 test for alignment+rna annotation -> Stockholm -> roundtrip.
Jim Procter [Tue, 9 May 2017 14:15:54 +0000 (15:15 +0100)]
JAL-2507 test for alignment+rna annotation -> Stockholm -> roundtrip.

7 years agoJAL-2491 Resolved highlighting and initialisation problems
kiramt [Tue, 9 May 2017 12:39:29 +0000 (13:39 +0100)]
JAL-2491 Resolved highlighting and initialisation problems

7 years agoJAL-1632 correct i18n and NPE
gmungoc [Tue, 9 May 2017 09:16:50 +0000 (10:16 +0100)]
JAL-1632 correct i18n and NPE

7 years agoJAL-2388 Added checkbox to toggle hidden columns menu & updated text
kiramt [Tue, 9 May 2017 08:09:55 +0000 (09:09 +0100)]
JAL-2388 Added checkbox to toggle hidden columns menu & updated text

7 years agoJAL-2491 More wrap corrections
kiramt [Mon, 8 May 2017 15:36:07 +0000 (16:36 +0100)]
JAL-2491 More wrap corrections

7 years agoJAL-1933 Spanish tooltips for annotation
gmungoc [Mon, 8 May 2017 14:40:19 +0000 (15:40 +0100)]
JAL-1933 Spanish tooltips for annotation

7 years agoJAL-1632 i18n for warning messages
gmungoc [Mon, 8 May 2017 13:54:56 +0000 (14:54 +0100)]
JAL-1632 i18n for warning messages

7 years agoMerge remote-tracking branch 'origin/bug/JAL-2515' into develop
gmungoc [Mon, 8 May 2017 12:17:04 +0000 (13:17 +0100)]
Merge remote-tracking branch 'origin/bug/JAL-2515' into develop

7 years agoJAL-2491 Tweaks to avoid scroll problems at bottom of wrapped alignment
kiramt [Mon, 8 May 2017 09:47:16 +0000 (10:47 +0100)]
JAL-2491 Tweaks to avoid scroll problems at bottom of wrapped alignment

7 years agoJAL-2515 Id panel in applet updated for NPE on urlProvider bug/JAL-2515
kiramt [Mon, 8 May 2017 08:23:31 +0000 (09:23 +0100)]
JAL-2515 Id panel in applet updated for NPE on urlProvider

7 years agoJAL-2512 And corresponding test bug/JAL-2512
kiramt [Mon, 8 May 2017 08:06:22 +0000 (09:06 +0100)]
JAL-2512 And corresponding test

7 years agoJAL-2512 And applet
kiramt [Mon, 8 May 2017 07:59:46 +0000 (08:59 +0100)]
JAL-2512 And applet

7 years agoJAL-2512 Fix to show non-gap positions in None colour scheme
kiramt [Mon, 8 May 2017 07:54:41 +0000 (08:54 +0100)]
JAL-2512 Fix to show non-gap positions in None colour scheme

7 years agoJAL-2491 Started moving other scrolling fns into viewportranges
kiramt [Mon, 8 May 2017 07:12:15 +0000 (08:12 +0100)]
JAL-2491 Started moving other scrolling fns into viewportranges

7 years agoMerge branch 'develop' into features/JAL-2435splitScreenFont
gmungoc [Fri, 5 May 2017 15:21:02 +0000 (16:21 +0100)]
Merge branch 'develop' into features/JAL-2435splitScreenFont

7 years agoMerge remote-tracking branch
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

7 years agoJAL-2491 Scrolling and interaction with overview/find working in desktop
kiramt [Fri, 5 May 2017 10:59:58 +0000 (11:59 +0100)]
JAL-2491 Scrolling and interaction with overview/find working in desktop

7 years agoMerge remote-tracking branch 'origin/develop' into features/JAL-2388hiddencolumnschanges
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

7 years agoMerge remote-tracking branch 'origin/develop' into
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

7 years agoJAL-2491 More working split panel + new scrolling
kiramt [Fri, 5 May 2017 09:18:29 +0000 (10:18 +0100)]
JAL-2491 More working split panel + new scrolling

7 years agoJAL-2506 allow graduated colour as default in new Sequence Feature
gmungoc [Thu, 4 May 2017 16:08:59 +0000 (17:08 +0100)]
JAL-2506 allow graduated colour as default in new Sequence Feature
dialog

7 years agoJAL-2510 ensure modified feature type is displayed
gmungoc [Thu, 4 May 2017 15:13:06 +0000 (16:13 +0100)]
JAL-2510 ensure modified feature type is displayed

7 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
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

7 years agoJAL-2504 allow feature type to be specified for Create Features dialog
gmungoc [Thu, 4 May 2017 14:56:32 +0000 (15:56 +0100)]
JAL-2504 allow feature type to be specified for Create Features dialog

7 years agoMerge branch 'develop' into features/JAL-2228_efficient_featurecounts
Jim Procter [Thu, 4 May 2017 14:00:58 +0000 (15:00 +0100)]
Merge branch 'develop' into features/JAL-2228_efficient_featurecounts

7 years agoMerge branch 'bug/JAL-2507_rnasecstrstockholmoutput' into develop
Jim Procter [Thu, 4 May 2017 13:10:44 +0000 (14:10 +0100)]
Merge branch 'bug/JAL-2507_rnasecstrstockholmoutput' into develop

7 years agoMerge branch 'features/JAL-2503_filteronquantitativeannotation' into develop
Jim Procter [Thu, 4 May 2017 13:10:03 +0000 (14:10 +0100)]
Merge branch 'features/JAL-2503_filteronquantitativeannotation' into develop

7 years agoMerge branch 'features/JAL-2393customMatrices' into develop
Jim Procter [Thu, 4 May 2017 13:09:44 +0000 (14:09 +0100)]
Merge branch 'features/JAL-2393customMatrices' into develop

7 years agoJAL-1656 make RNAML->Stockholm round trip test pass by ignoring differences in second...
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

7 years agoJAL-2507 JAL-2509 allow differences in visibility of annotation rows to be ignored...
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

7 years agoJAL-2507 JAL-2509 new assert to compare secondary structure in two annotation rows
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

7 years agofix for JAL-2509 - don’t replace all bracket types with ()
Jim Procter [Thu, 4 May 2017 12:56:11 +0000 (13:56 +0100)]
fix for JAL-2509 - don’t replace all bracket types with ()

7 years agofix for JAL-2507 - resolve stockholm per residue annotation type by annotation label...
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

7 years agoMerge branch 'features/JAL-2473_set-minimium-dimensions' into develop
tcofoegbu [Thu, 4 May 2017 10:06:37 +0000 (11:06 +0100)]
Merge branch 'features/JAL-2473_set-minimium-dimensions' into develop

7 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview into features/JAL...
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

7 years agoMerge branch 'features/JAL-2503_filteronquantitativeannotation' into develop
Jim Procter [Thu, 4 May 2017 08:53:10 +0000 (09:53 +0100)]
Merge branch 'features/JAL-2503_filteronquantitativeannotation' into develop

7 years agoMerge branch 'features/JAL-2393customMatrices' into develop
Jim Procter [Thu, 4 May 2017 08:52:21 +0000 (09:52 +0100)]
Merge branch 'features/JAL-2393customMatrices' into develop

7 years agoJAL-2393 JAL-2416 refresh the score model menu when updating gui enabled/disabled... features/JAL-2393customMatrices
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

7 years agoJAL-2503 show threshold slider for quantitative annotation rows
Jim Procter [Wed, 3 May 2017 16:43:55 +0000 (17:43 +0100)]
JAL-2503 show threshold slider for quantitative annotation rows

7 years agoJAL-2503 AlignmentAnnotation.isQuantitative() test
Jim Procter [Wed, 3 May 2017 16:35:47 +0000 (17:35 +0100)]
JAL-2503 AlignmentAnnotation.isQuantitative() test

7 years agoJAL-2491 Tidies
kiramt [Wed, 3 May 2017 15:31:14 +0000 (16:31 +0100)]
JAL-2491 Tidies

7 years agoJAL-2246 basic sanity test of fetching example accessions
gmungoc [Wed, 3 May 2017 14:51:36 +0000 (15:51 +0100)]
JAL-2246 basic sanity test of fetching example accessions

7 years agoJAL-2491 Wrapped panel scrolling
kiramt [Wed, 3 May 2017 13:55:08 +0000 (14:55 +0100)]
JAL-2491 Wrapped panel scrolling

7 years agoMerge branch 'features/JAL-2432_annotbypercent' into develop
Jim Procter [Wed, 3 May 2017 11:17:56 +0000 (12:17 +0100)]
Merge branch 'features/JAL-2432_annotbypercent' into develop

7 years agoJAL-1933 JAL-2501 i18n for all auto calculated descriptions features/JAL-2432_annotbypercent
Jim Procter [Wed, 3 May 2017 11:15:34 +0000 (12:15 +0100)]
JAL-1933 JAL-2501 i18n for all auto calculated descriptions