diff --git a/Comparison/pom.xml b/Comparison/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..9a327765fb07af939da353476835f5adbb05f77b --- /dev/null +++ b/Comparison/pom.xml @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>cz.findetis</groupId> + <artifactId>FIDENTIS-Analyst-parent</artifactId> + <version>2.0</version> + </parent> + <artifactId>Comparison</artifactId> + <packaging>nbm</packaging> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>nbm-maven-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <useOSGiDependencies>true</useOSGiDependencies> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <useDefaultManifestFile>true</useDefaultManifestFile> + </configuration> + </plugin> + <!-- Check code style --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>${version.maven.plugin.checkstyle}</version> + <executions> + <execution> + <id>validate</id> + <phase>validate</phase> + <configuration> + <configLocation>codestyle.xml</configLocation> + <encoding>UTF-8</encoding> + <consoleOutput>true</consoleOutput> + <failOnViolation>${checkstyle.fail}</failOnViolation> + <violationSeverity>${checkstyle.severity}</violationSeverity> + <includeTestSourceDirectory>false</includeTestSourceDirectory> + </configuration> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>8</source> + <target>8</target> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.netbeans.api</groupId> + <artifactId>org-netbeans-api-annotations-common</artifactId> + <version>${netbeans.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>MeshModel</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> +</project> \ No newline at end of file diff --git a/GUI/src/main/java/cz/fidentis/analyst/symmetry/AproxSymmetryPlane.java b/Comparison/src/main/java/cz/fidentis/analyst/symmetry/AproxSymmetryPlane.java similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/symmetry/AproxSymmetryPlane.java rename to Comparison/src/main/java/cz/fidentis/analyst/symmetry/AproxSymmetryPlane.java diff --git a/GUI/src/main/java/cz/fidentis/analyst/symmetry/BoundingBox.java b/Comparison/src/main/java/cz/fidentis/analyst/symmetry/BoundingBox.java similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/symmetry/BoundingBox.java rename to Comparison/src/main/java/cz/fidentis/analyst/symmetry/BoundingBox.java diff --git a/GUI/src/main/java/cz/fidentis/analyst/symmetry/Config.java b/Comparison/src/main/java/cz/fidentis/analyst/symmetry/Config.java similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/symmetry/Config.java rename to Comparison/src/main/java/cz/fidentis/analyst/symmetry/Config.java diff --git a/GUI/src/main/java/cz/fidentis/analyst/symmetry/Plane.java b/Comparison/src/main/java/cz/fidentis/analyst/symmetry/Plane.java similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/symmetry/Plane.java rename to Comparison/src/main/java/cz/fidentis/analyst/symmetry/Plane.java diff --git a/GUI/src/main/java/cz/fidentis/analyst/symmetry/SymmetryEstimator.java b/Comparison/src/main/java/cz/fidentis/analyst/symmetry/SymmetryEstimator.java similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/symmetry/SymmetryEstimator.java rename to Comparison/src/main/java/cz/fidentis/analyst/symmetry/SymmetryEstimator.java diff --git a/GUI/src/main/java/cz/fidentis/analyst/symmetry/Triangle.java b/Comparison/src/main/java/cz/fidentis/analyst/symmetry/Triangle.java similarity index 100% rename from GUI/src/main/java/cz/fidentis/analyst/symmetry/Triangle.java rename to Comparison/src/main/java/cz/fidentis/analyst/symmetry/Triangle.java diff --git a/Comparison/src/main/nbm/manifest.mf b/Comparison/src/main/nbm/manifest.mf new file mode 100644 index 0000000000000000000000000000000000000000..316179fa5311954f0e7119ce00ba9d8c6457ee4e --- /dev/null +++ b/Comparison/src/main/nbm/manifest.mf @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +OpenIDE-Module-Localizing-Bundle: cz/findetis/comparison/Bundle.properties + diff --git a/Comparison/src/main/resources/cz/findetis/comparison/Bundle.properties b/Comparison/src/main/resources/cz/findetis/comparison/Bundle.properties new file mode 100644 index 0000000000000000000000000000000000000000..200d019b247e9dca057c1542d71e2cb59b3d2ff5 --- /dev/null +++ b/Comparison/src/main/resources/cz/findetis/comparison/Bundle.properties @@ -0,0 +1,6 @@ +#Localized module labels. Defaults taken from POM (<name>, <description>, <groupId>) if unset. +#OpenIDE-Module-Name= +#OpenIDE-Module-Short-Description= +#OpenIDE-Module-Long-Description= +#OpenIDE-Module-Display-Category= +#Mon May 11 15:08:59 CEST 2020 diff --git a/GUI/pom.xml b/GUI/pom.xml index 02a7f01cab36638b5cdf51b59ad50d30980913af..860b8fb765842235841547d03bf404bb46ab029f 100644 --- a/GUI/pom.xml +++ b/GUI/pom.xml @@ -59,14 +59,23 @@ <dependency> <groupId>org.jogamp.jogl</groupId> <artifactId>jogl-all</artifactId> - <version>2.0-rc11</version> + <version>2.3.2</version> <type>jar</type> </dependency> <dependency> - <groupId>cz.findetis</groupId> + <groupId>org.jogamp.gluegen</groupId> + <artifactId>gluegen-rt-main</artifactId> + <version>2.3.2</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>MeshModel</artifactId> - <version>2.0</version> - <type>jar</type> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>Comparison</artifactId> + <version>${project.version}</version> </dependency> </dependencies> <properties> diff --git a/README.md b/README.md index 13178b4bfba112b72d76d5e4857a21ac504e8dfe..2254240e540445e6a68e2cc2806ea0ea9d518035 100644 --- a/README.md +++ b/README.md @@ -17,5 +17,5 @@ This project is being developed at Masaryk University, Brno as collaborative pro * **MeshModel:** The core model for triangle meshes. * **Renderer:** Rendering code. * **GUI:** GUI of the application. - +* **Comparison:** Application logic for the comparison of human faces. diff --git a/application/pom.xml b/application/pom.xml index b698ed85ec1a87a255d6aba88527d725d7416d4b..8d0fecce14501ab4c2fe42130b8b200cb9939feb 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -60,6 +60,11 @@ <artifactId>GUI</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>Comparison</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-api</artifactId> diff --git a/pom.xml b/pom.xml index 5dc06f253cf09a905f46f590123644117c34b35c..562e586070fd0d7f7dc7483ef0d5d5f66b7604ce 100644 --- a/pom.xml +++ b/pom.xml @@ -53,8 +53,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>2.5.1</version> <configuration> - <source>1.7</source> - <target>1.7</target> + <source>1.8</source> + <target>1.8</target> </configuration> </plugin> <plugin> @@ -77,6 +77,7 @@ <module>MeshModel</module> <module>Renderer</module> <module>GUI</module> + <module>Comparison</module> </modules> </project>