diff --git a/qupath-core-processing/src/main/java/qupath/lib/scripting/QP.java b/qupath-core-processing/src/main/java/qupath/lib/scripting/QP.java index 65bf7d155..2df5c789c 100644 --- a/qupath-core-processing/src/main/java/qupath/lib/scripting/QP.java +++ b/qupath-core-processing/src/main/java/qupath/lib/scripting/QP.java @@ -129,6 +129,7 @@ import qupath.lib.roi.RoiTools; import qupath.lib.roi.interfaces.ROI; import qupath.opencv.dnn.DnnTools; +import qupath.opencv.io.OpenCVTypeAdapters; import qupath.opencv.ml.objects.OpenCVMLClassifier; import qupath.opencv.ml.objects.features.FeatureExtractors; import qupath.opencv.ml.pixel.PixelClassifierTools; @@ -216,6 +217,7 @@ public class QP { .registerTypeAdapterFactory(PixelClassifiers.getTypeAdapterFactory()) .registerTypeAdapterFactory(FeatureExtractors.getTypeAdapterFactory()) .registerTypeAdapterFactory(ObjectClassifiers.getTypeAdapterFactory()) + .registerTypeAdapterFactory(OpenCVTypeAdapters.getOpenCVTypeAdaptorFactory()) .registerTypeAdapter(ColorTransforms.ColorTransform.class, new ColorTransforms.ColorTransformTypeAdapter()); // Currently, the type adapters are registered within the class... so we need to initialize the class diff --git a/qupath-core/src/main/java/qupath/lib/io/OpenCVTypeAdapters.java b/qupath-core-processing/src/main/java/qupath/opencv/io/OpenCVTypeAdapters.java similarity index 99% rename from qupath-core/src/main/java/qupath/lib/io/OpenCVTypeAdapters.java rename to qupath-core-processing/src/main/java/qupath/opencv/io/OpenCVTypeAdapters.java index 0532a17a9..a496e14ea 100644 --- a/qupath-core/src/main/java/qupath/lib/io/OpenCVTypeAdapters.java +++ b/qupath-core-processing/src/main/java/qupath/opencv/io/OpenCVTypeAdapters.java @@ -19,7 +19,7 @@ * #L% */ -package qupath.lib.io; +package qupath.opencv.io; import java.io.IOException; import java.util.Map; diff --git a/qupath-core-processing/src/main/java/qupath/opencv/ml/OpenCVClassifiers.java b/qupath-core-processing/src/main/java/qupath/opencv/ml/OpenCVClassifiers.java index 88f7df9f4..f7c9922da 100644 --- a/qupath-core-processing/src/main/java/qupath/opencv/ml/OpenCVClassifiers.java +++ b/qupath-core-processing/src/main/java/qupath/opencv/ml/OpenCVClassifiers.java @@ -44,8 +44,8 @@ import qupath.lib.common.GeneralTools; import qupath.lib.io.GsonTools; -import qupath.lib.io.OpenCVTypeAdapters; import qupath.lib.plugins.parameters.ParameterList; +import qupath.opencv.io.OpenCVTypeAdapters; import qupath.opencv.tools.OpenCVTools; /** diff --git a/qupath-core-processing/src/main/java/qupath/opencv/ml/objects/features/Preprocessing.java b/qupath-core-processing/src/main/java/qupath/opencv/ml/objects/features/Preprocessing.java index cd52fe29b..3713429ce 100644 --- a/qupath-core-processing/src/main/java/qupath/opencv/ml/objects/features/Preprocessing.java +++ b/qupath-core-processing/src/main/java/qupath/opencv/ml/objects/features/Preprocessing.java @@ -34,7 +34,7 @@ import qupath.lib.analysis.stats.RunningStatistics; import qupath.lib.classifiers.Normalization; -import qupath.lib.io.OpenCVTypeAdapters; +import qupath.opencv.io.OpenCVTypeAdapters; /** * Helper class for preprocessing input for machine learning algorithms using OpenCV Mats. diff --git a/qupath-core/src/test/java/qupath/lib/io/TypeAdaptersCVTest.java b/qupath-core-processing/src/test/java/qupath/opencv/io/TypeAdaptersCVTest.java similarity index 98% rename from qupath-core/src/test/java/qupath/lib/io/TypeAdaptersCVTest.java rename to qupath-core-processing/src/test/java/qupath/opencv/io/TypeAdaptersCVTest.java index 306e70bc2..4671c4097 100644 --- a/qupath-core/src/test/java/qupath/lib/io/TypeAdaptersCVTest.java +++ b/qupath-core-processing/src/test/java/qupath/opencv/io/TypeAdaptersCVTest.java @@ -19,7 +19,7 @@ * #L% */ -package qupath.lib.io; +package qupath.opencv.io; import static org.junit.jupiter.api.Assertions.*; @@ -38,6 +38,8 @@ import com.google.gson.GsonBuilder; +import qupath.opencv.io.OpenCVTypeAdapters; + @SuppressWarnings("javadoc") public class TypeAdaptersCVTest { diff --git a/qupath-core/build.gradle b/qupath-core/build.gradle index 228c36d0f..8901af2df 100644 --- a/qupath-core/build.gradle +++ b/qupath-core/build.gradle @@ -10,7 +10,6 @@ description = "Core QuPath module containing the main classes and datastructures configurations { implementation.extendsFrom guava - implementation.extendsFrom opencv } dependencies { diff --git a/qupath-core/src/main/java/qupath/lib/io/GsonTools.java b/qupath-core/src/main/java/qupath/lib/io/GsonTools.java index f9c1b8283..bd49aff66 100644 --- a/qupath-core/src/main/java/qupath/lib/io/GsonTools.java +++ b/qupath-core/src/main/java/qupath/lib/io/GsonTools.java @@ -76,7 +76,6 @@ public class GsonTools { .serializeSpecialFloatingPointValues() .setLenient() .registerTypeAdapterFactory(new QuPathTypeAdapterFactory()) - .registerTypeAdapterFactory(OpenCVTypeAdapters.getOpenCVTypeAdaptorFactory()) .registerTypeAdapter(AffineTransform.class, AffineTransformTypeAdapter.INSTANCE); //.create();