From 4ef256bad5b832b560264a3fb4a1b4f35a467d7b Mon Sep 17 00:00:00 2001
From: tpietzsch <tobias.pietzsch@gmail.com>
Date: Tue, 7 Jul 2020 20:44:32 +0200
Subject: [PATCH] WIP move net.imglib2.ui classes
RenderTarget -> bdv.viewer.render
TransformListener -> bdv.viewer
---
.../java/bdv/tools/RecordMaxProjectionDialog.java | 2 +-
src/main/java/bdv/tools/RecordMovieDialog.java | 2 +-
.../bdv/tools/boundingbox/TransformedBoxOverlay.java | 2 +-
.../transformation/ManualTransformationEditor.java | 2 +-
.../imglib2/ui => bdv/viewer}/TransformListener.java | 2 +-
src/main/java/bdv/viewer/ViewerPanel.java | 1 -
.../bdv/viewer/render/MultiResolutionRenderer.java | 1 -
.../ui => bdv/viewer/render}/RenderTarget.java | 12 +++++-------
.../ui/overlay/BufferedImageOverlayRenderer.java | 4 ++--
9 files changed, 12 insertions(+), 16 deletions(-)
rename src/main/java/{net/imglib2/ui => bdv/viewer}/TransformListener.java (98%)
rename src/main/java/{net/imglib2/ui => bdv/viewer/render}/RenderTarget.java (88%)
diff --git a/src/main/java/bdv/tools/RecordMaxProjectionDialog.java b/src/main/java/bdv/tools/RecordMaxProjectionDialog.java
index 0ed579b4..15c5f9c2 100644
--- a/src/main/java/bdv/tools/RecordMaxProjectionDialog.java
+++ b/src/main/java/bdv/tools/RecordMaxProjectionDialog.java
@@ -75,7 +75,7 @@ import net.imglib2.realtransform.AffineTransform3D;
import net.imglib2.type.numeric.ARGBType;
import net.imglib2.ui.OverlayRenderer;
import net.imglib2.ui.PainterThread;
-import net.imglib2.ui.RenderTarget;
+import bdv.viewer.render.RenderTarget;
import net.imglib2.util.LinAlgHelpers;
public class RecordMaxProjectionDialog extends JDialog implements OverlayRenderer
diff --git a/src/main/java/bdv/tools/RecordMovieDialog.java b/src/main/java/bdv/tools/RecordMovieDialog.java
index 3b8dd3fc..3c1ee091 100644
--- a/src/main/java/bdv/tools/RecordMovieDialog.java
+++ b/src/main/java/bdv/tools/RecordMovieDialog.java
@@ -69,7 +69,7 @@ import javax.swing.event.ChangeListener;
import net.imglib2.realtransform.AffineTransform3D;
import net.imglib2.ui.OverlayRenderer;
import net.imglib2.ui.PainterThread;
-import net.imglib2.ui.RenderTarget;
+import bdv.viewer.render.RenderTarget;
public class RecordMovieDialog extends JDialog implements OverlayRenderer
{
diff --git a/src/main/java/bdv/tools/boundingbox/TransformedBoxOverlay.java b/src/main/java/bdv/tools/boundingbox/TransformedBoxOverlay.java
index 97a12798..2b274641 100644
--- a/src/main/java/bdv/tools/boundingbox/TransformedBoxOverlay.java
+++ b/src/main/java/bdv/tools/boundingbox/TransformedBoxOverlay.java
@@ -46,7 +46,7 @@ import net.imglib2.Interval;
import net.imglib2.RealInterval;
import net.imglib2.realtransform.AffineTransform3D;
import net.imglib2.ui.OverlayRenderer;
-import net.imglib2.ui.TransformListener;
+import bdv.viewer.TransformListener;
import org.scijava.listeners.ChangeListener;
import org.scijava.listeners.ListenableVar;
diff --git a/src/main/java/bdv/tools/transformation/ManualTransformationEditor.java b/src/main/java/bdv/tools/transformation/ManualTransformationEditor.java
index 976eab5c..d0f9146b 100644
--- a/src/main/java/bdv/tools/transformation/ManualTransformationEditor.java
+++ b/src/main/java/bdv/tools/transformation/ManualTransformationEditor.java
@@ -39,7 +39,7 @@ import javax.swing.ActionMap;
import javax.swing.InputMap;
import javax.swing.KeyStroke;
import net.imglib2.realtransform.AffineTransform3D;
-import net.imglib2.ui.TransformListener;
+import bdv.viewer.TransformListener;
import org.scijava.listeners.Listeners;
import org.scijava.ui.behaviour.util.InputActionBindings;
import org.scijava.ui.behaviour.util.RunnableAction;
diff --git a/src/main/java/net/imglib2/ui/TransformListener.java b/src/main/java/bdv/viewer/TransformListener.java
similarity index 98%
rename from src/main/java/net/imglib2/ui/TransformListener.java
rename to src/main/java/bdv/viewer/TransformListener.java
index 9993a378..0f5aa796 100644
--- a/src/main/java/net/imglib2/ui/TransformListener.java
+++ b/src/main/java/bdv/viewer/TransformListener.java
@@ -31,7 +31,7 @@
* POSSIBILITY OF SUCH DAMAGE.
* #L%
*/
-package net.imglib2.ui;
+package bdv.viewer;
public interface TransformListener< A >
{
diff --git a/src/main/java/bdv/viewer/ViewerPanel.java b/src/main/java/bdv/viewer/ViewerPanel.java
index 4d959ec6..f45b44e8 100644
--- a/src/main/java/bdv/viewer/ViewerPanel.java
+++ b/src/main/java/bdv/viewer/ViewerPanel.java
@@ -85,7 +85,6 @@ import net.imglib2.ui.InteractiveDisplayCanvas;
import net.imglib2.ui.OverlayRenderer;
import net.imglib2.ui.PainterThread;
import net.imglib2.ui.TransformEventHandler;
-import net.imglib2.ui.TransformListener;
import net.imglib2.util.LinAlgHelpers;
import org.scijava.listeners.Listeners;
diff --git a/src/main/java/bdv/viewer/render/MultiResolutionRenderer.java b/src/main/java/bdv/viewer/render/MultiResolutionRenderer.java
index 46cf5ed3..89b26654 100644
--- a/src/main/java/bdv/viewer/render/MultiResolutionRenderer.java
+++ b/src/main/java/bdv/viewer/render/MultiResolutionRenderer.java
@@ -37,7 +37,6 @@ import net.imglib2.cache.iotiming.CacheIoTiming;
import net.imglib2.realtransform.AffineTransform3D;
import net.imglib2.type.numeric.ARGBType;
import net.imglib2.ui.PainterThread;
-import net.imglib2.ui.RenderTarget;
import net.imglib2.util.Intervals;
import bdv.cache.CacheControl;
diff --git a/src/main/java/net/imglib2/ui/RenderTarget.java b/src/main/java/bdv/viewer/render/RenderTarget.java
similarity index 88%
rename from src/main/java/net/imglib2/ui/RenderTarget.java
rename to src/main/java/bdv/viewer/render/RenderTarget.java
index 20ac6ad4..7a23c607 100644
--- a/src/main/java/net/imglib2/ui/RenderTarget.java
+++ b/src/main/java/bdv/viewer/render/RenderTarget.java
@@ -31,20 +31,18 @@
* POSSIBILITY OF SUCH DAMAGE.
* #L%
*/
-package net.imglib2.ui;
+package bdv.viewer.render;
import bdv.viewer.render.RenderResult;
-import java.awt.image.BufferedImage;
-import net.imglib2.ui.overlay.BufferedImageOverlayRenderer;
/**
- * Receiver for a {@link BufferedImage} (to be drawn onto a canvas later).
+ * Receiver for a rendered image (to be drawn onto a canvas later).
* <p>
* A renderer will render source data into a {@link RenderResult} and
- * provide this to a {@link RenderTarget}.
+ * provide this to the {@code RenderTarget}.
* <p>
- * See {@link BufferedImageOverlayRenderer}, which is both a {@code RenderTarget} and
- * an {@link OverlayRenderer} that draws the {@code RenderResult}.
+ * See {@code BufferedImageOverlayRenderer}, which is both a {@code RenderTarget} and
+ * an {@code OverlayRenderer} that draws the {@code RenderResult}.
*
* @author Tobias Pietzsch
*/
diff --git a/src/main/java/net/imglib2/ui/overlay/BufferedImageOverlayRenderer.java b/src/main/java/net/imglib2/ui/overlay/BufferedImageOverlayRenderer.java
index 7665fc53..505f5d2d 100644
--- a/src/main/java/net/imglib2/ui/overlay/BufferedImageOverlayRenderer.java
+++ b/src/main/java/net/imglib2/ui/overlay/BufferedImageOverlayRenderer.java
@@ -42,8 +42,8 @@ import java.awt.RenderingHints;
import java.awt.image.BufferedImage;
import net.imglib2.realtransform.AffineTransform3D;
import net.imglib2.ui.OverlayRenderer;
-import net.imglib2.ui.RenderTarget;
-import net.imglib2.ui.TransformListener;
+import bdv.viewer.render.RenderTarget;
+import bdv.viewer.TransformListener;
import org.scijava.listeners.Listeners;
/**
--
GitLab