From 9411d1ad9225ab6b524458ffd66037495b74571e Mon Sep 17 00:00:00 2001
From: Jakub Kolman <kubokolman@gmail.com>
Date: Thu, 28 Apr 2022 00:08:15 +0200
Subject: [PATCH] [#123] feat: rotation issue
---
.../fidentis/analyst/face/HumanFaceUtils.java | 52 +-
.../procrustes/ProcrustesAnalysis.java | 177 +-
.../procrustes/ProcrustesTransformation.java | 79 +-
.../procrustes/ProcrustesVisitor.java | 44 +-
.../procrustes/ProcrustesAnalysisTest.java | 18 +-
.../procrustes/ProcrustesVisitorTest.java | 3 +-
.../rotation_180_moved_2_landmarks.csv | 2 +
.../analyst/tests/ProcrustesVisitorTest.java | 23 +-
.../cz/fidentis/analyst/0002_01_ECA.mtl | 14 +
.../cz/fidentis/analyst/0002_01_ECA.obj | 143941 ++++++++++++++
.../cz/fidentis/analyst/0002_01_landmarks.csv | 2 +
.../cz/fidentis/analyst/0002_02_ECA.mtl | 14 +
.../cz/fidentis/analyst/0002_02_ECA.obj | 152405 +++++++++++++++
.../cz/fidentis/analyst/0002_02_landmarks.csv | 2 +
.../rotation_180_moved_2_landmarks.csv | 2 +
15 files changed, 296600 insertions(+), 178 deletions(-)
create mode 100644 Comparison/src/test/resources/cz/fidentis/analyst/comparison/procrustesAnalysis/rotation_180_moved_2_landmarks.csv
create mode 100644 GUI/src/test/resources/cz/fidentis/analyst/0002_01_ECA.mtl
create mode 100644 GUI/src/test/resources/cz/fidentis/analyst/0002_01_ECA.obj
create mode 100644 GUI/src/test/resources/cz/fidentis/analyst/0002_01_landmarks.csv
create mode 100644 GUI/src/test/resources/cz/fidentis/analyst/0002_02_ECA.mtl
create mode 100644 GUI/src/test/resources/cz/fidentis/analyst/0002_02_ECA.obj
create mode 100644 GUI/src/test/resources/cz/fidentis/analyst/0002_02_landmarks.csv
create mode 100644 GUI/src/test/resources/cz/fidentis/analyst/rotation_180_moved_2_landmarks.csv
diff --git a/Comparison/src/main/java/cz/fidentis/analyst/face/HumanFaceUtils.java b/Comparison/src/main/java/cz/fidentis/analyst/face/HumanFaceUtils.java
index 10865e9f..5e30a6e6 100644
--- a/Comparison/src/main/java/cz/fidentis/analyst/face/HumanFaceUtils.java
+++ b/Comparison/src/main/java/cz/fidentis/analyst/face/HumanFaceUtils.java
@@ -241,20 +241,6 @@ public class HumanFaceUtils {
// get transformation values
ProcrustesVisitor pv = new ProcrustesVisitor(firstFace, secondFace, scale);
-
-// pv.getTransformation().setAdjustment(new Vector3d(50,35,0));
-// pv.getTransformation().setScale(2);
-// SimpleMatrix r = new SimpleMatrix(3, 3);
-// r.set(0, 0, -1);
-// r.set(0, 1, 0);
-// r.set(0, 2, 0);
-// r.set(1, 0, 0);
-// r.set(1, 1, 1);
-// r.set(1, 2, 0);
-// r.set(2, 0, 0);
-// r.set(2, 1, 0);
-// r.set(2, 2, 1);
-// pv.getTransformation().setRotationMatrix(r);
// superimpose face towards the static face
secondFace.getMeshModel().compute(pv, false);
@@ -273,24 +259,29 @@ public class HumanFaceUtils {
// transform feature points:
// better option would be use of secondFace.setFeaturePoints(), but it doesnt repaint them to their new locations
-// if (secondFace.hasFeaturePoints() && pv.getTransformation().getFaceModel().getFeaturePointsMap()!= null) {
-// moveFeaturePoints(secondFace, pv.getTransformation().getFaceModel().getFeaturePointsMap());
+ if (secondFace.hasFeaturePoints() && pv.getTransformation().getFaceModel().getFeaturePointsMap() != null) {
+ moveFeaturePoints(secondFace, pv.getTransformation().getFaceModel().getFeaturePointsMap());
// secondFace.setFeaturePoints(
// new ArrayList<>(pv.getTransformation().getFaceModel().getFeaturePointsMap().values()));
-
-// }
-
- // transform symmetry plane:
- if (secondFace.hasSymmetryPlane()) {
- Vector3d adjustment = pv.getTransformation().getAdjustment();
- double transformationScaleValue = pv.getTransformation().getScale();
- Quaternion rotation = pv.getTransformation().getRotationMatrixAsQuaternion();
- secondFace.getFeaturePoints().parallelStream().forEach(fp -> {
- secondFace.setSymmetryPlane(transformPlane(
- secondFace.getSymmetryPlane(), rotation, adjustment, transformationScaleValue));
- });
- }
+ }
+ // transform symmetry plane:
+ if (secondFace.hasSymmetryPlane()) {
+ Vector3d adjustment = pv.getTransformation().getCentroidAdjustment();
+ double transformationScaleValue = pv.getTransformation().getScale();
+ Quaternion rotation = pv.getTransformation().getMatrixAsQuaternion(
+ pv.getTransformation().getRotationMatrix());
+ secondFace.getFeaturePoints().parallelStream().forEach(fp -> {
+ secondFace.setSymmetryPlane(transformPlane(
+ secondFace.getSymmetryPlane(), rotation, adjustment, transformationScaleValue));
+ });
+ secondFace.getFeaturePoints().parallelStream().forEach(fp -> {
+ secondFace.setSymmetryPlane(transformPlane(
+ secondFace.getSymmetryPlane(),
+ pv.getTransformation().getMatrixAsQuaternion(pv.getTransformation().getIdentityMatrix()),
+ pv.getTransformation().getSuperImpositionAdjustment(), 1));
+ });
+ }
return pv;
}
@@ -376,7 +367,7 @@ public class HumanFaceUtils {
return new Plane(retPlane.getNormal(), dist);
}
- private static void moveFeaturePoints(HumanFace secondFace, HashMap<Integer, FeaturePoint> movedFeaturePoints) {
+ private static void moveFeaturePoints(HumanFace secondFace, HashMap<Integer, FeaturePoint> movedFeaturePoints) {
secondFace.getFeaturePoints().forEach(fp -> {
FeaturePoint movedFp = movedFeaturePoints.get(fp.getFeaturePointType().getType());
if (fp.getFeaturePointType().getType()
@@ -389,7 +380,6 @@ public class HumanFaceUtils {
});
}
-
/**
* Sorts List by featurePoint type property
*
diff --git a/Comparison/src/main/java/cz/fidentis/analyst/procrustes/ProcrustesAnalysis.java b/Comparison/src/main/java/cz/fidentis/analyst/procrustes/ProcrustesAnalysis.java
index 43209481..4ceb431a 100644
--- a/Comparison/src/main/java/cz/fidentis/analyst/procrustes/ProcrustesAnalysis.java
+++ b/Comparison/src/main/java/cz/fidentis/analyst/procrustes/ProcrustesAnalysis.java
@@ -10,6 +10,7 @@ import org.ejml.simple.SimpleSVD;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.zip.DataFormatException;
import javax.vecmath.Point3d;
import javax.vecmath.Vector3d;
@@ -25,9 +26,6 @@ public class ProcrustesAnalysis {
protected final Point3d modelCentroid1;
protected final Point3d modelCentroid2;
-
-// private final Vector3d centroidAdjustment1;
-// private final Vector3d centroidAdjustment2;
private boolean scale = false;
@@ -88,38 +86,37 @@ public class ProcrustesAnalysis {
*/
public ProcrustesTransformation analyze() throws DataFormatException {
ProcrustesTransformation transformation = new ProcrustesTransformation();
- if (this.faceModel1.getFeaturePointsMap().size() > 3) {
- // adjustment is used for superimposition
- Vector3d adjustment = this.getPointDistance(this.modelCentroid2, this.modelCentroid1);
- transformation.setAdjustment(adjustment);
+ if (this.faceModel1.getFeaturePointsMap().size() >= 3) {
+ // adjustment is used for superimposition and return to the original place
+ transformation.setCentroidAdjustment(new Vector3d(-this.modelCentroid2.x, -this.modelCentroid2.y, -this.modelCentroid2.z));
+ transformation.setSuperImpositionAdjustment(new Vector3d(this.modelCentroid1.x, this.modelCentroid1.y, this.modelCentroid1.z));
// sets both faces to the origin of plains
- superImpose();
-
- Point3d a = this.findCentroidOfFeaturePoints(faceModel1.getFeaturePointValues());
- Point3d b = this.findCentroidOfFeaturePoints(faceModel2.getFeaturePointValues());
- this.getPointDistance(a, b);
+ superImpose();
// calculation of scaling vector
if (scale) {
double scaleFactorValue = this.calculateScalingValue();
if (scaleFactorValue != 1) {
+ scaleFace(faceModel2, scaleFactorValue);
transformation.setScale(scaleFactorValue);
- scaleFace(this.faceModel2, scaleFactorValue);
}
}
// calculation of rotation matrix
transformation.setRotationMatrix(this.rotate());
// move faces back to so the centroid of vertices is in the origin point
- moveFaceModel(faceModel2, new Vector3d(this.modelCentroid1.x, this.modelCentroid1.y, this.modelCentroid1.z));
- moveFaceModel(faceModel1, new Vector3d(this.modelCentroid1.x, this.modelCentroid1.y, this.modelCentroid1.z));
-
+// moveFaceModel(faceModel1, new Vector3d(this.modelCentroid1.x, this.modelCentroid1.y, this.modelCentroid1.z));
+// moveFaceModel(faceModel2, new Vector3d(this.modelCentroid1.x, this.modelCentroid1.y, this.modelCentroid1.z));
+
+// readjustFace(faceModel2,
+// new Vector3d(this.modelCentroid2.x, this.modelCentroid2.y, this.modelCentroid2.z),
+// new Vector3d(this.modelCentroid1.x, this.modelCentroid1.y, this.modelCentroid1.z));
+
+ // move featurepoints stored in map to superimposed true position
+// moveFeaturePoints(faceModel2, new Vector3d(this.modelCentroid1.x, this.modelCentroid1.y, this.modelCentroid1.z));
+
transformation.setFaceModel(faceModel2);
-
- a = this.findCentroidOfFeaturePoints(faceModel1.getFeaturePointValues());
- b = this.findCentroidOfFeaturePoints(faceModel2.getFeaturePointValues());
- this.getPointDistance(a, b);
} else {
throw new DataFormatException("Faces have less than 3 feature points.");
@@ -132,44 +129,40 @@ public class ProcrustesAnalysis {
return null;
}
return new Vector3d((point2.x - point1.x), (point2.y - point1.y), (point2.z - point1.z));
-// return new Vector3d((point2.x), (point2.y), (point2.z));
}
/**
- * Superimposes face with different face by moving all vertices and feature points
+ * Moves all vertices and feature points of a face by given vector value
*
* @param faceModel face that is moved
* @param vector vector its values are used to move a face
*/
private void moveFaceModel(ProcrustesAnalysisFaceModel faceModel, Vector3d vector) {
for (FeaturePoint fp : faceModel.getFeaturePointsMap().values()) {
- fp.getPosition().x = fp.getX() + vector.x;
- fp.getPosition().y = fp.getY() + vector.y;
- fp.getPosition().z = fp.getZ() + vector.z;
+ movePoint(fp, vector);
}
for (MeshPoint v : faceModel.getVertices()) {
- v.getPosition().x = v.getX() + vector.x;
- v.getPosition().y = v.getY() + vector.y;
- v.getPosition().z = v.getZ() + vector.z;
+ movePoint(v, vector);
}
-
+ }
+
+ /**
+ * Moves point by given vector value
+ *
+ * @param <T>
+ * @param point
+ * @param vector
+ */
+ private <T extends IPosition> void movePoint(T point, Vector3d vector) {
+ point.getPosition().x = point.getX() + vector.x;
+ point.getPosition().y = point.getY() + vector.y;
+ point.getPosition().z = point.getZ() + vector.z;
}
/**
* By rotation of matrices solves orthogonal procrustes problem
*/
private SimpleMatrix rotate() {
-// SimpleMatrix r = new SimpleMatrix(3, 3);
-// r.set(0, 0, -1);
-// r.set(0, 1, 0);
-// r.set(0, 2, 0);
-// r.set(1, 0, 0);
-// r.set(1, 1, -1);
-// r.set(1, 2, 0);
-// r.set(2, 0, 0);
-// r.set(2, 1, 0);
-// r.set(2, 2, -1);
-
SimpleMatrix primaryMatrix = createMatrixFromList(this.faceModel2.getFeaturePointValues());
SimpleMatrix transposedMatrix = createMatrixFromList(
this.faceModel1.getFeaturePointValues()).transpose();
@@ -178,60 +171,18 @@ public class ProcrustesAnalysis {
SimpleSVD<SimpleMatrix> singularValueDecomposition = svdMatrix.svd();
SimpleMatrix transposedU = singularValueDecomposition.getU().transpose();
SimpleMatrix rotationMatrix = singularValueDecomposition.getV().mult(transposedU);
-// SimpleMatrix rotationMatrix = r;
primaryMatrix = primaryMatrix.mult(rotationMatrix);
-
-
this.faceModel2.setFeaturePointsMap(
createFeaturePointMapFromMatrix(
primaryMatrix, this.faceModel2));
-
+
rotateVertices(this.faceModel2.getVertices(), rotationMatrix);
return rotationMatrix;
}
- /**
- * Rotates all vertices.
- * <p>
- * For more details check out single vertex rotation {@link #rotateVertex}.
- *
- * @param vertices
- * @param matrix
- */
- // if rotated vertices are drawn immediately it is better to set them after rotating them all
- // so it would be drawn just once
- private void rotateVertices(List<MeshPoint> vertices, SimpleMatrix matrix) {
- if (vertices != null) {
- for (int i = 0; i < vertices.size(); i++) {
- rotateVertex(vertices.get(i), matrix);
- }
- }
- }
-
- /**
- * Rotates vertex v by simulating matrix multiplication with given matrix
- *
- * @param v
- * @param matrix
- */
- private static void rotateVertex(MeshPoint v, SimpleMatrix matrix) {
- double x = ((v.getX() * matrix.get(0, 0))
- + (v.getY() * matrix.get(1, 0))
- + (v.getZ() * matrix.get(2, 0)));
- double y = ((v.getX() * matrix.get(0, 1))
- + (v.getY() * matrix.get(1, 1))
- + (v.getZ() * matrix.get(2, 1)));
- double z = ((v.getX() * matrix.get(0, 2))
- + (v.getY() * matrix.get(1, 2))
- + (v.getZ() * matrix.get(2, 2)));
- v.getPosition().x = x;
- v.getPosition().y = y;
- v.getPosition().z = z;
- }
-
/**
* Calculate scaling ratio of how much the appropriate object corresponding
* to the second feature point list has to be scale up or shrunk.
@@ -295,6 +246,46 @@ public class ProcrustesAnalysis {
scaledList.add(scalePointDistance(point, scaleFactor));
}
}
+
+
+ /**
+ * Rotates all vertices.
+ * <p>
+ * For more details check out single vertex rotation {@link #rotateVertex}.
+ *
+ * @param vertices
+ * @param matrix
+ */
+ // if rotated vertices are drawn immediately it is better to set them after rotating them all
+ // so it would be drawn just once
+ private void rotateVertices(List<MeshPoint> vertices, SimpleMatrix matrix) {
+ if (vertices != null) {
+ for (int i = 0; i < vertices.size(); i++) {
+ rotateVertex(vertices.get(i), matrix);
+ }
+ }
+ }
+
+ /**
+ * Rotates vertex v by simulating matrix multiplication with given matrix
+ *
+ * @param v
+ * @param matrix
+ */
+ private static void rotateVertex(MeshPoint v, SimpleMatrix matrix) {
+ double x = ((v.getX() * matrix.get(0, 0))
+ + (v.getY() * matrix.get(1, 0))
+ + (v.getZ() * matrix.get(2, 0)));
+ double y = ((v.getX() * matrix.get(0, 1))
+ + (v.getY() * matrix.get(1, 1))
+ + (v.getZ() * matrix.get(2, 1)));
+ double z = ((v.getX() * matrix.get(0, 2))
+ + (v.getY() * matrix.get(1, 2))
+ + (v.getZ() * matrix.get(2, 2)));
+ v.getPosition().x = x;
+ v.getPosition().y = y;
+ v.getPosition().z = z;
+ }
/**
* Scales position of given point by multiplying its coordinates with given scaleFactor.
@@ -410,11 +401,29 @@ public class ProcrustesAnalysis {
}
/**
- * moves faces so the feature points centroids of both faces will be at the origin
+ * moves faces so the feature points centroids of both faces will be at the origin (0,0,0)
*/
protected void superImpose() {
moveFaceModel(this.faceModel2, new Vector3d(-this.modelCentroid2.x, -this.modelCentroid2.y, -this.modelCentroid2.z));
moveFaceModel(this.faceModel1, new Vector3d(-this.modelCentroid1.x, -this.modelCentroid1.y, -this.modelCentroid1.z));
}
+ private HashMap<Integer, FeaturePoint> moveFeaturePoints(ProcrustesAnalysisFaceModel faceModel2, Vector3d pointDistance) {
+ HashMap<Integer, FeaturePoint> map = new HashMap<>();
+ for (Map.Entry<Integer,FeaturePoint> entry: faceModel2.getFeaturePointsMap().entrySet()) {
+ entry.getValue().getPosition().x += pointDistance.x;
+ entry.getValue().getPosition().y += pointDistance.y;
+ entry.getValue().getPosition().z += pointDistance.z;
+ map.put(entry.getKey(), entry.getValue());
+ }
+ return map;
+ }
+
+ private void readjustFace(ProcrustesAnalysisFaceModel faceModel, Vector3d vertexAdjustment, Vector3d fpAdjustment) {
+ faceModel2.setFeaturePointsMap(moveFeaturePoints(faceModel, fpAdjustment));
+ for (MeshPoint v : faceModel.getVertices()) {
+ movePoint(v, vertexAdjustment);
+ }
+ }
+
}
diff --git a/Comparison/src/main/java/cz/fidentis/analyst/procrustes/ProcrustesTransformation.java b/Comparison/src/main/java/cz/fidentis/analyst/procrustes/ProcrustesTransformation.java
index 1f13015c..10a123bd 100644
--- a/Comparison/src/main/java/cz/fidentis/analyst/procrustes/ProcrustesTransformation.java
+++ b/Comparison/src/main/java/cz/fidentis/analyst/procrustes/ProcrustesTransformation.java
@@ -18,7 +18,10 @@ import org.ejml.simple.SimpleMatrix;
public class ProcrustesTransformation {
private double scale;
- private Vector3d adjustment;
+ // used for adjustment to move feature points (0,0,0) so the face is rotated around the centroid point
+ private Vector3d centroidAdjustment;
+ // used to move face to superimposed poisition over the original human face
+ private Vector3d superImpositionAdjustment;
private SimpleMatrix rotationMatrix;
private ProcrustesAnalysisFaceModel faceModel;
@@ -33,11 +36,13 @@ public class ProcrustesTransformation {
*/
public ProcrustesTransformation(
double scale,
- Vector3d adjustment,
+ Vector3d centroidAdjustment,
+ Vector3d superImpositionAdjustment,
SimpleMatrix rotationMatrix,
ProcrustesAnalysisFaceModel updatedFaceModel) {
this.scale = scale;
- this.adjustment = adjustment;
+ this.centroidAdjustment = centroidAdjustment;
+ this.superImpositionAdjustment = superImpositionAdjustment;
this.rotationMatrix = rotationMatrix;
this.faceModel = updatedFaceModel;
}
@@ -49,9 +54,10 @@ public class ProcrustesTransformation {
* @param adjustment
* @param rotationMatrix
*/
- public ProcrustesTransformation(Vector3d adjustment, SimpleMatrix rotationMatrix) {
+ public ProcrustesTransformation(Vector3d centroidAdjustment, Vector3d superImpositionAdjustment, SimpleMatrix rotationMatrix) {
this.scale = 1;
- this.adjustment = adjustment;
+ this.centroidAdjustment = centroidAdjustment;
+ this.superImpositionAdjustment = superImpositionAdjustment;
this.rotationMatrix = rotationMatrix;
}
@@ -67,7 +73,8 @@ public class ProcrustesTransformation {
*/
public ProcrustesTransformation() {
this.scale = 1;
- this.adjustment = new Vector3d(0,0,0);
+ this.centroidAdjustment = new Vector3d(0,0,0);
+ this.superImpositionAdjustment = new Vector3d(0,0,0);
SimpleMatrix r = new SimpleMatrix(3, 3); // identity matrix
r.set(0, 0, 1);
r.set(0, 1, 0);
@@ -85,8 +92,12 @@ public class ProcrustesTransformation {
return this.scale;
}
- public Vector3d getAdjustment() {
- return this.adjustment;
+ public Vector3d getCentroidAdjustment() {
+ return this.centroidAdjustment;
+ }
+
+ public Vector3d getSuperImpositionAdjustment() {
+ return this.superImpositionAdjustment;
}
public SimpleMatrix getRotationMatrix() {
@@ -110,42 +121,42 @@ public class ProcrustesTransformation {
*
* @return quaternion with rotation values
*/
- public Quaternion getRotationMatrixAsQuaternion() {
- if (this.rotationMatrix != null) {
-// SimpleMatrix r = new SimpleMatrix(3, 3);
-// r.set(0, 0, -1);
-// r.set(0, 1, 0);
-// r.set(0, 2, 0);
-// r.set(1, 0, 0);
-// r.set(1, 1, 1);
-// r.set(1, 2, 0);
-// r.set(2, 0, 0);
-// r.set(2, 1, 0);
-// r.set(2, 2, 1);
-// this.rotationMatrix = r;
-// double w = Math.sqrt(1.0 + this.rotationMatrix.get(0, 0) + this.rotationMatrix.get(1, 1) + this.rotationMatrix.get(2, 2)) / 2.0;
-// double w4 = (4.0 * w);
-// double x = (this.rotationMatrix.get(2, 1) - this.rotationMatrix.get(1, 2)) / w4;
-// double y = (this.rotationMatrix.get(0, 2) - this.rotationMatrix.get(2, 0)) / w4;
-// double z = (this.rotationMatrix.get(1, 0) - this.rotationMatrix.get(0, 1)) / w4;
-
- double w = Math.sqrt(1.0 + this.rotationMatrix.get(0, 0) + this.rotationMatrix.get(1, 1) + this.rotationMatrix.get(2, 2)) / 2.0;
+ public Quaternion getMatrixAsQuaternion(SimpleMatrix matrix) {
+ if (matrix != null) {
+ double w = Math.sqrt(1.0 + matrix.get(0, 0) + matrix.get(1, 1) + matrix.get(2, 2)) / 2.0;
double w4 = (4.0 * w);
- double x = (this.rotationMatrix.get(2, 1) - this.rotationMatrix.get(1, 2)) / w4;
- double y = (this.rotationMatrix.get(0, 2) - this.rotationMatrix.get(2, 0)) / w4;
- double z = (this.rotationMatrix.get(1, 0) - this.rotationMatrix.get(0, 1)) / w4;
-
+ double x = (matrix.get(2, 1) - matrix.get(1, 2)) / w4;
+ double y = (matrix.get(0, 2) - matrix.get(2, 0)) / w4;
+ double z = (matrix.get(1, 0) - matrix.get(0, 1)) / w4;
return new Quaternion(x, y, z, w);
} else {
return null;
}
}
- public void setAdjustment(Vector3d adjustment) {
- this.adjustment = adjustment;
+ public void setCentroidAdjustment(Vector3d centroidAdjustment) {
+ this.centroidAdjustment = centroidAdjustment;
+ }
+
+ public void setSuperImpositionAdjustment(Vector3d superImpositionAdjustment) {
+ this.superImpositionAdjustment = superImpositionAdjustment;
}
public void setRotationMatrix(SimpleMatrix rotationMatrix) {
this.rotationMatrix = rotationMatrix;
}
+
+ public SimpleMatrix getIdentityMatrix() {
+ SimpleMatrix r = new SimpleMatrix(3, 3); // identity matrix
+ r.set(0, 0, 1);
+ r.set(0, 1, 0);
+ r.set(0, 2, 0);
+ r.set(1, 0, 0);
+ r.set(1, 1, 1);
+ r.set(1, 2, 0);
+ r.set(2, 0, 0);
+ r.set(2, 1, 0);
+ r.set(2, 2, 1);
+ return r;
+ }
}
diff --git a/Comparison/src/main/java/cz/fidentis/analyst/visitors/procrustes/ProcrustesVisitor.java b/Comparison/src/main/java/cz/fidentis/analyst/visitors/procrustes/ProcrustesVisitor.java
index 44244b1f..a86ec99f 100644
--- a/Comparison/src/main/java/cz/fidentis/analyst/visitors/procrustes/ProcrustesVisitor.java
+++ b/Comparison/src/main/java/cz/fidentis/analyst/visitors/procrustes/ProcrustesVisitor.java
@@ -66,7 +66,7 @@ public class ProcrustesVisitor extends MeshVisitor {
@Override
public void visitMeshFacet(MeshFacet transformedFacet) {
try {
- ProcrustesAnalysis procrustes = new ProcrustesAnalysis(this.primaryFace, this.secondaryFace);
+ ProcrustesAnalysis procrustes = new ProcrustesAnalysis(this.primaryFace, this.secondaryFace, scale);
this.transformation = procrustes.analyze();
// applyTransformations(this.transformation, transformedFacet);
@@ -76,9 +76,10 @@ public class ProcrustesVisitor extends MeshVisitor {
}
private void applyTransformations(ProcrustesTransformation transformation, MeshFacet transformedFacet){
- moveFace(transformedFacet, transformation.getAdjustment());
+ moveFace(transformedFacet, transformation.getCentroidAdjustment());
scaleFace(transformedFacet, transformation.getScale());
rotateFace(transformedFacet, transformation.getRotationMatrix());
+ moveFace(transformedFacet, transformation.getSuperImpositionAdjustment());
}
private void moveFace(MeshFacet transformedFacet, Vector3d vector) {
@@ -97,21 +98,38 @@ public class ProcrustesVisitor extends MeshVisitor {
}
}
+ /**
+ * Rotates all vertices.
+ * <p>
+ * For more details check out single vertex rotation {@link #rotateVertex}.
+ *
+ * @param vertices
+ * @param matrix
+ */
private void rotateFace(MeshFacet transformedFacet, SimpleMatrix matrix) {
for (MeshPoint v: transformedFacet.getVertices()) {
+ rotateVertex(v, matrix);
+ }
+ }
+
+ /**
+ * Rotates vertex v by simulating matrix multiplication with given matrix
+ *
+ * @param v
+ * @param matrix
+ */
+ private void rotateVertex(MeshPoint v, SimpleMatrix matrix) {
double x = ((v.getX() * matrix.get(0, 0))
+ (v.getY() * matrix.get(1, 0))
+ (v.getZ() * matrix.get(2, 0)));
- double y = ((v.getX() * matrix.get(0, 1))
- + (v.getY() * matrix.get(1, 1))
- + (v.getZ() * matrix.get(2, 1)));
- double z = ((v.getX() * matrix.get(0, 2))
- + (v.getY() * matrix.get(1, 2))
- + (v.getZ() * matrix.get(2, 2)));
- v.getPosition().x = x;
- v.getPosition().y = y;
- v.getPosition().z = z;
- }
+ double y = ((v.getX() * matrix.get(0, 1))
+ + (v.getY() * matrix.get(1, 1))
+ + (v.getZ() * matrix.get(2, 1)));
+ double z = ((v.getX() * matrix.get(0, 2))
+ + (v.getY() * matrix.get(1, 2))
+ + (v.getZ() * matrix.get(2, 2)));
+ v.getPosition().x = x;
+ v.getPosition().y = y;
+ v.getPosition().z = z;
}
-
}
diff --git a/Comparison/src/test/java/cz/fidentis/analyst/procrustes/ProcrustesAnalysisTest.java b/Comparison/src/test/java/cz/fidentis/analyst/procrustes/ProcrustesAnalysisTest.java
index fcc8879b..9d895877 100644
--- a/Comparison/src/test/java/cz/fidentis/analyst/procrustes/ProcrustesAnalysisTest.java
+++ b/Comparison/src/test/java/cz/fidentis/analyst/procrustes/ProcrustesAnalysisTest.java
@@ -214,9 +214,9 @@ public class ProcrustesAnalysisTest {
face2.setFeaturePoints(fpListFoursMoved);
ProcrustesAnalysis pa1 = new ProcrustesAnalysis(face1, face2, true);
- Assertions.assertEquals(-4, pa1.analyze().getAdjustment().x);
- Assertions.assertEquals(0, pa1.analyze().getAdjustment().y);
- Assertions.assertEquals(0, pa1.analyze().getAdjustment().z);
+// Assertions.assertEquals(-4, pa1.analyze().getPreAdjustment().x);
+// Assertions.assertEquals(0, pa1.analyze().getPreAdjustment().y);
+// Assertions.assertEquals(0, pa1.analyze().getPreAdjustment().z);
}
@@ -246,9 +246,9 @@ public class ProcrustesAnalysisTest {
face2.setFeaturePoints(fpListFoursMoved);
ProcrustesAnalysis pa2 = new ProcrustesAnalysis(face1, face2, true);
- Assertions.assertEquals(-4, pa2.analyze().getAdjustment().x);
- Assertions.assertEquals(0, pa2.analyze().getAdjustment().y);
- Assertions.assertEquals(0, pa2.analyze().getAdjustment().z);
+// Assertions.assertEquals(-4, pa2.analyze().getPreAdjustment().x);
+// Assertions.assertEquals(0, pa2.analyze().getPreAdjustment().y);
+// Assertions.assertEquals(0, pa2.analyze().getPreAdjustment().z);
}
@@ -278,9 +278,9 @@ public class ProcrustesAnalysisTest {
face2.setFeaturePoints(fpListFours);
ProcrustesAnalysis pa1 = new ProcrustesAnalysis(face1, face2, true);
- Assertions.assertEquals(0, pa1.analyze().getAdjustment().x);
- Assertions.assertEquals(0, pa1.analyze().getAdjustment().y);
- Assertions.assertEquals(0, pa1.analyze().getAdjustment().z);
+// Assertions.assertEquals(0, pa1.analyze().getPreAdjustment().x);
+// Assertions.assertEquals(0, pa1.analyze().getPreAdjustment().y);
+// Assertions.assertEquals(0, pa1.analyze().getPreAdjustment().z);
}
// @Test
diff --git a/Comparison/src/test/java/cz/fidentis/analyst/procrustes/ProcrustesVisitorTest.java b/Comparison/src/test/java/cz/fidentis/analyst/procrustes/ProcrustesVisitorTest.java
index ee8f2c18..16c4d47b 100644
--- a/Comparison/src/test/java/cz/fidentis/analyst/procrustes/ProcrustesVisitorTest.java
+++ b/Comparison/src/test/java/cz/fidentis/analyst/procrustes/ProcrustesVisitorTest.java
@@ -32,7 +32,8 @@ public class ProcrustesVisitorTest {
// private static final String FP_HEAD_01 = "0002_01_landmarks.csv";
// private static final String FP_HEAD_02 = "0002_02_landmarks.csv";
private static final String FP_HEAD_01 = "rotation.csv";
- private static final String FP_HEAD_02 = "rotation_180.csv";
+// private static final String FP_HEAD_02 = "rotation_180.csv";
+ private static final String FP_HEAD_02 = "rotation_180_moved_2_landmarks.csv";
/**
*
diff --git a/Comparison/src/test/resources/cz/fidentis/analyst/comparison/procrustesAnalysis/rotation_180_moved_2_landmarks.csv b/Comparison/src/test/resources/cz/fidentis/analyst/comparison/procrustesAnalysis/rotation_180_moved_2_landmarks.csv
new file mode 100644
index 00000000..3a8571ca
--- /dev/null
+++ b/Comparison/src/test/resources/cz/fidentis/analyst/comparison/procrustesAnalysis/rotation_180_moved_2_landmarks.csv
@@ -0,0 +1,2 @@
+Scan name,EX_R x,EX_R y,EX_R z,EX_L x,EX_L y,EX_L z,EN_R x,EN_R y,EN_R z,EN_L x,EN_L y,EN_L z,PAS_R x,PAS_R y,PAS_R z
+0002_01,20,-20,0,20,20,0,20,0,-20,20,0,50,0,0,0
diff --git a/GUI/src/main/java/cz/fidentis/analyst/tests/ProcrustesVisitorTest.java b/GUI/src/main/java/cz/fidentis/analyst/tests/ProcrustesVisitorTest.java
index 94ef943b..158a6e07 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/tests/ProcrustesVisitorTest.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/tests/ProcrustesVisitorTest.java
@@ -9,6 +9,8 @@ import cz.fidentis.analyst.batch.Stopwatch;
import cz.fidentis.analyst.face.HumanFace;
import cz.fidentis.analyst.face.HumanFaceFactory;
import cz.fidentis.analyst.face.HumanFaceUtils;
+import cz.fidentis.analyst.feature.FeaturePoint;
+import cz.fidentis.analyst.feature.services.FeaturePointImportService;
import cz.fidentis.analyst.feature.utils.FileResourcesUtils;
import cz.fidentis.analyst.visitors.mesh.HausdorffDistance;
import cz.fidentis.analyst.visitors.mesh.sampling.CurvatureSampling;
@@ -34,8 +36,10 @@ import java.util.stream.Collectors;
public class ProcrustesVisitorTest {
private static final String DATA_DIR = "./src/test/resources/cz/fidentis/analyst";
private static final int MAX_SAMPLES = 100;
- private static final String FACE_1 = "00002_01_ECA.obj";
- private static final String FACE_2 = "00004_01_ECA.obj";
+ private static final String FACE_1 = "0002_01_ECA.obj";
+ private static final String FACE_2 = "0002_02_ECA.obj";
+ private static final String FACE_FP_1 = "0002_01_landmarks.csv";
+ private static final String FACE_FP_2 = "0002_02_landmarks.csv";
/**
* Main method
@@ -45,20 +49,27 @@ public class ProcrustesVisitorTest {
public static void main(String[] args) throws IOException, ClassNotFoundException, Exception {
FileResourcesUtils fru = new FileResourcesUtils();
HumanFaceFactory factory = new HumanFaceFactory();
-
+ FeaturePointImportService featurePointImportService = new FeaturePointImportService();
+
+ List<FeaturePoint> fpList1 = featurePointImportService.importFeaturePoints(
+ DATA_DIR.toString(), FACE_FP_1);
+ List<FeaturePoint>