From b6fb00248eced8a2d17cd7c4e2b8aa4f5f7b26ac Mon Sep 17 00:00:00 2001
From: tpietzsch <tobias.pietzsch@gmail.com>
Date: Tue, 7 Jul 2020 21:43:05 +0200
Subject: [PATCH] RenderResult: Rename getScreenImage() to getTargetImage()
---
.../java/bdv/viewer/render/BufferedImageRenderResult.java | 2 +-
.../java/bdv/viewer/render/MultiResolutionRenderer.java | 6 +++---
src/main/java/bdv/viewer/render/RenderResult.java | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/bdv/viewer/render/BufferedImageRenderResult.java b/src/main/java/bdv/viewer/render/BufferedImageRenderResult.java
index 0ba08f1c..afb9cb36 100644
--- a/src/main/java/bdv/viewer/render/BufferedImageRenderResult.java
+++ b/src/main/java/bdv/viewer/render/BufferedImageRenderResult.java
@@ -46,7 +46,7 @@ public class BufferedImageRenderResult implements RenderResult
}
@Override
- public RandomAccessibleInterval< ARGBType > getScreenImage()
+ public RandomAccessibleInterval< ARGBType > getTargetImage()
{
return screenImage;
}
diff --git a/src/main/java/bdv/viewer/render/MultiResolutionRenderer.java b/src/main/java/bdv/viewer/render/MultiResolutionRenderer.java
index 67972187..c5a0555b 100644
--- a/src/main/java/bdv/viewer/render/MultiResolutionRenderer.java
+++ b/src/main/java/bdv/viewer/render/MultiResolutionRenderer.java
@@ -442,7 +442,7 @@ public class MultiResolutionRenderer
currentViewerState.getViewerTransform( renderResult.getViewerTransform() );
renderStorage.checkRenewData( screenScales.get( 0 ).width(), screenScales.get( 0 ).height(), currentNumVisibleSources );
- projector = createProjector( currentViewerState, requestedScreenScaleIndex, renderResult.getScreenImage(), 0, 0 );
+ projector = createProjector( currentViewerState, requestedScreenScaleIndex, renderResult.getTargetImage(), 0, 0 );
requestNewFrameIfIncomplete = projectorFactory.requestNewFrameIfIncomplete();
}
p = projector;
@@ -492,7 +492,7 @@ public class MultiResolutionRenderer
{
intervalResult.init( intervalRenderData.width(), intervalRenderData.height() );
intervalResult.setScaleFactor( intervalRenderData.scale() );
- projector = createProjector( currentViewerState, requestedIntervalScaleIndex, intervalResult.getScreenImage(), intervalRenderData.offsetX(), intervalRenderData.offsetY() );
+ projector = createProjector( currentViewerState, requestedIntervalScaleIndex, intervalResult.getTargetImage(), intervalRenderData.offsetX(), intervalRenderData.offsetY() );
}
p = projector;
}
@@ -539,7 +539,7 @@ public class MultiResolutionRenderer
private void recordRenderTime( final RenderResult result, final long renderNanos )
{
- final int numRenderPixels = ( int ) Intervals.numElements( result.getScreenImage() ) * currentNumVisibleSources;
+ final int numRenderPixels = ( int ) Intervals.numElements( result.getTargetImage() ) * currentNumVisibleSources;
if ( numRenderPixels >= 4096 )
renderNanosPerPixelAndSource.add( renderNanos / ( double ) numRenderPixels );
}
diff --git a/src/main/java/bdv/viewer/render/RenderResult.java b/src/main/java/bdv/viewer/render/RenderResult.java
index 16caf1b1..176952cd 100644
--- a/src/main/java/bdv/viewer/render/RenderResult.java
+++ b/src/main/java/bdv/viewer/render/RenderResult.java
@@ -14,7 +14,7 @@ import net.imglib2.type.numeric.ARGBType;
public interface RenderResult
{
/**
- * Allocate storage such that {@link #getScreenImage()} holds an image of
+ * Allocate storage such that {@link #getTargetImage()} holds an image of
* {@code width * height}.
* <p>
* (Called by the {@link MultiResolutionRenderer renderer}.)
@@ -29,7 +29,7 @@ public interface RenderResult
* @return the image to render to
*/
// TODO: rename getTargetImage() ???
- RandomAccessibleInterval< ARGBType > getScreenImage();
+ RandomAccessibleInterval< ARGBType > getTargetImage();
/**
* Get the viewer transform used to render image. This is with respect to
@@ -62,7 +62,7 @@ public interface RenderResult
void patch( final RenderResult patch, final Interval interval, final double ox, final double oy );
/**
- * Notify that the {@link #getScreenImage() target image} data was changed.
+ * Notify that the {@link #getTargetImage() target image} data was changed.
* <p>
* (Called by the {@link MultiResolutionRenderer renderer}.)
*/
--
GitLab