Skip to content
Snippets Groups Projects
Commit ffe1f62a authored by Radek Ošlejšek's avatar Radek Ošlejšek
Browse files

Merged changes from master

parents 922f2d12 07f447b1
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 3809 additions and 67 deletions
.gitignore
+ 15
− 2
View file @ ffe1f62a
**/target
*.iml
# From directories, ignore...
### Idea:
.idea/
codestyle.xml
\ No newline at end of file
.idea_modules/
/out/
### Maven template
target/
### Eclipse template
bin/
tmp/
.settings/
.gitignore.orig 0 → 100644
+ 23
− 0
View file @ ffe1f62a
**/target
<<<<<<< HEAD
*.iml
.idea/
codestyle.xml
=======
# From directories, ignore...
### Idea:
.idea/
.idea_modules/
/out/
### Maven template
target/
### Eclipse template
bin/
tmp/
.settings/
>>>>>>> origin/master
Comparison/pom.xml
+ 84
− 64
View file @ ffe1f62a
<?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>
<groupId>groupId</groupId>
<artifactId>Comparison</artifactId>
<version>1.0-SNAPSHOT</version>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.0</version>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
</plugins>
</build>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.3</version>
</plugin>
</plugins>
</reporting>
<dependencies>
<dependency>
<groupId>cz.findetis</groupId>
<artifactId>MeshModel</artifactId>
<version>2.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.vecmath</groupId>
<artifactId>vecmath</artifactId>
<version>1.5.2</version>
</dependency>
<dependency>
<groupId>org.javatuples</groupId>
<artifactId>javatuples</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>
\ No newline at end of file
<?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>
<publicPackages> <!-- expose API/packages to other modules -->
<publicPackage>cz.fidentis.analyst.symmetry.*</publicPackage>
</publicPackages>
</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>
<dependency>
<groupId>javax.vecmath</groupId>
<artifactId>vecmath</artifactId>
<version>${version.javax.vecmath}</version>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>
Comparison/pom.xml.orig 0 → 100644
+ 150
− 0
View file @ ffe1f62a
<<<<<<< HEAD
<?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>
<groupId>groupId</groupId>
<artifactId>Comparison</artifactId>
<version>1.0-SNAPSHOT</version>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.0</version>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
</plugins>
</build>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.3</version>
</plugin>
</plugins>
</reporting>
<dependencies>
<dependency>
<groupId>cz.findetis</groupId>
<artifactId>MeshModel</artifactId>
<version>2.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.vecmath</groupId>
<artifactId>vecmath</artifactId>
<version>1.5.2</version>
</dependency>
<dependency>
<groupId>org.javatuples</groupId>
<artifactId>javatuples</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
=======
<?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>
<publicPackages> <!-- expose API/packages to other modules -->
<publicPackage>cz.fidentis.analyst.symmetry.*</publicPackage>
</publicPackages>
</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>
<dependency>
<groupId>javax.vecmath</groupId>
<artifactId>vecmath</artifactId>
<version>${version.javax.vecmath}</version>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
>>>>>>> origin/master
</project>
\ No newline at end of file
Comparison/src/main/java/cz/fidentis/analyst/symmetry/AproxSymmetryPlane.java 0 → 100644
+ 42
− 0
View file @ ffe1f62a
package cz.fidentis.analyst.symmetry;
/**
*
* @author Natália Bebjaková
*
* 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;
/**
* returns number of votes that were given to plane while computing the symmetry
*
* @return Number of votes
*/
public Integer getVotes() {
return votes;
}
/**
*
* @param plane Original plane without votes
* @param votes number of votes given to the plane
*/
public AproxSymmetryPlane(Plane plane, int votes) {
super(plane.a, plane.b, plane.c, plane.d);
this.votes = votes;
}
/**
* Enables to compare two approximate planes due to number of votes
*
* @param other plane to be compared
* @return number that decides which plane has more votes
*/
@Override
public int compareTo(AproxSymmetryPlane other) {
return this.votes.compareTo(other.votes);
}
}
Comparison/src/main/java/cz/fidentis/analyst/symmetry/AproxSymmetryPlane.java.orig 0 → 100644
+ 42
− 0
View file @ ffe1f62a
package cz.fidentis.analyst.symmetry;
/**
*
* @author Natália Bebjaková
*
* 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;
/**
* returns number of votes that were given to plane while computing the symmetry
*
* @return Number of votes
*/
public Integer getVotes() {
return votes;
}
/**
*
* @param plane Original plane without votes
* @param votes number of votes given to the plane
*/
public AproxSymmetryPlane(Plane plane, int votes) {
super(plane.a, plane.b, plane.c, plane.d);
this.votes = votes;
}
/**
* Enables to compare two approximate planes due to number of votes
*
* @param other plane to be compared
* @return number that decides which plane has more votes
*/
@Override
public int compareTo(AproxSymmetryPlane other) {
return this.votes.compareTo(other.votes);
}
}
Comparison/src/main/java/cz/fidentis/analyst/symmetry/Config.java 0 → 100644
+ 173
− 0
View file @ ffe1f62a
package cz.fidentis.analyst.symmetry;
/**
*
* @author Natália Bebjaková
*
* Representation of configuration for symmetry estimate.
* Default numbers are given due to the best results on tested data.
* On many different 3D models, it exists other values of config that will have
* better impact on results in estimate of symmetry.
*/
public class Config {
private static final double DEFAULT_MIN_CURV_RATIO = 0.5;
private static final double DEFAULT_MIN_ANGLE_COS = 0.985;
private static final double DEFAULT_MIN_NORM_ANGLE_COS = 0.985;
private static final double DEFAULT_MAX_REL_DISTANCE = 1.0 / 100.0;
private static final int DEFAULT_SIGNIFICANT_POINT_COUNT = 200;
private static final boolean DEFAULT_AVERAGING = true;
private double minCurvRatio;
private double minAngleCos;
private double minNormAngleCos;
private double maxRelDistance;
private int significantPointCount;
private boolean averaging;
/**
* Parameter which denotes how similar the Gaussian curvatures in the two vertices
* must be for this criteria to be satisfied.
* The higher the value is the more similar they must be.
*
* @return minimal similarity of curvatures to satisfy the criteria
*/
public double getMinCurvRatio() {
return minCurvRatio;
}
/**
*
* @param minCurvRatio new minimal similarity of curvatures to satisfy the criteria
*/
public void setMinCurvRatio(double minCurvRatio) {
this.minCurvRatio = minCurvRatio;
}
/**
* MinAngleCos ∈ (0,1)
* It is the angle between the vector (xk − xl) and the normal vector nij of the plane ρij
* (which is the vector (xi −xj))
* Returns parameter which denotes how large the angle αij can be for this criteria to be satisfied.
*
* @return minimal angle satisfy criteria
*/
public double getMinAngleCos() {
return minAngleCos;
}
/**
*
* @param minAngleCos new minimal angle to satisfy the criteria
*/
public void setMinAngleCos(double minAngleCos) {
this.minAngleCos = minAngleCos;
}
/**
* MinNormAngleCos ∈ (0,1)
* It is angle between vectors (xi − xj) and (ni − nj), where xi, xj are vertices and ni, nj its normals
* Returns parameter which denotes how large the angle αij can be for this criteria to be satisfied.
*
* @return minimal angle to satisfy criteria
*/
public double getMinNormAngleCos() {
return minNormAngleCos;
}
/**
*
* @param minNormAngleCos new minimal angle to satisfy the criteria
*/
public void setMinNormAngleCos(double minNormAngleCos) {
this.minNormAngleCos = minNormAngleCos;
}
/**
* Parameter which denotes how far (relatively to the length of the bounding box diagonal)
* the middle point of the two vertices can be from the plane in order to satisfy this criteria.
*
* @return relative distance
*/
public double getMaxRelDistance() {
return maxRelDistance;
}
/**
*
* @param maxRelDistance new relative distance
*/
public void setMaxRelDistance(double maxRelDistance) {
this.maxRelDistance = maxRelDistance;
}
/**
* Returns number of vertices with the highest Gaussian curvature.
*
* @return number of significant points for computing the symmetry
*/
public int getSignificantPointCount() {
return significantPointCount;
}
/**
*
* @param significantPointCount new number of significant points for computing the symmetry
*/
public void setSignificantPointCount(int significantPointCount) {
this.significantPointCount = significantPointCount;
}
/**
* If there are more planes with the same highest number of votes while computing symmetry,
* we can average them all together.
* Returns parameter that decides whether to average them or not.
*
* @return true if planes will be averaged
*/
public boolean isAveraging() {
return averaging;
}
/**
*
* @param averaging new averaging flag
*/
public void setAveraging(boolean averaging) {
this.averaging = averaging;
}
/**
* Creates new configuration with default values
*
* @return configuration with default values
*/
public static Config getDefault() {
Config conf = new Config();
conf.minCurvRatio = DEFAULT_MIN_CURV_RATIO;
conf.minAngleCos = DEFAULT_MIN_ANGLE_COS;
conf.minNormAngleCos = DEFAULT_MIN_NORM_ANGLE_COS;
conf.maxRelDistance = DEFAULT_MAX_REL_DISTANCE;
conf.significantPointCount = DEFAULT_SIGNIFICANT_POINT_COUNT;
conf.averaging = DEFAULT_AVERAGING;
return conf;
}
/**
*
* @return String representation of configuration
*/
@Override
public String toString() {
String str = "PARAMETERS: ";
str += "\n";
str += "Min curvature ratio: " + minCurvRatio + "\n";
str += "Min angle cosine: " + minAngleCos + "\n";
str += "Min norm angle cosine: " + minNormAngleCos + "\n";
str += "Max relative distance: " + maxRelDistance + "\n";
str += "Significant points: " + significantPointCount + "\n";
str += "Averaging: " + averaging + "\n";
return str;
}
}
\ No newline at end of file
Comparison/src/main/java/cz/fidentis/analyst/symmetry/Config.java.orig 0 → 100644
+ 173
− 0
View file @ ffe1f62a
package cz.fidentis.analyst.symmetry;
/**
*
* @author Natália Bebjaková
*
* Representation of configuration for symmetry estimate.
* Default numbers are given due to the best results on tested data.
* On many different 3D models, it exists other values of config that will have
* better impact on results in estimate of symmetry.
*/
public class Config {
private static final double DEFAULT_MIN_CURV_RATIO = 0.5;
private static final double DEFAULT_MIN_ANGLE_COS = 0.985;
private static final double DEFAULT_MIN_NORM_ANGLE_COS = 0.985;
private static final double DEFAULT_MAX_REL_DISTANCE = 1.0 / 100.0;
private static final int DEFAULT_SIGNIFICANT_POINT_COUNT = 200;
private static final boolean DEFAULT_AVERAGING = true;
private double minCurvRatio;
private double minAngleCos;
private double minNormAngleCos;
private double maxRelDistance;
private int significantPointCount;
private boolean averaging;
/**
* Parameter which denotes how similar the Gaussian curvatures in the two vertices
* must be for this criteria to be satisfied.
* The higher the value is the more similar they must be.
*
* @return minimal similarity of curvatures to satisfy the criteria
*/
public double getMinCurvRatio() {
return minCurvRatio;
}
/**
*
* @param minCurvRatio new minimal similarity of curvatures to satisfy the criteria
*/
public void setMinCurvRatio(double minCurvRatio) {
this.minCurvRatio = minCurvRatio;
}
/**
* MinAngleCos ∈ (0,1)
* It is the angle between the vector (xk − xl) and the normal vector nij of the plane ρij
* (which is the vector (xi −xj))
* Returns parameter which denotes how large the angle αij can be for this criteria to be satisfied.
*
* @return minimal angle satisfy criteria
*/
public double getMinAngleCos() {
return minAngleCos;
}
/**
*
* @param minAngleCos new minimal angle to satisfy the criteria
*/
public void setMinAngleCos(double minAngleCos) {
this.minAngleCos = minAngleCos;
}
/**
* MinNormAngleCos ∈ (0,1)
* It is angle between vectors (xi − xj) and (ni − nj), where xi, xj are vertices and ni, nj its normals
* Returns parameter which denotes how large the angle αij can be for this criteria to be satisfied.
*
* @return minimal angle to satisfy criteria
*/
public double getMinNormAngleCos() {
return minNormAngleCos;
}
/**
*
* @param minNormAngleCos new minimal angle to satisfy the criteria
*/
public void setMinNormAngleCos(double minNormAngleCos) {
this.minNormAngleCos = minNormAngleCos;
}
/**
* Parameter which denotes how far (relatively to the length of the bounding box diagonal)
* the middle point of the two vertices can be from the plane in order to satisfy this criteria.
*
* @return relative distance
*/
public double getMaxRelDistance() {
return maxRelDistance;
}
/**
*
* @param maxRelDistance new relative distance
*/
public void setMaxRelDistance(double maxRelDistance) {
this.maxRelDistance = maxRelDistance;
}
/**
* Returns number of vertices with the highest Gaussian curvature.
*
* @return number of significant points for computing the symmetry
*/
public int getSignificantPointCount() {
return significantPointCount;
}
/**
*
* @param significantPointCount new number of significant points for computing the symmetry
*/
public void setSignificantPointCount(int significantPointCount) {
this.significantPointCount = significantPointCount;
}
/**
* If there are more planes with the same highest number of votes while computing symmetry,
* we can average them all together.
* Returns parameter that decides whether to average them or not.
*
* @return true if planes will be averaged
*/
public boolean isAveraging() {
return averaging;
}
/**
*
* @param averaging new averaging flag
*/
public void setAveraging(boolean averaging) {
this.averaging = averaging;
}
/**
* Creates new configuration with default values
*
* @return configuration with default values
*/
public static Config getDefault() {
Config conf = new Config();
conf.minCurvRatio = DEFAULT_MIN_CURV_RATIO;
conf.minAngleCos = DEFAULT_MIN_ANGLE_COS;
conf.minNormAngleCos = DEFAULT_MIN_NORM_ANGLE_COS;
conf.maxRelDistance = DEFAULT_MAX_REL_DISTANCE;
conf.significantPointCount = DEFAULT_SIGNIFICANT_POINT_COUNT;
conf.averaging = DEFAULT_AVERAGING;
return conf;
}
/**
*
* @return String representation of configuration
*/
@Override
public String toString() {
String str = "PARAMETERS: ";
str += "\n";
str += "Min curvature ratio: " + minCurvRatio + "\n";
str += "Min angle cosine: " + minAngleCos + "\n";
str += "Min norm angle cosine: " + minNormAngleCos + "\n";
str += "Max relative distance: " + maxRelDistance + "\n";
str += "Significant points: " + significantPointCount + "\n";
str += "Averaging: " + averaging + "\n";
return str;
}
}
\ No newline at end of file
Comparison/src/main/java/cz/fidentis/analyst/symmetry/Plane.java 0 → 100644
+ 101
− 0
View file @ ffe1f62a
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á
*
* Representation of the symmetry plane
*/
public class Plane {
public double a;
public double b;
public double c;
public double d;
private static MeshFacet facet;
/**
* Creates new plane
*
* @param a a coordinate
* @param b b coordinate
* @param c c coordinate
* @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;
}
/**
* Normalize the plane
*/
public void normalize() {
double normalLength = Math.sqrt(a * a + b * b + c * c);
a /= normalLength;
b /= normalLength;
c /= normalLength;
d /= normalLength;
}
/**
* 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
*/
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;
}
/**
* Returns string description of the plane
*
* @return description of the plane
*/
@Override
public String toString(){
return "APPROXIMATE PLANE:\n" + a + "\n" + b + "\n" + c + "\n" + d + "\n";
}
}
Comparison/src/main/nbm/manifest.mf 0 → 100644
+ 3
− 0
View file @ ffe1f62a
Manifest-Version: 1.0
OpenIDE-Module-Localizing-Bundle: cz/findetis/comparison/Bundle.properties
Comparison/src/main/resources/cz/findetis/comparison/Bundle.properties 0 → 100644
+ 6
− 0
View file @ ffe1f62a
#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
GUI/GUI.iml 0 → 100644
+ 23
− 0
View file @ ffe1f62a
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-api-annotations-common:RELEASE82" level="project" />
<orderEntry type="library" name="Maven: org.jogamp.jogl:jogl-all:2.0-rc11" level="project" />
<orderEntry type="module" module-name="MeshModel" />
<orderEntry type="library" name="Maven: java3d:j3d-core-utils:1.3.1" level="project" />
<orderEntry type="library" name="Maven: java3d:vecmath:1.3.1" level="project" />
<orderEntry type="library" name="Maven: java3d:j3d-core:1.3.1" level="project" />
<orderEntry type="library" name="Maven: com.github.mokiat:java-data-front:v2.0.0" level="project" />
<orderEntry type="library" name="Maven: javax.vecmath:vecmath:1.5.2" level="project" />
</component>
</module>
GUI/GUI.iml.orig 0 → 100644
+ 23
− 0
View file @ ffe1f62a
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-api-annotations-common:RELEASE82" level="project" />
<orderEntry type="library" name="Maven: org.jogamp.jogl:jogl-all:2.0-rc11" level="project" />
<orderEntry type="module" module-name="MeshModel" />
<orderEntry type="library" name="Maven: java3d:j3d-core-utils:1.3.1" level="project" />
<orderEntry type="library" name="Maven: java3d:vecmath:1.3.1" level="project" />
<orderEntry type="library" name="Maven: java3d:j3d-core:1.3.1" level="project" />
<orderEntry type="library" name="Maven: com.github.mokiat:java-data-front:v2.0.0" level="project" />
<orderEntry type="library" name="Maven: javax.vecmath:vecmath:1.5.2" level="project" />
</component>
</module>
GUI/pom.xml
+ 42
− 1
View file @ ffe1f62a
......@@ -56,8 +56,49 @@
<artifactId>org-netbeans-api-annotations-common</artifactId>
<version>${netbeans.version}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util</artifactId>
<version>${netbeans.version}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-awt</artifactId>
<version>${netbeans.version}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-dialogs</artifactId>
<version>${netbeans.version}</version>
</dependency>
<dependency>
<groupId>org.jogamp.jogl</groupId>
<artifactId>jogl-all</artifactId>
<version>2.3.2</version>
<type>jar</type>
</dependency>
<dependency>
<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>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>Comparison</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.vecmath</groupId>
<artifactId>vecmath</artifactId>
<version>${version.javax.vecmath}</version>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>
\ No newline at end of file
</project>
GUI/pom.xml.orig 0 → 100644
+ 107
− 0
View file @ ffe1f62a
<?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>GUI</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>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-api-annotations-common</artifactId>
<version>${netbeans.version}</version>
</dependency>
<<<<<<< HEAD
=======
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util</artifactId>
<version>${netbeans.version}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-awt</artifactId>
<version>${netbeans.version}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-dialogs</artifactId>
<version>${netbeans.version}</version>
</dependency>
<dependency>
<groupId>org.jogamp.jogl</groupId>
<artifactId>jogl-all</artifactId>
<version>2.3.2</version>
<type>jar</type>
</dependency>
<dependency>
<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>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>Comparison</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.vecmath</groupId>
<artifactId>vecmath</artifactId>
<version>${version.javax.vecmath}</version>
</dependency>
>>>>>>> origin/master
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>
\ No newline at end of file
GUI/src/main/java/cz/fidentis/analyst/gui/Canvas.form 0 → 100644
+ 308
− 0
View file @ ffe1f62a
<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.9" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<Properties>
<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="0" green="0" red="0" type="rgb"/>
</Property>
</Properties>
<AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,93,0,0,1,-79"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Container class="javax.swing.JLayeredPane" name="jLayeredPane1">
<Properties>
<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="28" green="28" red="28" type="rgb"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="opaque" type="boolean" value="true"/>
</Properties>
<Events>
<EventHandler event="componentResized" listener="java.awt.event.ComponentListener" parameters="java.awt.event.ComponentEvent" handler="jLayeredPane1ComponentResized"/>
<EventHandler event="componentShown" listener="java.awt.event.ComponentListener" parameters="java.awt.event.ComponentEvent" handler="jLayeredPane1ComponentShown"/>
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Center"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
<Property name="useNullLayout" type="boolean" value="true"/>
</Layout>
<SubComponents>
<Component class="javax.swing.JLabel" name="resetButton">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/cz/fidentis/analyst/gui/resources/resetButton.png"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value="Reset position of model"/>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Hand Cursor"/>
</Property>
</Properties>
<Events>
<EventHandler event="mouseMoved" listener="java.awt.event.MouseMotionListener" parameters="java.awt.event.MouseEvent" handler="resetButtonMouseMoved"/>
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="resetButtonMouseClicked"/>
<EventHandler event="mouseExited" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="resetButtonMouseExited"/>
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="60" y="40" width="30" height="30"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JButton" name="upNavigationButton">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/cz/fidentis/analyst/gui/resources/upButton.png"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value="Rotate up"/>
<Property name="borderPainted" type="boolean" value="false"/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Hand Cursor"/>
</Property>
</Properties>
<Events>
<EventHandler event="mousePressed" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="upNavigationButtonMousePressed"/>
<EventHandler event="mouseReleased" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="upNavigationButtonMouseReleased"/>
</Events>
<AuxValues>
<AuxValue name="JLayeredPane.layer" type="java.lang.Integer" value="200"/>
</AuxValues>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="60" y="10" width="30" height="30"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JButton" name="leftNavigationButton">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/cz/fidentis/analyst/gui/resources/leftButton.png"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value="Rotate left"/>
<Property name="borderPainted" type="boolean" value="false"/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Hand Cursor"/>
</Property>
</Properties>
<Events>
<EventHandler event="mousePressed" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="leftNavigationButtonMousePressed"/>
<EventHandler event="mouseReleased" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="leftNavigationButtonMouseReleased"/>
</Events>
<AuxValues>
<AuxValue name="JLayeredPane.layer" type="java.lang.Integer" value="200"/>
</AuxValues>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="30" y="40" width="30" height="30"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JButton" name="minusNavigationButton">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/cz/fidentis/analyst/gui/resources/minus.png"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value="Zoom out"/>
<Property name="borderPainted" type="boolean" value="false"/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Hand Cursor"/>
</Property>
</Properties>
<Events>
<EventHandler event="mousePressed" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="minusNavigationButtonMousePressed"/>
<EventHandler event="mouseReleased" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="minusNavigationButtonMouseReleased"/>
</Events>
<AuxValues>
<AuxValue name="JLayeredPane.layer" type="java.lang.Integer" value="200"/>
</AuxValues>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="90" y="90" width="30" height="30"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JButton" name="downNavigationButton">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/cz/fidentis/analyst/gui/resources/downButton.png"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value="Rotate down"/>
<Property name="borderPainted" type="boolean" value="false"/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Hand Cursor"/>
</Property>
</Properties>
<Events>
<EventHandler event="mousePressed" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="downNavigationButtonMousePressed"/>
<EventHandler event="mouseReleased" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="downNavigationButtonMouseReleased"/>
</Events>
<AuxValues>
<AuxValue name="JLayeredPane.layer" type="java.lang.Integer" value="200"/>
</AuxValues>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="60" y="70" width="30" height="30"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JButton" name="plusNavigationButton">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/cz/fidentis/analyst/gui/resources/plus.png"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value="Zoom in"/>
<Property name="borderPainted" type="boolean" value="false"/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Hand Cursor"/>
</Property>
</Properties>
<Events>
<EventHandler event="mousePressed" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="plusNavigationButtonMousePressed"/>
<EventHandler event="mouseReleased" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="plusNavigationButtonMouseReleased"/>
</Events>
<AuxValues>
<AuxValue name="JLayeredPane.layer" type="java.lang.Integer" value="200"/>
</AuxValues>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="30" y="90" width="30" height="30"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="jLabel1">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/cz/fidentis/analyst/gui/resources/navigBackground.png"/>
</Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="30" y="10" width="90" height="90"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="loadModelButton">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/cz/fidentis/analyst/gui/resources/loadCanva.png"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Hand Cursor"/>
</Property>
</Properties>
<Events>
<EventHandler event="mouseMoved" listener="java.awt.event.MouseMotionListener" parameters="java.awt.event.MouseEvent" handler="loadModelButtonMouseMoved"/>
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="loadModelButtonMouseClicked"/>
<EventHandler event="mouseExited" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="loadModelButtonMouseExited"/>
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="200" y="100" width="210" height="220"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JButton" name="rightNavigationButton1">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/cz/fidentis/analyst/gui/resources/rightButton.png"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value="Rotate right"/>
<Property name="borderPainted" type="boolean" value="false"/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Hand Cursor"/>
</Property>
</Properties>
<Events>
<EventHandler event="mousePressed" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="rightNavigationButton1MousePressed"/>
<EventHandler event="mouseReleased" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="rightNavigationButton1MouseReleased"/>
</Events>
<AuxValues>
<AuxValue name="JLayeredPane.layer" type="java.lang.Integer" value="200"/>
</AuxValues>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="90" y="40" width="30" height="30"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="whiteBackroundButton">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/cz/fidentis/analyst/gui/resources/whiteBackroundCanvas.png"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value="White backround"/>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Hand Cursor"/>
</Property>
</Properties>
<Events>
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="whiteBackroundButtonMouseClicked"/>
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="50" y="130" width="-1" height="-1"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="blackBackroundButton">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/cz/fidentis/analyst/gui/resources/blackBackroundCanvas.png"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value="Dark background"/>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Hand Cursor"/>
</Property>
</Properties>
<Events>
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="blackBackroundButtonMouseClicked"/>
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="50" y="190" width="-1" height="-1"/>
</Constraint>
</Constraints>
</Component>
<Container class="javax.swing.JPanel" name="jPanel1">
<Properties>
<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="0" green="0" red="0" type="rgb"/>
</Property>
</Properties>
<Events>
<EventHandler event="mouseWheelMoved" listener="java.awt.event.MouseWheelListener" parameters="java.awt.event.MouseWheelEvent" handler="jPanel1MouseWheelMoved"/>
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="0" y="0" width="-1" height="-1"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
</Container>
</SubComponents>
</Container>
</SubComponents>
</Form>
GUI/src/main/java/cz/fidentis/analyst/gui/Canvas.form.orig 0 → 100644
+ 308
− 0
View file @ ffe1f62a
<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.9" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<Properties>
<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="0" green="0" red="0" type="rgb"/>
</Property>
</Properties>
<AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,93,0,0,1,-79"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Container class="javax.swing.JLayeredPane" name="jLayeredPane1">
<Properties>
<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="28" green="28" red="28" type="rgb"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="opaque" type="boolean" value="true"/>
</Properties>
<Events>
<EventHandler event="componentResized" listener="java.awt.event.ComponentListener" parameters="java.awt.event.ComponentEvent" handler="jLayeredPane1ComponentResized"/>
<EventHandler event="componentShown" listener="java.awt.event.ComponentListener" parameters="java.awt.event.ComponentEvent" handler="jLayeredPane1ComponentShown"/>
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Center"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
<Property name="useNullLayout" type="boolean" value="true"/>
</Layout>
<SubComponents>
<Component class="javax.swing.JLabel" name="resetButton">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/cz/fidentis/analyst/gui/resources/resetButton.png"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value="Reset position of model"/>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Hand Cursor"/>
</Property>
</Properties>
<Events>
<EventHandler event="mouseMoved" listener="java.awt.event.MouseMotionListener" parameters="java.awt.event.MouseEvent" handler="resetButtonMouseMoved"/>
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="resetButtonMouseClicked"/>
<EventHandler event="mouseExited" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="resetButtonMouseExited"/>
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="60" y="40" width="30" height="30"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JButton" name="upNavigationButton">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/cz/fidentis/analyst/gui/resources/upButton.png"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value="Rotate up"/>
<Property name="borderPainted" type="boolean" value="false"/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Hand Cursor"/>
</Property>
</Properties>
<Events>
<EventHandler event="mousePressed" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="upNavigationButtonMousePressed"/>
<EventHandler event="mouseReleased" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="upNavigationButtonMouseReleased"/>
</Events>
<AuxValues>
<AuxValue name="JLayeredPane.layer" type="java.lang.Integer" value="200"/>
</AuxValues>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="60" y="10" width="30" height="30"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JButton" name="leftNavigationButton">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/cz/fidentis/analyst/gui/resources/leftButton.png"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value="Rotate left"/>
<Property name="borderPainted" type="boolean" value="false"/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Hand Cursor"/>
</Property>
</Properties>
<Events>
<EventHandler event="mousePressed" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="leftNavigationButtonMousePressed"/>
<EventHandler event="mouseReleased" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="leftNavigationButtonMouseReleased"/>
</Events>
<AuxValues>
<AuxValue name="JLayeredPane.layer" type="java.lang.Integer" value="200"/>
</AuxValues>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="30" y="40" width="30" height="30"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JButton" name="minusNavigationButton">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/cz/fidentis/analyst/gui/resources/minus.png"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value="Zoom out"/>
<Property name="borderPainted" type="boolean" value="false"/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Hand Cursor"/>
</Property>
</Properties>
<Events>
<EventHandler event="mousePressed" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="minusNavigationButtonMousePressed"/>
<EventHandler event="mouseReleased" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="minusNavigationButtonMouseReleased"/>
</Events>
<AuxValues>
<AuxValue name="JLayeredPane.layer" type="java.lang.Integer" value="200"/>
</AuxValues>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="90" y="90" width="30" height="30"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JButton" name="downNavigationButton">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/cz/fidentis/analyst/gui/resources/downButton.png"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value="Rotate down"/>
<Property name="borderPainted" type="boolean" value="false"/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Hand Cursor"/>
</Property>
</Properties>
<Events>
<EventHandler event="mousePressed" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="downNavigationButtonMousePressed"/>
<EventHandler event="mouseReleased" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="downNavigationButtonMouseReleased"/>
</Events>
<AuxValues>
<AuxValue name="JLayeredPane.layer" type="java.lang.Integer" value="200"/>
</AuxValues>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="60" y="70" width="30" height="30"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JButton" name="plusNavigationButton">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/cz/fidentis/analyst/gui/resources/plus.png"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value="Zoom in"/>
<Property name="borderPainted" type="boolean" value="false"/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Hand Cursor"/>
</Property>
</Properties>
<Events>
<EventHandler event="mousePressed" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="plusNavigationButtonMousePressed"/>
<EventHandler event="mouseReleased" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="plusNavigationButtonMouseReleased"/>
</Events>
<AuxValues>
<AuxValue name="JLayeredPane.layer" type="java.lang.Integer" value="200"/>
</AuxValues>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="30" y="90" width="30" height="30"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="jLabel1">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/cz/fidentis/analyst/gui/resources/navigBackground.png"/>
</Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="30" y="10" width="90" height="90"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="loadModelButton">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/cz/fidentis/analyst/gui/resources/loadCanva.png"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Hand Cursor"/>
</Property>
</Properties>
<Events>
<EventHandler event="mouseMoved" listener="java.awt.event.MouseMotionListener" parameters="java.awt.event.MouseEvent" handler="loadModelButtonMouseMoved"/>
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="loadModelButtonMouseClicked"/>
<EventHandler event="mouseExited" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="loadModelButtonMouseExited"/>
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="200" y="100" width="210" height="220"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JButton" name="rightNavigationButton1">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/cz/fidentis/analyst/gui/resources/rightButton.png"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value="Rotate right"/>
<Property name="borderPainted" type="boolean" value="false"/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Hand Cursor"/>
</Property>
</Properties>
<Events>
<EventHandler event="mousePressed" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="rightNavigationButton1MousePressed"/>
<EventHandler event="mouseReleased" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="rightNavigationButton1MouseReleased"/>
</Events>
<AuxValues>
<AuxValue name="JLayeredPane.layer" type="java.lang.Integer" value="200"/>
</AuxValues>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="90" y="40" width="30" height="30"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="whiteBackroundButton">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/cz/fidentis/analyst/gui/resources/whiteBackroundCanvas.png"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value="White backround"/>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Hand Cursor"/>
</Property>
</Properties>
<Events>
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="whiteBackroundButtonMouseClicked"/>
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="50" y="130" width="-1" height="-1"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="blackBackroundButton">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/cz/fidentis/analyst/gui/resources/blackBackroundCanvas.png"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value="Dark background"/>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Hand Cursor"/>
</Property>
</Properties>
<Events>
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="blackBackroundButtonMouseClicked"/>
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="50" y="190" width="-1" height="-1"/>
</Constraint>
</Constraints>
</Component>
<Container class="javax.swing.JPanel" name="jPanel1">
<Properties>
<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="0" green="0" red="0" type="rgb"/>
</Property>
</Properties>
<Events>
<EventHandler event="mouseWheelMoved" listener="java.awt.event.MouseWheelListener" parameters="java.awt.event.MouseWheelEvent" handler="jPanel1MouseWheelMoved"/>
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="0" y="0" width="-1" height="-1"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
</Container>
</SubComponents>
</Container>
</SubComponents>
</Form>
GUI/src/main/java/cz/fidentis/analyst/gui/Canvas.java 0 → 100644
+ 746
− 0
View file @ ffe1f62a
This diff is collapsed.
GUI/src/main/java/cz/fidentis/analyst/gui/Canvas.java.orig 0 → 100644
+ 746
− 0
View file @ ffe1f62a
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment