From 0cdc958047a2d2b9390faa7178c8e770b983dd07 Mon Sep 17 00:00:00 2001 From: Martin Pernollet Date: Tue, 30 Dec 2014 11:29:33 +0100 Subject: [PATCH] rename log transform package --- .../factories/AxeTransformableAWTChartComponentFactory.java | 4 ++-- jzy3d-api/src/api/org/jzy3d/maths/BoundingBox3d.java | 2 +- jzy3d-api/src/api/org/jzy3d/plot3d/builder/Builder.java | 2 +- .../plot3d/builder/concrete/OrthonormalTessellatorLog.java | 2 +- .../src/api/org/jzy3d/plot3d/primitives/AbstractDrawable.java | 2 +- .../src/api/org/jzy3d/plot3d/primitives/axes/LogAxeBox.java | 4 ++-- .../primitives/log/AxeTransformableAbstractGeometry.java | 2 +- .../log/AxeTransformableConcurrentScatterMultiColor.java | 2 +- .../log/AxeTransformableConcurrentScatterMultiColorList.java | 2 +- .../log/AxeTransformableConcuurentScatterPoint.java | 2 +- .../plot3d/primitives/log/AxeTransformableFlatLine2d.java | 2 +- .../plot3d/primitives/log/AxeTransformableLineStrip.java | 2 +- .../primitives/log/AxeTransformableLineStripInterpolated.java | 2 +- .../jzy3d/plot3d/primitives/log/AxeTransformablePoint.java | 2 +- .../jzy3d/plot3d/primitives/log/AxeTransformablePolygon.java | 4 ++-- .../org/jzy3d/plot3d/primitives/log/AxeTransformableQuad.java | 2 +- .../jzy3d/plot3d/primitives/log/AxeTransformableScatter.java | 2 +- .../plot3d/primitives/log/AxeTransformableScatterPoint.java | 2 +- .../api/org/jzy3d/plot3d/primitives/log/GlVertexExecutor.java | 4 ++-- jzy3d-api/src/api/org/jzy3d/plot3d/rendering/view/View.java | 2 +- .../log/transformers => transform/log}/AxeTransform.java | 2 +- .../transformers => transform/log}/AxeTransformLinear.java | 2 +- .../log/transformers => transform/log}/AxeTransformLog.java | 2 +- .../log/transformers => transform/log}/LogTransformer.java | 2 +- jzy3d-api/src/tests/org/jzy3d/tests/LogScatterTest.java | 4 ++-- jzy3d-api/src/tests/org/jzy3d/tests/LogTest.java | 4 ++-- 26 files changed, 32 insertions(+), 32 deletions(-) rename jzy3d-api/src/api/org/jzy3d/plot3d/{primitives/log/transformers => transform/log}/AxeTransform.java (72%) rename jzy3d-api/src/api/org/jzy3d/plot3d/{primitives/log/transformers => transform/log}/AxeTransformLinear.java (79%) rename jzy3d-api/src/api/org/jzy3d/plot3d/{primitives/log/transformers => transform/log}/AxeTransformLog.java (83%) rename jzy3d-api/src/api/org/jzy3d/plot3d/{primitives/log/transformers => transform/log}/LogTransformer.java (96%) diff --git a/jzy3d-api/src/api/org/jzy3d/chart/factories/AxeTransformableAWTChartComponentFactory.java b/jzy3d-api/src/api/org/jzy3d/chart/factories/AxeTransformableAWTChartComponentFactory.java index 34f2fb30..54a5c2ea 100644 --- a/jzy3d-api/src/api/org/jzy3d/chart/factories/AxeTransformableAWTChartComponentFactory.java +++ b/jzy3d-api/src/api/org/jzy3d/chart/factories/AxeTransformableAWTChartComponentFactory.java @@ -7,10 +7,10 @@ import org.jzy3d.maths.Coord3d; import org.jzy3d.plot3d.primitives.axes.AxeBox; import org.jzy3d.plot3d.primitives.axes.IAxe; import org.jzy3d.plot3d.primitives.axes.LogAxeBox; -import org.jzy3d.plot3d.primitives.log.transformers.AxeTransform; -import org.jzy3d.plot3d.primitives.log.transformers.LogTransformer; import org.jzy3d.plot3d.rendering.canvas.Quality; import org.jzy3d.plot3d.rendering.view.View; +import org.jzy3d.plot3d.transform.log.AxeTransform; +import org.jzy3d.plot3d.transform.log.LogTransformer; public class AxeTransformableAWTChartComponentFactory extends AWTChartComponentFactory{ diff --git a/jzy3d-api/src/api/org/jzy3d/maths/BoundingBox3d.java b/jzy3d-api/src/api/org/jzy3d/maths/BoundingBox3d.java index e68e282b..30c0bf4e 100644 --- a/jzy3d-api/src/api/org/jzy3d/maths/BoundingBox3d.java +++ b/jzy3d-api/src/api/org/jzy3d/maths/BoundingBox3d.java @@ -5,7 +5,7 @@ import java.util.List; import org.jzy3d.plot3d.primitives.Point; import org.jzy3d.plot3d.primitives.Polygon; -import org.jzy3d.plot3d.primitives.log.transformers.LogTransformer; +import org.jzy3d.plot3d.transform.log.LogTransformer; /** * A BoundingBox3d stores a couple of maximal and minimal limit on each diff --git a/jzy3d-api/src/api/org/jzy3d/plot3d/builder/Builder.java b/jzy3d-api/src/api/org/jzy3d/plot3d/builder/Builder.java index 02f6b9f0..e0cd92f4 100644 --- a/jzy3d-api/src/api/org/jzy3d/plot3d/builder/Builder.java +++ b/jzy3d-api/src/api/org/jzy3d/plot3d/builder/Builder.java @@ -15,7 +15,7 @@ import org.jzy3d.plot3d.builder.concrete.RingTessellator; import org.jzy3d.plot3d.builder.delaunay.DelaunayTessellator; import org.jzy3d.plot3d.primitives.CompileableComposite; import org.jzy3d.plot3d.primitives.Shape; -import org.jzy3d.plot3d.primitives.log.transformers.LogTransformer; +import org.jzy3d.plot3d.transform.log.LogTransformer; public class Builder { diff --git a/jzy3d-api/src/api/org/jzy3d/plot3d/builder/concrete/OrthonormalTessellatorLog.java b/jzy3d-api/src/api/org/jzy3d/plot3d/builder/concrete/OrthonormalTessellatorLog.java index ffc28a44..00e2443c 100644 --- a/jzy3d-api/src/api/org/jzy3d/plot3d/builder/concrete/OrthonormalTessellatorLog.java +++ b/jzy3d-api/src/api/org/jzy3d/plot3d/builder/concrete/OrthonormalTessellatorLog.java @@ -3,7 +3,7 @@ package org.jzy3d.plot3d.builder.concrete; import org.jzy3d.plot3d.primitives.AbstractDrawable; import org.jzy3d.plot3d.primitives.Point; import org.jzy3d.plot3d.primitives.log.AxeTransformablePolygon; -import org.jzy3d.plot3d.primitives.log.transformers.LogTransformer; +import org.jzy3d.plot3d.transform.log.LogTransformer; public class OrthonormalTessellatorLog extends OrthonormalTessellator { LogTransformer transformers; diff --git a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/AbstractDrawable.java b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/AbstractDrawable.java index 8fb1f571..7134a374 100644 --- a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/AbstractDrawable.java +++ b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/AbstractDrawable.java @@ -13,12 +13,12 @@ import org.jzy3d.maths.BoundingBox3d; import org.jzy3d.maths.Coord3d; import org.jzy3d.maths.Utils; import org.jzy3d.plot3d.primitives.axes.AxeBox; -import org.jzy3d.plot3d.primitives.log.transformers.LogTransformer; import org.jzy3d.plot3d.rendering.canvas.ICanvas; import org.jzy3d.plot3d.rendering.compat.GLES2CompatUtils; import org.jzy3d.plot3d.rendering.legends.ILegend; import org.jzy3d.plot3d.rendering.view.Camera; import org.jzy3d.plot3d.transform.Transform; +import org.jzy3d.plot3d.transform.log.LogTransformer; /** * A {@link AbstractDrawable} defines objects that may be rendered into an diff --git a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/axes/LogAxeBox.java b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/axes/LogAxeBox.java index 3d7219b8..3ed9dd6a 100644 --- a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/axes/LogAxeBox.java +++ b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/axes/LogAxeBox.java @@ -10,12 +10,12 @@ import org.jzy3d.maths.Coord3d; import org.jzy3d.plot3d.primitives.axes.layout.AxeBoxLayout; import org.jzy3d.plot3d.primitives.axes.layout.IAxeLayout; import org.jzy3d.plot3d.primitives.log.GlVertexExecutor; -import org.jzy3d.plot3d.primitives.log.transformers.AxeTransform; -import org.jzy3d.plot3d.primitives.log.transformers.LogTransformer; import org.jzy3d.plot3d.rendering.compat.GLES2CompatUtils; import org.jzy3d.plot3d.rendering.view.Camera; import org.jzy3d.plot3d.text.align.Halign; import org.jzy3d.plot3d.text.align.Valign; +import org.jzy3d.plot3d.transform.log.AxeTransform; +import org.jzy3d.plot3d.transform.log.LogTransformer; /** * TODO : diff --git a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableAbstractGeometry.java b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableAbstractGeometry.java index de8ea2df..6cf06bae 100644 --- a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableAbstractGeometry.java +++ b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableAbstractGeometry.java @@ -4,8 +4,8 @@ import javax.media.opengl.GL; import org.jzy3d.maths.Coord3d; import org.jzy3d.plot3d.primitives.AbstractGeometry; -import org.jzy3d.plot3d.primitives.log.transformers.LogTransformer; import org.jzy3d.plot3d.rendering.compat.GLES2CompatUtils; +import org.jzy3d.plot3d.transform.log.LogTransformer; public abstract class AxeTransformableAbstractGeometry extends AbstractGeometry{ diff --git a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableConcurrentScatterMultiColor.java b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableConcurrentScatterMultiColor.java index 58cc4092..93121edf 100644 --- a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableConcurrentScatterMultiColor.java +++ b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableConcurrentScatterMultiColor.java @@ -7,8 +7,8 @@ import org.jzy3d.colors.Color; import org.jzy3d.colors.ColorMapper; import org.jzy3d.maths.Coord3d; import org.jzy3d.plot3d.primitives.ConcurrentScatterMultiColor; -import org.jzy3d.plot3d.primitives.log.transformers.LogTransformer; import org.jzy3d.plot3d.rendering.compat.GLES2CompatUtils; +import org.jzy3d.plot3d.transform.log.LogTransformer; public class AxeTransformableConcurrentScatterMultiColor extends ConcurrentScatterMultiColor { diff --git a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableConcurrentScatterMultiColorList.java b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableConcurrentScatterMultiColorList.java index aed7a169..7f7545ff 100644 --- a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableConcurrentScatterMultiColorList.java +++ b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableConcurrentScatterMultiColorList.java @@ -10,8 +10,8 @@ import org.jzy3d.colors.Color; import org.jzy3d.colors.ColorMapper; import org.jzy3d.maths.Coord3d; import org.jzy3d.plot3d.primitives.ConcurrentScatterMultiColorList; -import org.jzy3d.plot3d.primitives.log.transformers.LogTransformer; import org.jzy3d.plot3d.rendering.compat.GLES2CompatUtils; +import org.jzy3d.plot3d.transform.log.LogTransformer; public class AxeTransformableConcurrentScatterMultiColorList extends ConcurrentScatterMultiColorList { diff --git a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableConcuurentScatterPoint.java b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableConcuurentScatterPoint.java index 97b26ab9..40bb7f09 100644 --- a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableConcuurentScatterPoint.java +++ b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableConcuurentScatterPoint.java @@ -8,8 +8,8 @@ import javax.media.opengl.GL2; import org.jzy3d.maths.Coord3d; import org.jzy3d.plot3d.primitives.ConcurrentScatterPoint; import org.jzy3d.plot3d.primitives.LightPoint; -import org.jzy3d.plot3d.primitives.log.transformers.LogTransformer; import org.jzy3d.plot3d.rendering.compat.GLES2CompatUtils; +import org.jzy3d.plot3d.transform.log.LogTransformer; public class AxeTransformableConcuurentScatterPoint extends ConcurrentScatterPoint { diff --git a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableFlatLine2d.java b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableFlatLine2d.java index 8a1e869c..4892e64b 100644 --- a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableFlatLine2d.java +++ b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableFlatLine2d.java @@ -3,7 +3,7 @@ package org.jzy3d.plot3d.primitives.log; import org.jzy3d.maths.Coord3d; import org.jzy3d.plot3d.primitives.FlatLine2d; import org.jzy3d.plot3d.primitives.Point; -import org.jzy3d.plot3d.primitives.log.transformers.LogTransformer; +import org.jzy3d.plot3d.transform.log.LogTransformer; public class AxeTransformableFlatLine2d extends FlatLine2d { public AxeTransformableFlatLine2d(LogTransformer transformers){ diff --git a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableLineStrip.java b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableLineStrip.java index 715bc6ad..853b4821 100644 --- a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableLineStrip.java +++ b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableLineStrip.java @@ -10,9 +10,9 @@ import org.jzy3d.maths.BoundingBox3d; import org.jzy3d.maths.Coord3d; import org.jzy3d.plot3d.primitives.LineStrip; import org.jzy3d.plot3d.primitives.Point; -import org.jzy3d.plot3d.primitives.log.transformers.LogTransformer; import org.jzy3d.plot3d.rendering.compat.GLES2CompatUtils; import org.jzy3d.plot3d.rendering.view.Camera; +import org.jzy3d.plot3d.transform.log.LogTransformer; public class AxeTransformableLineStrip extends LineStrip { diff --git a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableLineStripInterpolated.java b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableLineStripInterpolated.java index c84ca302..f11919d5 100644 --- a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableLineStripInterpolated.java +++ b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableLineStripInterpolated.java @@ -9,7 +9,7 @@ import org.jzy3d.maths.algorithms.interpolation.IInterpolator; import org.jzy3d.plot3d.primitives.LineStrip; import org.jzy3d.plot3d.primitives.LineStripInterpolated; import org.jzy3d.plot3d.primitives.Point; -import org.jzy3d.plot3d.primitives.log.transformers.LogTransformer; +import org.jzy3d.plot3d.transform.log.LogTransformer; public class AxeTransformableLineStripInterpolated extends LineStripInterpolated{ diff --git a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformablePoint.java b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformablePoint.java index 0814643e..3cb4f96f 100644 --- a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformablePoint.java +++ b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformablePoint.java @@ -8,9 +8,9 @@ import org.jzy3d.colors.Color; import org.jzy3d.maths.BoundingBox3d; import org.jzy3d.maths.Coord3d; import org.jzy3d.plot3d.primitives.Point; -import org.jzy3d.plot3d.primitives.log.transformers.LogTransformer; import org.jzy3d.plot3d.rendering.compat.GLES2CompatUtils; import org.jzy3d.plot3d.rendering.view.Camera; +import org.jzy3d.plot3d.transform.log.LogTransformer; public class AxeTransformablePoint extends Point { /** Intialize a point at the origin, with a white color and a width of 1. */ diff --git a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformablePolygon.java b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformablePolygon.java index 033c9461..5f73cfb8 100644 --- a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformablePolygon.java +++ b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformablePolygon.java @@ -5,9 +5,9 @@ import java.awt.Polygon; import javax.media.opengl.GL; import javax.media.opengl.GL2; -import org.jzy3d.plot3d.primitives.log.transformers.AxeTransform; -import org.jzy3d.plot3d.primitives.log.transformers.LogTransformer; import org.jzy3d.plot3d.rendering.compat.GLES2CompatUtils; +import org.jzy3d.plot3d.transform.log.AxeTransform; +import org.jzy3d.plot3d.transform.log.LogTransformer; public class AxeTransformablePolygon extends AxeTransformableAbstractGeometry { diff --git a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableQuad.java b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableQuad.java index 93c691d4..42876219 100644 --- a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableQuad.java +++ b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableQuad.java @@ -3,8 +3,8 @@ package org.jzy3d.plot3d.primitives.log; import javax.media.opengl.GL; import javax.media.opengl.GL2; -import org.jzy3d.plot3d.primitives.log.transformers.LogTransformer; import org.jzy3d.plot3d.rendering.compat.GLES2CompatUtils; +import org.jzy3d.plot3d.transform.log.LogTransformer; public class AxeTransformableQuad extends AxeTransformableAbstractGeometry { diff --git a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableScatter.java b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableScatter.java index 8353fbc1..4c33081f 100644 --- a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableScatter.java +++ b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableScatter.java @@ -7,8 +7,8 @@ import org.jzy3d.colors.Color; import org.jzy3d.maths.BoundingBox3d; import org.jzy3d.maths.Coord3d; import org.jzy3d.plot3d.primitives.Scatter; -import org.jzy3d.plot3d.primitives.log.transformers.LogTransformer; import org.jzy3d.plot3d.rendering.compat.GLES2CompatUtils; +import org.jzy3d.plot3d.transform.log.LogTransformer; public class AxeTransformableScatter extends Scatter{ LogTransformer transformers; diff --git a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableScatterPoint.java b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableScatterPoint.java index d81a51be..7b3fca15 100644 --- a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableScatterPoint.java +++ b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/AxeTransformableScatterPoint.java @@ -11,9 +11,9 @@ import org.jzy3d.maths.BoundingBox3d; import org.jzy3d.maths.Coord3d; import org.jzy3d.plot3d.primitives.LightPoint; import org.jzy3d.plot3d.primitives.ScatterPoint; -import org.jzy3d.plot3d.primitives.log.transformers.LogTransformer; import org.jzy3d.plot3d.rendering.compat.GLES2CompatUtils; import org.jzy3d.plot3d.rendering.view.Camera; +import org.jzy3d.plot3d.transform.log.LogTransformer; public class AxeTransformableScatterPoint extends ScatterPoint{ diff --git a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/GlVertexExecutor.java b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/GlVertexExecutor.java index 78919e2b..995148e6 100644 --- a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/GlVertexExecutor.java +++ b/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/GlVertexExecutor.java @@ -3,8 +3,8 @@ package org.jzy3d.plot3d.primitives.log; import javax.media.opengl.GL; import org.jzy3d.maths.Coord3d; -import org.jzy3d.plot3d.primitives.log.transformers.AxeTransform; -import org.jzy3d.plot3d.primitives.log.transformers.LogTransformer; +import org.jzy3d.plot3d.transform.log.AxeTransform; +import org.jzy3d.plot3d.transform.log.LogTransformer; public abstract class GlVertexExecutor { public static void Vertex(GL gl, Coord3d c3d,LogTransformer transformers){ diff --git a/jzy3d-api/src/api/org/jzy3d/plot3d/rendering/view/View.java b/jzy3d-api/src/api/org/jzy3d/plot3d/rendering/view/View.java index ebc8b419..e792a864 100644 --- a/jzy3d-api/src/api/org/jzy3d/plot3d/rendering/view/View.java +++ b/jzy3d-api/src/api/org/jzy3d/plot3d/rendering/view/View.java @@ -28,7 +28,6 @@ import org.jzy3d.maths.Coord3d; import org.jzy3d.maths.Rectangle; import org.jzy3d.plot3d.primitives.axes.AxeBox; import org.jzy3d.plot3d.primitives.axes.IAxe; -import org.jzy3d.plot3d.primitives.log.transformers.LogTransformer; import org.jzy3d.plot3d.rendering.canvas.ICanvas; import org.jzy3d.plot3d.rendering.canvas.Quality; import org.jzy3d.plot3d.rendering.compat.GLES2CompatUtils; @@ -40,6 +39,7 @@ import org.jzy3d.plot3d.rendering.view.modes.ViewBoundMode; import org.jzy3d.plot3d.rendering.view.modes.ViewPositionMode; import org.jzy3d.plot3d.transform.Scale; import org.jzy3d.plot3d.transform.Transform; +import org.jzy3d.plot3d.transform.log.LogTransformer; import com.jogamp.opengl.util.awt.Overlay; diff --git a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/transformers/AxeTransform.java b/jzy3d-api/src/api/org/jzy3d/plot3d/transform/log/AxeTransform.java similarity index 72% rename from jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/transformers/AxeTransform.java rename to jzy3d-api/src/api/org/jzy3d/plot3d/transform/log/AxeTransform.java index 06d940b8..928a7887 100644 --- a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/transformers/AxeTransform.java +++ b/jzy3d-api/src/api/org/jzy3d/plot3d/transform/log/AxeTransform.java @@ -1,4 +1,4 @@ -package org.jzy3d.plot3d.primitives.log.transformers; +package org.jzy3d.plot3d.transform.log; /** * Specify an axe transform (e.g. for log axes) diff --git a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/transformers/AxeTransformLinear.java b/jzy3d-api/src/api/org/jzy3d/plot3d/transform/log/AxeTransformLinear.java similarity index 79% rename from jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/transformers/AxeTransformLinear.java rename to jzy3d-api/src/api/org/jzy3d/plot3d/transform/log/AxeTransformLinear.java index 2959ddb1..c93d4881 100644 --- a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/transformers/AxeTransformLinear.java +++ b/jzy3d-api/src/api/org/jzy3d/plot3d/transform/log/AxeTransformLinear.java @@ -1,4 +1,4 @@ -package org.jzy3d.plot3d.primitives.log.transformers; +package org.jzy3d.plot3d.transform.log; /** * Do not apply any transform (return input value). diff --git a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/transformers/AxeTransformLog.java b/jzy3d-api/src/api/org/jzy3d/plot3d/transform/log/AxeTransformLog.java similarity index 83% rename from jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/transformers/AxeTransformLog.java rename to jzy3d-api/src/api/org/jzy3d/plot3d/transform/log/AxeTransformLog.java index a59a37f4..999b542b 100644 --- a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/transformers/AxeTransformLog.java +++ b/jzy3d-api/src/api/org/jzy3d/plot3d/transform/log/AxeTransformLog.java @@ -1,4 +1,4 @@ -package org.jzy3d.plot3d.primitives.log.transformers; +package org.jzy3d.plot3d.transform.log; /** * Apply log transform if value is greater than 0 (otherwise return 0). diff --git a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/transformers/LogTransformer.java b/jzy3d-api/src/api/org/jzy3d/plot3d/transform/log/LogTransformer.java similarity index 96% rename from jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/transformers/LogTransformer.java rename to jzy3d-api/src/api/org/jzy3d/plot3d/transform/log/LogTransformer.java index f3194d41..d0a52891 100644 --- a/jzy3d-api/src/api/org/jzy3d/plot3d/primitives/log/transformers/LogTransformer.java +++ b/jzy3d-api/src/api/org/jzy3d/plot3d/transform/log/LogTransformer.java @@ -1,4 +1,4 @@ -package org.jzy3d.plot3d.primitives.log.transformers; +package org.jzy3d.plot3d.transform.log; import org.jzy3d.maths.Coord2d; import org.jzy3d.maths.Coord3d; diff --git a/jzy3d-api/src/tests/org/jzy3d/tests/LogScatterTest.java b/jzy3d-api/src/tests/org/jzy3d/tests/LogScatterTest.java index aef8f6a0..4cf30f6c 100644 --- a/jzy3d-api/src/tests/org/jzy3d/tests/LogScatterTest.java +++ b/jzy3d-api/src/tests/org/jzy3d/tests/LogScatterTest.java @@ -16,9 +16,9 @@ import org.jzy3d.plot3d.primitives.Scatter; import org.jzy3d.plot3d.primitives.log.AxeTransformableConcurrentScatterMultiColor; import org.jzy3d.plot3d.primitives.log.AxeTransformableConcurrentScatterMultiColorList; import org.jzy3d.plot3d.primitives.log.AxeTransformableScatter; -import org.jzy3d.plot3d.primitives.log.transformers.AxeTransformLog; -import org.jzy3d.plot3d.primitives.log.transformers.LogTransformer; import org.jzy3d.plot3d.rendering.canvas.Quality; +import org.jzy3d.plot3d.transform.log.AxeTransformLog; +import org.jzy3d.plot3d.transform.log.LogTransformer; public class LogScatterTest extends AbstractAnalysis{ diff --git a/jzy3d-api/src/tests/org/jzy3d/tests/LogTest.java b/jzy3d-api/src/tests/org/jzy3d/tests/LogTest.java index 0eac713c..d981eac1 100644 --- a/jzy3d-api/src/tests/org/jzy3d/tests/LogTest.java +++ b/jzy3d-api/src/tests/org/jzy3d/tests/LogTest.java @@ -13,9 +13,9 @@ import org.jzy3d.plot3d.builder.Mapper; import org.jzy3d.plot3d.builder.concrete.OrthonormalGrid; import org.jzy3d.plot3d.primitives.CompileableComposite; import org.jzy3d.plot3d.primitives.log.AxeTransformablePoint; -import org.jzy3d.plot3d.primitives.log.transformers.AxeTransformLog; -import org.jzy3d.plot3d.primitives.log.transformers.LogTransformer; import org.jzy3d.plot3d.rendering.canvas.Quality; +import org.jzy3d.plot3d.transform.log.AxeTransformLog; +import org.jzy3d.plot3d.transform.log.LogTransformer; public class LogTest {