From f59a4773870bff7051f682bc63e65867fd3de9c7 Mon Sep 17 00:00:00 2001 From: tpietzsch <tobias.pietzsch@gmail.com> Date: Tue, 7 Jul 2020 21:18:47 +0200 Subject: [PATCH] WIP move net.imglib2.ui classes InteractiveDisplayCanvas -> bdv.viewer OverlayRenderer -> bdv.viewer --- src/main/java/bdv/tools/RecordMaxProjectionDialog.java | 2 +- src/main/java/bdv/tools/RecordMovieDialog.java | 2 +- .../java/bdv/tools/boundingbox/TransformedBoxOverlay.java | 2 +- .../imglib2/ui => bdv/viewer}/InteractiveDisplayCanvas.java | 4 +--- .../java/{net/imglib2/ui => bdv/viewer}/OverlayRenderer.java | 2 +- src/main/java/bdv/viewer/ViewerPanel.java | 2 -- .../net/imglib2/ui/overlay/BufferedImageOverlayRenderer.java | 2 +- src/test/java/bdv/IntervalPaintingExample.java | 2 +- 8 files changed, 7 insertions(+), 11 deletions(-) rename src/main/java/{net/imglib2/ui => bdv/viewer}/InteractiveDisplayCanvas.java (99%) rename src/main/java/{net/imglib2/ui => bdv/viewer}/OverlayRenderer.java (99%) diff --git a/src/main/java/bdv/tools/RecordMaxProjectionDialog.java b/src/main/java/bdv/tools/RecordMaxProjectionDialog.java index 15c5f9c2..9d91b44b 100644 --- a/src/main/java/bdv/tools/RecordMaxProjectionDialog.java +++ b/src/main/java/bdv/tools/RecordMaxProjectionDialog.java @@ -73,7 +73,7 @@ import net.imglib2.img.Img; import net.imglib2.img.array.ArrayImgs; import net.imglib2.realtransform.AffineTransform3D; import net.imglib2.type.numeric.ARGBType; -import net.imglib2.ui.OverlayRenderer; +import bdv.viewer.OverlayRenderer; import net.imglib2.ui.PainterThread; import bdv.viewer.render.RenderTarget; import net.imglib2.util.LinAlgHelpers; diff --git a/src/main/java/bdv/tools/RecordMovieDialog.java b/src/main/java/bdv/tools/RecordMovieDialog.java index 3c1ee091..c4adb030 100644 --- a/src/main/java/bdv/tools/RecordMovieDialog.java +++ b/src/main/java/bdv/tools/RecordMovieDialog.java @@ -67,7 +67,7 @@ import javax.swing.WindowConstants; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import net.imglib2.realtransform.AffineTransform3D; -import net.imglib2.ui.OverlayRenderer; +import bdv.viewer.OverlayRenderer; import net.imglib2.ui.PainterThread; import bdv.viewer.render.RenderTarget; diff --git a/src/main/java/bdv/tools/boundingbox/TransformedBoxOverlay.java b/src/main/java/bdv/tools/boundingbox/TransformedBoxOverlay.java index 2b274641..7439703c 100644 --- a/src/main/java/bdv/tools/boundingbox/TransformedBoxOverlay.java +++ b/src/main/java/bdv/tools/boundingbox/TransformedBoxOverlay.java @@ -45,7 +45,7 @@ import java.awt.geom.GeneralPath; import net.imglib2.Interval; import net.imglib2.RealInterval; import net.imglib2.realtransform.AffineTransform3D; -import net.imglib2.ui.OverlayRenderer; +import bdv.viewer.OverlayRenderer; import bdv.viewer.TransformListener; import org.scijava.listeners.ChangeListener; diff --git a/src/main/java/net/imglib2/ui/InteractiveDisplayCanvas.java b/src/main/java/bdv/viewer/InteractiveDisplayCanvas.java similarity index 99% rename from src/main/java/net/imglib2/ui/InteractiveDisplayCanvas.java rename to src/main/java/bdv/viewer/InteractiveDisplayCanvas.java index 3819f9fa..2f2b6a22 100644 --- a/src/main/java/net/imglib2/ui/InteractiveDisplayCanvas.java +++ b/src/main/java/bdv/viewer/InteractiveDisplayCanvas.java @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. * #L% */ -package net.imglib2.ui; +package bdv.viewer; import bdv.TransformEventHandler; import java.awt.Component; @@ -134,7 +134,6 @@ public class InteractiveDisplayCanvas extends JComponent * * @param h handler to remove */ -// @Override public void addHandler( final Object h ) { if ( h instanceof KeyListener ) @@ -163,7 +162,6 @@ public class InteractiveDisplayCanvas extends JComponent * * @param h handler to remove */ -// @Override public void removeHandler( final Object h ) { if ( h instanceof KeyListener ) diff --git a/src/main/java/net/imglib2/ui/OverlayRenderer.java b/src/main/java/bdv/viewer/OverlayRenderer.java similarity index 99% rename from src/main/java/net/imglib2/ui/OverlayRenderer.java rename to src/main/java/bdv/viewer/OverlayRenderer.java index 590b9abc..7b8ba718 100644 --- a/src/main/java/net/imglib2/ui/OverlayRenderer.java +++ b/src/main/java/bdv/viewer/OverlayRenderer.java @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. * #L% */ -package net.imglib2.ui; +package bdv.viewer; import java.awt.Graphics; diff --git a/src/main/java/bdv/viewer/ViewerPanel.java b/src/main/java/bdv/viewer/ViewerPanel.java index 61012f1e..338c6988 100644 --- a/src/main/java/bdv/viewer/ViewerPanel.java +++ b/src/main/java/bdv/viewer/ViewerPanel.java @@ -82,8 +82,6 @@ import net.imglib2.RealLocalizable; import net.imglib2.RealPoint; import net.imglib2.RealPositionable; import net.imglib2.realtransform.AffineTransform3D; -import net.imglib2.ui.InteractiveDisplayCanvas; -import net.imglib2.ui.OverlayRenderer; import net.imglib2.ui.PainterThread; import net.imglib2.util.LinAlgHelpers; import org.scijava.listeners.Listeners; diff --git a/src/main/java/net/imglib2/ui/overlay/BufferedImageOverlayRenderer.java b/src/main/java/net/imglib2/ui/overlay/BufferedImageOverlayRenderer.java index 505f5d2d..eea8ee9d 100644 --- a/src/main/java/net/imglib2/ui/overlay/BufferedImageOverlayRenderer.java +++ b/src/main/java/net/imglib2/ui/overlay/BufferedImageOverlayRenderer.java @@ -41,7 +41,7 @@ import java.awt.Graphics2D; import java.awt.RenderingHints; import java.awt.image.BufferedImage; import net.imglib2.realtransform.AffineTransform3D; -import net.imglib2.ui.OverlayRenderer; +import bdv.viewer.OverlayRenderer; import bdv.viewer.render.RenderTarget; import bdv.viewer.TransformListener; import org.scijava.listeners.Listeners; diff --git a/src/test/java/bdv/IntervalPaintingExample.java b/src/test/java/bdv/IntervalPaintingExample.java index 61e711b0..54cb871c 100644 --- a/src/test/java/bdv/IntervalPaintingExample.java +++ b/src/test/java/bdv/IntervalPaintingExample.java @@ -39,7 +39,7 @@ import java.awt.Graphics2D; import java.io.File; import mpicbg.spim.data.SpimDataException; import net.imglib2.Interval; -import net.imglib2.ui.OverlayRenderer; +import bdv.viewer.OverlayRenderer; import net.imglib2.util.Intervals; import org.scijava.ui.behaviour.DragBehaviour; import org.scijava.ui.behaviour.io.InputTriggerConfig; -- GitLab