62 Commits

Author SHA1 Message Date
David Williams
d2bbd6beba Some renaming. 2014-09-18 14:58:17 +02:00
David Williams
8dd026e095 Work on limiting maximum memory usage. 2014-09-18 14:51:43 +02:00
David Williams
c0a22de2df Removed a lot of compression-related code. 2014-09-13 12:20:56 +02:00
David Williams
302c6e688b More work eliminating compression from inside LargeVolume. 2014-09-13 11:59:51 +02:00
David Williams
4781ca5c42 Work on removing compression from LargeVolume. 2014-09-12 15:36:28 +02:00
David Williams
4478e365c9 Removed RLECompressor as the code is now in RLEBlockCompressor.
Things are starting to get back under control. All tests pass, and all examples except PagingExample work.
2013-07-30 17:01:27 +02:00
David Williams
a4fc814a51 Rearranging and renaming some code. 2013-07-29 16:04:01 +02:00
David Williams
7146b5ecdb The idea of a 'setTargetMemoryLimitInBytes' function was not really working out. It was too comp-lex and not really clear what the ideal size would be. I think user code needs to call setMaxNumberOfBlocksInMemory() and setMaxNumberOfUncompressedBlocks() directly, if they see from profiling toat too much camressing or paging is taking place. 2013-07-23 13:15:01 +02:00
Daviw Williams
bd60f34bd7 Removing explicit functions to control the number of compressed and uncompressed blocks in memory, and letting the user set a memory limit instead. 2013-07-04 16:23:58 +02:00
Daviw Williams
e38aa3b1b9 Unit tests now test FilePager. 2013-06-28 16:16:08 +02:00
David Williams
a14de4a72e Replaced std::functions with Pager class for paging. 2013-06-16 19:48:14 +02:00
Daviw Williams
fa8e7c390f replaced 'getVoxelWithWrapping()' with regular 'getVoxel()', as they can be differentiated by their parameters. 2013-05-17 15:52:18 +02:00
Daviw Williams
62370868c8 Reverted accidental changes to tests.
Updated comments in compression code.
2013-02-25 17:06:12 +01:00
Daviw Williams
f70498e806 Removed old code. 2013-02-25 16:34:21 +01:00
Daviw Williams
c3801db4e2 Set tests to use MinizCompressor. 2013-02-07 16:20:05 +01:00
Daviw Williams
50c1c7c64b Removed setCompressionEnabled() from LargeVolume. 2013-02-07 15:55:10 +01:00
Daviw Williams
09c6e2bf26 More work making the compression more robust. 2013-02-01 16:10:10 +01:00
Daviw Williams
3d66db50e0 Fixes and comments for RLE compression. 2013-02-01 14:09:29 +01:00
Daviw Williams
46e38c4714 Work on compression. 2013-01-31 16:56:32 +01:00
Daviw Williams
a81ec68714 Work on compression interface. 2013-01-31 16:35:50 +01:00
Daviw Williams
c7937b176d Very bad (but functional!) initial implementation of LargeVolume compression with miniz. 2013-01-10 16:20:29 +01:00
Daviw Williams
a8383b47db Temporarily disabled multiple samplers as they break the LargeVolume tests. 2013-01-08 16:54:17 +01:00
Daviw Williams
4b45bb297f More volume unit tests - now iterating backwards as well as forwards. 2013-01-02 17:05:35 +01:00
Daviw Williams
25fae419f3 Removed some old testing code. 2013-01-02 16:11:19 +01:00
Daviw Williams
7bbaa0d559 Better testing of volume samplers. 2013-01-02 16:09:30 +01:00
Daviw Williams
a4b6339689 Fixed typos. 2013-01-02 15:15:30 +01:00
Daviw Williams
97024ba9b2 More volume test configurations. 2013-01-02 14:48:30 +01:00
Daviw Williams
c05293844f Work on volume tests. 2013-01-02 14:13:14 +01:00
Daviw Williams
8b018be2dc Fix for LargeVolumeSampler. 2012-12-18 16:25:31 +01:00
Daviw Williams
2a12bcd6d6 Fixed behavior of SimpleVolumeSampler.inl 2012-12-18 14:34:36 +01:00
David Williams
c0d4b2a36f Linux compile fix. 2012-12-14 16:50:06 +01:00
Daviw Williams
c69417a72b Commented out failing volume tests - will have to come back to these. 2012-12-13 15:59:25 +01:00
Daviw Williams
2d7045ddd1 Compile fixes for Linux.
Removed use of qrand() until I can confirm results match between platforms.
2012-12-13 15:29:22 +01:00
David Williams
ab6ec9380d Tweaking results so that the tests pass... I'll have to debug this properly on a faster computer. 2012-12-11 22:14:26 +00:00
David Williams
d8da6a7b7f Refactoring the volume unit test code, trying to get some performance benchmarks. Unit tests are currently not passing. 2012-12-11 21:57:30 +00:00
David Williams
dac0e5449f Refactoring volume unit test code. 2012-12-11 20:18:26 +00:00
David Williams
8a376fa396 Improving (making tougher) the volume unit tests. 2012-12-10 23:25:17 +00:00
David Williams
ec203c6954 Added QBENCHMARK macros to volume unit test. 2012-12-08 11:25:10 +01:00
Daviw Williams
eb0c7e7a9f More work on volume unit test. 2012-12-07 14:01:42 +01:00
Daviw Williams
e7e1f80e74 Work on volume unit test. 2012-12-07 13:54:00 +01:00
Daviw Williams
d0c9b7ba3d Added extra tests to move functions. 2012-12-07 13:38:39 +01:00
David Williams
fea429a79a Compile fixes for GCC. 2012-12-07 10:57:26 +01:00
David Williams
ab6898c4c5 Removed the assignment operator from SimpleVolume::Sampler and LargeVolume::Sampler. I had forgotten to call the base class assignment operator and this was causing problems.
Also updated the volume unit tests... at least I know now that it's helping!
2012-12-06 23:53:51 +01:00
Daviw Williams
d19f16ef64 Added new accessors to volume. getVoxel() and getVoxelWithWrapping() will probably replace getVoxelAt, which will be deprecated. 2012-12-06 16:17:21 +01:00
David Williams
3f87fc780f Fixed bug with SimpleVolume and negative positions. 2012-12-05 23:49:39 +01:00
Daviw Williams
57b78e148b Extended volume unit test. This is mainly to test whether I can commit to the new Git repo on BitBucket. 2012-12-03 16:21:18 +01:00
David Williams
c37997bfe2 Updated new volumes test. 2012-12-02 14:02:50 +01:00
David Williams
9e8e976bfe Work on new unit test for volumes. 2012-12-02 09:43:00 +01:00
David Williams
528cb73771 Moved headers into subdirectories. 2011-05-17 22:27:46 +01:00
David Williams
ea309ab15b Renamed Volume to LargeVolume. 2011-04-28 21:21:59 +01:00