diff --git a/Comparison/src/main/java/cz/fidentis/analyst/symmetry/AproxSymmetryPlane.java b/Comparison/src/main/java/cz/fidentis/analyst/symmetry/ApproxSymmetryPlane.java
similarity index 52%
rename from Comparison/src/main/java/cz/fidentis/analyst/symmetry/AproxSymmetryPlane.java
rename to Comparison/src/main/java/cz/fidentis/analyst/symmetry/ApproxSymmetryPlane.java
index 6ddae7b0d4dcbd1e3e1bdfefb2495105dc732ed2..7bc26d6373d4baacb35baf097c34653f687663f3 100644
--- a/Comparison/src/main/java/cz/fidentis/analyst/symmetry/AproxSymmetryPlane.java
+++ b/Comparison/src/main/java/cz/fidentis/analyst/symmetry/ApproxSymmetryPlane.java
@@ -1,31 +1,33 @@
package cz.fidentis.analyst.symmetry;
/**
+ *
+ * Symmetry plane with votes used for the decision about symmetry estimate of 3D models.
*
- * @author Natália Bebjaková
+ * @author Natalia Bebjakova
*
- * Respresents plane with added atribute - votes, that play role
- * in decision about symmetry estimate of the 3D model
*/
-public class AproxSymmetryPlane extends Plane implements Comparable<AproxSymmetryPlane> {
- public Integer votes;
+public class ApproxSymmetryPlane extends Plane implements Comparable<ApproxSymmetryPlane> {
+
+ private int votes;
/**
* returns number of votes that were given to plane while computing the symmetry
*
* @return Number of votes
*/
- public Integer getVotes() {
+ public int getVotes() {
return votes;
}
/**
- *
+ * Constructor.
* @param plane Original plane without votes
* @param votes number of votes given to the plane
+ * @throws IllegalArgumentExpcption if the @code{plane} argument is null
*/
- public AproxSymmetryPlane(Plane plane, int votes) {
- super(plane.a, plane.b, plane.c, plane.d);
+ public ApproxSymmetryPlane(Plane plane, int votes) {
+ super(plane);
this.votes = votes;
}
@@ -36,7 +38,7 @@ public class AproxSymmetryPlane extends Plane implements Comparable<AproxSymmetr
* @return number that decides which plane has more votes
*/
@Override
- public int compareTo(AproxSymmetryPlane other) {
- return this.votes.compareTo(other.votes);
+ public int compareTo(ApproxSymmetryPlane other) {
+ return Integer.compare(votes, other.votes);
}
}
diff --git a/Comparison/src/main/java/cz/fidentis/analyst/symmetry/Plane.java b/Comparison/src/main/java/cz/fidentis/analyst/symmetry/Plane.java
index cb9cfaa3db6c98feb84d7b5b976d0c65f971f781..b2827693c2e1aaa9472ce16737afbc290fafb4b1 100644
--- a/Comparison/src/main/java/cz/fidentis/analyst/symmetry/Plane.java
+++ b/Comparison/src/main/java/cz/fidentis/analyst/symmetry/Plane.java
@@ -1,25 +1,19 @@
package cz.fidentis.analyst.symmetry;
-import cz.fidentis.analyst.mesh.core.MeshFacet;
-import cz.fidentis.analyst.mesh.core.MeshFacetImpl;
-import cz.fidentis.analyst.mesh.core.MeshPointImpl;
import javax.vecmath.Vector3d;
/**
- *
- * @author Natália Bebjaková
+ * Symmetry plane.
*
- * Representation of the symmetry plane
+ * @author Natalia Bebjakova
*/
public class Plane {
- public double a;
- public double b;
- public double c;
- public double d;
- private static MeshFacet facet;
+
+ private Vector3d normal;
+ private double distance;
/**
- * Creates new plane
+ * Creates new plane.
*
* @param a a coordinate
* @param b b coordinate
@@ -27,66 +21,36 @@ public class Plane {
* @param d d coordinate
*/
public Plane(double a, double b, double c, double d) {
- this.a = a;
- this.b = b;
- this.c = c;
- this.d = d;
+ normal = new Vector3d(a,b,c);
+ distance = d;
}
/**
- * Normalize the plane
+ * Constructor.
+ * @param normal Normal vector of the plane
+ * @param dist distance
+ * @throws IllegalArgumentExpcption if the @code{plane} argument is null
*/
- public void normalize() {
- double normalLength = Math.sqrt(a * a + b * b + c * c);
-
- a /= normalLength;
- b /= normalLength;
- c /= normalLength;
- d /= normalLength;
+ public Plane(Vector3d normal, double dist) {
+ this(normal.x, normal.y, normal.z, dist);
}
/**
- * Returns plane that is represented by mesh which can be merged with model
- *
- * @param centroid middle point of the plane
- * @param a a coordinate
- * @param b b coordinate
- * @param scale distance of points given by bounding box
- * @return plane represented as mesh
+ * Copy constructor.
+ * @param plane original plane
+ * @throws IllegalArgumentExpcption if the @code{plane} argument is null
*/
- public static SymmetryEstimator createPlaneMesh(Vector3d centroid, Vector3d a, Vector3d b, double scale) {
- Vector3d[] points = new Vector3d[4];
-
- Vector3d aScaled = new Vector3d(a);
- Vector3d bScaled = new Vector3d(b);
- aScaled.scale(scale);
- bScaled.scale(scale);
-
- points[0] = new Vector3d(centroid);
- points[0].sub(aScaled);
- points[0].sub(bScaled);
-
- points[1] = new Vector3d(centroid);
- points[1].sub(aScaled);
- points[1].add(bScaled);
-
- points[2] = new Vector3d(centroid);
- points[2].add(aScaled);
- points[2].add(bScaled);
-
- points[3] = new Vector3d(centroid);
- points[3].add(aScaled);
- points[3].sub(bScaled);
-
- facet = new MeshFacetImpl();
- for (Vector3d point : points) {
- facet.addVertex(new MeshPointImpl(point, null, null));
- }
- facet.calculateVertexNormals();
-
- SymmetryEstimator planeMesh = new SymmetryEstimator(facet, Config.getDefault());
-
- return planeMesh;
+ public Plane(Plane plane) {
+ this(plane.getNormal(), plane.getDistance());
+ }
+
+ /**
+ * Normalize the plane
+ */
+ public void normalize() {
+ double normalLength = normal.length();
+ normal.normalize();
+ distance /= normalLength; // Do we really want this? --ro
}
/**
@@ -96,6 +60,18 @@ public class Plane {
*/
@Override
public String toString(){
- return "APPROXIMATE PLANE:\n" + a + "\n" + b + "\n" + c + "\n" + d + "\n";
+ return "APPROXIMATE PLANE:" + System.lineSeparator() +
+ normal.x + System.lineSeparator() +
+ normal.y + System.lineSeparator() +
+ normal.z + System.lineSeparator() +
+ distance + System.lineSeparator();
+ }
+
+ public Vector3d getNormal() {
+ return normal;
+ }
+
+ public double getDistance() {
+ return distance;
}
}
diff --git a/Comparison/src/main/java/cz/fidentis/analyst/symmetry/SymmetryEstimator.java b/Comparison/src/main/java/cz/fidentis/analyst/symmetry/SymmetryEstimator.java
index 50e9f043b3d572ea22ce7d7ac486c295fcabd574..0507e945fc054d4d25c6fd66b35143618acadf20 100644
--- a/Comparison/src/main/java/cz/fidentis/analyst/symmetry/SymmetryEstimator.java
+++ b/Comparison/src/main/java/cz/fidentis/analyst/symmetry/SymmetryEstimator.java
@@ -3,57 +3,78 @@ package cz.fidentis.analyst.symmetry;
import cz.fidentis.analyst.mesh.core.CornerTableRow;
import cz.fidentis.analyst.mesh.core.MeshFacet;
import cz.fidentis.analyst.mesh.core.MeshPoint;
-import cz.fidentis.analyst.mesh.core.MeshPointImpl;
import cz.fidentis.analyst.mesh.core.BoundingBox;
+import cz.fidentis.analyst.mesh.core.MeshFacetImpl;
+import cz.fidentis.analyst.mesh.core.MeshPointImpl;
import cz.fidentis.analyst.mesh.core.MeshTriangle;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import javax.swing.ImageIcon;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.ProgressMonitor;
import javax.swing.UIManager;
+//import javax.swing.ImageIcon;
+//import javax.swing.JOptionPane;
+//import javax.swing.JPanel;
+//import javax.swing.ProgressMonitor;
+//import javax.swing.UIManager;
import javax.vecmath.Vector3d;
/**
- *
- * @author Natália Bebjaková
- *
* Main class for computing approximate plane of symmetry of the 3D model.
* For computing the symmetry, for every
* Default values of the configuration are given due to the best results on tested objects.
* On many different 3D models, it exists other values of config that will have better impact on result.
*
+ * @author Natalia Bebjakova
*/
public class SymmetryEstimator {
+
+ private final MeshFacet facet; // Facet of the model on which symmetry is computed
+
+ private TriangleVertexAreas[] areas; // Representation for areas of Voronoi region of triangles
+
+ private BoundingBox boundingBox; // Represent min-max box. It is automatically maintained by given point array.
+
+ private List<MeshTriangle> triangles; // Helping array of triangles computed from corner table
+
+ //private JPanel panel; // panel for configuration of symmetry counting
+
+ private final Config config;
+
/**
- * Facet of the model on which symmetry is computed
- */
- private final MeshFacet facet;
- /**
- * Representation for areas of Voronoi region of triangles
- */
- private TriangleVertexAreas[] areas;
- /**
- * Represent min-max box. It is automatically maintained by given point array.
- */
- private BoundingBox boundingBox;
- /**
- * Helping array of triangles computed from corner table
+ * Constructor.
+ *
+ * @param f facet on which the symmetry will be computed
+ * @param config configuration of optional parameters of the algorithm
*/
- private List<MeshTriangle> triangles;
+ public SymmetryEstimator(MeshFacet f, Config config) {
+ this.facet = f;
+ this.config = config;
+
+ this.triangles = f.asTriangles();
+
+ this.areas = new TriangleVertexAreas[triangles.size()];
+ for (int i = 0; i < areas.length; i++) {
+ areas[i] = computeTriangleVertexAreas(triangles.get(i));
+ }
+
+ boundingBox = facet.getBoundingBox();
+ }
/**
- * panel for configuration of symmetry counting
+ * Helper constructor.
+ * @param centroid Centroid
+ * @param a A
+ * @param b B
+ * @param scale Scale
*/
- private JPanel panel;
+ protected SymmetryEstimator(Vector3d centroid, Vector3d a, Vector3d b, double scale) {
+ this(createMeshFacet(centroid, a, b, scale), Config.getDefault());
+ }
- private final Config config;
-
/**
*
* @return configuration of optional parameters of the algorithm
@@ -66,19 +87,18 @@ public class SymmetryEstimator {
*
* @return panel for configuration of symmetry counting
*/
- public JPanel getPanel() {
- return panel;
- }
+ //public JPanel getPanel() {
+ // return panel;
+ //}
/**
*
* @param panel new panel for configuration of symmetry counting
*/
- public void setPanel(JPanel panel) {
- this.panel = panel;
- }
+ //public void setPanel(JPanel panel) {
+ // this.panel = panel;
+ //}
-
/**
*
* @return Facet of the model on which symmetry is computed
@@ -88,35 +108,267 @@ public class SymmetryEstimator {
}
/**
- * Creates new class for computing symmetry
+ * If bounding box is not created yet, it creates new one.
*
- * @param f facet on which symmetry will be computed
- * @param config configuration of optional parameters of the algorithm
+ * @return Represent min-max box of the boundries of the model.
*/
- public SymmetryEstimator(MeshFacet f, Config config) {
- this.facet = f;
- this.config = config;
+ public BoundingBox getBoundingBox() {
+ if (boundingBox == null) {
+ boundingBox = facet.getBoundingBox();
+ }
+ return boundingBox;
+ }
+
+ /**
+ * Computes the approximate plane of symmetry.
+ * @param panel parrent window for the progress window (can be null)
+ * @return approximate plane of symmtetry
+ */
+ public Plane getApproxSymmetryPlane(JPanel panel) {
- this.triangles = f.asTriangles();
+ ///UIManager.put("ProgressMonitor.progressText", "Counting symmetry...");
+
+ ArrayList<ApproxSymmetryPlane> planes = new ArrayList<>();
+ //List<Vector3d> normals = calculateNormals();
+ if (!facet.hasVertexNormals()) {
+ facet.calculateVertexNormals();
+ }
+ double[] curvatures = new double[facet.getNumberOfVertices()];
+ for (int i = 0; i < facet.getNumberOfVertices(); i++) {
+ if (facet.getNumberOfVertices() == 2500) {
+ curvatures[i] = this.getMaxCurvature(i);
+ } else {
+ curvatures[i] = this.getGaussianCurvature(i);
+ }
+ if (Double.isNaN(curvatures[i])){
+ curvatures[i] = Double.MIN_VALUE;
+ }
+ }
+ ArrayList<Double> sortedCurvatures = new ArrayList<>();
+ for (int i = 0; i < curvatures.length; i++) {
+ sortedCurvatures.add(curvatures[i]);
+ }
+ Collections.sort(sortedCurvatures);
+
+ if(config.getSignificantPointCount() > facet.getNumberOfVertices()) {
+ config.setSignificantPointCount((facet.getNumberOfVertices()) - 1);
+ }
+ double bottomCurvature = sortedCurvatures.get(sortedCurvatures.size() - 1 - config.getSignificantPointCount());
- this.areas = new TriangleVertexAreas[triangles.size()];
- for (int i = 0; i < areas.length; i++) {
- areas[i] = computeTriangleVertexAreas(triangles.get(i));
+ ArrayList<Integer> significantPoints = new ArrayList<>();
+ ArrayList<Double> significantCurvatures = new ArrayList<>();
+
+ for (int i = 0; i < facet.getNumberOfVertices(); i++) {
+ if (curvatures[i] >= bottomCurvature) {
+ significantCurvatures.add(curvatures[i]);
+ significantPoints.add(i);
+ }
+ }
+
+ Plane plane = new Plane(0, 0, 0, 0);
+ int lastVotes = 0;
+
+ ProgressMonitor progressMonitor = null;
+ if (panel != null) {
+ UIManager.put("ProgressMonitor.progressText", "Counting symmetry...");
+ progressMonitor = new ProgressMonitor(panel, "Counting...", "Steps", 0, significantPoints.size());
+ }
+
+ double onePercent = significantCurvatures.size() / 100.0;
+ double percentsPerStep = 1 / onePercent;
+ for (int i = 0; i < significantPoints.size(); i++) {
+ for (int j = 0; j < significantPoints.size(); j++) {
+ if (i != j) {
+ double minRatio = config.getMinCurvRatio();
+ double maxRatio = 1.0 / minRatio;
+ if (significantCurvatures.get(i) / significantCurvatures.get(j) >= minRatio && significantCurvatures.get(i) /
+ significantCurvatures.get(j) <= maxRatio) {
+
+ Vector3d p1 = new Vector3d(facet.getVertex(significantPoints.get(i)).getPosition());
+ Vector3d p2 = new Vector3d(facet.getVertex(significantPoints.get(j)).getPosition());
+
+ Vector3d avrg = new Vector3d(p1);
+ avrg.add(p2);
+ avrg.scale(0.5);
+
+ Vector3d normal = new Vector3d(p1);
+ normal.sub(p2);
+ normal.normalize();
+
+ double d = -(normal.x * avrg.x) - (normal.y * avrg.y) - (normal.z * avrg.z);
+
+ Vector3d ni = new Vector3d(facet.getVertex(significantPoints.get(i)).getNormal());
+ Vector3d nj = new Vector3d(facet.getVertex(significantPoints.get(j)).getNormal());
+ ni.normalize();
+ nj.normalize();
+
+ Vector3d normVec = ni;
+ normVec.sub(nj);
+ normVec.normalize();
+ double normCos = normVec.dot(normal);
+
+ if (Math.abs(normCos) >= config.getMinNormAngleCos()) {
+ Plane newPlane = new Plane(normal.x, normal.y, normal.z, d);
+ int currentVotes = getVotes(newPlane,
+ significantCurvatures,
+ significantPoints,
+ config.getMinCurvRatio(),
+ config.getMinAngleCos(),
+ config.getMinNormAngleCos(),
+ boundingBox.getMaxDiag() * config.getMaxRelDistance());
+
+ planes.add(new ApproxSymmetryPlane(newPlane, currentVotes));
+
+ if (currentVotes > lastVotes) {
+ lastVotes = currentVotes;
+ plane = newPlane;
+ }
+ }
+
+ }
+ }
+ }
+ if (panel != null) {
+ progressMonitor.setNote("Task step: " + (int) ((i + 1) * percentsPerStep));
+ progressMonitor.setProgress(i);
+ }
}
+
+ Collections.sort(planes);
+ ArrayList<ApproxSymmetryPlane> finalPlanes = new ArrayList<>();
+ for (int i = 0; i < planes.size(); i++) {
+ if (planes.get(i).getVotes() == lastVotes){
+ finalPlanes.add(planes.get(i));
+ }
+ }
+ //Plane finalPlane = new Plane(0, 0, 0, 0);
+ double newA = 0, newB = 0, newC = 0, newD = 0;
+ Vector3d refDir = finalPlanes.get(0).getNormal();
+ for (int i = 0; i < finalPlanes.size(); i++) {
+ Vector3d normDir = finalPlanes.get(i).getNormal();
+ if (normDir.dot(refDir) < 0) {
+ newA -= normDir.x;
+ newB -= normDir.y;
+ newC -= normDir.z;
+ newD -= finalPlanes.get(i).getDistance();
+ } else {
+ newA += normDir.x;
+ newB += normDir.y;
+ newC += normDir.z;
+ newD += finalPlanes.get(i).getDistance();
+ }
+ }
+ Plane finalPlane = new Plane(newA, newB, newC, newD);
+ finalPlane.normalize();
+ if (config.isAveraging()){
+ plane = finalPlane;
+ }
+ if (panel != null) {
+ JOptionPane.showMessageDialog(panel, "Symmetry estimate done.", "Done", 0,
+ new ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/exportedModel.png")));
- boundingBox = facet.getBoundingBox();
+ progressMonitor.close();
+ }
+ return plane;
}
/**
- * If bounding box is not created yet, it creates new one.
*
- * @return Represent min-max box of the boundries of the model.
+ * @param plane Plane computed as symmetry plane
+ * @return mesh that represents facet with computed plane of approximate symmetry
*/
- public BoundingBox getBoundingBox() {
- if (boundingBox == null) {
- boundingBox = facet.getBoundingBox();
+ public SymmetryEstimator mergeWithPlane(Plane plane) {
+ Vector3d normal = plane.getNormal();
+ Vector3d midPoint = boundingBox.getMidPoint().getPosition();
+
+ double alpha = -((normal.x * midPoint.x) +
+ (normal.y * midPoint.y) + (normal.z * midPoint.z) +
+ plane.getDistance()) / (normal.dot(normal));
+
+ Vector3d midPointOnPlane = new Vector3d(midPoint);
+ Vector3d nn = new Vector3d(normal);
+ nn.scale(alpha);
+ midPointOnPlane.add(nn);
+
+ double val = normal.x * midPointOnPlane.x + normal.y *
+ midPointOnPlane.y + normal.z *
+ midPointOnPlane.z + plane.getDistance();
+
+ Vector3d a = new Vector3d();
+ if (Math.abs(normal.dot(new Vector3d(0.0, 1.0, 0.0))) > Math.abs(normal.dot(new Vector3d (1.0, 0.0, 0.0)))) {
+ a.cross(normal, new Vector3d(1.0, 0.0, 0.0));
+ } else {
+ a.cross(normal, new Vector3d(0.0, 1.0, 0.0));
}
- return boundingBox;
+ a.normalize();
+
+ Vector3d b = new Vector3d();
+ b.cross(normal,a);
+ b.normalize();
+
+ SymmetryEstimator planeMesh = new SymmetryEstimator(midPointOnPlane, a, b,
+ (boundingBox.getMaxPoint().subtractPosition(boundingBox.getMinPoint())).getPosition().x);
+
+ return mergeMeshWith(planeMesh);
+ }
+
+ /**
+ *
+ * @param s mesh that will be merged
+ * @return mesh with merged vertices from both meshes
+ */
+ public SymmetryEstimator mergeMeshWith(SymmetryEstimator s) {
+ CornerTableRow row1 = new CornerTableRow(facet.getNumberOfVertices(), -1);
+ CornerTableRow row2 = new CornerTableRow(facet.getNumberOfVertices() + 1, facet.getNumberOfVertices() + 3);
+ CornerTableRow row3 = new CornerTableRow(facet.getNumberOfVertices() + 2, -1);
+ CornerTableRow row4 = new CornerTableRow(facet.getNumberOfVertices() + 2, -1);
+ CornerTableRow row5 = new CornerTableRow(facet.getNumberOfVertices() + 3, facet.getNumberOfVertices() + 1);
+ CornerTableRow row6 = new CornerTableRow(facet.getNumberOfVertices(), -1);
+
+ facet.getCornerTable().addRow(row1);
+ facet.getCornerTable().addRow(row2);
+ facet.getCornerTable().addRow(row3);
+ facet.getCornerTable().addRow(row4);
+ facet.getCornerTable().addRow(row5);
+ facet.getCornerTable().addRow(row6);
+
+ for(int n = 0; n < 4; n++) {
+ facet.addVertex(s.getFacet().getVertices().get(n));
+ }
+ return this;
+ }
+
+ private static MeshFacet createMeshFacet(Vector3d centroid, Vector3d a, Vector3d b, double scale) {
+ Vector3d[] points = new Vector3d[4];
+
+ Vector3d aScaled = new Vector3d(a);
+ Vector3d bScaled = new Vector3d(b);
+ aScaled.scale(scale);
+ bScaled.scale(scale);
+
+ points[0] = new Vector3d(centroid);
+ points[0].sub(aScaled);
+ points[0].sub(bScaled);
+
+ points[1] = new Vector3d(centroid);
+ points[1].sub(aScaled);
+ points[1].add(bScaled);
+
+ points[2] = new Vector3d(centroid);
+ points[2].add(aScaled);
+ points[2].add(bScaled);
+
+ points[3] = new Vector3d(centroid);
+ points[3].add(aScaled);
+ points[3].sub(bScaled);
+
+ MeshFacet facet = new MeshFacetImpl();
+ for (Vector3d point : points) {
+ facet.addVertex(new MeshPointImpl(point, null, null));
+ }
+ facet.calculateVertexNormals();
+
+ return facet;
}
/**
@@ -125,10 +377,16 @@ public class SymmetryEstimator {
*
* @author Natália Bebjaková
*/
- private class TriangleVertexAreas {
- public double v1Area;
- public double v2Area;
- public double v3Area;
+ private final class TriangleVertexAreas {
+ public final double v1Area;
+ public final double v2Area;
+ public final double v3Area;
+
+ private TriangleVertexAreas(double v1, double v2, double v3) {
+ v1Area = v1;
+ v2Area = v2;
+ v3Area = v3;
+ }
}
/**
@@ -165,41 +423,41 @@ public class SymmetryEstimator {
MeshPoint v3Half = (t.vertex2.addPosition(t.vertex1)).dividePosition(2);
- TriangleVertexAreas area = new TriangleVertexAreas();
+ //TriangleVertexAreas area = new TriangleVertexAreas();
if (d1 < 0) {
- area.v3Area = ((v2Half.subtractPosition(t.vertex3)).crossProduct(v1Half.subtractPosition(t.vertex3))).abs() / 2.0;
- area.v2Area = ((v3Half.subtractPosition(t.vertex2)).crossProduct(v1Half.subtractPosition(t.vertex2))).abs() / 2.0;
- area.v1Area = (((v1Half.subtractPosition(t.vertex1)).crossProduct(v3Half.subtractPosition(t.vertex1))).abs() / 2.0) +
+ double v3Area = ((v2Half.subtractPosition(t.vertex3)).crossProduct(v1Half.subtractPosition(t.vertex3))).abs() / 2.0;
+ double v2Area = ((v3Half.subtractPosition(t.vertex2)).crossProduct(v1Half.subtractPosition(t.vertex2))).abs() / 2.0;
+ double v1Area = (((v1Half.subtractPosition(t.vertex1)).crossProduct(v3Half.subtractPosition(t.vertex1))).abs() / 2.0) +
(((v1Half.subtractPosition(t.vertex1)).crossProduct(v2Half.subtractPosition(t.vertex1))).abs() / 2.0);
- return area;
+ return new TriangleVertexAreas(v1Area, v2Area, v3Area);
}
if (d2 < 0) {
- area.v1Area = ((v3Half.subtractPosition(t.vertex1)).crossProduct(v2Half.subtractPosition(t.vertex1))).abs() / 2.0;
- area.v3Area = ((v1Half.subtractPosition(t.vertex3)).crossProduct(v2Half.subtractPosition(t.vertex3))).abs() / 2.0;
- area.v2Area = (((v2Half.subtractPosition(t.vertex2)).crossProduct(v1Half.subtractPosition(t.vertex2))).abs() / 2.0) +
+ double v1Area = ((v3Half.subtractPosition(t.vertex1)).crossProduct(v2Half.subtractPosition(t.vertex1))).abs() / 2.0;
+ double v3Area = ((v1Half.subtractPosition(t.vertex3)).crossProduct(v2Half.subtractPosition(t.vertex3))).abs() / 2.0;
+ double v2Area = (((v2Half.subtractPosition(t.vertex2)).crossProduct(v1Half.subtractPosition(t.vertex2))).abs() / 2.0) +
(((v2Half.subtractPosition(t.vertex2)).crossProduct(v3Half.subtractPosition(t.vertex2))).abs() / 2.0);
- return area;
+ return new TriangleVertexAreas(v1Area, v2Area, v3Area);
}
if (d3 < 0) {
- area.v2Area = ((v1Half.subtractPosition(t.vertex2)).crossProduct(v3Half.subtractPosition(t.vertex2))).abs() / 2.0;
- area.v1Area = ((v2Half.subtractPosition(t.vertex1)).crossProduct(v3Half.subtractPosition(t.vertex1))).abs() / 2.0;
- area.v3Area = (((v3Half.subtractPosition(t.vertex3)).crossProduct(v2Half.subtractPosition(t.vertex3))).abs() / 2.0) +
+ double v2Area = ((v1Half.subtractPosition(t.vertex2)).crossProduct(v3Half.subtractPosition(t.vertex2))).abs() / 2.0;
+ double v1Area = ((v2Half.subtractPosition(t.vertex1)).crossProduct(v3Half.subtractPosition(t.vertex1))).abs() / 2.0;
+ double v3Area = (((v3Half.subtractPosition(t.vertex3)).crossProduct(v2Half.subtractPosition(t.vertex3))).abs() / 2.0) +
(((v3Half.subtractPosition(t.vertex3)).crossProduct(v1Half.subtractPosition(t.vertex3))).abs() / 2.0);
- return area;
+ return new TriangleVertexAreas(v1Area, v2Area, v3Area);
}
MeshPoint circumcenter = t.vertex1.multiplyPosition(d1).addPosition(t.vertex2.multiplyPosition(d2).addPosition(t.vertex3.multiplyPosition(d3)));
- area.v1Area = (((v2Half.subtractPosition(t.vertex1)).crossProduct(circumcenter.subtractPosition(t.vertex1))).abs() / 2.0) +
+ double v1Area = (((v2Half.subtractPosition(t.vertex1)).crossProduct(circumcenter.subtractPosition(t.vertex1))).abs() / 2.0) +
(((v3Half.subtractPosition(t.vertex1)).crossProduct(circumcenter.subtractPosition(t.vertex1))).abs() / 2.0);
- area.v2Area = (((v3Half.subtractPosition(t.vertex2)).crossProduct(circumcenter.subtractPosition(t.vertex2))).abs() / 2.0) +
+ double v2Area = (((v3Half.subtractPosition(t.vertex2)).crossProduct(circumcenter.subtractPosition(t.vertex2))).abs() / 2.0) +
(((v1Half.subtractPosition(t.vertex2)).crossProduct(circumcenter.subtractPosition(t.vertex2))).abs() / 2.0);
- area.v3Area = (((v1Half.subtractPosition(t.vertex3)).crossProduct(circumcenter.subtractPosition(t.vertex3))).abs() / 2.0) +
+ double v3Area = (((v1Half.subtractPosition(t.vertex3)).crossProduct(circumcenter.subtractPosition(t.vertex3))).abs() / 2.0) +
(((v2Half.subtractPosition(t.vertex3)).crossProduct(circumcenter.subtractPosition(t.vertex3))).abs() / 2.0);
- return area;
+ return new TriangleVertexAreas(v1Area, v2Area, v3Area);
}
/**
@@ -428,11 +686,10 @@ public class SymmetryEstimator {
double minAngleCos,
double minNormAngleCos,
double maxDist) {
-
plane.normalize();
- Vector3d normal = new Vector3d(plane.a, plane.b, plane.c);
- double d = plane.d;
+ Vector3d normal = plane.getNormal();
+ double d = plane.getDistance();
double maxCurvRatio = 1.0 / minCurvRatio;
int votes = 0;
//List<Vector3d> normals = calculateNormals();
@@ -481,214 +738,4 @@ public class SymmetryEstimator {
return votes;
}
- /**
- *
- *
- * @return approximate plane of symmtetry
- */
- public Plane getAproxSymmetryPlane() {
-
- UIManager.put("ProgressMonitor.progressText", "Counting symmetry...");
-
- ArrayList<AproxSymmetryPlane> planes = new ArrayList<>();
- //List<Vector3d> normals = calculateNormals();
- if (!facet.hasVertexNormals()) {
- facet.calculateVertexNormals();
- }
- double[] curvatures = new double[facet.getNumberOfVertices()];
- for (int i = 0; i < facet.getNumberOfVertices(); i++) {
- if (facet.getNumberOfVertices() == 2500) {
- curvatures[i] = this.getMaxCurvature(i);
- } else {
- curvatures[i] = this.getGaussianCurvature(i);
- }
- if (Double.isNaN(curvatures[i])){
- curvatures[i] = Double.MIN_VALUE;
- }
- }
- ArrayList<Double> sortedCurvatures = new ArrayList<>();
- for (int i = 0; i < curvatures.length; i++) {
- sortedCurvatures.add(curvatures[i]);
- }
- Collections.sort(sortedCurvatures);
-
- if(config.getSignificantPointCount() > facet.getNumberOfVertices()) {
- config.setSignificantPointCount((facet.getNumberOfVertices()) - 1);
- }
- double bottomCurvature = sortedCurvatures.get(sortedCurvatures.size() - 1 - config.getSignificantPointCount());
-
- ArrayList<Integer> significantPoints = new ArrayList<>();
- ArrayList<Double> significantCurvatures = new ArrayList<>();
-
- for (int i = 0; i < facet.getNumberOfVertices(); i++) {
- if (curvatures[i] >= bottomCurvature) {
- significantCurvatures.add(curvatures[i]);
- significantPoints.add(i);
- }
- }
-
- Plane plane = new Plane(0, 0, 0, 0);
- int lastVotes = 0;
-
- ProgressMonitor progressMonitor;
- progressMonitor = new ProgressMonitor(panel, "Cunting...",
- "Steps", 0, significantPoints.size());
-
- double onePercent = significantCurvatures.size() / 100.0;
- double percentsPerStep = 1 / onePercent;
- for (int i = 0; i < significantPoints.size(); i++) {
- for (int j = 0; j < significantPoints.size(); j++) {
- if (i != j) {
- double minRatio = config.getMinCurvRatio();
- double maxRatio = 1.0 / minRatio;
- if (significantCurvatures.get(i) / significantCurvatures.get(j) >= minRatio && significantCurvatures.get(i) /
- significantCurvatures.get(j) <= maxRatio) {
-
- Vector3d p1 = new Vector3d(facet.getVertex(significantPoints.get(i)).getPosition());
- Vector3d p2 = new Vector3d(facet.getVertex(significantPoints.get(j)).getPosition());
-
- Vector3d avrg = new Vector3d(p1);
- avrg.add(p2);
- avrg.scale(0.5);
-
- Vector3d normal = new Vector3d(p1);
- normal.sub(p2);
- normal.normalize();
-
- double d = -(normal.x * avrg.x) - (normal.y * avrg.y) - (normal.z * avrg.z);
-
- Vector3d ni = new Vector3d(facet.getVertex(significantPoints.get(i)).getNormal());
- Vector3d nj = new Vector3d(facet.getVertex(significantPoints.get(j)).getNormal());
- ni.normalize();
- nj.normalize();
-
- Vector3d normVec = ni;
- normVec.sub(nj);
- normVec.normalize();
- double normCos = normVec.dot(normal);
-
- if (Math.abs(normCos) >= config.getMinNormAngleCos()) {
- Plane newPlane = new Plane(normal.x, normal.y, normal.z, d);
- int currentVotes = getVotes(newPlane,
- significantCurvatures,
- significantPoints,
- config.getMinCurvRatio(),
- config.getMinAngleCos(),
- config.getMinNormAngleCos(),
- boundingBox.getMaxDiag() * config.getMaxRelDistance());
-
- planes.add(new AproxSymmetryPlane(newPlane, currentVotes));
-
- if (currentVotes > lastVotes) {
- lastVotes = currentVotes;
- plane = newPlane;
- }
- }
-
- }
- }
- }
- progressMonitor.setNote("Task step: " + (int) ((i + 1) * percentsPerStep));
- progressMonitor.setProgress(i);
- }
-
- Collections.sort(planes);
- ArrayList<AproxSymmetryPlane> finalPlanes = new ArrayList<>();
- for (int i = 0; i < planes.size(); i++) {
- if (planes.get(i).votes == lastVotes){
- finalPlanes.add(planes.get(i));
- }
- }
- Plane finalPlane = new Plane(0, 0, 0, 0);
- Vector3d refDir = new Vector3d(finalPlanes.get(0).a, finalPlanes.get(0).b, finalPlanes.get(0).c);
- for (int i = 0; i < finalPlanes.size(); i++) {
- Vector3d normDir = new Vector3d(finalPlanes.get(i).a, finalPlanes.get(i).b, finalPlanes.get(i).c);
- if (normDir.dot(refDir) < 0) {
- finalPlane.a -= finalPlanes.get(i).a;
- finalPlane.b -= finalPlanes.get(i).b;
- finalPlane.c -= finalPlanes.get(i).c;
- finalPlane.d -= finalPlanes.get(i).d;
- } else {
- finalPlane.a += finalPlanes.get(i).a;
- finalPlane.b += finalPlanes.get(i).b;
- finalPlane.c += finalPlanes.get(i).c;
- finalPlane.d += finalPlanes.get(i).d;
- }
- }
- finalPlane.normalize();
- if (config.isAveraging()){
- plane = finalPlane;
- }
- JOptionPane.showMessageDialog(panel, "Symmetry estimate done.", "Done", 0,
- new ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/exportedModel.png")));
-
- progressMonitor.close();
- return plane;
- }
-
- /**
- *
- * @param plane Plane computed as symmetry plane
- * @return mesh that represents facet with computed plane of approximate symmetry
- */
- public SymmetryEstimator mergeWithPlane(Plane plane) {
- Vector3d normal = new Vector3d(plane.a, plane.b, plane.c);
- Vector3d midPoint = boundingBox.getMidPoint().getPosition();
-
- double alpha = -((plane.a * midPoint.x) +
- (plane.b * midPoint.y) + (plane.c * midPoint.z) +
- plane.d) / (normal.dot(normal));
-
- Vector3d midPointOnPlane = new Vector3d(midPoint);
- Vector3d nn = new Vector3d(normal);
- nn.scale(alpha);
- midPointOnPlane.add(nn);
-
- double val = plane.a * midPointOnPlane.x + plane.b *
- midPointOnPlane.y + plane.c *
- midPointOnPlane.z + plane.d;
-
- Vector3d a = new Vector3d();
- if (Math.abs(normal.dot(new Vector3d(0.0, 1.0, 0.0))) > Math.abs(normal.dot(new Vector3d (1.0, 0.0, 0.0)))) {
- a.cross(normal, new Vector3d(1.0, 0.0, 0.0));
- } else {
- a.cross(normal, new Vector3d(0.0, 1.0, 0.0));
- }
- a.normalize();
-
- Vector3d b = new Vector3d();
- b.cross(normal,a);
- b.normalize();
-
- SymmetryEstimator planeMesh = Plane.createPlaneMesh(midPointOnPlane, a, b,
- (boundingBox.getMaxPoint().subtractPosition(boundingBox.getMinPoint())).getPosition().x);
-
- return mergeMeshWith(planeMesh);
- }
-
- /**
- *
- * @param s mesh that will be merged
- * @return mesh with merged vertices from both meshes
- */
- public SymmetryEstimator mergeMeshWith(SymmetryEstimator s) {
- CornerTableRow row1 = new CornerTableRow(facet.getNumberOfVertices(), -1);
- CornerTableRow row2 = new CornerTableRow(facet.getNumberOfVertices() + 1, facet.getNumberOfVertices() + 3);
- CornerTableRow row3 = new CornerTableRow(facet.getNumberOfVertices() + 2, -1);
- CornerTableRow row4 = new CornerTableRow(facet.getNumberOfVertices() + 2, -1);
- CornerTableRow row5 = new CornerTableRow(facet.getNumberOfVertices() + 3, facet.getNumberOfVertices() + 1);
- CornerTableRow row6 = new CornerTableRow(facet.getNumberOfVertices(), -1);
-
- facet.getCornerTable().addRow(row1);
- facet.getCornerTable().addRow(row2);
- facet.getCornerTable().addRow(row3);
- facet.getCornerTable().addRow(row4);
- facet.getCornerTable().addRow(row5);
- facet.getCornerTable().addRow(row6);
-
- for(int n = 0; n < 4; n++) {
- facet.addVertex(s.getFacet().getVertices().get(n));
- }
- return this;
- }
}
diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/SymmetryPanel.form b/GUI/src/main/java/cz/fidentis/analyst/gui/SymmetryPanel.form
index 65d045392839a2d7c63dd98b9731e7518c2821a6..3af48b80f709f79399b8138ff9d0553279069aea 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/gui/SymmetryPanel.form
+++ b/GUI/src/main/java/cz/fidentis/analyst/gui/SymmetryPanel.form
@@ -77,7 +77,7 @@
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="minCurvatio4" pref="157" max="32767" attributes="0"/>
+ <Component id="minCurvatio4" pref="0" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="minCurvatio" min="-2" max="-2" attributes="0"/>
@@ -208,7 +208,6 @@
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Hand Cursor"/>
</Property>
- <Property name="opaque" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JSlider" name="angleCosineSlider">
@@ -218,7 +217,6 @@
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Hand Cursor"/>
</Property>
- <Property name="opaque" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="minCurvatio">
@@ -250,7 +248,6 @@
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Hand Cursor"/>
</Property>
- <Property name="opaque" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="minCurvatio3">
@@ -272,7 +269,6 @@
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Hand Cursor"/>
</Property>
- <Property name="opaque" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="minCurvatio4">
@@ -293,7 +289,6 @@
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Hand Cursor"/>
</Property>
- <Property name="opaque" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="significantPointLabel">
@@ -325,7 +320,6 @@
<Component class="javax.swing.JCheckBox" name="averagingCheckBox">
<Properties>
<Property name="selected" type="boolean" value="true"/>
- <Property name="opaque" type="boolean" value="false"/>
</Properties>
<Events>
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="averagingCheckBoxMouseClicked"/>
diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/SymmetryPanel.java b/GUI/src/main/java/cz/fidentis/analyst/gui/SymmetryPanel.java
index 2a9889fe2734364490585a4744783e2dcece20bf..cbb2d2bdac7011a02bb78f0344d100bafdd64574 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/gui/SymmetryPanel.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/gui/SymmetryPanel.java
@@ -11,6 +11,8 @@ import javax.swing.ImageIcon;
import javax.swing.JOptionPane;
import javax.swing.JSlider;
import javax.swing.JTextField;
+import javax.swing.ProgressMonitor;
+import javax.swing.UIManager;
import javax.swing.event.ChangeEvent;
/**
@@ -155,8 +157,7 @@ public final class SymmetryPanel extends javax.swing.JPanel {
MeshModel model = new MeshModel();
canvas.changeModel(canvas.getLoadedModel());
symCounter = new SymmetryEstimator(canvas.getModel().getFacets().get(0), config);
- symCounter.setPanel(this);
- finalPlane = symCounter.getAproxSymmetryPlane();
+ finalPlane = symCounter.getApproxSymmetryPlane(this);
SymmetryEstimator counted = symCounter.mergeWithPlane(finalPlane);
model.addFacet(counted.getFacet());
@@ -525,8 +526,8 @@ public final class SymmetryPanel extends javax.swing.JPanel {
* @param evt Final computed plane is shown to user
*/
private void showPlaneLabelMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_showPlaneLabelMouseClicked
- JOptionPane.showMessageDialog(frameMain, "Approximate plane of symmetry: \n" + finalPlane.a + "\n" + finalPlane.b + "\n" + finalPlane.c + "\n" +
- finalPlane.d + "\n", "Final plane.", 0, new ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/showPlanePane.png")));
+ JOptionPane.showMessageDialog(frameMain, "Approximate plane of symmetry: \n" + finalPlane.getNormal().x + "\n" + finalPlane.getNormal().y + "\n" + finalPlane.getNormal().z + "\n" +
+ finalPlane.getDistance() + "\n", "Final plane.", 0, new ImageIcon(getClass().getResource("/cz/fidentis/analyst/gui/resources/showPlanePane.png")));
}//GEN-LAST:event_showPlaneLabelMouseClicked
/**