Commit 1b9dc54f authored by Piotr Wendykier's avatar Piotr Wendykier

Merge branch 'bugfix/issue_87' into 'develop'

Fix for issue #87.

See merge request !99
parents d175f6d2 0d4c4f14
Pipeline #30660924 passed with stage
in 0 seconds
......@@ -40,6 +40,9 @@ package pl.edu.icm.visnow.lib.basic.filters.DifferentialOperations;
import pl.edu.icm.visnow.engine.core.ParameterName;
import pl.edu.icm.visnow.gui.widgets.RunButton.RunState;
import pl.edu.icm.visnow.lib.utils.field.DifferentialOperations.ScalarOperation;
import pl.edu.icm.visnow.lib.utils.field.DifferentialOperations.TimeOperation;
import pl.edu.icm.visnow.lib.utils.field.DifferentialOperations.VectorOperation;
/**
*
......@@ -47,22 +50,6 @@ import pl.edu.icm.visnow.gui.widgets.RunButton.RunState;
*/
public class DifferentialOperationsShared
{
public enum ScalarOperation
{
GRADIENT, GRADIENT_NORM, GRADIENT_COMPONENTS, NORMALIZED_GRADIENT,
LAPLACIAN, HESSIAN, HESSIAN_EIGEN
};
public enum VectorOperation
{
DERIV, DERIV_COMPONENTS, DIV, ROT
};
public enum TimeOperation
{
D_DT, D2_DT2
};
//Parameter names + specification. SPECIFICATION CONSTRAINTS ARE NOT TESTED IN LOGIC!
//Specification:
......
......@@ -55,9 +55,9 @@ import pl.edu.icm.visnow.engine.core.ParameterProxy;
import pl.edu.icm.visnow.engine.core.Parameters;
import pl.edu.icm.visnow.gui.widgets.RunButton.RunState;
import static pl.edu.icm.visnow.lib.basic.filters.DifferentialOperations.DifferentialOperationsShared.*;
import static pl.edu.icm.visnow.lib.basic.filters.DifferentialOperations.DifferentialOperationsShared.ScalarOperation.*;
import static pl.edu.icm.visnow.lib.basic.filters.DifferentialOperations.DifferentialOperationsShared.VectorOperation.*;
import static pl.edu.icm.visnow.lib.basic.filters.DifferentialOperations.DifferentialOperationsShared.TimeOperation.*;
import pl.edu.icm.visnow.lib.utils.field.DifferentialOperations.ScalarOperation;
import pl.edu.icm.visnow.lib.utils.field.DifferentialOperations.TimeOperation;
import pl.edu.icm.visnow.lib.utils.field.DifferentialOperations.VectorOperation;
import pl.edu.icm.visnow.system.swing.FixedGridBagLayoutPanel;
/**
......@@ -71,8 +71,8 @@ public final class GUI extends FixedGridBagLayoutPanel
protected final static ScalarOperation[] SCALAR_TABLE_COLUMN_ORDER =
{null, GRADIENT, GRADIENT_COMPONENTS, GRADIENT_NORM, NORMALIZED_GRADIENT,
LAPLACIAN, HESSIAN, HESSIAN_EIGEN};
{null, ScalarOperation.GRADIENT, ScalarOperation.GRADIENT_COMPONENTS, ScalarOperation.GRADIENT_NORM, ScalarOperation.NORMALIZED_GRADIENT,
ScalarOperation.LAPLACIAN, ScalarOperation.HESSIAN, ScalarOperation.HESSIAN_EIGEN};
protected final static String[] SCALAR_TABLE_TOOLTIPS = {
null, "gradient", "partial derivatives as scalars", "gradient norm", "normalized gradient",
"Laplacian","Hessian matrix (upper triangle)","Hessian eigenvalues and eigenvectors"
......@@ -132,7 +132,7 @@ public final class GUI extends FixedGridBagLayoutPanel
}
};
private final static VectorOperation[] VECTOR_TABLE_COLUMN_ORDER = {null, DERIV, ROT, DIV};
private final static VectorOperation[] VECTOR_TABLE_COLUMN_ORDER = {null, VectorOperation.DERIV, VectorOperation.ROT, VectorOperation.DIV};
protected final static String[] VECTOR_TABLE_TOOLTIPS = {null, "partial derivatives", "rotation", "divergence"};
protected final static int[] VECTOR_TABLE_COLUMN_WIDTHS = new int[]{100, 20, 20, 20};
protected final DefaultTableModel vectorTableModel =
......@@ -187,7 +187,7 @@ public final class GUI extends FixedGridBagLayoutPanel
}
};
private final static TimeOperation[] TIME_TABLE_COLUMN_ORDER = {null, D_DT, D2_DT2};
private final static TimeOperation[] TIME_TABLE_COLUMN_ORDER = {null, TimeOperation.D_DT, TimeOperation.D2_DT2};
protected final static String[] TIME_TABLE_TOOLTIPS = {null, "time derivative (change velocity)", "time change acceleration"};
protected final static int[] TIME_TABLE_COLUMN_WIDTHS = new int[]{120, 30, 30};
protected DefaultTableModel timeTableModel
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment