jalview.git
6 years agoJAL-2624 additional tests for FeatureColour.getColour(),
gmungoc [Mon, 24 Jul 2017 08:24:48 +0000 (09:24 +0100)]
JAL-2624 additional tests for FeatureColour.getColour(),
filterFeaturesForDisplay

6 years agoMerge branch 'develop' into features/JAL-2446NCList
gmungoc [Mon, 24 Jul 2017 05:48:34 +0000 (06:48 +0100)]
Merge branch 'develop' into features/JAL-2446NCList

6 years agoMerge branch 'documentation/JAL-2418_release2102' into develop
Jim Procter [Mon, 24 Jul 2017 05:24:15 +0000 (07:24 +0200)]
Merge branch 'documentation/JAL-2418_release2102' into develop

6 years agoJAL-2481 JAL-2624 test for render feature below score feature outwith
gmungoc [Sun, 23 Jul 2017 08:37:51 +0000 (09:37 +0100)]
JAL-2481 JAL-2624 test for render feature below score feature outwith
threshold

6 years agoMerge branch 'develop' into features/JAL-2446NCList
gmungoc [Sun, 23 Jul 2017 07:59:37 +0000 (08:59 +0100)]
Merge branch 'develop' into features/JAL-2446NCList

Conflicts:
src/jalview/renderer/seqfeatures/FeatureRenderer.java
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java

6 years agoJAL-2624 check feature colour threshold when colouring structure
gmungoc [Sat, 22 Jul 2017 15:38:54 +0000 (16:38 +0100)]
JAL-2624 check feature colour threshold when colouring structure

6 years agoJAL-2623 initialise colour threshold slider correctly
gmungoc [Sat, 22 Jul 2017 13:48:22 +0000 (14:48 +0100)]
JAL-2623 initialise colour threshold slider correctly

6 years agoMerge branch 'develop' into features/JAL-2446NCList
gmungoc [Wed, 19 Jul 2017 15:39:11 +0000 (16:39 +0100)]
Merge branch 'develop' into features/JAL-2446NCList

Conflicts:
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/SeqCanvas.java
src/jalview/gui/SeqPanel.java

6 years agoJAL-2432 updated documentation for select/hide by annotation to include As Percentage...
Jim Procter [Tue, 18 Jul 2017 15:24:26 +0000 (16:24 +0100)]
JAL-2432 updated documentation for select/hide by annotation to include As Percentage checkbox

6 years agoJAL-147 don't scroll up beyond startRes = 0 bug/JAL-147scrollWrappedView
gmungoc [Tue, 18 Jul 2017 13:44:27 +0000 (14:44 +0100)]
JAL-147 don't scroll up beyond startRes = 0

6 years agoJAL-147 corrected calculation of vertical scroll position and max
gmungoc [Tue, 18 Jul 2017 12:02:15 +0000 (13:02 +0100)]
JAL-147 corrected calculation of vertical scroll position and max

6 years agoJAL-147 draw up to last position of wrapped alignment!
gmungoc [Tue, 18 Jul 2017 12:01:46 +0000 (13:01 +0100)]
JAL-147 draw up to last position of wrapped alignment!

6 years agoMerge branch 'develop' into bug/JAL-147scrollWrappedView
gmungoc [Mon, 17 Jul 2017 15:20:37 +0000 (16:20 +0100)]
Merge branch 'develop' into bug/JAL-147scrollWrappedView

6 years agoJAL-1648 JAL-2447 Spanish translations
gmungoc [Mon, 17 Jul 2017 11:25:04 +0000 (12:25 +0100)]
JAL-1648 JAL-2447 Spanish translations

6 years agoJAL-1858 fast paint wrapped highlights unless view was scrolled
gmungoc [Thu, 6 Jul 2017 16:39:37 +0000 (17:39 +0100)]
JAL-1858 fast paint wrapped highlights unless view was scrolled

6 years agoJAL-1858 scrollToWrappedVisible preserve any horizontal offset of view
gmungoc [Thu, 6 Jul 2017 16:38:18 +0000 (17:38 +0100)]
JAL-1858 scrollToWrappedVisible preserve any horizontal offset of view

6 years agoJAL-147 prevent vertical Overview box movement in wrapped mode
gmungoc [Thu, 6 Jul 2017 14:59:43 +0000 (15:59 +0100)]
JAL-147 prevent vertical Overview box movement in wrapped mode

6 years agoJAL-147 unit test for hide/show sequences update ViewportRanges
gmungoc [Thu, 6 Jul 2017 14:59:09 +0000 (15:59 +0100)]
JAL-147 unit test for hide/show sequences update ViewportRanges

6 years agoJAL-2605 ensure correct scale width calculation
gmungoc [Thu, 6 Jul 2017 14:03:24 +0000 (15:03 +0100)]
JAL-2605 ensure correct scale width calculation

6 years agoJAL-1858 fastpaint highlights on wrapped alignment
gmungoc [Wed, 5 Jul 2017 14:43:28 +0000 (15:43 +0100)]
JAL-1858 fastpaint highlights on wrapped alignment

6 years agoJAL-147 don't update overview for column selection (applet)
gmungoc [Wed, 5 Jul 2017 12:43:48 +0000 (13:43 +0100)]
JAL-147 don't update overview for column selection (applet)

6 years agoJAL-147 additions to unit test, check for negative array index
gmungoc [Wed, 5 Jul 2017 12:37:26 +0000 (13:37 +0100)]
JAL-147 additions to unit test, check for negative array index

6 years agoJAL-147 prevent overview box move up over hidden first sequence
gmungoc [Wed, 5 Jul 2017 10:34:50 +0000 (11:34 +0100)]
JAL-147 prevent overview box move up over hidden first sequence

6 years agoJAL-147 revised update of startSeq, endSeq on unhide sequences
gmungoc [Tue, 4 Jul 2017 15:51:34 +0000 (16:51 +0100)]
JAL-147 revised update of startSeq, endSeq on unhide sequences

6 years agoJAL-147 unit tests added, unused setEndRes removed
gmungoc [Tue, 4 Jul 2017 15:20:03 +0000 (16:20 +0100)]
JAL-147 unit tests added, unused setEndRes removed

6 years agoJAL-147 corrected update of ViewportRanges for show/hide sequences
gmungoc [Tue, 4 Jul 2017 10:23:32 +0000 (11:23 +0100)]
JAL-147 corrected update of ViewportRanges for show/hide sequences

6 years agoJAL-147 update ViewportRanges height after show/hide sequences
gmungoc [Tue, 4 Jul 2017 10:05:15 +0000 (11:05 +0100)]
JAL-147 update ViewportRanges height after show/hide sequences

6 years agoJAL-147 remove redundant calls to update overview panel
gmungoc [Tue, 4 Jul 2017 09:26:43 +0000 (10:26 +0100)]
JAL-147 remove redundant calls to update overview panel

6 years agoJAL-2608 tidy up OverviewPanel when closed
gmungoc [Tue, 4 Jul 2017 08:35:01 +0000 (09:35 +0100)]
JAL-2608 tidy up OverviewPanel when closed

6 years agoJAL-147 call method that sets visible width when drawing wrapped panel
gmungoc [Tue, 4 Jul 2017 08:12:49 +0000 (09:12 +0100)]
JAL-147 call method that sets visible width when drawing wrapped panel

6 years agoJAL-147 extract local variable for ease of debugging
gmungoc [Tue, 4 Jul 2017 08:12:13 +0000 (09:12 +0100)]
JAL-147 extract local variable for ease of debugging

6 years agoMerge branch 'develop' into bug/JAL-147scrollWrappedView
gmungoc [Mon, 3 Jul 2017 14:39:09 +0000 (15:39 +0100)]
Merge branch 'develop' into bug/JAL-147scrollWrappedView

6 years agoJAL-147 correct width out-by-one drawing ids
gmungoc [Mon, 3 Jul 2017 14:27:01 +0000 (15:27 +0100)]
JAL-147 correct width out-by-one drawing ids

6 years agoJAL-147 don't scroll Overview box outside panel dimensions
gmungoc [Mon, 3 Jul 2017 14:26:33 +0000 (15:26 +0100)]
JAL-147 don't scroll Overview box outside panel dimensions

6 years agoJAL-147 ViewportRanges calculate wrapped vertical scroll position
gmungoc [Mon, 3 Jul 2017 14:25:48 +0000 (15:25 +0100)]
JAL-147 ViewportRanges calculate wrapped vertical scroll position

6 years agoJAL-147 don't draw ScalePanel when in wrapped mode
gmungoc [Mon, 3 Jul 2017 14:17:27 +0000 (15:17 +0100)]
JAL-147 don't draw ScalePanel when in wrapped mode

6 years agoJAL-2034 don't refresh Overview for selection in id panel
gmungoc [Mon, 3 Jul 2017 13:54:11 +0000 (14:54 +0100)]
JAL-2034 don't refresh Overview for selection in id panel

6 years agoJAL-2505 correct handling of change of feature type
gmungoc [Fri, 30 Jun 2017 15:17:47 +0000 (16:17 +0100)]
JAL-2505 correct handling of change of feature type

6 years agoJAL-2483 corrected finding feature groups
gmungoc [Fri, 30 Jun 2017 15:16:13 +0000 (16:16 +0100)]
JAL-2483 corrected finding feature groups

6 years agoMerge branch 'develop' into features/JAL-2446NCList
gmungoc [Fri, 30 Jun 2017 14:30:05 +0000 (15:30 +0100)]
Merge branch 'develop' into features/JAL-2446NCList

6 years agoJAL-2602 unit test added
gmungoc [Fri, 30 Jun 2017 14:06:50 +0000 (15:06 +0100)]
JAL-2602 unit test added

6 years agoJAL-147 don't page up above origin, repaint ids for scroll in wrapped
gmungoc [Fri, 30 Jun 2017 13:49:13 +0000 (14:49 +0100)]
JAL-147 don't page up above origin, repaint ids for scroll in wrapped
mode

6 years agoMerge branch 'bug/JAL-2597' into develop
gmungoc [Fri, 30 Jun 2017 12:00:56 +0000 (13:00 +0100)]
Merge branch 'bug/JAL-2597' into develop

6 years agoJAL-2602 pulled up identical methods to base class
gmungoc [Fri, 30 Jun 2017 10:48:15 +0000 (11:48 +0100)]
JAL-2602 pulled up identical methods to base class

6 years agoJAL-2602 same fix for applet
gmungoc [Fri, 30 Jun 2017 10:44:27 +0000 (11:44 +0100)]
JAL-2602 same fix for applet

6 years agoJAL-2526 correct treatment of contact features only partly visible
gmungoc [Fri, 30 Jun 2017 09:44:37 +0000 (10:44 +0100)]
JAL-2526 correct treatment of contact features only partly visible

6 years agoMerge branch 'bugs/JAL-2606_broken_jabaws22_IADependency' into develop
Jim Procter [Fri, 30 Jun 2017 08:02:30 +0000 (09:02 +0100)]
Merge branch 'bugs/JAL-2606_broken_jabaws22_IADependency' into develop

6 years agoJAL-2606 updated IA build for changed dependency due to JAL-2549
Jim Procter [Fri, 30 Jun 2017 08:00:41 +0000 (09:00 +0100)]
JAL-2606 updated IA build for changed dependency due to JAL-2549

6 years agoMerge branch 'develop' into features/JAL-2446NCList
gmungoc [Fri, 30 Jun 2017 04:38:32 +0000 (05:38 +0100)]
Merge branch 'develop' into features/JAL-2446NCList

6 years agoJAL-147 improved wrapped scrolling (including Overview) with
gmungoc [Thu, 29 Jun 2017 18:59:08 +0000 (19:59 +0100)]
JAL-147 improved wrapped scrolling (including Overview) with
ViewportRanges

6 years agoJAL-2597 Fix and unit test bug/JAL-2597
kiramt [Thu, 29 Jun 2017 13:02:45 +0000 (14:02 +0100)]
JAL-2597 Fix and unit test

6 years agoJAL-2605 exclude left/right scale in sequence column calculation
gmungoc [Thu, 29 Jun 2017 11:20:15 +0000 (12:20 +0100)]
JAL-2605 exclude left/right scale in sequence column calculation

6 years agoMerge branch 'bug/JAL-2600resizeflicker' into develop
gmungoc [Wed, 28 Jun 2017 14:16:17 +0000 (15:16 +0100)]
Merge branch 'bug/JAL-2600resizeflicker' into develop

6 years agoJAL-2600 Tidies bug/JAL-2600resizeflicker
kiramt [Wed, 28 Jun 2017 11:49:17 +0000 (12:49 +0100)]
JAL-2600 Tidies

6 years agoJAL-2600 updates following review
kiramt [Wed, 28 Jun 2017 11:45:50 +0000 (12:45 +0100)]
JAL-2600 updates following review

6 years agoJAL-1858 repaint after Amend Features dialog
gmungoc [Tue, 27 Jun 2017 20:25:28 +0000 (21:25 +0100)]
JAL-1858 repaint after Amend Features dialog

6 years agoMerge branch 'develop' into features/JAL-2446NCList
gmungoc [Tue, 27 Jun 2017 13:27:36 +0000 (14:27 +0100)]
Merge branch 'develop' into features/JAL-2446NCList

Conflicts:
src/jalview/appletgui/SeqPanel.java
src/jalview/renderer/seqfeatures/FeatureRenderer.java

6 years agoJAL-2600 Tidies
kiramt [Tue, 27 Jun 2017 13:18:01 +0000 (14:18 +0100)]
JAL-2600 Tidies

6 years agoJAL-2600 Abandoned fastpaint for resize; now full repaint, single call
kiramt [Tue, 27 Jun 2017 13:16:56 +0000 (14:16 +0100)]
JAL-2600 Abandoned fastpaint for resize; now full repaint, single call

6 years agoJAL-2602 check for null or empty description when copying consensus
gmungoc [Tue, 27 Jun 2017 13:03:09 +0000 (14:03 +0100)]
JAL-2602 check for null or empty description when copying consensus

6 years agoJAL-1858 highlights on wrapped panel - work in progress
gmungoc [Tue, 27 Jun 2017 13:01:47 +0000 (14:01 +0100)]
JAL-1858 highlights on wrapped panel - work in progress

6 years agoJAL-147 scroll wrapped panel by one width's worth at a time
gmungoc [Tue, 27 Jun 2017 12:59:46 +0000 (13:59 +0100)]
JAL-147 scroll wrapped panel by one width's worth at a time

6 years agoJAL-2600 Add in IdCanvas and checks for 0 size images
kiramt [Tue, 27 Jun 2017 08:36:37 +0000 (09:36 +0100)]
JAL-2600 Add in IdCanvas and checks for 0 size images

6 years agoJAL-2600 vertical fast paint too
kiramt [Tue, 27 Jun 2017 07:12:00 +0000 (08:12 +0100)]
JAL-2600 vertical fast paint too

6 years agoJAL-2600 fast painting on resize
kiramt [Tue, 27 Jun 2017 06:47:55 +0000 (07:47 +0100)]
JAL-2600 fast painting on resize

6 years agoJAL-2600 reinstate original behaviour
kiramt [Mon, 26 Jun 2017 13:33:15 +0000 (14:33 +0100)]
JAL-2600 reinstate original behaviour

6 years agoJAL-1858 ensure full redraw on 'remove all selections'
gmungoc [Mon, 26 Jun 2017 07:29:52 +0000 (08:29 +0100)]
JAL-1858 ensure full redraw on 'remove all selections'

6 years agoJAL-2589 unit test updated
gmungoc [Sat, 24 Jun 2017 12:08:00 +0000 (13:08 +0100)]
JAL-2589 unit test updated

6 years agoJAL-2547 fix case of gap followed by enclosing contact feature position
gmungoc [Sat, 24 Jun 2017 12:06:12 +0000 (13:06 +0100)]
JAL-2547 fix case of gap followed by enclosing contact feature position

6 years agoJAL-1858 null img when doing full repaint of wrapped alignment
gmungoc [Sat, 24 Jun 2017 08:29:18 +0000 (09:29 +0100)]
JAL-1858 null img when doing full repaint of wrapped alignment

6 years agoJAL-1858 don't fastpaint highlights if wrapped format bug/JAL-1858fastPaintHighlights
gmungoc [Sat, 24 Jun 2017 08:16:34 +0000 (09:16 +0100)]
JAL-1858 don't fastpaint highlights if wrapped format

6 years agoJAL-1858 refactored method to redraw previous/new highlighted positions
gmungoc [Sat, 24 Jun 2017 05:48:27 +0000 (06:48 +0100)]
JAL-1858 refactored method to redraw previous/new highlighted positions

6 years agoJAL-1858 handle hidden columns when computing region to redraw
gmungoc [Fri, 23 Jun 2017 15:05:53 +0000 (16:05 +0100)]
JAL-1858 handle hidden columns when computing region to redraw

6 years agoJAL-1858 'fastPaint' of minimal region for highlights; todo: hidden
gmungoc [Fri, 23 Jun 2017 12:13:02 +0000 (13:13 +0100)]
JAL-1858 'fastPaint' of minimal region for highlights; todo: hidden
columns

6 years agoJAL-2481 JAL-2593 JAL-2526 further optimisation of feature/index finding
gmungoc [Thu, 22 Jun 2017 15:45:53 +0000 (16:45 +0100)]
JAL-2481 JAL-2593 JAL-2526 further optimisation of feature/index finding

6 years agoJAL-2480 simpler and safer test to avoid adding duplicates
gmungoc [Thu, 22 Jun 2017 09:46:39 +0000 (10:46 +0100)]
JAL-2480 simpler and safer test to avoid adding duplicates

6 years agoJAL-2480 tidy generic initialisations, SequenceFeatures.varargToTypes
gmungoc [Wed, 21 Jun 2017 15:26:56 +0000 (16:26 +0100)]
JAL-2480 tidy generic initialisations, SequenceFeatures.varargToTypes

6 years agoJAL-2524 don't render up to a hidden marker beyond the visible region
gmungoc [Wed, 21 Jun 2017 08:37:34 +0000 (09:37 +0100)]
JAL-2524 don't render up to a hidden marker beyond the visible region

6 years agoJAL-2526 don't retain lastColumnPosition from an invalidated cursor
gmungoc [Tue, 20 Jun 2017 09:35:25 +0000 (10:35 +0100)]
JAL-2526 don't retain lastColumnPosition from an invalidated cursor

6 years agoJAL-2563 test updated for fix
gmungoc [Thu, 15 Jun 2017 13:22:11 +0000 (14:22 +0100)]
JAL-2563 test updated for fix

6 years agoMerge branch 'bug/JAL-2386groupConservationColouring' into develop
gmungoc [Thu, 15 Jun 2017 13:08:32 +0000 (14:08 +0100)]
Merge branch 'bug/JAL-2386groupConservationColouring' into develop

6 years agoMerge remote-tracking branch 'origin/develop' into bug/JAL-2591 bug/JAL-2591
kiramt [Thu, 15 Jun 2017 10:54:40 +0000 (11:54 +0100)]
Merge remote-tracking branch 'origin/develop' into bug/JAL-2591

6 years agoJAL-2418 typos
gmungoc [Thu, 15 Jun 2017 10:34:37 +0000 (11:34 +0100)]
JAL-2418 typos

6 years agoMerge branch 'bug/JAL-2589gapColour' into develop
gmungoc [Thu, 15 Jun 2017 09:26:40 +0000 (10:26 +0100)]
Merge branch 'bug/JAL-2589gapColour' into develop

6 years agoJAL-2598 Sequence.getSequence return a copy of the char array
gmungoc [Wed, 14 Jun 2017 08:04:14 +0000 (09:04 +0100)]
JAL-2598 Sequence.getSequence return a copy of the char array

6 years agoMerge branch 'develop' into features/JAL-2446NCList
gmungoc [Tue, 13 Jun 2017 08:07:40 +0000 (09:07 +0100)]
Merge branch 'develop' into features/JAL-2446NCList

6 years agoJAL-2577 mirror select/hide by annotation in split frame applet, and on
gmungoc [Mon, 12 Jun 2017 16:11:27 +0000 (17:11 +0100)]
JAL-2577 mirror select/hide by annotation in split frame applet, and on
Cancel

6 years agoJAL-2591 Updates following code review
kiramt [Mon, 12 Jun 2017 15:00:20 +0000 (16:00 +0100)]
JAL-2591 Updates following code review

6 years agoJAL-2577 mirror hide/select columns by annotation across split frame
gmungoc [Mon, 12 Jun 2017 09:36:36 +0000 (10:36 +0100)]
JAL-2577 mirror hide/select columns by annotation across split frame

6 years agoJAL-2418 updated release branch/version and release date before forking release branch
Jim Procter [Sun, 11 Jun 2017 02:24:29 +0000 (12:24 +1000)]
JAL-2418 updated release branch/version and release date before forking release branch

6 years agoJAL-2589 render colour scheme gap colour in overview bug/JAL-2589gapColour
gmungoc [Fri, 9 Jun 2017 14:21:35 +0000 (15:21 +0100)]
JAL-2589 render colour scheme gap colour in overview

6 years agoJAL-2594 avoid stack trace creating feature on gapped region
gmungoc [Fri, 9 Jun 2017 09:58:52 +0000 (10:58 +0100)]
JAL-2594 avoid stack trace creating feature on gapped region

6 years agoJAL-2480 tidy javadoc
gmungoc [Fri, 9 Jun 2017 09:32:45 +0000 (10:32 +0100)]
JAL-2480 tidy javadoc

6 years agoJAL-2593 avoid redundant rendering of co-located features
gmungoc [Fri, 9 Jun 2017 09:32:20 +0000 (10:32 +0100)]
JAL-2593 avoid redundant rendering of co-located features

6 years agoJAL-2526 correct boundary conditions for sequence left/right of cursor
gmungoc [Thu, 8 Jun 2017 15:14:43 +0000 (16:14 +0100)]
JAL-2526 correct boundary conditions for sequence left/right of cursor

6 years agoJAL-2386 JAL-2570 use ResidueShader copy constructor in SequenceGroup bug/JAL-2386groupConservationColouring
gmungoc [Thu, 8 Jun 2017 14:19:04 +0000 (15:19 +0100)]
JAL-2386 JAL-2570 use ResidueShader copy constructor in SequenceGroup
copy constructor for 'like but yet unlike' colouring of new group

6 years agoMerge branch 'bug/JAL-2586' into develop
kiramt [Thu, 8 Jun 2017 14:01:35 +0000 (15:01 +0100)]
Merge branch 'bug/JAL-2586' into develop

6 years agoJAL-2586 Clarification to URL link code bug/JAL-2586
kiramt [Thu, 8 Jun 2017 14:01:02 +0000 (15:01 +0100)]
JAL-2586 Clarification to URL link code

6 years agoJAL-2591 made redraw volatile
kiramt [Thu, 8 Jun 2017 10:38:08 +0000 (11:38 +0100)]
JAL-2591 made redraw volatile

6 years agoJAL-2591 Refactor HiddenColumns to use ArrayList instead of Vector
kiramt [Thu, 8 Jun 2017 10:15:28 +0000 (11:15 +0100)]
JAL-2591 Refactor HiddenColumns to use ArrayList instead of Vector