diff --git a/Comparison/src/main/java/cz/fidentis/analyst/comparison/HausdorffDistance.java b/Comparison/src/main/java/cz/fidentis/analyst/comparison/HausdorffDistance.java index 8939c6009c4f910269d65092fc3be38edf253dfe..f63122bd1372f3a976781cc617d305a6ee651f58 100644 --- a/Comparison/src/main/java/cz/fidentis/analyst/comparison/HausdorffDistance.java +++ b/Comparison/src/main/java/cz/fidentis/analyst/comparison/HausdorffDistance.java @@ -332,17 +332,18 @@ public class HausdorffDistance { * * @param <K> key * @param <V> value + * @author Radek Oslejsek */ - private class Pair<K,V> { - private K key; - private V value; + private final class Pair<K,V> { + private final K key; + private final V value; /** * Constructor. * @param key key * @param value value */ - public Pair(K key, V value) { + private Pair(K key, V value) { this.key = key; this.value = value; } diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/Installer.java b/GUI/src/main/java/cz/fidentis/analyst/gui/Installer.java index 6252ba998b74937195309172a2ee5b1a7f2afc32..1e651ac1c2e05fe419e25ae74aefbae0603fca7d 100644 --- a/GUI/src/main/java/cz/fidentis/analyst/gui/Installer.java +++ b/GUI/src/main/java/cz/fidentis/analyst/gui/Installer.java @@ -14,7 +14,7 @@ import org.openide.modules.ModuleInstall; /** * - * @author oslejsek + * @author Radek Oslejsek */ public class Installer extends ModuleInstall { diff --git a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/HumanFace.java b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/HumanFace.java index 93c6511f00cd37eb84e80b13d1ddc28c9e92a512..044448d1edea8e513f0080ee75a8e185c0a9b1ce 100644 --- a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/HumanFace.java +++ b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/HumanFace.java @@ -9,7 +9,7 @@ import java.io.InputStream; /** * This class encapsulates data for 3D scan of a single human face. * - * @author oslejsek + * @author Radek Oslejsek */ public class HumanFace { diff --git a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshFacet.java b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshFacet.java index 8d70d62228faca7854ffc8b4055da9f26571dea8..1db7603be5d26ea5f17d69f5f5c6162bf3a0642a 100644 --- a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshFacet.java +++ b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshFacet.java @@ -62,5 +62,5 @@ public interface MeshFacet { * * @param visitor Visitor */ - public void accept(Visitor visitor); + void accept(Visitor visitor); } diff --git a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshFacetImpl.java b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshFacetImpl.java index 32ab10eaee8a1c4d829d830db3925f6090723687..d50797953e3789ec245dd6c85a6bb0825c0ea6cd 100644 --- a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshFacetImpl.java +++ b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshFacetImpl.java @@ -1,6 +1,5 @@ package cz.fidentis.analyst.mesh.core; -import cz.fidentis.analyst.mesh.visitors.BoundingBox; import cz.fidentis.analyst.mesh.visitors.TriangleListVisitor; import cz.fidentis.analyst.mesh.visitors.Visitor; import java.util.ArrayList; diff --git a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/io/MeshObjExporter.java b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/io/MeshObjExporter.java index e518c9adee25c1e061d031795743492c7e5dcf10..2a6a5c83bb26cd7010c074879ee77ecde8f9f86b 100644 --- a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/io/MeshObjExporter.java +++ b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/io/MeshObjExporter.java @@ -108,8 +108,12 @@ public class MeshObjExporter { out.write("#" + facet.getCornerTable().getSize() / 3 + " triangles"); out.newLine(); - /* - //computes triangles of facet + //writeTriangles(facet, out); + } + } + + /* + protected void writeTriangles(MeshFacet facet, BufferedWriter out) throws IOException { Triangle[] triangles = new Triangle[facet.getCornerTable().getSize() / 3]; for (int i = 0; i < facet.getCornerTable().getSize(); i += 3) { Triangle t = new Triangle(facet.getCornerTable().getRow(i).getVertexIndex(), @@ -124,18 +128,18 @@ public class MeshObjExporter { if (facet.getVertex(triangle.getVertex1()).getNormal() != null && hasAllNormals) { out.write((triangle.getVertex1() + 1) + "//" + (triangle.getVertex1() + 1) + " " + (triangle.getVertex2() + 1) + "//" + (triangle.getVertex2() + 1) + " " - + (triangle.getVertex3() + 1) + "//" + (triangle.getVertex3() + 1) + "\n"); + + (triangle.getVertex3() + 1) + "//" + (triangle.getVertex3() + 1)); + out.newLine(); } else { out.write((triangle.getVertex1() + 1) + " " + (triangle.getVertex2() + 1) + - " " + (triangle.getVertex3() + 1) + "\n"); + " " + (triangle.getVertex3() + 1)); + out.newLine(); } } - out.write("#" + triangles.length + " triangles" + "\n"); - out.write("\n"); - out.close(); - fstream.close(); - */ - } + out.write("#" + triangles.length + " triangles"); + out.newLine(); + out.newLine(); } + */ } diff --git a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/BoundingBoxVisitor.java b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/BoundingBoxVisitor.java index 7805d36f39679a207cb778364ed1498cb2b117c2..4e138d069d3fed48b8f4ec78d21e4837e49d7536 100644 --- a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/BoundingBoxVisitor.java +++ b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/BoundingBoxVisitor.java @@ -1,12 +1,11 @@ package cz.fidentis.analyst.mesh.visitors; import cz.fidentis.analyst.mesh.core.MeshFacet; -import cz.fidentis.analyst.mesh.core.MeshModel; /** * Visitor that computes a 3D bounding box (cube). * - * @author oslejsek + * @author Radek Oslejsek */ public class BoundingBoxVisitor implements Visitor { diff --git a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/TriangleListVisitor.java b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/TriangleListVisitor.java index 42cb05c05d92ebe289051c0428010b06a00f31b3..8acb8c8bc098689cff9746bd20a7092adddabe9a 100644 --- a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/TriangleListVisitor.java +++ b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/TriangleListVisitor.java @@ -2,7 +2,6 @@ package cz.fidentis.analyst.mesh.visitors; import cz.fidentis.analyst.mesh.core.CornerTable; import cz.fidentis.analyst.mesh.core.MeshFacet; -import cz.fidentis.analyst.mesh.core.MeshModel; import cz.fidentis.analyst.mesh.core.MeshTriangle; import java.util.ArrayList; import java.util.List; @@ -10,7 +9,7 @@ import java.util.List; /** * Visitor that collects and returs list of triangles. * - * @author oslejsek + * @author Radek Oslejsek */ public class TriangleListVisitor implements Visitor { diff --git a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/Visitor.java b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/Visitor.java index cf8401b9329240af765cca3055e76e18ae81b0f4..bc6d0a8adca3814ecca65670f8789f86ad6b908b 100644 --- a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/Visitor.java +++ b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/Visitor.java @@ -6,11 +6,10 @@ import cz.fidentis.analyst.mesh.core.MeshModel; /** * Visitor for the traversal of @code{MeshModel} and @code{MeshFacet}. * - * @author oslejsek + * @author Radek Oslejsek */ public interface Visitor { - /** * Visits a mesh model. *