diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/RegistrationCPEventListener.java b/GUI/src/main/java/cz/fidentis/analyst/gui/RegistrationCPEventListener.java
index b2d9b2d07c7c8367bb56a0cf4a80ea21ecf63c0f..d89022d8be0370a9dbdd7eafe85962a082a2f6df 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/gui/RegistrationCPEventListener.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/gui/RegistrationCPEventListener.java
@@ -11,7 +11,7 @@ import cz.fidentis.analyst.visitors.mesh.BoundingBox;
import java.awt.Color;
import java.util.ArrayList;
import javax.vecmath.Point3d;
-import javax.vecmath.Vector3f;
+import javax.vecmath.Vector3d;
/**
* Executes changes made in PostRegistrationCP
@@ -24,11 +24,11 @@ public class RegistrationCPEventListener {
private final Color defaultPrimaryColor = new Color(51, 51, 153);
private final Color defaultSecondaryColor = new Color(255, 239, 0);
private final int transparencyRange = 10;
- private final float changeAmount = 500f;
- private final float moveX;
- private final float moveY;
- private final float moveZ;
- private final float scaleXYZ;
+ private final double changeAmount = 500d;
+ private final double moveX;
+ private final double moveY;
+ private final double moveZ;
+ private final double scaleXYZ;
private DrawableMesh primaryFace;
private DrawableMesh secondaryFace;
@@ -45,11 +45,11 @@ public class RegistrationCPEventListener {
BoundingBox visitor = new BoundingBox();
secondaryFace.getModel().compute(visitor);
Point3d maxPoint = visitor.getBoundingBox().getMaxPoint();
- Point3d minPoint = visitor.getBoundingBox().getMaxPoint();
- moveX = (float) (maxPoint.x - minPoint.x) / changeAmount;
- moveY = (float) (maxPoint.y - minPoint.y) / changeAmount;
- moveZ = (float) (maxPoint.z - minPoint.z) / changeAmount;
- scaleXYZ = (float) (visitor.getBoundingBox().getMaxDiag() / (10 * changeAmount));
+ Point3d minPoint = visitor.getBoundingBox().getMinPoint();
+ moveX = (maxPoint.x - minPoint.x) / changeAmount;
+ moveY = (maxPoint.y - minPoint.y) / changeAmount;
+ moveZ = (maxPoint.z - minPoint.z) / changeAmount;
+ scaleXYZ = (visitor.getBoundingBox().getMaxDiag() / (10 * changeAmount));
}
public final void setDeafultColor() {
@@ -80,35 +80,35 @@ public class RegistrationCPEventListener {
}
public void setTransparency(int value) {
- int range = this.transparencyRange;
- if (value == range) {
- setPrimaryTransparency(1f);
- setSecondaryTransparency(1f);
+
+ if (value == transparencyRange) {
+ setPrimaryTransparency(1d);
+ setSecondaryTransparency(1d);
}
- if (value < range) {
- setPrimaryTransparency(value / range);
- setSecondaryTransparency(1f);
+ if (value < transparencyRange) {
+ setPrimaryTransparency(value / 10d);
+ setSecondaryTransparency(1d);
}
- if (value > range) {
- setSecondaryTransparency((2 * range - value) / range);
- setPrimaryTransparency(1f);
+ if (value > transparencyRange) {
+ setSecondaryTransparency((2 * transparencyRange - value) / 10d);
+ setPrimaryTransparency(1d);
}
canvas.renderScene();
}
- public void setPrimaryTransparency(float transparency) {
+ public void setPrimaryTransparency(double transparency) {
primaryFace.setTransparency(transparency);
}
- public void setSecondaryTransparency(float transparency) {
+ public void setSecondaryTransparency(double transparency) {
secondaryFace.setTransparency(transparency);
}
- public float getPrimaryTransparency() {
+ public double getPrimaryTransparency() {
return primaryFace.getTransparency();
}
- public float getSecondaryTransparency() {
+ public double getSecondaryTransparency() {
return secondaryFace.getTransparency();
}
@@ -132,51 +132,51 @@ public class RegistrationCPEventListener {
}
public void resetTranslation() {
- secondaryFace.setTranslation(new Vector3f(0, 0, 0));
+ secondaryFace.setTranslation(new Vector3d(0, 0, 0));
canvas.renderScene();
}
public void resetRotation() {
- secondaryFace.setRotation(new Vector3f(0, 0, 0));
+ secondaryFace.setRotation(new Vector3d(0, 0, 0));
canvas.renderScene();
}
public void resetScale() {
- secondaryFace.setScale(new Vector3f(0, 0, 0));
+ secondaryFace.setScale(new Vector3d(0, 0, 0));
canvas.renderScene();
}
- public void setXTranslation(float value) {
+ public void setXTranslation(double value) {
secondaryFace.getTranslation().x = value * moveX;
canvas.renderScene();
}
- public void setYTranslation(float value) {
+ public void setYTranslation(double value) {
secondaryFace.getTranslation().y = value * moveY;
canvas.renderScene();
}
- public void setZTranslation(float value) {
+ public void setZTranslation(double value) {
secondaryFace.getTranslation().z = value * moveZ;
canvas.renderScene();
}
- public void setXRotation(float value) {
+ public void setXRotation(double value) {
secondaryFace.getRotation().x = value * moveX;
canvas.renderScene();
}
- public void setYRotation(float value) {
+ public void setYRotation(double value) {
secondaryFace.getRotation().y = value * moveY;
canvas.renderScene();
}
- public void setZRotation(float value) {
+ public void setZRotation(double value) {
secondaryFace.getRotation().z = value * moveZ;
canvas.renderScene();
}
- public void setScale(float value) {
+ public void setScale(double value) {
secondaryFace.getScale().x = value * scaleXYZ;
secondaryFace.getScale().y = value * scaleXYZ;
secondaryFace.getScale().z = value * scaleXYZ;
diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/scene/DrawableMesh.java b/GUI/src/main/java/cz/fidentis/analyst/gui/scene/DrawableMesh.java
index 779139197c8b58f6e3e9f5936b7ad39dbd94ffc9..11c518ed5df19e0fee22fd461e2726a28afe85c3 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/gui/scene/DrawableMesh.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/gui/scene/DrawableMesh.java
@@ -4,7 +4,7 @@ import cz.fidentis.analyst.mesh.core.MeshFacet;
import cz.fidentis.analyst.mesh.core.MeshModel;
import java.awt.Color;
import java.util.List;
-import javax.vecmath.Vector3f;
+import javax.vecmath.Vector3d;
/**
* A drawable triangular mesh, i.e., a mesh model with drawing information like
@@ -21,10 +21,10 @@ public class DrawableMesh {
// TO DO - R. Pajersky: add transformation attributes and methods
private Color color = new Color(255, 255, 255);
- private float transparency = 1f;
- private Vector3f translation = new Vector3f(0, 0, 0);
- private Vector3f rotation = new Vector3f(0, 0, 0);
- private Vector3f scale = new Vector3f(0, 0, 0);
+ private double transparency = 1f;
+ private Vector3d translation = new Vector3d(0, 0, 0);
+ private Vector3d rotation = new Vector3d(0, 0, 0);
+ private Vector3d scale = new Vector3d(0, 0, 0);
/**
* Constructor.
@@ -78,35 +78,35 @@ public class DrawableMesh {
return color;
}
- public float getTransparency() {
+ public double getTransparency() {
return transparency;
}
- public void setTransparency(float transparency) {
+ public void setTransparency(double transparency) {
this.transparency = transparency;
}
- public Vector3f getTranslation() {
+ public Vector3d getTranslation() {
return translation;
}
- public void setTranslation(Vector3f translation) {
+ public void setTranslation(Vector3d translation) {
this.translation = translation;
}
- public Vector3f getRotation() {
+ public Vector3d getRotation() {
return rotation;
}
- public void setRotation(Vector3f rotation) {
+ public void setRotation(Vector3d rotation) {
this.rotation = rotation;
}
- public Vector3f getScale() {
+ public Vector3d getScale() {
return scale;
}
- public void setScale(Vector3f scale) {
+ public void setScale(Vector3d scale) {
this.scale = scale;
}
diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/scene/SceneRenderer.java b/GUI/src/main/java/cz/fidentis/analyst/gui/scene/SceneRenderer.java
index fb73a96aee6bfce0379ebc0f333253389d1385cd..eeede157e4211f17e8e1a14bdf0d5ddcefdb871d 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/gui/scene/SceneRenderer.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/gui/scene/SceneRenderer.java
@@ -15,7 +15,6 @@ import java.util.List;
import javax.vecmath.Point3d;
import javax.vecmath.Point4f;
import javax.vecmath.Vector3d;
-import javax.vecmath.Vector3f;
/**
* Handles {@link DrawableMesh}s - objects to be drawn, and (re-)renders them on demand.
@@ -137,20 +136,20 @@ public class SceneRenderer {
for (DrawableMesh obj: drawables) {
// render color
Color color = obj.getColor();
- gl.glColor4f(color.getRed() / 255f, color.getGreen() / 255f,
- color.getBlue() / 255f , obj.getTransparency());
+ gl.glColor4d(color.getRed() / 255d, color.getGreen() / 255d,
+ color.getBlue() / 255d , obj.getTransparency());
for (MeshFacet facet: obj.getFacets()) {
// TO DO - R. Pajersky: add transformation (glPushMatrix, glRotate, ...)
// rotate
gl.glPushMatrix();
- gl.glRotatef(obj.getRotation().x, 1f, 0f, 0f);
- gl.glRotatef(obj.getRotation().y, 0f, 1f, 0f);
- gl.glRotatef(obj.getRotation().z, 0f, 0f, 1f);
+ gl.glRotated(obj.getRotation().x, 1, 0, 0);
+ gl.glRotated(obj.getRotation().y, 0, 1, 0);
+ gl.glRotated(obj.getRotation().z, 0, 0, 1);
// move
- gl.glTranslatef(obj.getTranslation().x, obj.getTranslation().y, obj.getTranslation().z);
+ gl.glTranslated(obj.getTranslation().x, obj.getTranslation().y, obj.getTranslation().z);
// scale
- gl.glScalef(1 + obj.getScale().x, 1 + obj.getScale().y, 1 + obj.getScale().z);
+ gl.glScaled(1 + obj.getScale().x, 1 + obj.getScale().y, 1 + obj.getScale().z);
renderFacet(facet);
gl.glPopMatrix();
}
diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/tab/PostRegistrationCP.form b/GUI/src/main/java/cz/fidentis/analyst/gui/tab/PostRegistrationCP.form
index 19fbd45c2366547021e4df301a9185dd95e623cc..3704d02c42fd8379f38021e1d4d90a6059089b9c 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/gui/tab/PostRegistrationCP.form
+++ b/GUI/src/main/java/cz/fidentis/analyst/gui/tab/PostRegistrationCP.form
@@ -97,121 +97,116 @@
<Component id="rotatZLabel" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
- <Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0">
- <Component id="jSeparator2" alignment="1" min="-2" pref="384" max="-2" attributes="0"/>
- <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/>
- <Group type="102" alignment="0" attributes="0">
- <Group type="103" groupAlignment="0" max="-2" attributes="0">
- <Component id="viewLabel" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="jLabel2" alignment="0" max="32767" attributes="0"/>
- <Component id="translationButton" alignment="0" max="32767" attributes="0"/>
- </Group>
- <EmptySpace min="-2" pref="23" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" attributes="0">
- <Component id="frontButton" min="-2" max="-2" attributes="0"/>
- <EmptySpace type="separate" max="-2" attributes="0"/>
- <Component id="profileButton" min="-2" max="-2" attributes="0"/>
+ <Component id="jSeparator2" alignment="1" min="-2" pref="384" max="-2" attributes="0"/>
+ <Component id="jSeparator3" alignment="0" max="32767" attributes="0"/>
+ <Component id="jSeparator1" alignment="0" max="32767" attributes="0"/>
+ <Component id="jSeparator6" alignment="0" max="32767" attributes="0"/>
+ <Group type="102" alignment="1" attributes="0">
+ <Component id="transparencyButton" min="-2" pref="64" max="-2" attributes="0"/>
+ <EmptySpace type="separate" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="transparencySlider" max="32767" attributes="0"/>
+ <Group type="102" attributes="0">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="primaryLabel" min="-2" max="-2" attributes="0"/>
+ <Component id="primaryColorPanel" min="-2" pref="120" max="-2" attributes="0"/>
</Group>
- <Group type="102" alignment="0" attributes="0">
- <Group type="103" groupAlignment="0" attributes="0">
- <Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0">
- <Component id="translationXFTF" alignment="0" max="32767" attributes="0"/>
- <Group type="102" alignment="0" attributes="0">
- <Component id="leftTranslationXButton" min="-2" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="leftSmallTranslXButton" min="-2" max="-2" attributes="0"/>
- <EmptySpace min="-2" pref="1" max="-2" attributes="0"/>
- <Component id="rightSmallTranslXButton" min="-2" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="rightTranslationXButton1" min="-2" max="-2" attributes="0"/>
- </Group>
- </Group>
- <Component id="translXLabel" alignment="0" min="-2" max="-2" attributes="0"/>
- </Group>
- <EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" max="-2" attributes="0">
- <Component id="translYLabel" min="-2" max="-2" attributes="0"/>
- <Group type="102" attributes="0">
- <Component id="leftTranslationYButton" min="-2" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="leftSmallTranslYButton" min="-2" max="-2" attributes="0"/>
- <EmptySpace min="-2" pref="1" max="-2" attributes="0"/>
- <Component id="rightSmallTranslYButton" min="-2" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="rightTranslationYButton" min="-2" max="-2" attributes="0"/>
- </Group>
- <Component id="translationYFTF" alignment="0" max="32767" attributes="0"/>
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="102" attributes="0">
+ <EmptySpace min="-2" pref="64" max="-2" attributes="0"/>
+ <Component id="secondaryColorPanel" min="-2" pref="120" max="-2" attributes="0"/>
+ <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
- <EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" max="-2" attributes="0">
- <Group type="102" attributes="0">
- <Component id="leftTranslationZButton" min="-2" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="leftSmallTranslZButton" min="-2" max="-2" attributes="0"/>
- <EmptySpace min="-2" pref="1" max="-2" attributes="0"/>
- <Component id="rightSmallTranslZButton" min="-2" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="rightTranslationZButton" min="-2" max="-2" attributes="0"/>
- </Group>
- <Component id="translationZFTF" max="32767" attributes="0"/>
- <Component id="translZLabel" min="-2" max="-2" attributes="0"/>
+ <Group type="102" alignment="1" attributes="0">
+ <EmptySpace max="32767" attributes="0"/>
+ <Component id="secondaryLabel" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</Group>
</Group>
- <Component id="jSeparator3" alignment="0" max="32767" attributes="0"/>
- <Component id="jSeparator1" alignment="0" max="32767" attributes="0"/>
- <Component id="jSeparator6" alignment="0" max="32767" attributes="0"/>
- <Component id="jLabel4" alignment="0" min="-2" max="-2" attributes="0"/>
- <Group type="102" alignment="0" attributes="0">
- <Component id="scaleButton" min="-2" pref="59" max="-2" attributes="0"/>
- <EmptySpace min="-2" pref="23" max="-2" attributes="0"/>
- <Component id="scaleMinusButton" min="-2" pref="26" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="scaleSmallMinusButton" min="-2" pref="26" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="scaleSmallPlusButton" min="-2" pref="26" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="scalePlusButton" min="-2" pref="26" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="scaleFTF" min="-2" pref="72" max="-2" attributes="0"/>
- </Group>
- <Group type="102" alignment="0" attributes="0">
- <Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" attributes="0">
- <Component id="modelLabel" min="-2" max="-2" attributes="0"/>
- <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+ </Group>
+ <Group type="102" alignment="0" attributes="0">
+ <Group type="103" groupAlignment="1" attributes="0">
+ <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Group type="102" alignment="0" attributes="0">
+ <Group type="103" groupAlignment="0" max="-2" attributes="0">
+ <Component id="viewLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Component id="jLabel2" alignment="0" max="32767" attributes="0"/>
+ <Component id="translationButton" alignment="0" max="32767" attributes="0"/>
</Group>
- <Component id="colorButton" alignment="0" min="-2" pref="64" max="-2" attributes="0"/>
- </Group>
- <EmptySpace min="-2" pref="40" max="-2" attributes="0"/>
- </Group>
- <Group type="102" attributes="0">
- <Component id="transparencyButton" min="-2" pref="64" max="-2" attributes="0"/>
- <EmptySpace type="separate" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="transparencySlider" max="32767" attributes="0"/>
- <Group type="102" attributes="0">
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="primaryLabel" min="-2" max="-2" attributes="0"/>
- <Component id="primaryColorPanel" min="-2" pref="120" max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="23" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="102" attributes="0">
+ <Component id="frontButton" min="-2" max="-2" attributes="0"/>
+ <EmptySpace type="separate" max="-2" attributes="0"/>
+ <Component id="profileButton" min="-2" max="-2" attributes="0"/>
</Group>
- <Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" attributes="0">
- <EmptySpace min="-2" pref="64" max="-2" attributes="0"/>
- <Component id="secondaryColorPanel" min="-2" pref="120" max="-2" attributes="0"/>
- <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+ <Group type="102" alignment="0" attributes="0">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0">
+ <Component id="translationXFTF" alignment="0" max="32767" attributes="0"/>
+ <Group type="102" alignment="0" attributes="0">
+ <Component id="leftTranslationXButton" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="leftSmallTranslXButton" min="-2" max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="1" max="-2" attributes="0"/>
+ <Component id="rightSmallTranslXButton" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="rightTranslationXButton" min="-2" max="-2" attributes="0"/>
+ </Group>
+ </Group>
+ <Component id="translXLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+ </Group>
+ <EmptySpace max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="0" max="-2" attributes="0">
+ <Component id="translYLabel" min="-2" max="-2" attributes="0"/>
+ <Group type="102" attributes="0">
+ <Component id="leftTranslationYButton" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="leftSmallTranslYButton" min="-2" max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="1" max="-2" attributes="0"/>
+ <Component id="rightSmallTranslYButton" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="rightTranslationYButton" min="-2" max="-2" attributes="0"/>
+ </Group>
+ <Component id="translationYFTF" alignment="0" max="32767" attributes="0"/>
</Group>
- <Group type="102" alignment="1" attributes="0">
- <EmptySpace max="32767" attributes="0"/>
- <Component id="secondaryLabel" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="0" max="-2" attributes="0">
+ <Group type="102" attributes="0">
+ <Component id="leftTranslationZButton" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="leftSmallTranslZButton" min="-2" max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="1" max="-2" attributes="0"/>
+ <Component id="rightSmallTranslZButton" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="rightTranslationZButton" min="-2" max="-2" attributes="0"/>
+ </Group>
+ <Component id="translationZFTF" max="32767" attributes="0"/>
+ <Component id="translZLabel" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</Group>
</Group>
+ <Component id="jLabel4" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Group type="102" alignment="0" attributes="0">
+ <Component id="scaleButton" min="-2" pref="59" max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="23" max="-2" attributes="0"/>
+ <Component id="scaleMinusButton" min="-2" pref="26" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="scaleSmallMinusButton" min="-2" pref="26" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="scaleSmallPlusButton" min="-2" pref="26" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="scalePlusButton" min="-2" pref="26" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="scaleFTF" min="-2" pref="72" max="-2" attributes="0"/>
+ </Group>
+ <Component id="modelLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Component id="colorButton" alignment="0" min="-2" pref="64" max="-2" attributes="0"/>
+ <Component id="featurePointsButton" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
- <Component id="featurePointsButton" alignment="0" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
<EmptySpace max="32767" attributes="0"/>
@@ -228,10 +223,12 @@
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="jSeparator6" min="-2" pref="5" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="3" attributes="0">
- <Component id="primaryLabel" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="modelLabel" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="0" attributes="0">
<Component id="secondaryLabel" alignment="1" min="-2" pref="14" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="3" attributes="0">
+ <Component id="primaryLabel" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="modelLabel" alignment="3" min="-2" max="-2" attributes="0"/>
+ </Group>
</Group>
<EmptySpace min="-2" pref="13" max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0">
@@ -268,7 +265,7 @@
<Component id="leftTranslationXButton" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="leftSmallTranslXButton" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="rightSmallTranslXButton" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="rightTranslationXButton1" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="rightTranslationXButton" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="leftTranslationYButton" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="rightTranslationYButton" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="rightSmallTranslYButton" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -340,7 +337,7 @@
<Component id="jSeparator7" min="-2" pref="10" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="featurePointsButton" min="-2" max="-2" attributes="0"/>
- <EmptySpace pref="267" max="32767" attributes="0"/>
+ <EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -578,10 +575,10 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="leftTranslationXButtonActionPerformed"/>
</Events>
</Component>
- <Component class="javax.swing.JButton" name="rightTranslationXButton1">
+ <Component class="javax.swing.JButton" name="rightTranslationXButton">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.rightTranslationXButton1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.rightTranslationXButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
</Property>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Default Cursor"/>
@@ -592,7 +589,7 @@
<Property name="opaque" type="boolean" value="false"/>
</Properties>
<Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="rightTranslationXButton1ActionPerformed"/>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="rightTranslationXButtonActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JFormattedTextField" name="translationXFTF">
@@ -1237,16 +1234,7 @@
<Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
<Insets value="[2, 2, 2, 2]"/>
</Property>
- <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[13, 23]"/>
- </Property>
- <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[13, 23]"/>
- </Property>
<Property name="opaque" type="boolean" value="false"/>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[13, 23]"/>
- </Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="scaleSmallMinusButtonActionPerformed"/>
diff --git a/GUI/src/main/java/cz/fidentis/analyst/gui/tab/PostRegistrationCP.java b/GUI/src/main/java/cz/fidentis/analyst/gui/tab/PostRegistrationCP.java
index 6b95bfe10b1250e22465d12104445d5b1f61b1e6..3475f7612364d2a12ee97ae513282c5d6ba18b87 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/gui/tab/PostRegistrationCP.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/gui/tab/PostRegistrationCP.java
@@ -32,8 +32,8 @@ public class PostRegistrationCP extends javax.swing.JPanel {
}
private void setDefaults() {
- transparencySlider.setMaximum(2 * listener.getTransparencyRange());
- transparencySlider.setValue(listener.getTransparencyRange());
+ //transparencySlider.setMaximum(2 * listener.getTransparencyRange());
+ //transparencySlider.setValue(listener.getTransparencyRange());
primaryColorPanel.setBackground(listener.getDefaultPrimaryColor());
secondaryColorPanel.setBackground(listener.getDefaultSecondaryColor());
resetAllButtonActionPerformed(null);
@@ -62,7 +62,7 @@ public class PostRegistrationCP extends javax.swing.JPanel {
profileButton = new javax.swing.JButton();
translationButton = new javax.swing.JButton();
leftTranslationXButton = new javax.swing.JButton();
- rightTranslationXButton1 = new javax.swing.JButton();
+ rightTranslationXButton = new javax.swing.JButton();
translationXFTF = new javax.swing.JFormattedTextField();
translationYFTF = new javax.swing.JFormattedTextField();
translationZFTF = new javax.swing.JFormattedTextField();
@@ -250,13 +250,13 @@ public class PostRegistrationCP extends javax.swing.JPanel {
}
});
- org.openide.awt.Mnemonics.setLocalizedText(rightTranslationXButton1, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.rightTranslationXButton1.text")); // NOI18N
- rightTranslationXButton1.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
- rightTranslationXButton1.setMargin(new java.awt.Insets(2, 2, 2, 2));
- rightTranslationXButton1.setOpaque(false);
- rightTranslationXButton1.addActionListener(new java.awt.event.ActionListener() {
+ org.openide.awt.Mnemonics.setLocalizedText(rightTranslationXButton, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.rightTranslationXButton.text")); // NOI18N
+ rightTranslationXButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
+ rightTranslationXButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
+ rightTranslationXButton.setOpaque(false);
+ rightTranslationXButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
- rightTranslationXButton1ActionPerformed(evt);
+ rightTranslationXButtonActionPerformed(evt);
}
});
@@ -605,10 +605,7 @@ public class PostRegistrationCP extends javax.swing.JPanel {
org.openide.awt.Mnemonics.setLocalizedText(scaleSmallMinusButton, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.scaleSmallMinusButton.text")); // NOI18N
scaleSmallMinusButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
scaleSmallMinusButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
- scaleSmallMinusButton.setMaximumSize(new java.awt.Dimension(13, 23));
- scaleSmallMinusButton.setMinimumSize(new java.awt.Dimension(13, 23));
scaleSmallMinusButton.setOpaque(false);
- scaleSmallMinusButton.setPreferredSize(new java.awt.Dimension(13, 23));
scaleSmallMinusButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
scaleSmallMinusButtonActionPerformed(evt);
@@ -679,98 +676,95 @@ public class PostRegistrationCP extends javax.swing.JPanel {
.addComponent(rightRotationZButton))
.addComponent(rotationZFTF)
.addComponent(rotatZLabel)))
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
- .addComponent(jSeparator2, javax.swing.GroupLayout.PREFERRED_SIZE, 384, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(jLabel1, javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
- .addComponent(viewLabel)
- .addComponent(jLabel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(translationButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- .addGap(23, 23, 23)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addComponent(frontButton)
- .addGap(18, 18, 18)
- .addComponent(profileButton))
- .addGroup(layout.createSequentialGroup()
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
- .addComponent(translationXFTF, javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
- .addComponent(leftTranslationXButton)
+ .addComponent(jSeparator2, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 384, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(jSeparator3)
+ .addComponent(jSeparator1)
+ .addComponent(jSeparator6)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+ .addComponent(transparencyButton, javax.swing.GroupLayout.PREFERRED_SIZE, 64, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(18, 18, 18)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(transparencySlider, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(layout.createSequentialGroup()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(primaryLabel)
+ .addComponent(primaryColorPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addGap(64, 64, 64)
+ .addComponent(secondaryColorPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(0, 0, Short.MAX_VALUE))
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(secondaryLabel))))))
+ .addGroup(layout.createSequentialGroup()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(jLabel1, javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(viewLabel)
+ .addComponent(jLabel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(translationButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addGap(23, 23, 23)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(frontButton)
+ .addGap(18, 18, 18)
+ .addComponent(profileButton))
+ .addGroup(layout.createSequentialGroup()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
+ .addComponent(translationXFTF, javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
+ .addComponent(leftTranslationXButton)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(leftSmallTranslXButton)
+ .addGap(1, 1, 1)
+ .addComponent(rightSmallTranslXButton)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(rightTranslationXButton)))
+ .addComponent(translXLabel))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(translYLabel)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(leftTranslationYButton)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(leftSmallTranslXButton)
+ .addComponent(leftSmallTranslYButton)
.addGap(1, 1, 1)
- .addComponent(rightSmallTranslXButton)
+ .addComponent(rightSmallTranslYButton)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(rightTranslationXButton1)))
- .addComponent(translXLabel))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
- .addComponent(translYLabel)
- .addGroup(layout.createSequentialGroup()
- .addComponent(leftTranslationYButton)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(leftSmallTranslYButton)
- .addGap(1, 1, 1)
- .addComponent(rightSmallTranslYButton)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(rightTranslationYButton))
- .addComponent(translationYFTF))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
- .addGroup(layout.createSequentialGroup()
- .addComponent(leftTranslationZButton)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(leftSmallTranslZButton)
- .addGap(1, 1, 1)
- .addComponent(rightSmallTranslZButton)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(rightTranslationZButton))
- .addComponent(translationZFTF)
- .addComponent(translZLabel)))))
- .addComponent(jSeparator3, javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(jSeparator1, javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(jSeparator6, javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(jLabel4, javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
- .addComponent(scaleButton, javax.swing.GroupLayout.PREFERRED_SIZE, 59, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGap(23, 23, 23)
- .addComponent(scaleMinusButton, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(scaleSmallMinusButton, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(scaleSmallPlusButton, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(scalePlusButton, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(scaleFTF, javax.swing.GroupLayout.PREFERRED_SIZE, 72, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addComponent(modelLabel)
- .addGap(0, 0, Short.MAX_VALUE))
- .addComponent(colorButton, javax.swing.GroupLayout.PREFERRED_SIZE, 64, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGap(40, 40, 40))
- .addGroup(layout.createSequentialGroup()
- .addComponent(transparencyButton, javax.swing.GroupLayout.PREFERRED_SIZE, 64, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGap(18, 18, 18)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(transparencySlider, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addGroup(layout.createSequentialGroup()
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(primaryLabel)
- .addComponent(primaryColorPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addGap(64, 64, 64)
- .addComponent(secondaryColorPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGap(0, 0, Short.MAX_VALUE))
- .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(secondaryLabel))))))
- .addComponent(featurePointsButton, javax.swing.GroupLayout.Alignment.LEADING)))
+ .addComponent(rightTranslationYButton))
+ .addComponent(translationYFTF))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(leftTranslationZButton)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(leftSmallTranslZButton)
+ .addGap(1, 1, 1)
+ .addComponent(rightSmallTranslZButton)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(rightTranslationZButton))
+ .addComponent(translationZFTF)
+ .addComponent(translZLabel)))))
+ .addComponent(jLabel4, javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
+ .addComponent(scaleButton, javax.swing.GroupLayout.PREFERRED_SIZE, 59, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(23, 23, 23)
+ .addComponent(scaleMinusButton, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(scaleSmallMinusButton, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(scaleSmallPlusButton, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(scalePlusButton, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(scaleFTF, javax.swing.GroupLayout.PREFERRED_SIZE, 72, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(modelLabel, javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(colorButton, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.PREFERRED_SIZE, 64, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(featurePointsButton, javax.swing.GroupLayout.Alignment.LEADING))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
);
layout.setVerticalGroup(
@@ -781,10 +775,11 @@ public class PostRegistrationCP extends javax.swing.JPanel {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(jSeparator6, javax.swing.GroupLayout.PREFERRED_SIZE, 5, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(primaryLabel)
- .addComponent(modelLabel)
- .addComponent(secondaryLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 14, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(secondaryLabel, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 14, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(primaryLabel)
+ .addComponent(modelLabel)))
.addGap(13, 13, 13)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
@@ -815,7 +810,7 @@ public class PostRegistrationCP extends javax.swing.JPanel {
.addComponent(leftTranslationXButton)
.addComponent(leftSmallTranslXButton)
.addComponent(rightSmallTranslXButton)
- .addComponent(rightTranslationXButton1)
+ .addComponent(rightTranslationXButton)
.addComponent(leftTranslationYButton)
.addComponent(rightTranslationYButton)
.addComponent(rightSmallTranslYButton)
@@ -866,7 +861,7 @@ public class PostRegistrationCP extends javax.swing.JPanel {
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(scaleButton)
.addComponent(scaleMinusButton)
- .addComponent(scaleSmallMinusButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(scaleSmallMinusButton)
.addComponent(scaleSmallPlusButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(scalePlusButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(scaleFTF, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
@@ -880,7 +875,7 @@ public class PostRegistrationCP extends javax.swing.JPanel {
.addComponent(jSeparator7, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(featurePointsButton)
- .addContainerGap(267, Short.MAX_VALUE))
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
}// </editor-fold>//GEN-END:initComponents
@@ -955,10 +950,10 @@ public class PostRegistrationCP extends javax.swing.JPanel {
scaleButtonActionPerformed(evt);
}//GEN-LAST:event_resetAllButtonActionPerformed
- private void rightTranslationXButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rightTranslationXButton1ActionPerformed
+ private void rightTranslationXButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rightTranslationXButtonActionPerformed
double newValue = ((Number)translationXFTF.getValue()).doubleValue() + 1;
translationXFTF.setValue(newValue);
- }//GEN-LAST:event_rightTranslationXButton1ActionPerformed
+ }//GEN-LAST:event_rightTranslationXButtonActionPerformed
private void leftTranslationYButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_leftTranslationYButtonActionPerformed
double newValue = ((Number)translationYFTF.getValue()).doubleValue() - 1;
@@ -1066,62 +1061,62 @@ public class PostRegistrationCP extends javax.swing.JPanel {
}//GEN-LAST:event_scaleSmallMinusButtonActionPerformed
private void leftSmallTranslXButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_leftSmallTranslXButtonActionPerformed
- double newValue = ((Number)translationXFTF.getValue()).doubleValue() + 0.1;
+ double newValue = ((Number)translationXFTF.getValue()).doubleValue() - 0.1;
translationXFTF.setValue(newValue);
}//GEN-LAST:event_leftSmallTranslXButtonActionPerformed
private void rightSmallTranslXButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rightSmallTranslXButtonActionPerformed
- double newValue = ((Number)translationXFTF.getValue()).doubleValue() - 0.1;
+ double newValue = ((Number)translationXFTF.getValue()).doubleValue() + 0.1;
translationXFTF.setValue(newValue);
}//GEN-LAST:event_rightSmallTranslXButtonActionPerformed
private void leftSmallTranslYButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_leftSmallTranslYButtonActionPerformed
- double newValue = ((Number)translationYFTF.getValue()).doubleValue() + 0.1;
+ double newValue = ((Number)translationYFTF.getValue()).doubleValue() - 0.1;
translationYFTF.setValue(newValue);
}//GEN-LAST:event_leftSmallTranslYButtonActionPerformed
private void rightSmallTranslYButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rightSmallTranslYButtonActionPerformed
- double newValue = ((Number)translationYFTF.getValue()).doubleValue() - 0.1;
+ double newValue = ((Number)translationYFTF.getValue()).doubleValue() + 0.1;
translationYFTF.setValue(newValue);
}//GEN-LAST:event_rightSmallTranslYButtonActionPerformed
private void leftSmallTranslZButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_leftSmallTranslZButtonActionPerformed
- double newValue = ((Number)translationZFTF.getValue()).doubleValue() + 0.1;
+ double newValue = ((Number)translationZFTF.getValue()).doubleValue() - 0.1;
translationZFTF.setValue(newValue);
}//GEN-LAST:event_leftSmallTranslZButtonActionPerformed
private void rightSmallTranslZButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rightSmallTranslZButtonActionPerformed
- double newValue = ((Number)translationZFTF.getValue()).doubleValue() - 0.1;
+ double newValue = ((Number)translationZFTF.getValue()).doubleValue() + 0.1;
translationZFTF.setValue(newValue);
}//GEN-LAST:event_rightSmallTranslZButtonActionPerformed
private void leftSmallRotaXButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_leftSmallRotaXButtonActionPerformed
- double newValue = ((Number)rotationXFTF.getValue()).doubleValue() + 0.1;
+ double newValue = ((Number)rotationXFTF.getValue()).doubleValue() - 0.1;
rotationXFTF.setValue(newValue);
}//GEN-LAST:event_leftSmallRotaXButtonActionPerformed
private void rightSmallRotaXButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rightSmallRotaXButtonActionPerformed
- double newValue = ((Number)rotationXFTF.getValue()).doubleValue() - 0.1;
+ double newValue = ((Number)rotationXFTF.getValue()).doubleValue() + 0.1;
rotationXFTF.setValue(newValue);
}//GEN-LAST:event_rightSmallRotaXButtonActionPerformed
private void leftSmallRotaYButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_leftSmallRotaYButtonActionPerformed
- double newValue = ((Number)rotationYFTF.getValue()).doubleValue() + 0.1;
+ double newValue = ((Number)rotationYFTF.getValue()).doubleValue() - 0.1;
rotationYFTF.setValue(newValue);
}//GEN-LAST:event_leftSmallRotaYButtonActionPerformed
private void rightSmallRotaYButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rightSmallRotaYButtonActionPerformed
- double newValue = ((Number)rotationYFTF.getValue()).doubleValue() - 0.1;
+ double newValue = ((Number)rotationYFTF.getValue()).doubleValue() + 0.1;
rotationYFTF.setValue(newValue);
}//GEN-LAST:event_rightSmallRotaYButtonActionPerformed
private void leftSmallRotaZButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_leftSmallRotaZButtonActionPerformed
- double newValue = ((Number)rotationZFTF.getValue()).doubleValue() + 0.1;
+ double newValue = ((Number)rotationZFTF.getValue()).doubleValue() - 0.1;
rotationZFTF.setValue(newValue);
}//GEN-LAST:event_leftSmallRotaZButtonActionPerformed
private void rightSmallRotaZButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rightSmallRotaZButtonActionPerformed
- double newValue = ((Number)rotationZFTF.getValue()).doubleValue() - 0.1;
+ double newValue = ((Number)rotationZFTF.getValue()).doubleValue() + 0.1;
rotationZFTF.setValue(newValue);
}//GEN-LAST:event_rightSmallRotaZButtonActionPerformed
@@ -1168,7 +1163,7 @@ public class PostRegistrationCP extends javax.swing.JPanel {
private javax.swing.JButton rightSmallTranslXButton;
private javax.swing.JButton rightSmallTranslYButton;
private javax.swing.JButton rightSmallTranslZButton;
- private javax.swing.JButton rightTranslationXButton1;
+ private javax.swing.JButton rightTranslationXButton;
private javax.swing.JButton rightTranslationYButton;
private javax.swing.JButton rightTranslationZButton;
private javax.swing.JLabel rotatXLabel;
diff --git a/GUI/src/main/resources/cz/fidentis/analyst/gui/tab/Bundle.properties b/GUI/src/main/resources/cz/fidentis/analyst/gui/tab/Bundle.properties
index 3c5fa03787f66a5bc0cce370176a5fd13053a197..974575481198505e166fee906856d25f5b7308c4 100644
--- a/GUI/src/main/resources/cz/fidentis/analyst/gui/tab/Bundle.properties
+++ b/GUI/src/main/resources/cz/fidentis/analyst/gui/tab/Bundle.properties
@@ -16,7 +16,6 @@ PostRegistrationCP.translationZFTF.text=0
PostRegistrationCP.translationYFTF.text=0
PostRegistrationCP.translationXFTF.toolTipText=
PostRegistrationCP.translationXFTF.text=0
-PostRegistrationCP.rightTranslationXButton1.text=>>
PostRegistrationCP.leftTranslationXButton.text=<<
PostRegistrationCP.translationButton.toolTipText=reset translation
PostRegistrationCP.translationButton.text=reset
@@ -73,3 +72,4 @@ PostRegistrationCP.rotatYLabel.text=Y
PostRegistrationCP.rotatZLabel.text=Z
PostRegistrationCP.scaleSmallPlusButton.text=+
PostRegistrationCP.scaleSmallMinusButton.text=-
+PostRegistrationCP.rightTranslationXButton.text=>>