Loading Comparison/src/main/java/cz/fidentis/analyst/procrustes/ProcrustesAnalysis.java +0 −5 Original line number Diff line number Diff line Loading @@ -2,16 +2,11 @@ package cz.fidentis.analyst.procrustes; import cz.fidentis.analyst.face.HumanFace; import cz.fidentis.analyst.feature.FeaturePoint; import cz.fidentis.analyst.icp.IcpTransformation; import cz.fidentis.analyst.mesh.core.MeshPoint; import cz.fidentis.analyst.procrustes.exceptions.ProcrustesAnalysisException; import cz.fidentis.analyst.procrustes.utils.ProcrustesAnalysisUtils; import org.ejml.data.Matrix; import org.ejml.simple.SimpleMatrix; import org.ejml.simple.SimpleSVD; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import javax.vecmath.Point3d; Loading Comparison/src/main/java/cz/fidentis/analyst/procrustes/ProcrustesAnalysisComparison.java +7 −17 Original line number Diff line number Diff line /* * To change this license header, choose License Headers in Project Properties. * To change this template file, choose Tools | Templates * and open the template in the editor. */ package cz.fidentis.analyst.procrustes; import cz.fidentis.analyst.face.HumanFace; import cz.fidentis.analyst.face.HumanFaceFactory; import cz.fidentis.analyst.feature.FeaturePoint; import cz.fidentis.analyst.feature.services.FeaturePointCsvLoader; import cz.fidentis.analyst.feature.services.FeaturePointExportService; import cz.fidentis.analyst.feature.services.FeaturePointImportService; import cz.fidentis.analyst.feature.utils.FileResourcesUtils; import cz.fidentis.analyst.mesh.core.MeshModel; import cz.fidentis.analyst.mesh.io.MeshObjLoader; import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.net.URISyntaxException; import java.net.URL; import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; /** * Class used for testing procrustes analysis and converting feature point file formats. * * @author Jakub Kolman */ Loading @@ -51,9 +38,12 @@ public class ProcrustesAnalysisComparison { private static final Path OLD_HEAD_02_PATH = Paths.get( "cz", "fidentis", "comparison", "procrustesAnalysis", "faces", "3points_head02_ECA.obj"); /** * main class used to * @param args * @throws IOException * @throws URISyntaxException */ public static void main(String[] args) throws IOException, URISyntaxException { FileResourcesUtils fru = new FileResourcesUtils(); Loading Comparison/src/main/java/cz/fidentis/analyst/procrustes/ProcrustesAnalysisFaceModel.java +5 −6 Original line number Diff line number Diff line /* * To change this license header, choose License Headers in Project Properties. * To change this template file, choose Tools | Templates * and open the template in the editor. */ package cz.fidentis.analyst.procrustes; import cz.fidentis.analyst.face.HumanFace; Loading @@ -10,7 +5,6 @@ import cz.fidentis.analyst.feature.FeaturePoint; import cz.fidentis.analyst.mesh.core.MeshModel; import cz.fidentis.analyst.mesh.core.MeshPoint; import cz.fidentis.analyst.procrustes.utils.ProcrustesAnalysisUtils; import org.ejml.simple.SimpleMatrix; import java.util.ArrayList; import java.util.HashMap; Loading @@ -29,6 +23,11 @@ public class ProcrustesAnalysisFaceModel { private MeshModel meshModel; private final HashMap<Integer, Integer> featurePointTypeCorrespondence; /** * constructor creating inner attributes used in procrustes analysis from face * * @param face */ public ProcrustesAnalysisFaceModel(HumanFace face) { this.humanFace = face; // getFeaturePoints() returns unmodifiable List. To sort it we need to make copy first Loading Comparison/src/main/java/cz/fidentis/analyst/procrustes/utils/ProcrustesAnalysisUtils.java +5 −10 Original line number Diff line number Diff line /* * To change this license header, choose License Headers in Project Properties. * To change this template file, choose Tools | Templates * and open the template in the editor. */ package cz.fidentis.analyst.procrustes.utils; import cz.fidentis.analyst.feature.FeaturePoint; import cz.fidentis.analyst.feature.api.IPosition; import cz.fidentis.analyst.feature.provider.FeaturePointTypeProvider; import cz.fidentis.analyst.mesh.core.MeshPoint; import cz.fidentis.analyst.procrustes.ProcrustesAnalysisFaceModel; import org.ejml.simple.SimpleMatrix; import javax.vecmath.Point3d; import javax.vecmath.Vector3f; import java.util.*; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.List; /** * @author Jakub Kolman Loading GUI/pom.xml +1 −7 Original line number Diff line number Diff line Loading @@ -138,12 +138,6 @@ <version>RELEASE123</version> </dependency> <!-- http://ejml.org/wiki/index.php?title=Main_Page --> <dependency> <groupId>org.ejml</groupId> <artifactId>ejml-all</artifactId> <version>0.41</version> </dependency> </dependencies> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> Loading Loading
Comparison/src/main/java/cz/fidentis/analyst/procrustes/ProcrustesAnalysis.java +0 −5 Original line number Diff line number Diff line Loading @@ -2,16 +2,11 @@ package cz.fidentis.analyst.procrustes; import cz.fidentis.analyst.face.HumanFace; import cz.fidentis.analyst.feature.FeaturePoint; import cz.fidentis.analyst.icp.IcpTransformation; import cz.fidentis.analyst.mesh.core.MeshPoint; import cz.fidentis.analyst.procrustes.exceptions.ProcrustesAnalysisException; import cz.fidentis.analyst.procrustes.utils.ProcrustesAnalysisUtils; import org.ejml.data.Matrix; import org.ejml.simple.SimpleMatrix; import org.ejml.simple.SimpleSVD; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import javax.vecmath.Point3d; Loading
Comparison/src/main/java/cz/fidentis/analyst/procrustes/ProcrustesAnalysisComparison.java +7 −17 Original line number Diff line number Diff line /* * To change this license header, choose License Headers in Project Properties. * To change this template file, choose Tools | Templates * and open the template in the editor. */ package cz.fidentis.analyst.procrustes; import cz.fidentis.analyst.face.HumanFace; import cz.fidentis.analyst.face.HumanFaceFactory; import cz.fidentis.analyst.feature.FeaturePoint; import cz.fidentis.analyst.feature.services.FeaturePointCsvLoader; import cz.fidentis.analyst.feature.services.FeaturePointExportService; import cz.fidentis.analyst.feature.services.FeaturePointImportService; import cz.fidentis.analyst.feature.utils.FileResourcesUtils; import cz.fidentis.analyst.mesh.core.MeshModel; import cz.fidentis.analyst.mesh.io.MeshObjLoader; import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.net.URISyntaxException; import java.net.URL; import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; /** * Class used for testing procrustes analysis and converting feature point file formats. * * @author Jakub Kolman */ Loading @@ -51,9 +38,12 @@ public class ProcrustesAnalysisComparison { private static final Path OLD_HEAD_02_PATH = Paths.get( "cz", "fidentis", "comparison", "procrustesAnalysis", "faces", "3points_head02_ECA.obj"); /** * main class used to * @param args * @throws IOException * @throws URISyntaxException */ public static void main(String[] args) throws IOException, URISyntaxException { FileResourcesUtils fru = new FileResourcesUtils(); Loading
Comparison/src/main/java/cz/fidentis/analyst/procrustes/ProcrustesAnalysisFaceModel.java +5 −6 Original line number Diff line number Diff line /* * To change this license header, choose License Headers in Project Properties. * To change this template file, choose Tools | Templates * and open the template in the editor. */ package cz.fidentis.analyst.procrustes; import cz.fidentis.analyst.face.HumanFace; Loading @@ -10,7 +5,6 @@ import cz.fidentis.analyst.feature.FeaturePoint; import cz.fidentis.analyst.mesh.core.MeshModel; import cz.fidentis.analyst.mesh.core.MeshPoint; import cz.fidentis.analyst.procrustes.utils.ProcrustesAnalysisUtils; import org.ejml.simple.SimpleMatrix; import java.util.ArrayList; import java.util.HashMap; Loading @@ -29,6 +23,11 @@ public class ProcrustesAnalysisFaceModel { private MeshModel meshModel; private final HashMap<Integer, Integer> featurePointTypeCorrespondence; /** * constructor creating inner attributes used in procrustes analysis from face * * @param face */ public ProcrustesAnalysisFaceModel(HumanFace face) { this.humanFace = face; // getFeaturePoints() returns unmodifiable List. To sort it we need to make copy first Loading
Comparison/src/main/java/cz/fidentis/analyst/procrustes/utils/ProcrustesAnalysisUtils.java +5 −10 Original line number Diff line number Diff line /* * To change this license header, choose License Headers in Project Properties. * To change this template file, choose Tools | Templates * and open the template in the editor. */ package cz.fidentis.analyst.procrustes.utils; import cz.fidentis.analyst.feature.FeaturePoint; import cz.fidentis.analyst.feature.api.IPosition; import cz.fidentis.analyst.feature.provider.FeaturePointTypeProvider; import cz.fidentis.analyst.mesh.core.MeshPoint; import cz.fidentis.analyst.procrustes.ProcrustesAnalysisFaceModel; import org.ejml.simple.SimpleMatrix; import javax.vecmath.Point3d; import javax.vecmath.Vector3f; import java.util.*; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.List; /** * @author Jakub Kolman Loading
GUI/pom.xml +1 −7 Original line number Diff line number Diff line Loading @@ -138,12 +138,6 @@ <version>RELEASE123</version> </dependency> <!-- http://ejml.org/wiki/index.php?title=Main_Page --> <dependency> <groupId>org.ejml</groupId> <artifactId>ejml-all</artifactId> <version>0.41</version> </dependency> </dependencies> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> Loading