diff --git a/pom.xml b/pom.xml index b3fcafcc73d3d80e9061bb1bc1157e5b242ab1a6..38baa4aea92d3347a2276bd9311ef6cfc7156bad 100644 --- a/pom.xml +++ b/pom.xml @@ -1,216 +1,242 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.scijava</groupId> - <artifactId>pom-scijava</artifactId> - <version>29.2.1</version> - <relativePath /> - </parent> + <parent> + <groupId>org.scijava</groupId> + <artifactId>pom-scijava</artifactId> + <version>29.2.1</version> + <relativePath/> + </parent> - <groupId>sc.fiji</groupId> - <artifactId>bigdataviewer-core</artifactId> - <version>10.0.3-SNAPSHOT</version> + <groupId>sc.fiji</groupId> + <artifactId>bigdataviewer-core</artifactId> + <version>10.0.3-SNAPSHOT</version> - <name>BigDataViewer Core</name> - <description>BigDataViewer core classes with minimal dependencies.</description> - <url>https://github.com/bigdataviewer/bigdataviewer-core</url> - <inceptionYear>2012</inceptionYear> - <organization> - <name>BigDataViewer</name> - <url>https://imagej.net/BigDataViewer</url> - </organization> - <licenses> - <license> - <name>Simplified BSD License</name> - <url>https://opensource.org/licenses/BSD-2-Clause</url> - <distribution>repo</distribution> - </license> - </licenses> + <name>BigDataViewer Core</name> + <description>BigDataViewer core classes with minimal dependencies.</description> + <url>https://github.com/bigdataviewer/bigdataviewer-core</url> + <inceptionYear>2012</inceptionYear> + <organization> + <name>BigDataViewer</name> + <url>https://imagej.net/BigDataViewer</url> + </organization> + <licenses> + <license> + <name>Simplified BSD License</name> + <url>https://opensource.org/licenses/BSD-2-Clause</url> + <distribution>repo</distribution> + </license> + </licenses> - <developers> - <developer> - <id>tpietzsch</id> - <name>Tobias Pietzsch</name> - <url>https://imagej.net/User:Pietzsch</url> - <roles> - <role>founder</role> - <role>lead</role> - <role>developer</role> - <role>debugger</role> - <role>reviewer</role> - <role>support</role> - <role>maintainer</role> - </roles> - </developer> - <developer> - <id>ctrueden</id> - <name>Curtis Rueden</name> - <url>https://imagej.net/User:Rueden</url> - <roles> - <role>maintainer</role> - </roles> - </developer> - </developers> - <contributors> - <contributor> - <name>John Bogovic</name> - <url>https://imagej.net/User:Bogovic</url> - <properties><id>bogovicj</id></properties> - </contributor> - <contributor> - <name>HongKee Moon</name> - <url>https://imagej.net/User:Moon</url> - <properties><id>hkmoon</id></properties> - </contributor> - <contributor> - <name>Stephan Preibisch</name> - <url>https://imagej.net/User:StephanP</url> - <properties><id>StephanPreibisch</id></properties> - </contributor> - <contributor> - <name>Stephan Saalfeld</name> - <url>https://imagej.net/User:Saalfeld</url> - <properties><id>axtimwalde</id></properties> - </contributor> - <contributor> - <name>Johannes Schindelin</name> - <url>https://imagej.net/User:Schindelin</url> - <properties><id>dscho</id></properties> - </contributor> - <contributor> - <name>Jean-Yves Tinevez</name> - <url>https://imagej.net/User:JeanYvesTinevez</url> - <properties><id>tinevez</id></properties> - </contributor> - <contributor> - <name>Igor Pisarev</name> - <properties><id>igorpisarev</id></properties> - </contributor> - <contributor> - <name>Neil Thistlethwaite</name> - <properties><id>nthistle</id></properties> - </contributor> - <contributor> - <name>Philipp Hanslovsky</name> - <url>https://imagej.net/User:Hanslovsky</url> - <properties><id>hanslovsky</id></properties> - </contributor> - <contributor> - <name>Tim-Oliver Buchholz</name> - <url>https://imagej.net/User:Tibuch</url> - <properties><id>tibuch</id></properties> - </contributor> - <contributor> - <name>Christian Tischer</name> - <properties><id>tischi</id></properties> - </contributor> - </contributors> + <developers> + <developer> + <id>tpietzsch</id> + <name>Tobias Pietzsch</name> + <url>https://imagej.net/User:Pietzsch</url> + <roles> + <role>founder</role> + <role>lead</role> + <role>developer</role> + <role>debugger</role> + <role>reviewer</role> + <role>support</role> + <role>maintainer</role> + </roles> + </developer> + <developer> + <id>ctrueden</id> + <name>Curtis Rueden</name> + <url>https://imagej.net/User:Rueden</url> + <roles> + <role>maintainer</role> + </roles> + </developer> + </developers> + <contributors> + <contributor> + <name>John Bogovic</name> + <url>https://imagej.net/User:Bogovic</url> + <properties> + <id>bogovicj</id> + </properties> + </contributor> + <contributor> + <name>HongKee Moon</name> + <url>https://imagej.net/User:Moon</url> + <properties> + <id>hkmoon</id> + </properties> + </contributor> + <contributor> + <name>Stephan Preibisch</name> + <url>https://imagej.net/User:StephanP</url> + <properties> + <id>StephanPreibisch</id> + </properties> + </contributor> + <contributor> + <name>Stephan Saalfeld</name> + <url>https://imagej.net/User:Saalfeld</url> + <properties> + <id>axtimwalde</id> + </properties> + </contributor> + <contributor> + <name>Johannes Schindelin</name> + <url>https://imagej.net/User:Schindelin</url> + <properties> + <id>dscho</id> + </properties> + </contributor> + <contributor> + <name>Jean-Yves Tinevez</name> + <url>https://imagej.net/User:JeanYvesTinevez</url> + <properties> + <id>tinevez</id> + </properties> + </contributor> + <contributor> + <name>Igor Pisarev</name> + <properties> + <id>igorpisarev</id> + </properties> + </contributor> + <contributor> + <name>Neil Thistlethwaite</name> + <properties> + <id>nthistle</id> + </properties> + </contributor> + <contributor> + <name>Philipp Hanslovsky</name> + <url>https://imagej.net/User:Hanslovsky</url> + <properties> + <id>hanslovsky</id> + </properties> + </contributor> + <contributor> + <name>Tim-Oliver Buchholz</name> + <url>https://imagej.net/User:Tibuch</url> + <properties> + <id>tibuch</id> + </properties> + </contributor> + <contributor> + <name>Christian Tischer</name> + <properties> + <id>tischi</id> + </properties> + </contributor> + </contributors> - <mailingLists> - <mailingList> - <name>Image.sc Forum</name> - <archive>https://forum.image.sc/tags/bigdataviewer</archive> - </mailingList> - </mailingLists> + <mailingLists> + <mailingList> + <name>Image.sc Forum</name> + <archive>https://forum.image.sc/tags/bigdataviewer</archive> + </mailingList> + </mailingLists> - <scm> - <connection>scm:git:git://github.com/bigdataviewer/bigdataviewer-core</connection> - <developerConnection>scm:git:git@github.com:bigdataviewer/bigdataviewer-core</developerConnection> - <tag>HEAD</tag> - <url>https://github.com/bigdataviewer/bigdataviewer-core</url> - </scm> - <issueManagement> - <system>GitHub Issues</system> - <url>https://github.com/bigdataviewer/bigdataviewer-core/issues</url> - </issueManagement> - <ciManagement> - <system>Travis CI</system> - <url>https://travis-ci.org/bigdataviewer/bigdataviewer-core</url> - </ciManagement> + <scm> + <connection>scm:git:git://github.com/bigdataviewer/bigdataviewer-core</connection> + <developerConnection>scm:git:git@github.com:bigdataviewer/bigdataviewer-core</developerConnection> + <tag>HEAD</tag> + <url>https://github.com/bigdataviewer/bigdataviewer-core</url> + </scm> + <issueManagement> + <system>GitHub Issues</system> + <url>https://github.com/bigdataviewer/bigdataviewer-core/issues</url> + </issueManagement> + <ciManagement> + <system>Travis CI</system> + <url>https://travis-ci.org/bigdataviewer/bigdataviewer-core</url> + </ciManagement> - <properties> - <package-name>bdv</package-name> - <license.licenseName>bsd_2</license.licenseName> - <license.copyrightOwners>BigDataViewer developers.</license.copyrightOwners> + <properties> + <package-name>bdv</package-name> + <license.licenseName>bsd_2</license.licenseName> + <license.copyrightOwners>BigDataViewer developers.</license.copyrightOwners> - <!-- NB: Deploy releases to the SciJava Maven repository. --> - <releaseProfiles>deploy-to-scijava</releaseProfiles> - </properties> + <!-- NB: Deploy releases to the SciJava Maven repository. --> + <releaseProfiles>deploy-to-scijava</releaseProfiles> + </properties> - <repositories> - <repository> - <id>scijava.public</id> - <url>https://maven.scijava.org/content/groups/public</url> - </repository> - </repositories> + <repositories> + <repository> + <id>scijava.public</id> + <url>https://maven.scijava.org/content/groups/public</url> + </repository> + <repository> + <id>cz.it4i</id> + <url>https://code.it4i.cz/api/v4/projects/932/packages/maven</url> + </repository> + </repositories> - <dependencies> - <dependency> - <groupId>net.imglib2</groupId> - <artifactId>imglib2</artifactId> - </dependency> - <dependency> - <groupId>net.imglib2</groupId> - <artifactId>imglib2-realtransform</artifactId> - </dependency> - <dependency> - <groupId>net.imglib2</groupId> - <artifactId>imglib2-cache</artifactId> - </dependency> - <dependency> - <groupId>net.imglib2</groupId> - <artifactId>imglib2-algorithm</artifactId> - </dependency> - <dependency> - <groupId>sc.fiji</groupId> - <artifactId>spim_data</artifactId> - </dependency> - <dependency> - <groupId>cisd</groupId> - <artifactId>jhdf5</artifactId> - </dependency> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom2</artifactId> - </dependency> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - <dependency> - <groupId>org.scijava</groupId> - <artifactId>ui-behaviour</artifactId> - </dependency> - <dependency> - <groupId>org.scijava</groupId> - <artifactId>scijava-listeners</artifactId> - </dependency> - <dependency> - <groupId>org.janelia.saalfeldlab</groupId> - <artifactId>n5-imglib2</artifactId> - </dependency> - <dependency> - <groupId>org.janelia.saalfeldlab</groupId> - <artifactId>n5</artifactId> - </dependency> - <dependency> - <groupId>com.miglayout</groupId> - <artifactId>miglayout-swing</artifactId> - </dependency> + <dependencies> + <dependency> + <groupId>net.imglib2</groupId> + <artifactId>imglib2</artifactId> + </dependency> + <dependency> + <groupId>net.imglib2</groupId> + <artifactId>imglib2-realtransform</artifactId> + </dependency> + <dependency> + <groupId>net.imglib2</groupId> + <artifactId>imglib2-cache</artifactId> + </dependency> + <dependency> + <groupId>net.imglib2</groupId> + <artifactId>imglib2-algorithm</artifactId> + </dependency> + <dependency> + <groupId>sc.fiji</groupId> + <artifactId>spim_data</artifactId> + </dependency> + <dependency> + <groupId>cisd</groupId> + <artifactId>jhdf5</artifactId> + </dependency> + <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom2</artifactId> + </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + </dependency> + <dependency> + <groupId>org.scijava</groupId> + <artifactId>ui-behaviour</artifactId> + </dependency> + <dependency> + <groupId>org.scijava</groupId> + <artifactId>scijava-listeners</artifactId> + </dependency> + <dependency> + <groupId>org.janelia.saalfeldlab</groupId> + <artifactId>n5-imglib2</artifactId> + </dependency> + <dependency> + <groupId>org.janelia.saalfeldlab</groupId> + <artifactId>n5</artifactId> + </dependency> + <dependency> + <groupId>com.miglayout</groupId> + <artifactId>miglayout-swing</artifactId> + </dependency> - <!-- test dependencies --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> + <!-- test dependencies --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> <dependency> - <groupId>org.azgra</groupId> - <artifactId>DataCompressor</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>compile</scope> + <groupId>cz.it4i</groupId> + <artifactId>QcmpCompression</artifactId> + <version>0.5-SNAPSHOT</version> </dependency> </dependencies> </project> diff --git a/src/main/java/bdv/BigDataViewer.java b/src/main/java/bdv/BigDataViewer.java index e18b63e034d07352d678d0f10a6c5a0a7bcad7c6..a4e22a1d788b742212dd9fbc30a8592bf0efa0c6 100644 --- a/src/main/java/bdv/BigDataViewer.java +++ b/src/main/java/bdv/BigDataViewer.java @@ -28,7 +28,6 @@ */ package bdv; -import azgracompress.utilities.ColorConsole; import bdv.cache.CacheControl; import bdv.export.ProgressWriter; import bdv.export.ProgressWriterConsole; @@ -44,6 +43,7 @@ import bdv.tools.transformation.ManualTransformation; import bdv.tools.transformation.ManualTransformationEditor; import bdv.tools.transformation.TransformedSource; import bdv.viewer.*; +import cz.it4i.qcmp.utilities.ColorConsole; import mpicbg.spim.data.SpimDataException; import mpicbg.spim.data.generic.AbstractSpimData; import mpicbg.spim.data.generic.sequence.AbstractSequenceDescription; diff --git a/src/main/java/bdv/img/remote/RemoteImageLoader.java b/src/main/java/bdv/img/remote/RemoteImageLoader.java index 74178125e057eb7c88ec721b2cb5209057873afc..762577df7a0d670e961c2b5b5dcefeec1c0ebb0a 100644 --- a/src/main/java/bdv/img/remote/RemoteImageLoader.java +++ b/src/main/java/bdv/img/remote/RemoteImageLoader.java @@ -28,10 +28,6 @@ */ package bdv.img.remote; -import azgracompress.cache.ICacheFile; -import azgracompress.cache.QuantizationCacheManager; -import azgracompress.compression.ImageDecompressor; -import azgracompress.utilities.ColorConsole; import bdv.AbstractViewerSetupImgLoader; import bdv.ViewerImgLoader; import bdv.img.cache.VolatileCachedCellImg; @@ -42,6 +38,10 @@ import bdv.img.hdf5.ViewLevelId; import bdv.util.ConstantRandomAccessible; import bdv.viewer.ViewerOptions; import com.google.gson.GsonBuilder; +import cz.it4i.qcmp.cache.ICacheFile; +import cz.it4i.qcmp.cache.QuantizationCacheManager; +import cz.it4i.qcmp.compression.ImageDecompressor; +import cz.it4i.qcmp.utilities.ColorConsole; import mpicbg.spim.data.generic.sequence.ImgLoaderHint; import net.imglib2.FinalInterval; import net.imglib2.RandomAccessibleInterval; diff --git a/src/main/java/bdv/img/remote/RemoteVolatileShortArrayLoader.java b/src/main/java/bdv/img/remote/RemoteVolatileShortArrayLoader.java index 8d6dbb9edc3455974f7719ef15e3d1ce5c5dd81c..5ce1bb8cd5edc0680d1400dba6f9f02de202c53c 100644 --- a/src/main/java/bdv/img/remote/RemoteVolatileShortArrayLoader.java +++ b/src/main/java/bdv/img/remote/RemoteVolatileShortArrayLoader.java @@ -28,10 +28,10 @@ */ package bdv.img.remote; -import azgracompress.compression.CompressorDecompressorBase; -import azgracompress.compression.ImageDecompressor; -import azgracompress.utilities.ColorConsole; import bdv.img.cache.CacheArrayLoader; +import cz.it4i.qcmp.compression.CompressorDecompressorBase; +import cz.it4i.qcmp.compression.ImageDecompressor; +import cz.it4i.qcmp.utilities.ColorConsole; import net.imglib2.img.basictypeaccess.volatiles.array.VolatileShortArray; import java.io.IOException;