diff --git a/src/main/java/com/romraider/maps/Table.java b/src/main/java/com/romraider/maps/Table.java index eb6a5c05..22672a11 100644 --- a/src/main/java/com/romraider/maps/Table.java +++ b/src/main/java/com/romraider/maps/Table.java @@ -1109,6 +1109,7 @@ public abstract class Table extends JPanel implements Serializable { } public void verticalInterpolate() { + horizontalInterpolate(); } public void horizontalInterpolate() { diff --git a/src/main/java/com/romraider/maps/Table2D.java b/src/main/java/com/romraider/maps/Table2D.java index f099076a..c6892795 100644 --- a/src/main/java/com/romraider/maps/Table2D.java +++ b/src/main/java/com/romraider/maps/Table2D.java @@ -303,6 +303,24 @@ public class Table2D extends Table { } } + @Override + public void interpolate() { + super.interpolate(); + this.getAxis().interpolate(); + } + + @Override + public void verticalInterpolate() { + super.verticalInterpolate(); + this.getAxis().verticalInterpolate(); + } + + @Override + public void horizontalInterpolate() { + super.horizontalInterpolate(); + this.getAxis().horizontalInterpolate(); + } + @Override public boolean isLiveDataSupported() { return !isNullOrEmpty(axis.getLogParam()); diff --git a/src/main/java/com/romraider/maps/Table3D.java b/src/main/java/com/romraider/maps/Table3D.java index ea447aeb..a05c5178 100644 --- a/src/main/java/com/romraider/maps/Table3D.java +++ b/src/main/java/com/romraider/maps/Table3D.java @@ -809,6 +809,8 @@ public class Table3D extends Table { } } } + // Interpolate y axis in case the y axis in selected. + this.getYAxis().verticalInterpolate(); } @Override @@ -841,6 +843,8 @@ public class Table3D extends Table { } } } + // Interpolate x axis in case the x axis in selected. + this.getXAxis().horizontalInterpolate(); } @Override diff --git a/src/main/java/com/romraider/swing/TableFrame.java b/src/main/java/com/romraider/swing/TableFrame.java index a3694dc4..53d08e9e 100644 --- a/src/main/java/com/romraider/swing/TableFrame.java +++ b/src/main/java/com/romraider/swing/TableFrame.java @@ -180,13 +180,13 @@ public class TableFrame extends JInternalFrame implements InternalFrameListener, getTable().refreshCompare(); } else if (e.getSource() == menu.getInterp()) { - table.interpolate(); + getTable().interpolate(); } else if (e.getSource() == menu.getVertInterp()) { - table.verticalInterpolate(); + getTable().verticalInterpolate(); } else if (e.getSource() == menu.getHorizInterp()) { - table.horizontalInterpolate(); + getTable().horizontalInterpolate(); } }