From 12c7b017bd3b7bd633e5ec6085a0c8c441d93d7d Mon Sep 17 00:00:00 2001 From: Eugene Katrukha Date: Tue, 19 Nov 2024 16:06:14 +0100 Subject: [PATCH] update bvv --- pom.xml | 6 ++--- src/main/java/bigtrace/BigTrace.java | 22 +++++++++---------- .../java/bigtrace/BigTraceControlPanel.java | 2 +- .../bigtrace/animation/AnimationRender.java | 2 +- src/main/java/bigtrace/gui/BCsettings.java | 4 ++-- .../java/bigtrace/scene/VisPointsScaled.java | 10 ++++----- .../java/bigtrace/scene/VisPolyLineAA.java | 10 ++++----- .../java/bigtrace/scene/VisPolygonFlat.java | 10 ++++----- src/main/java/bigtrace/scene/VisWireMesh.java | 12 +++++----- 9 files changed, 40 insertions(+), 38 deletions(-) diff --git a/pom.xml b/pom.xml index f973f12..2991530 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ nl.uu.science.cellbiology bvv-playground - 0.2.7 + 0.3.0 @@ -120,13 +120,13 @@ com.formdev jide-oss - 3.7.12 + 3.7.15 com.formdev flatlaf-jide-oss - 2.0 + 3.5 diff --git a/src/main/java/bigtrace/BigTrace.java b/src/main/java/bigtrace/BigTrace.java index f4465f4..4bb4b38 100644 --- a/src/main/java/bigtrace/BigTrace.java +++ b/src/main/java/bigtrace/BigTrace.java @@ -56,17 +56,17 @@ import bdv.viewer.TimePointListener; import bdv.viewer.ViewerState; -import btbvv.vistools.BvvFunctions; -import btbvv.vistools.BvvHandleFrame; -import btbvv.vistools.Bvv; -import btbvv.vistools.BvvStackSource; -import btbvv.core.render.RenderData; -import btbvv.core.render.VolumeRenderer.RepaintType; -import btbvv.btuitools.BvvGamma; -import btbvv.btuitools.GammaConverterSetup; -import btbvv.core.VolumeViewerFrame; -import btbvv.core.VolumeViewerPanel; -import btbvv.core.util.MatrixMath; +import bvvpg.vistools.BvvFunctions; +import bvvpg.vistools.BvvHandleFrame; +import bvvpg.vistools.Bvv; +import bvvpg.vistools.BvvStackSource; +import bvvpg.core.render.RenderData; +import bvvpg.core.render.VolumeRenderer.RepaintType; +import bvvpg.pguitools.BvvGamma; +import bvvpg.pguitools.GammaConverterSetup; +import bvvpg.core.VolumeViewerFrame; +import bvvpg.core.VolumeViewerPanel; +import bvvpg.core.util.MatrixMath; import bigtrace.animation.Scene; import bigtrace.geometry.Cuboid3D; import bigtrace.geometry.Intersections3D; diff --git a/src/main/java/bigtrace/BigTraceControlPanel.java b/src/main/java/bigtrace/BigTraceControlPanel.java index aaaf711..d01b00f 100644 --- a/src/main/java/bigtrace/BigTraceControlPanel.java +++ b/src/main/java/bigtrace/BigTraceControlPanel.java @@ -46,7 +46,7 @@ import bigtrace.rois.RoiManager3D; import bigtrace.tracks.TrackingPanel; import bigtrace.volume.ExtractClip; -import btbvv.vistools.BvvStackSource; +import bvvpg.vistools.BvvStackSource; import ij.Prefs; import net.imglib2.FinalInterval; import net.imglib2.FinalRealInterval; diff --git a/src/main/java/bigtrace/animation/AnimationRender.java b/src/main/java/bigtrace/animation/AnimationRender.java index fe6b1ca..0c2f292 100644 --- a/src/main/java/bigtrace/animation/AnimationRender.java +++ b/src/main/java/bigtrace/animation/AnimationRender.java @@ -25,7 +25,7 @@ import bigtrace.BigTrace; import bigtrace.BigTraceBGWorker; import bigtrace.BigTraceData; -import btbvv.core.render.VolumeRenderer.RepaintType; +import bvvpg.core.render.VolumeRenderer.RepaintType; import ij.IJ; diff --git a/src/main/java/bigtrace/gui/BCsettings.java b/src/main/java/bigtrace/gui/BCsettings.java index 0293ce6..69d528b 100644 --- a/src/main/java/bigtrace/gui/BCsettings.java +++ b/src/main/java/bigtrace/gui/BCsettings.java @@ -1,7 +1,7 @@ package bigtrace.gui; -import btbvv.btuitools.RealARGBColorGammaConverterSetup; -import btbvv.vistools.BvvStackSource; +import bvvpg.pguitools.RealARGBColorGammaConverterSetup; +import bvvpg.vistools.BvvStackSource; /** class to store and apply broghtness and contrast settings **/ public class BCsettings { diff --git a/src/main/java/bigtrace/scene/VisPointsScaled.java b/src/main/java/bigtrace/scene/VisPointsScaled.java index 1d6a186..46eced0 100644 --- a/src/main/java/bigtrace/scene/VisPointsScaled.java +++ b/src/main/java/bigtrace/scene/VisPointsScaled.java @@ -17,11 +17,11 @@ import org.joml.Vector3f; import org.joml.Vector4f; -import btbvv.core.backend.jogl.JoglGpuContext; -import btbvv.core.shadergen.DefaultShader; -import btbvv.core.shadergen.Shader; -import btbvv.core.shadergen.generate.Segment; -import btbvv.core.shadergen.generate.SegmentTemplate; +import bvvpg.core.backend.jogl.JoglGpuContext; +import bvvpg.core.shadergen.DefaultShader; +import bvvpg.core.shadergen.Shader; +import bvvpg.core.shadergen.generate.Segment; +import bvvpg.core.shadergen.generate.SegmentTemplate; import static com.jogamp.opengl.GL.GL_FLOAT; diff --git a/src/main/java/bigtrace/scene/VisPolyLineAA.java b/src/main/java/bigtrace/scene/VisPolyLineAA.java index 3b986a6..74e28dc 100644 --- a/src/main/java/bigtrace/scene/VisPolyLineAA.java +++ b/src/main/java/bigtrace/scene/VisPolyLineAA.java @@ -17,11 +17,11 @@ import org.joml.Vector4f; import bigtrace.BigTraceData; -import btbvv.core.backend.jogl.JoglGpuContext; -import btbvv.core.shadergen.DefaultShader; -import btbvv.core.shadergen.Shader; -import btbvv.core.shadergen.generate.Segment; -import btbvv.core.shadergen.generate.SegmentTemplate; +import bvvpg.core.backend.jogl.JoglGpuContext; +import bvvpg.core.shadergen.DefaultShader; +import bvvpg.core.shadergen.Shader; +import bvvpg.core.shadergen.generate.Segment; +import bvvpg.core.shadergen.generate.SegmentTemplate; import static com.jogamp.opengl.GL.GL_FLOAT; diff --git a/src/main/java/bigtrace/scene/VisPolygonFlat.java b/src/main/java/bigtrace/scene/VisPolygonFlat.java index a31711e..70d1a67 100644 --- a/src/main/java/bigtrace/scene/VisPolygonFlat.java +++ b/src/main/java/bigtrace/scene/VisPolygonFlat.java @@ -21,11 +21,11 @@ import net.imglib2.RealPoint; import net.imglib2.util.LinAlgHelpers; -import btbvv.core.backend.jogl.JoglGpuContext; -import btbvv.core.shadergen.DefaultShader; -import btbvv.core.shadergen.Shader; -import btbvv.core.shadergen.generate.Segment; -import btbvv.core.shadergen.generate.SegmentTemplate; +import bvvpg.core.backend.jogl.JoglGpuContext; +import bvvpg.core.shadergen.DefaultShader; +import bvvpg.core.shadergen.Shader; +import bvvpg.core.shadergen.generate.Segment; +import bvvpg.core.shadergen.generate.SegmentTemplate; public class VisPolygonFlat { diff --git a/src/main/java/bigtrace/scene/VisWireMesh.java b/src/main/java/bigtrace/scene/VisWireMesh.java index 9f0e4de..0dcc27e 100644 --- a/src/main/java/bigtrace/scene/VisWireMesh.java +++ b/src/main/java/bigtrace/scene/VisWireMesh.java @@ -21,11 +21,13 @@ import bigtrace.BigTraceData; import bigtrace.geometry.Pipe3D; import bigtrace.rois.Roi3D; -import btbvv.core.backend.jogl.JoglGpuContext; -import btbvv.core.shadergen.DefaultShader; -import btbvv.core.shadergen.Shader; -import btbvv.core.shadergen.generate.Segment; -import btbvv.core.shadergen.generate.SegmentTemplate; + +import bvvpg.core.backend.jogl.JoglGpuContext; +import bvvpg.core.shadergen.DefaultShader; +import bvvpg.core.shadergen.Shader; +import bvvpg.core.shadergen.generate.Segment; +import bvvpg.core.shadergen.generate.SegmentTemplate; + import net.imglib2.RealPoint; import net.imglib2.mesh.impl.nio.BufferMesh;