Move OpenCVTypeAdapters to core-processing

Addresses qupath#961
petebankhead · May 31, 2022 · 42ffe78 · 42ffe78
1 parent 6784de7
commit 42ffe78
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 6 deletions.
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
@@ -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/...ava/qupath/lib/io/OpenCVTypeAdapters.java → .../qupath/opencv/io/OpenCVTypeAdapters.java b/...ava/qupath/lib/io/OpenCVTypeAdapters.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
@@ -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
@@ -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/...ava/qupath/lib/io/TypeAdaptersCVTest.java → .../qupath/opencv/io/TypeAdaptersCVTest.java b/...ava/qupath/lib/io/TypeAdaptersCVTest.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
@@ -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
@@ -76,7 +76,6 @@ public class GsonTools {
 			.serializeSpecialFloatingPointValues()
 			.setLenient()
 			.registerTypeAdapterFactory(new QuPathTypeAdapterFactory())
-			.registerTypeAdapterFactory(OpenCVTypeAdapters.getOpenCVTypeAdaptorFactory())
 			.registerTypeAdapter(AffineTransform.class, AffineTransformTypeAdapter.INSTANCE);
 			//.create();