gmungoc [Thu, 9 Feb 2017 09:05:30 +0000 (09:05 +0000)]
Merge branch 'develop' into features/JAL-2379pcaMemory
gmungoc [Thu, 9 Feb 2017 09:01:13 +0000 (09:01 +0000)]
JAL-2371 skip upper-casing consensus as it already is
gmungoc [Thu, 9 Feb 2017 08:49:38 +0000 (08:49 +0000)]
JAL-2405 check for circular reference in SequenceGroup.context
gmungoc [Thu, 9 Feb 2017 08:41:33 +0000 (08:41 +0000)]
JAL-2405 set initial selection group alignment context
gmungoc [Thu, 9 Feb 2017 08:41:02 +0000 (08:41 +0000)]
JAL-2405 enable nucleotide/peptide colour schemes in applet menus
gmungoc [Wed, 8 Feb 2017 15:30:42 +0000 (15:30 +0000)]
JAL-2405 set context on selection group for tailored colour options
gmungoc [Wed, 8 Feb 2017 14:43:36 +0000 (14:43 +0000)]
JAL-2401 fix for NPE on selectedButtons, tweak for button appearance
Jim Procter [Tue, 7 Feb 2017 18:15:14 +0000 (18:15 +0000)]
Merge branch 'features/JAL-2371collectionColourScheme' into develop
gmungoc [Tue, 7 Feb 2017 15:59:37 +0000 (15:59 +0000)]
JAL-2401 Lower Case Colour toggleable, help text added
gmungoc [Tue, 7 Feb 2017 13:20:31 +0000 (13:20 +0000)]
JAL-2379 removed unused commented code
gmungoc [Tue, 7 Feb 2017 13:20:12 +0000 (13:20 +0000)]
JAL-2397 flag provided for 2.10.1 PCA gap calculation treatment
gmungoc [Tue, 7 Feb 2017 12:50:49 +0000 (12:50 +0000)]
JAL-2398 include 'compatibility mode' for C->R score correction
gmungoc [Tue, 7 Feb 2017 12:44:01 +0000 (12:44 +0000)]
JAL-2397 scripts to toggle 2.10.1 / 2.10.2 PCA calculation mode
gmungoc [Tue, 7 Feb 2017 12:43:19 +0000 (12:43 +0000)]
JAL-2397 PCA gap cost uses last column of score matrix
gmungoc [Tue, 7 Feb 2017 11:50:00 +0000 (11:50 +0000)]
JAL-2398 corrected entry for C->R in Blosum62 matrix
gmungoc [Mon, 6 Feb 2017 14:50:11 +0000 (14:50 +0000)]
JAL-2379 computePairwiseScores() moved to ScoreMatrix
gmungoc [Fri, 3 Feb 2017 16:13:24 +0000 (16:13 +0000)]
JAL-2379 'direct' pairwise score calculation for PCA (no encoding)
gmungoc [Wed, 1 Feb 2017 13:02:56 +0000 (13:02 +0000)]
JAL-2371 (slight!) simplification of isApplicableTo()
gmungoc [Wed, 1 Feb 2017 11:37:04 +0000 (11:37 +0000)]
JAL-2383 and Spanish!
gmungoc [Tue, 31 Jan 2017 15:23:06 +0000 (15:23 +0000)]
JAL-2371 commented code removed only
gmungoc [Tue, 31 Jan 2017 14:40:51 +0000 (14:40 +0000)]
JAL-2371 rename global/viewportColourScheme to residueShading
gmungoc [Tue, 31 Jan 2017 14:38:38 +0000 (14:38 +0000)]
JAL-2385 more tests/bug fixes mostly for gui.SliderPanel and some
JAL-2371 tidying
gmungoc [Fri, 27 Jan 2017 15:46:02 +0000 (15:46 +0000)]
JAL-2379 commented out code removed
gmungoc [Fri, 27 Jan 2017 15:37:30 +0000 (15:37 +0000)]
JAL-2371 CollectionColourScheme renamed ResidueShader and moved to
jalview.renderer
gmungoc [Fri, 27 Jan 2017 15:30:49 +0000 (15:30 +0000)]
JAL-2099 belated unit test
gmungoc [Fri, 27 Jan 2017 10:40:43 +0000 (10:40 +0000)]
JAL-2360 JAL-2371 updates from review CR-JAL-1
gmungoc [Thu, 26 Jan 2017 14:35:28 +0000 (14:35 +0000)]
JAL-2360 corrected comment
gmungoc [Thu, 26 Jan 2017 14:24:38 +0000 (14:24 +0000)]
JAL-2360 C is Pink with consensus > 85% (not 100%)
gmungoc [Thu, 26 Jan 2017 11:34:46 +0000 (11:34 +0000)]
Merge branch 'features/JAL-2360colourSchemeApplicability' into features/JAL-2371collectionColourScheme
gmungoc [Thu, 26 Jan 2017 11:34:04 +0000 (11:34 +0000)]
Merge branch 'develop' into features/JAL-2360colourSchemeApplicability
Conflicts:
src/jalview/gui/UserDefinedColours.java
gmungoc [Thu, 26 Jan 2017 09:47:42 +0000 (09:47 +0000)]
Merge branch 'develop' into features/JAL-2379pcaMemory
Conflicts:
src/jalview/analysis/PCA.java
src/jalview/math/Matrix.java
test/jalview/math/MatrixTest.java
gmungoc [Thu, 26 Jan 2017 09:38:31 +0000 (09:38 +0000)]
JAL-2344 test fix and code tidy for review comments
gmungoc [Thu, 26 Jan 2017 09:20:46 +0000 (09:20 +0000)]
JAL-2380 code tidy after review
gmungoc [Wed, 25 Jan 2017 12:15:43 +0000 (12:15 +0000)]
JAL-2344 push Cache.getProperty("LAST_DIRECTORY") inside method
gmungoc [Mon, 23 Jan 2017 20:25:42 +0000 (20:25 +0000)]
JAL-2379 made SparseMatrix.divide() so as to exactly match
Matrix.divide()
gmungoc [Mon, 23 Jan 2017 13:26:24 +0000 (13:26 +0000)]
JAL-2386 unit tests for change colour (and minor refactoring for
testability)
gmungoc [Mon, 23 Jan 2017 09:11:36 +0000 (09:11 +0000)]
JAL-2386 simplify changeColour (doesn't change colour thresholds)
gmungoc [Fri, 20 Jan 2017 14:49:29 +0000 (14:49 +0000)]
Merge branch 'features/JAL-2360colourSchemeApplicability' into features/JAL-2371collectionColourScheme
gmungoc [Fri, 20 Jan 2017 14:48:43 +0000 (14:48 +0000)]
Merge branch 'develop' into features/JAL-2360colourSchemeApplicability
gmungoc [Fri, 20 Jan 2017 14:48:16 +0000 (14:48 +0000)]
JAL-2385 tweak to applet 'switch colour slider context'
gmungoc [Fri, 20 Jan 2017 14:44:02 +0000 (14:44 +0000)]
Merge branch 'features/JAL-2360colourSchemeApplicability' into
features/JAL-2371collectionColourScheme
Conflicts:
src/jalview/appletgui/SliderPanel.java
src/jalview/gui/SliderPanel.java
gmungoc [Fri, 20 Jan 2017 14:25:58 +0000 (14:25 +0000)]
Merge branch 'develop' into features/JAL-2360colourSchemeApplicability
gmungoc [Fri, 20 Jan 2017 14:20:48 +0000 (14:20 +0000)]
JAL-2385 update slider settings when switching slider panel focus
gmungoc [Fri, 20 Jan 2017 12:21:42 +0000 (12:21 +0000)]
Merge branch 'features/JAL-2360colourSchemeApplicability' into
features/JAL-2371collectionColourScheme
Conflicts:
src/jalview/appletgui/SliderPanel.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/SliderPanel.java
gmungoc [Fri, 20 Jan 2017 12:03:39 +0000 (12:03 +0000)]
JAL-2383 fixup from last merge
gmungoc [Fri, 20 Jan 2017 11:56:07 +0000 (11:56 +0000)]
Merge branch 'develop' into features/JAL-2360colourSchemeApplicability
Conflicts:
src/jalview/appletgui/APopupMenu.java
src/jalview/appletgui/SliderPanel.java
src/jalview/gui/PopupMenu.java
gmungoc [Fri, 20 Jan 2017 10:55:50 +0000 (10:55 +0000)]
JAL-2383 check for null, spelling
gmungoc [Fri, 20 Jan 2017 10:55:24 +0000 (10:55 +0000)]
JAL-2383 make popup colour menu order and wording consistent
gmungoc [Fri, 20 Jan 2017 10:52:29 +0000 (10:52 +0000)]
JAL-2383 restore group conservation slider setting from project
gmungoc [Fri, 20 Jan 2017 09:47:20 +0000 (09:47 +0000)]
Merge branch 'develop' into features/JAL-2360colourSchemeApplicability
Conflicts:
src/jalview/appletgui/APopupMenu.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/PopupMenu.java
src/jalview/jbgui/GAlignFrame.java
gmungoc [Thu, 19 Jan 2017 16:37:02 +0000 (16:37 +0000)]
JAL-2383 restore PID colour threshold from project; enable/disable
modify PID/Conservation (and add to popup menus)
gmungoc [Thu, 19 Jan 2017 10:29:04 +0000 (10:29 +0000)]
JAL-2370 unit tests for extracted ColumnSelection.stretchGroup()
gmungoc [Thu, 19 Jan 2017 09:40:06 +0000 (09:40 +0000)]
JAL-2370 corrected applet mouse drag, refactored into ColumnSelection
gmungoc [Wed, 18 Jan 2017 09:14:12 +0000 (09:14 +0000)]
JAL-2379 more realistic matrices for unit tests
gmungoc [Tue, 17 Jan 2017 15:01:01 +0000 (15:01 +0000)]
JAL-2370 fix bug when hiding a range including two or more hidden ranges
gmungoc [Tue, 17 Jan 2017 13:32:33 +0000 (13:32 +0000)]
Merge branch 'features/JAL-2360colourSchemeApplicability' into features/JAL-2371collectionColourScheme
gmungoc [Tue, 17 Jan 2017 13:31:55 +0000 (13:31 +0000)]
Merge branch 'develop' into features/JAL-2360colourSchemeApplicability
Conflicts:
src/jalview/gui/PopupMenu.java
src/jalview/jbgui/GAlignFrame.java
gmungoc [Tue, 17 Jan 2017 13:21:12 +0000 (13:21 +0000)]
JAL-2379 use SparseMatrix for encoded sequences, tidy unneeded code
gmungoc [Tue, 17 Jan 2017 13:20:37 +0000 (13:20 +0000)]
JAL-2379 SparseMatrix alternative to Matrix, both MatrixI
gmungoc [Tue, 17 Jan 2017 13:18:45 +0000 (13:18 +0000)]
JAL-2379 SparseDoubleArray added (for use by SparseMatrix)
gmungoc [Mon, 16 Jan 2017 09:02:52 +0000 (09:02 +0000)]
JAL-1270 class renamed
gmungoc [Mon, 16 Jan 2017 09:02:34 +0000 (09:02 +0000)]
JAL-2380 fix Matrix.postMultiply()
gmungoc [Mon, 16 Jan 2017 08:52:20 +0000 (08:52 +0000)]
JAL-1270 tweaks to AlignmentGenerator / client class
gmungoc [Thu, 12 Jan 2017 17:10:00 +0000 (17:10 +0000)]
JAL-1270 renamed AlignmentGenerator, and added peptide option
gmungoc [Thu, 12 Jan 2017 16:44:09 +0000 (16:44 +0000)]
JAL-2379 null references to PCA model when panel is closed
gmungoc [Thu, 12 Jan 2017 09:05:56 +0000 (09:05 +0000)]
JAL-2344 now flagging formats as 'identifiable' instead of 'dynamic'
gmungoc [Wed, 11 Jan 2017 16:48:28 +0000 (16:48 +0000)]
JAL-2344 separated AlignmentFileI into AlignmentFileReaderI,
AlignmentFileWriterI
gmungoc [Wed, 11 Jan 2017 16:06:01 +0000 (16:06 +0000)]
JAL-2344 groovy script that registers a new file format
gmungoc [Wed, 11 Jan 2017 16:05:41 +0000 (16:05 +0000)]
JAL-2344 FileFormats singleton for formats, FileFormatI simplified
gmungoc [Wed, 11 Jan 2017 15:38:34 +0000 (15:38 +0000)]
JAL-2344 addSequence() method added to support Groovy parser
gmungoc [Tue, 10 Jan 2017 14:38:48 +0000 (14:38 +0000)]
JAL-2377 avoid infinite loop formatting 1.0E-310
gmungoc [Mon, 9 Jan 2017 12:02:33 +0000 (12:02 +0000)]
JAL-2371 pull up isNucleotide to SequenceCollectionI
gmungoc [Mon, 9 Jan 2017 11:54:27 +0000 (11:54 +0000)]
JAL-2371 remove ColourSchemeI.findColour(c), pure interface groovy
script
gmungoc [Fri, 6 Jan 2017 15:21:58 +0000 (15:21 +0000)]
JAL-2371 slight simplification of findColour overrides
gmungoc [Fri, 6 Jan 2017 14:42:40 +0000 (14:42 +0000)]
JAL-2371 correct Clustal, Blosum, PID colouring of consensus logo
gmungoc [Fri, 6 Jan 2017 14:11:24 +0000 (14:11 +0000)]
Merge branch 'features/JAL-2360colourSchemeApplicability' into features/JAL-2371collectionColourScheme
gmungoc [Fri, 6 Jan 2017 14:10:44 +0000 (14:10 +0000)]
JAL-2360 findColour() with no args removed from ColourSchemeI
gmungoc [Fri, 6 Jan 2017 09:04:18 +0000 (09:04 +0000)]
Merge branch 'features/JAL-2360colourSchemeApplicability' into features/JAL-2371collectionColourScheme
gmungoc [Fri, 6 Jan 2017 09:03:27 +0000 (09:03 +0000)]
Merge branch 'develop' into features/JAL-2360colourSchemeApplicability
gmungoc [Thu, 5 Jan 2017 16:31:55 +0000 (16:31 +0000)]
JAL-2374 unit test for (modified) Alignment.findGroup()
gmungoc [Thu, 5 Jan 2017 16:00:23 +0000 (16:00 +0000)]
JAL-2374 fix popup out by one and multiple groups bugs
gmungoc [Thu, 5 Jan 2017 14:26:04 +0000 (14:26 +0000)]
JAL-2371 add test for toggling ignore gaps with PID colour scheme
gmungoc [Thu, 5 Jan 2017 13:45:13 +0000 (13:45 +0000)]
Merge branch 'features/JAL-2360colourSchemeApplicability' into
features/JAL-2371collectionColourScheme
Conflicts:
src/jalview/appletgui/APopupMenu.java
gmungoc [Thu, 5 Jan 2017 12:24:37 +0000 (12:24 +0000)]
Merge branch 'develop' into features/JAL-2360colourSchemeApplicability
Conflicts:
src/jalview/gui/PopupMenu.java
gmungoc [Thu, 5 Jan 2017 11:35:21 +0000 (11:35 +0000)]
JAL-2373 set state of Above PID, By Conservation in Popup Menu
gmungoc [Thu, 5 Jan 2017 09:21:49 +0000 (09:21 +0000)]
JAL-2371 tests added
gmungoc [Wed, 4 Jan 2017 15:21:19 +0000 (15:21 +0000)]
JAL-2371 CollectionColourScheme wraps ColourSchemeI
gmungoc [Thu, 29 Dec 2016 11:59:17 +0000 (11:59 +0000)]
JAL-2630 first pass groovy colour scheme (with slight refactoring)
gmungoc [Fri, 23 Dec 2016 13:48:01 +0000 (13:48 +0000)]
JAL-2360 removed UserDefinedColours.userColourSchemes
gmungoc [Fri, 23 Dec 2016 09:17:22 +0000 (09:17 +0000)]
JAL-2120 JAL-2360 remove obsolete PDBViewer
gmungoc [Thu, 22 Dec 2016 14:03:20 +0000 (14:03 +0000)]
JAL-2360 fix bug that prematurely created a SequenceGroup
gmungoc [Thu, 22 Dec 2016 13:12:33 +0000 (13:12 +0000)]
JAL-2360 structure viewers now using ColourMenuHelper, obsolete methods
and fields removed, more methods pulled up
gmungoc [Wed, 21 Dec 2016 16:52:12 +0000 (16:52 +0000)]
JAL-2360 set new/loaded colour scheme name correctly
gmungoc [Wed, 21 Dec 2016 16:00:29 +0000 (16:00 +0000)]
JAL-2360 simplified code to create a new colour scheme
gmungoc [Wed, 21 Dec 2016 15:19:38 +0000 (15:19 +0000)]
JAL-2360 added a table to show score colours
gmungoc [Wed, 21 Dec 2016 15:18:41 +0000 (15:18 +0000)]
JAL-2360 ColourMenuHelper now builds and selects items in colour menu
for align frame and popup menus
gmungoc [Wed, 21 Dec 2016 15:17:10 +0000 (15:17 +0000)]
JAL-2360 comment only
gmungoc [Wed, 21 Dec 2016 15:16:34 +0000 (15:16 +0000)]
JAL-2360 tidy up, simplify isApplicableTo test
gmungoc [Wed, 21 Dec 2016 15:15:33 +0000 (15:15 +0000)]
JAL-2360 no RNAHelices colouring for groups
gmungoc [Wed, 21 Dec 2016 14:51:43 +0000 (14:51 +0000)]
JAL-2361 Blosum is enabled for peptide
git://source.jalview.org / jalview.git / log