Commit 531ac27d authored by Radek Ošlejšek's avatar Radek Ošlejšek
Browse files

Merge branch 'poisson-disk-sub-sampling' into 'master' 

Poisson disk sub sampling

See merge request grp-fidentis/analyst2!259
parents 033499a9 76a4bbbb

GUI/src/main/java/cz/fidentis/analyst/gui/task/registration/RegistrationAction.java

+4 −6
Original line number Diff line number Diff line
@@ -15,12 +15,8 @@ import cz.fidentis.analyst.procrustes.ProcrustesUtils; 
import cz.fidentis.analyst.drawables.DrawablePointCloud;

import cz.fidentis.analyst.gui.elements.ManualAnimationPanel;

import cz.fidentis.analyst.project.FacesProxy;

import cz.fidentis.analyst.sampling.CurvatureSampling;

import cz.fidentis.analyst.sampling.NoSampling;

import cz.fidentis.analyst.sampling.PointSampling;

import cz.fidentis.analyst.sampling.RandomSampling;

import cz.fidentis.analyst.sampling.UniformSpaceSampling;

import cz.fidentis.analyst.sampling.UniformSurfaceSampling;

import cz.fidentis.analyst.sampling.*;



import java.awt.Color;

import java.awt.event.ActionEvent;

import javax.swing.JFormattedTextField;
@@ -360,6 +356,8 @@ public class RegistrationAction extends ControlPanelAction<RegistrationPanel> im 
            return new UniformSpaceSampling(strength);

        } else if (st.equals(RegistrationPanel.POINT_SAMPLING_STRATEGIES[7])) {

            return new UniformSurfaceSampling(strength);

        } else if (st.equals(RegistrationPanel.POINT_SAMPLING_STRATEGIES[8])) {

            return new PoissonDiskSubSampling(strength);

        } else {

            return null;

        }

GUI/src/main/java/cz/fidentis/analyst/gui/task/registration/RegistrationPanel.java

+5 −3
Original line number Diff line number Diff line
@@ -56,7 +56,9 @@ public class RegistrationPanel extends ControlPanel { 
        "Max Curvature",

        "Min Curvature",

        "Uniform Space Sampling",

        "Uniform Mesh Sampling",};

        "Uniform Mesh Sampling",

        "Poisson disk sub sampling"

    };

    

    public static final String[] AUTO_ALIGNMENT_ALGORITHM = new String[] {

        "Align meshes (ICP)",

GUI/src/main/java/cz/fidentis/analyst/gui/task/symmetry/SymmetryAction.java

+3 −5
Original line number Diff line number Diff line 
package cz.fidentis.analyst.gui.task.symmetry;



import cz.fidentis.analyst.sampling.*;

import cz.fidentis.analyst.shapes.Plane;

import cz.fidentis.analyst.Logger;

import cz.fidentis.analyst.canvas.Canvas;
@@ -17,11 +18,6 @@ import cz.fidentis.analyst.drawables.DrawablePointCloud; 
import cz.fidentis.analyst.distance.MeshDistanceNN;

import cz.fidentis.analyst.distance.MeshDistanceNN.Strategy;

import cz.fidentis.analyst.project.FacesProxy;

import cz.fidentis.analyst.sampling.CurvatureSampling;

import cz.fidentis.analyst.sampling.NoSampling;

import cz.fidentis.analyst.sampling.PointSampling;

import cz.fidentis.analyst.sampling.RandomSampling;

import cz.fidentis.analyst.sampling.UniformSpaceSampling;

import cz.fidentis.analyst.symmetry.SymmetryEstimator;

import cz.fidentis.analyst.symmetry.SymmetryEstimatorMesh;

import cz.fidentis.analyst.symmetry.SymmetryEstimatorRobust;
@@ -295,6 +291,8 @@ public class SymmetryAction extends ControlPanelAction<SymmetryPanel> implements 
            return new CurvatureSampling(CurvatureSampling.CurvatureAlg.MIN);

        } else if (st.equals(SymmetryPanel.POINT_SAMPLING_STRATEGIES[0])) {

            return new UniformSpaceSampling();

        } else if (st.equals((SymmetryPanel.POINT_SAMPLING_STRATEGIES[6]))){

            return new PoissonDiskSubSampling();

        } else {

            return null;

        }

GUI/src/main/java/cz/fidentis/analyst/gui/task/symmetry/SymmetryPanel.java

+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ public class SymmetryPanel extends ControlPanel { 
        "Mean Curvature",

        "Gaussian Curvature",

        "Max Curvature",

        "Min Curvature"

        "Min Curvature",

        "Poisson disk sub sampling"

    };

    

    public static final String[] ALGORITHM = new String[] {

MeshAlgorithms/src/main/java/cz/fidentis/analyst/sampling/PoissonDiskSubSampling.java

0 → 100644
+547 −0

File added.

Preview size limit exceeded, changes collapsed.