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 [Fri, 27 Jan 2017 15:46:02 +0000 (15:46 +0000)]
JAL-2379 commented out code removed
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 [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:20:48 +0000 (14:20 +0000)]
JAL-2385 update slider settings when switching slider panel focus
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 [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: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 [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 11:35:21 +0000 (11:35 +0000)]
JAL-2373 set state of Above PID, By Conservation in Popup Menu
gmungoc [Fri, 16 Dec 2016 16:04:52 +0000 (16:04 +0000)]
JAL-2356 enhanced unit test to verify reuse (or not) of file from cache
Jim Procter [Wed, 14 Dec 2016 15:08:14 +0000 (15:08 +0000)]
Merge branch 'patch/JAL-2197_jpredforjnets' into develop
merge was missed for 2.10.1 release!
gmungoc [Fri, 9 Dec 2016 11:52:52 +0000 (11:52 +0000)]
JAL-2105 updated for reviewed REST version 4.8
gmungoc [Fri, 9 Dec 2016 09:23:55 +0000 (09:23 +0000)]
JAL-1895 suppress RNA interaction colour option
gmungoc [Thu, 8 Dec 2016 09:20:08 +0000 (09:20 +0000)]
JAL-2359 add Window menu entry only after all danger of error is passed
gmungoc [Wed, 7 Dec 2016 16:58:46 +0000 (16:58 +0000)]
JAL-2356 use cached Sifts file if not expired
gmungoc [Wed, 7 Dec 2016 13:13:46 +0000 (13:13 +0000)]
JAL-2354 handle error response when fetching features
gmungoc [Wed, 7 Dec 2016 12:10:00 +0000 (12:10 +0000)]
JAL-2344 handle null format, simplify JalviewFileChooser constructor
Jim Procter [Wed, 30 Nov 2016 16:04:57 +0000 (16:04 +0000)]
Merge branch 'features/JAL-2320_closeChimeraAction' into develop
also tidied up javadoc
gmungoc [Wed, 30 Nov 2016 12:38:29 +0000 (12:38 +0000)]
JAL-2344 use ".cif" for saved mmCIF file (and refactor fetch as file)
gmungoc [Tue, 29 Nov 2016 16:20:42 +0000 (16:20 +0000)]
JAL-2329 tests to confirm behaviour of Java extended for loops
gmungoc [Tue, 29 Nov 2016 13:25:45 +0000 (13:25 +0000)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
gmungoc [Tue, 29 Nov 2016 10:57:10 +0000 (10:57 +0000)]
JAL-2344 corrected conversion of Type enum to FileFormat
Jim Procter [Tue, 29 Nov 2016 09:18:59 +0000 (09:18 +0000)]
Merge branch 'documentation/JAL-2325_release2101' into develop
Jim Procter [Tue, 29 Nov 2016 09:18:14 +0000 (09:18 +0000)]
JAL-2325 update release date in whatsNew
gmungoc [Tue, 29 Nov 2016 09:07:25 +0000 (09:07 +0000)]
JAL-2344 FileFormat.isStructureFile replaces
StructureFile.isStructureFile
Jim Procter [Tue, 29 Nov 2016 07:43:23 +0000 (07:43 +0000)]
Merge branch 'develop' of source.jalview.org/git/jalview into develop
Jim Procter [Tue, 29 Nov 2016 07:42:02 +0000 (07:42 +0000)]
Merge branch 'documentation/JAL-2325_release2101' into develop
gmungoc [Mon, 28 Nov 2016 17:31:30 +0000 (17:31 +0000)]
Merge branch 'develop' into trialMerge
Conflicts:
src/jalview/gui/CutAndPasteTransfer.java
test/MCview/PDBfileTest.java
test/jalview/analysis/AlignmentAnnotationUtilsTest.java
test/jalview/analysis/DnaTest.java
test/jalview/analysis/FinderTest.java
test/jalview/analysis/scoremodels/FeatureScoreModelTest.java
test/jalview/controller/AlignViewControllerTest.java
test/jalview/datamodel/AlignmentTest.java
test/jalview/ext/ensembl/EnsemblSeqProxyTest.java
test/jalview/ext/jmol/JmolParserTest.java
test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java
test/jalview/ext/paradise/TestAnnotate3D.java
test/jalview/io/gff/ExonerateHelperTest.java
test/jalview/io/gff/GffTests.java
test/jalview/structure/Mapping.java
test/jalview/structure/StructureSelectionManagerTest.java
test/jalview/structures/models/AAStructureBindingModelTest.java
test/jalview/util/MappingUtilsTest.java
test/jalview/ws/sifts/SiftsClientTest.java
Jim Procter [Mon, 28 Nov 2016 17:12:16 +0000 (17:12 +0000)]
JAL-2325 JAL-1878 update minimum versions of JRE for running/installing on windows and OSX
tcofoegbu [Mon, 28 Nov 2016 16:02:32 +0000 (16:02 +0000)]
Merge branch 'features/JAL-2326_JOptionPane-refactoring' into develop
gmungoc [Mon, 28 Nov 2016 14:35:59 +0000 (14:35 +0000)]
JAL-2344 added FileFormatI.isStructureFile()
gmungoc [Mon, 28 Nov 2016 14:24:37 +0000 (14:24 +0000)]
JAL-2345 cache generated ImageIcon per file path
Jim Procter [Mon, 28 Nov 2016 14:16:52 +0000 (14:16 +0000)]
Merge branch 'documentation/JAL-2325_release2101' into develop
Jim Procter [Mon, 28 Nov 2016 14:16:39 +0000 (14:16 +0000)]
JAL-2325 finalise release notes
gmungoc [Fri, 25 Nov 2016 15:35:53 +0000 (15:35 +0000)]
JAL-2344 dynamically determine recognised extensions for file browser
Jim Procter [Fri, 25 Nov 2016 15:16:55 +0000 (15:16 +0000)]
Merge branch 'documentation/JAL-2325_release2101' into develop
Jim Procter [Fri, 25 Nov 2016 14:58:27 +0000 (14:58 +0000)]
JAL-2325 JAL-2273 update vms bound to different installers
Jim Procter [Fri, 25 Nov 2016 14:58:08 +0000 (14:58 +0000)]
JAL-2325 more ignores on sourcedist build
gmungoc [Fri, 25 Nov 2016 14:21:34 +0000 (14:21 +0000)]
Merge branch 'develop' into trialMerge
Conflicts:
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/AppletJmol.java
src/jalview/appletgui/AppletJmolBinding.java
src/jalview/appletgui/ExtJmol.java
src/jalview/datamodel/PDBEntry.java
src/jalview/ext/ensembl/EnsemblRestClient.java
src/jalview/ext/jmol/JalviewJmolBinding.java
src/jalview/ext/jmol/JmolParser.java
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AppJmolBinding.java
src/jalview/gui/Desktop.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/JalviewChimeraBindingModel.java
src/jalview/gui/StructureChooser.java
src/jalview/io/AppletFormatAdapter.java
src/jalview/io/BioJsHTMLOutput.java
src/jalview/io/HTMLOutput.java
src/jalview/io/HtmlSvgOutput.java
src/jalview/io/StructureFile.java
src/jalview/structure/StructureSelectionManager.java
src/jalview/structures/models/AAStructureBindingModel.java
src/jalview/ws/dbsources/Pdb.java
src/jalview/ws/dbsources/Xfam.java
test/MCview/PDBfileTest.java
test/jalview/datamodel/AlignmentTest.java
test/jalview/ext/jmol/JmolParserTest.java
test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java
test/jalview/gui/AlignViewportTest.java
test/jalview/io/FeaturesFileTest.java
test/jalview/io/Jalview2xmlTests.java
test/jalview/io/PfamFormatInputTest.java
test/jalview/io/gff/ExonerateHelperTest.java
test/jalview/structure/Mapping.java
test/jalview/structures/models/AAStructureBindingModelTest.java
gmungoc [Fri, 25 Nov 2016 09:43:04 +0000 (09:43 +0000)]
JAL-2344 override to ignore (obsolete?) JalviewFileView
gmungoc [Fri, 25 Nov 2016 09:01:54 +0000 (09:01 +0000)]
JAL-2344 use .equals() to compare FileFormatI objects
gmungoc [Fri, 25 Nov 2016 09:01:23 +0000 (09:01 +0000)]
JAL-2344 correct roundtrip test to exclude Jalview project format
tcofoegbu [Thu, 24 Nov 2016 17:35:50 +0000 (17:35 +0000)]
JAL-2326 added setup method for JvOptionPane in all Jalveiw test classes to enable JvOptionPane to run non-interactively
gmungoc [Thu, 24 Nov 2016 16:43:06 +0000 (16:43 +0000)]
Distinguish text-only output formats and others (.jar/.jvp)
tcofoegbu [Thu, 24 Nov 2016 16:18:54 +0000 (16:18 +0000)]
JAL-2326 updated references of JOptionPane to JvOptionPane
Jim Procter [Thu, 24 Nov 2016 16:16:35 +0000 (16:16 +0000)]
Merge branch 'documentation/JAL-2325_release2101' into develop
Jim Procter [Thu, 24 Nov 2016 16:16:13 +0000 (16:16 +0000)]
JAL-2325 exclude .class and .* files (install anywhere build files) from source distribution
Jim Procter [Thu, 24 Nov 2016 15:49:16 +0000 (15:49 +0000)]
Merge branch 'documentation/JAL-2325_release2101' into develop
Jim Procter [Thu, 24 Nov 2016 15:48:30 +0000 (15:48 +0000)]
JAL-2325 applied BSD license for chimera/StrucViz2 code
gmungoc [Thu, 24 Nov 2016 15:42:52 +0000 (15:42 +0000)]
Further tweaks to get tests passing
tcofoegbu [Thu, 24 Nov 2016 15:40:05 +0000 (15:40 +0000)]
JAL-2326 added layer of abstraction between Jalview and JOptionPane to provide better control for running unattended test non-interactively
Jim Procter [Thu, 24 Nov 2016 15:35:39 +0000 (15:35 +0000)]
JAL-2325 apply license to new source files
Jim Procter [Thu, 24 Nov 2016 15:35:17 +0000 (15:35 +0000)]
JAL-2325 update release date to next Tuesday
gmungoc [Thu, 24 Nov 2016 13:06:38 +0000 (13:06 +0000)]
FileFormatI further tweaks, clean compile
Jim Procter [Thu, 24 Nov 2016 10:06:03 +0000 (10:06 +0000)]
JAL-2325 tidy up release notes
Jim Procter [Wed, 23 Nov 2016 18:51:01 +0000 (18:51 +0000)]
JAL-2325 remove 2.10.0 what’s new
Jim Procter [Wed, 23 Nov 2016 18:50:49 +0000 (18:50 +0000)]
JAL-2325 latest release to 2.10
Jim Procter [Wed, 23 Nov 2016 17:44:12 +0000 (17:44 +0000)]
JAL-1738 Ctrl/Cmd/Alt modifiers and mention that B and Alt-B by default add columns to selection
Jim Procter [Wed, 23 Nov 2016 17:43:24 +0000 (17:43 +0000)]
JAL-1738 hint about using the task switching key combination to quickly mark highlighted regions in Jalview from selections in Chimera.
Jim Procter [Wed, 23 Nov 2016 17:41:56 +0000 (17:41 +0000)]
JAL-1738 mention Ctrl/Cmd/Alt modifiers and mention that B by default adds columns to selection
Jim Procter [Wed, 23 Nov 2016 17:40:59 +0000 (17:40 +0000)]
JAL-1738 mention Ctrl or Cmd for toggle behaviour in tooltip
Jim Procter [Wed, 23 Nov 2016 17:14:12 +0000 (17:14 +0000)]
JAL-2325 updated what’s new for 2.10.1
Jim Procter [Wed, 23 Nov 2016 17:13:59 +0000 (17:13 +0000)]
JAL-2325 reword ‘tame tooltip’ JAL-1723 release note
Jim Procter [Wed, 23 Nov 2016 17:13:15 +0000 (17:13 +0000)]
JAL-2325 rejig authors and add Kira
Jim Procter [Wed, 23 Nov 2016 15:36:39 +0000 (15:36 +0000)]
JAL-2282 JAL-2325 added link to help text from release notes
Jim Procter [Wed, 23 Nov 2016 15:36:31 +0000 (15:36 +0000)]
JAL-2325 updated what’s new for 2.10.1
Jim Procter [Wed, 23 Nov 2016 15:22:50 +0000 (15:22 +0000)]
Merge branch 'develop' of source.jalview.org/git/jalview into develop
Jim Procter [Wed, 23 Nov 2016 15:22:44 +0000 (15:22 +0000)]
JAL-2282 revised docs about warning message.
gmungoc [Wed, 23 Nov 2016 15:07:31 +0000 (15:07 +0000)]
JAL-1738 Spanish versions added
Jim Procter [Wed, 23 Nov 2016 14:36:43 +0000 (14:36 +0000)]
Merge branch 'documentation/JAL-2325_release2101' into develop
Jim Procter [Wed, 23 Nov 2016 14:36:17 +0000 (14:36 +0000)]
JAL-2325 JAL-2332 release notes
Jim Procter [Wed, 23 Nov 2016 14:02:29 +0000 (14:02 +0000)]
Merge branch 'documentation/JAL-2325_release2101' into develop
Jim Procter [Wed, 23 Nov 2016 14:02:19 +0000 (14:02 +0000)]
Merge branch 'bug/JAL-2323disulfideOverview' into develop
Jim Procter [Wed, 23 Nov 2016 13:43:14 +0000 (13:43 +0000)]
JAL-2325 moved disulphide/contact bug fixes (JAL-2323,JAL-2333,JAL-2335,JAL-2327) to ‘General’ section of release notes