From ebfe905b81bce840eeffc94ce20e1db605888a88 Mon Sep 17 00:00:00 2001 From: Richard Pajersky <xpajersk@fi.muni.cz> Date: Wed, 5 May 2021 11:37:03 +0200 Subject: [PATCH] Rotation adjustment preview works --- .../gui/RegistrationCPEventListener.java | 45 ++ .../analyst/gui/scene/SceneRenderer.java | 4 +- .../analyst/gui/tab/PostRegistrationCP.form | 390 +++++++------ .../analyst/gui/tab/PostRegistrationCP.java | 542 +++++++++++------- .../analyst/gui/tab/Bundle.properties | 1 + 5 files changed, 581 insertions(+), 401 deletions(-) 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 ca700584..3b4350b2 100644 --- a/GUI/src/main/java/cz/fidentis/analyst/gui/RegistrationCPEventListener.java +++ b/GUI/src/main/java/cz/fidentis/analyst/gui/RegistrationCPEventListener.java @@ -110,13 +110,58 @@ public class RegistrationCPEventListener { public void resetTranslation() { secondaryFace.resetTranslation(); + canvas.renderScene(); } public void resetRotation() { secondaryFace.resetRotation(); + canvas.renderScene(); } public void resetScale() { secondaryFace.resetScale(); + canvas.renderScene(); + } + + public void setXTranslation(float value) { + secondaryFace.getTranslation().x = value; + canvas.renderScene(); + } + + public void setYTranslation(float value) { + secondaryFace.getTranslation().y = value; + canvas.renderScene(); + } + + public void setZTranslation(float value) { + secondaryFace.getTranslation().z = value; + canvas.renderScene(); + } + + public void setXRotation(float value) { + secondaryFace.getRotation().x = value; + canvas.renderScene(); + } + + public void setYRotation(float value) { + secondaryFace.getRotation().y = value; + canvas.renderScene(); + } + + public void setZRotation(float value) { + secondaryFace.getRotation().z = value; + canvas.renderScene(); + } + + public void setXScale() { + + } + + public void setYScale() { + + } + + public void setZScale() { + } } 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 3e048886..076aa371 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 @@ -147,10 +147,10 @@ public class SceneRenderer { gl.glRotatef(obj.getRotation().x, 1f, 0f, 0f); gl.glRotatef(obj.getRotation().y, 0f, 1f, 0f); gl.glRotatef(obj.getRotation().z, 0f, 0f, 1f); - // move + /*// move gl.glTranslatef(obj.getTranslation().x, obj.getTranslation().y, obj.getTranslation().z); // scale - gl.glScalef(obj.getScale().x, obj.getScale().y, obj.getScale().z); + gl.glScalef(obj.getScale().x, obj.getScale().y, 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 e5d1e614..f6c0e79e 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 @@ -26,189 +26,164 @@ <Group type="103" groupAlignment="0" attributes="0"> <Group type="102" attributes="0"> <EmptySpace max="-2" attributes="0"/> - <Group type="103" groupAlignment="0" attributes="0"> + <Group type="103" groupAlignment="1" attributes="0"> + <Component id="jSeparator7" max="32767" attributes="0"/> + <Component id="jSeparator5" min="-2" pref="292" max="-2" attributes="0"/> <Group type="102" attributes="0"> - <Group type="103" groupAlignment="0" attributes="0"> - <Component id="jSeparator7" max="32767" attributes="0"/> + <Component id="resetAllButton" min="-2" max="-2" attributes="0"/> + <EmptySpace min="-2" pref="131" max="-2" attributes="0"/> + <Component id="applyButton" min="-2" pref="88" max="-2" attributes="0"/> + </Group> + <Group type="102" alignment="0" attributes="0"> + <Group type="103" groupAlignment="1" attributes="0"> + <Component id="featurePointsButton" alignment="0" min="-2" max="-2" attributes="0"/> + <Component id="jSeparator1" alignment="0" min="-2" pref="292" max="-2" attributes="0"/> + <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/> + <Component id="jSeparator6" alignment="0" min="-2" pref="290" max="-2" attributes="0"/> <Group type="102" alignment="0" attributes="0"> - <Group type="103" groupAlignment="1" max="-2" attributes="0"> - <Component id="jSeparator4" alignment="0" max="32767" attributes="0"/> - <Component id="jSeparator3" alignment="0" max="32767" attributes="0"/> - <Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0"> - <Component id="jSeparator2" min="-2" pref="292" max="-2" attributes="0"/> - <Group type="102" attributes="0"> - <Group type="103" groupAlignment="0" attributes="0"> - <Component id="colorButton" max="32767" attributes="0"/> - <Group type="102" alignment="0" attributes="0"> - <Component id="modelLabel" min="-2" max="-2" attributes="0"/> - <EmptySpace min="0" pref="0" max="32767" attributes="0"/> - </Group> - </Group> - <EmptySpace type="separate" max="-2" attributes="0"/> - <Group type="103" groupAlignment="0" attributes="0"> - <Component id="primaryLabel" alignment="0" min="-2" max="-2" attributes="0"/> - <Group type="102" alignment="0" attributes="0"> - <Component id="primaryColorPanel" min="-2" pref="90" max="-2" attributes="0"/> - <EmptySpace min="-2" pref="28" max="-2" attributes="0"/> - <Component id="secondaryColorPanel" min="-2" pref="90" max="-2" attributes="0"/> - </Group> - </Group> - </Group> - </Group> - <Group type="102" alignment="0" attributes="0"> + <Component id="scaleButton" min="-2" pref="59" max="-2" attributes="0"/> + <EmptySpace type="separate" max="-2" attributes="0"/> + <Component id="scaleMinusButton" min="-2" pref="26" max="-2" attributes="0"/> + </Group> + <Component id="jLabel4" alignment="0" min="-2" max="-2" attributes="0"/> + <Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0"> + <Component id="jSeparator3" alignment="0" max="32767" attributes="0"/> + <Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0"> + <Component id="jSeparator2" min="-2" pref="292" max="-2" attributes="0"/> + <Group type="102" attributes="0"> <Group type="103" groupAlignment="0" attributes="0"> - <Group type="103" groupAlignment="0" attributes="0"> - <Component id="translationButton" alignment="0" min="-2" pref="64" max="-2" attributes="0"/> - <Component id="jLabel2" alignment="1" min="-2" max="-2" attributes="0"/> - </Group> + <Component id="colorButton" max="32767" attributes="0"/> <Group type="102" alignment="0" attributes="0"> - <EmptySpace min="10" pref="10" max="-2" attributes="0"/> - <Component id="viewLabel" min="-2" max="-2" attributes="0"/> + <Component id="modelLabel" min="-2" max="-2" attributes="0"/> + <EmptySpace min="0" pref="0" max="32767" attributes="0"/> </Group> </Group> <EmptySpace type="separate" 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="102" attributes="0"> - <Group type="103" groupAlignment="0" attributes="0"> - <Group type="102" alignment="1" attributes="0"> - <Group type="103" groupAlignment="1" max="-2" attributes="0"> - <Group type="102" alignment="1" attributes="0"> - <Component id="leftTranslationXButton" min="-2" max="-2" attributes="0"/> - <EmptySpace max="32767" attributes="0"/> - <Component id="rightTranslationXButton1" min="-2" max="-2" attributes="0"/> - </Group> - <Component id="translationXButton" min="-2" pref="59" max="-2" attributes="0"/> - </Group> - <EmptySpace type="separate" max="-2" attributes="0"/> - </Group> - <Group type="102" alignment="0" attributes="0"> - <Component id="translationXFTF" min="-2" pref="57" max="-2" attributes="0"/> - <EmptySpace min="-2" pref="20" max="-2" attributes="0"/> - </Group> - </Group> - <Group type="103" groupAlignment="0" max="-2" attributes="0"> - <Component id="translationYFTF" alignment="1" max="32767" attributes="0"/> - <Component id="translationYButton" alignment="1" pref="57" max="32767" attributes="0"/> - <Group type="102" alignment="0" attributes="0"> - <Component id="leftTranslationYButton" min="-2" max="-2" attributes="0"/> - <EmptySpace max="32767" attributes="0"/> - <Component id="rightTranslationYButton" min="-2" max="-2" attributes="0"/> - </Group> - </Group> - <EmptySpace type="separate" max="-2" attributes="0"/> - <Group type="103" groupAlignment="0" max="-2" attributes="0"> - <Group type="102" alignment="0" attributes="0"> - <Component id="leftTranslationZButton" min="-2" max="-2" attributes="0"/> - <EmptySpace max="32767" attributes="0"/> - <Component id="rightTranslationZButton" min="-2" max="-2" attributes="0"/> - </Group> - <Component id="translationZButton" min="-2" max="-2" attributes="0"/> - <Component id="translationZFTF" alignment="0" min="-2" pref="59" max="-2" attributes="0"/> - </Group> + <Component id="primaryLabel" alignment="0" min="-2" max="-2" attributes="0"/> + <Group type="102" alignment="0" attributes="0"> + <Component id="primaryColorPanel" min="-2" pref="90" max="-2" attributes="0"/> + <EmptySpace min="-2" pref="28" max="-2" attributes="0"/> + <Component id="secondaryColorPanel" min="-2" pref="90" max="-2" attributes="0"/> </Group> </Group> </Group> - <Group type="102" alignment="0" attributes="0"> - <Group type="103" groupAlignment="1" max="-2" attributes="0"> - <Group type="102" attributes="0"> - <EmptySpace min="10" pref="10" max="-2" attributes="0"/> - <Component id="jLabel4" min="-2" max="-2" attributes="0"/> - <EmptySpace min="-2" pref="36" max="-2" attributes="0"/> - <Component id="scaleMinusButton" min="-2" pref="26" max="-2" attributes="0"/> - <EmptySpace pref="13" max="32767" attributes="0"/> - <Component id="scalePlusButton" min="-2" pref="26" max="-2" attributes="0"/> - <EmptySpace type="separate" max="-2" attributes="0"/> - <Component id="scaleFTF" min="-2" pref="57" max="-2" attributes="0"/> - </Group> - <Group type="102" attributes="0"> - <Group type="103" groupAlignment="1" max="-2" attributes="0"> - <Group type="102" attributes="0"> - <EmptySpace min="-2" pref="1" max="-2" attributes="0"/> - <Component id="rotationButton" min="-2" pref="63" max="-2" attributes="0"/> - <EmptySpace type="separate" max="-2" attributes="0"/> - </Group> - <Group type="102" alignment="0" attributes="0"> - <EmptySpace min="10" pref="10" max="-2" attributes="0"/> - <Component id="jLabel3" min="-2" max="-2" attributes="0"/> - <EmptySpace max="32767" attributes="0"/> - </Group> - </Group> - <Group type="103" groupAlignment="0" attributes="0"> - <Group type="102" alignment="1" attributes="0"> - <Group type="103" groupAlignment="1" max="-2" attributes="0"> - <Group type="102" alignment="1" attributes="0"> - <Component id="leftRotationXButton" min="-2" max="-2" attributes="0"/> - <EmptySpace max="32767" attributes="0"/> - <Component id="rightRotationXButton" min="-2" max="-2" attributes="0"/> - </Group> - <Component id="rotationXButton" alignment="1" min="-2" pref="59" max="-2" attributes="0"/> + </Group> + <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"/> + </Group> + <Group type="102" attributes="0"> + <Group type="103" groupAlignment="0" attributes="0"> + <Group type="102" alignment="1" attributes="0"> + <Group type="103" groupAlignment="1" max="-2" attributes="0"> + <Group type="102" alignment="1" attributes="0"> + <Component id="leftTranslationXButton" min="-2" max="-2" attributes="0"/> + <EmptySpace max="32767" attributes="0"/> + <Component id="rightTranslationXButton1" min="-2" max="-2" attributes="0"/> </Group> - <EmptySpace type="separate" max="-2" attributes="0"/> - </Group> - <Group type="102" alignment="0" attributes="0"> - <Component id="rotationXFTF" min="-2" pref="57" max="-2" attributes="0"/> - <EmptySpace min="-2" pref="20" max="-2" attributes="0"/> + <Component id="translationXButton" min="-2" pref="59" max="-2" attributes="0"/> </Group> + <EmptySpace type="separate" max="-2" attributes="0"/> </Group> - <Group type="103" groupAlignment="0" max="-2" attributes="0"> - <Component id="rotationYFTF" alignment="1" max="32767" attributes="0"/> - <Component id="rotationYButton" alignment="1" pref="57" max="32767" attributes="0"/> - <Group type="102" alignment="0" attributes="0"> - <Component id="leftRotationYButton" min="-2" max="-2" attributes="0"/> - <EmptySpace max="32767" attributes="0"/> - <Component id="rightRotationYButton" min="-2" max="-2" attributes="0"/> - </Group> + <Group type="102" alignment="0" attributes="0"> + <Component id="translationXFTF" min="-2" pref="57" max="-2" attributes="0"/> + <EmptySpace min="-2" pref="20" max="-2" attributes="0"/> </Group> </Group> - </Group> - <EmptySpace type="separate" max="-2" attributes="0"/> - <Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" max="-2" attributes="0"> + <Component id="translationYFTF" alignment="1" max="32767" attributes="0"/> + <Component id="translationYButton" alignment="1" pref="57" max="32767" attributes="0"/> <Group type="102" alignment="0" attributes="0"> - <Component id="leftRotationZButton" min="-2" max="-2" attributes="0"/> + <Component id="leftTranslationYButton" min="-2" max="-2" attributes="0"/> <EmptySpace max="32767" attributes="0"/> - <Component id="rightRotationZButton" min="-2" max="-2" attributes="0"/> + <Component id="rightTranslationYButton" min="-2" max="-2" attributes="0"/> </Group> - <Component id="rotationZButton" alignment="0" min="-2" max="-2" attributes="0"/> - <Component id="rotationZFTF" alignment="0" min="-2" pref="59" max="-2" attributes="0"/> </Group> - <Component id="scaleButton" alignment="1" min="-2" pref="63" max="-2" attributes="0"/> + <EmptySpace type="separate" max="-2" attributes="0"/> + <Group type="103" groupAlignment="0" max="-2" attributes="0"> + <Group type="102" alignment="0" attributes="0"> + <Component id="leftTranslationZButton" min="-2" max="-2" attributes="0"/> + <EmptySpace max="32767" attributes="0"/> + <Component id="rightTranslationZButton" min="-2" max="-2" attributes="0"/> + </Group> + <Component id="translationZButton" min="-2" max="-2" attributes="0"/> + <Component id="translationZFTF" alignment="0" min="-2" pref="59" max="-2" attributes="0"/> + </Group> </Group> </Group> - <Group type="103" alignment="0" groupAlignment="1" attributes="0"> - <Component id="secondaryLabel" min="-2" max="-2" attributes="0"/> + </Group> + <Group type="102" alignment="0" attributes="0"> + <Group type="103" groupAlignment="0" attributes="0"> + <Group type="102" attributes="0"> + <Group type="103" groupAlignment="0" max="-2" attributes="0"> + <Component id="jLabel3" min="-2" max="-2" attributes="0"/> + <Component id="rotationButton" min="-2" pref="59" max="-2" attributes="0"/> + </Group> + <EmptySpace min="-2" pref="23" max="-2" attributes="0"/> + <Group type="103" groupAlignment="0" attributes="0"> + <Component id="rotationXFTF" alignment="0" min="-2" pref="57" max="-2" attributes="0"/> + <Group type="102" alignment="1" attributes="0"> + <Component id="leftRotationXButton" min="-2" max="-2" attributes="0"/> + <EmptySpace min="-2" pref="25" max="-2" attributes="0"/> + <Component id="rightRotationXButton" min="-2" max="-2" attributes="0"/> + </Group> + <Component id="rotationXButton" alignment="1" min="-2" pref="59" max="-2" attributes="0"/> + </Group> + </Group> <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"/> - <Component id="transparencySlider" min="-2" pref="208" max="-2" attributes="0"/> + <EmptySpace min="-2" pref="115" max="-2" attributes="0"/> + <Component id="scalePlusButton" min="-2" pref="26" max="-2" attributes="0"/> + </Group> + </Group> + <EmptySpace type="separate" max="-2" attributes="0"/> + <Group type="103" groupAlignment="0" attributes="0"> + <Component id="scaleFTF" min="-2" pref="57" max="-2" attributes="0"/> + <Group type="103" groupAlignment="0" max="-2" attributes="0"> + <Component id="rotationYFTF" alignment="1" min="-2" pref="57" max="-2" attributes="0"/> + <Component id="rotationYButton" alignment="1" min="-2" pref="57" max="-2" attributes="0"/> + <Group type="102" alignment="0" attributes="0"> + <Component id="leftRotationYButton" min="-2" max="-2" attributes="0"/> + <EmptySpace min="-2" pref="23" max="-2" attributes="0"/> + <Component id="rightRotationYButton" min="-2" max="-2" attributes="0"/> + </Group> </Group> </Group> + <EmptySpace type="separate" max="-2" attributes="0"/> + <Group type="103" groupAlignment="0" max="-2" attributes="0"> + <Group type="102" alignment="0" attributes="0"> + <Component id="leftRotationZButton" min="-2" max="-2" attributes="0"/> + <EmptySpace max="32767" attributes="0"/> + <Component id="rightRotationZButton" min="-2" max="-2" attributes="0"/> + </Group> + <Component id="rotationZButton" alignment="0" min="-2" max="-2" attributes="0"/> + <Component id="rotationZFTF" alignment="0" min="-2" pref="59" max="-2" attributes="0"/> + </Group> </Group> - <EmptySpace min="0" pref="0" max="32767" attributes="0"/> - </Group> - <Group type="102" alignment="1" attributes="0"> - <EmptySpace min="0" pref="0" max="32767" attributes="0"/> - <Component id="applyButton" min="-2" max="-2" attributes="0"/> + <Group type="103" alignment="0" groupAlignment="1" attributes="0"> + <Component id="secondaryLabel" min="-2" max="-2" 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"/> + <Component id="transparencySlider" min="-2" pref="208" max="-2" attributes="0"/> + </Group> + </Group> + <Component id="jSeparator4" alignment="0" max="32767" attributes="0"/> </Group> </Group> - <EmptySpace max="-2" attributes="0"/> - </Group> - <Group type="102" attributes="0"> - <Group type="103" groupAlignment="0" attributes="0"> - <Component id="jSeparator5" min="-2" pref="292" max="-2" attributes="0"/> - <Component id="jSeparator1" alignment="0" min="-2" pref="292" max="-2" attributes="0"/> - <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/> - <Component id="jSeparator6" alignment="0" min="-2" pref="290" max="-2" attributes="0"/> - <Component id="featurePointsButton" alignment="0" min="-2" max="-2" attributes="0"/> - </Group> <EmptySpace min="0" pref="0" max="32767" attributes="0"/> </Group> </Group> + <EmptySpace min="-2" pref="14" max="-2" attributes="0"/> </Group> </Group> </DimensionLayout> @@ -263,13 +238,13 @@ <Component id="leftTranslationZButton" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="rightTranslationYButton" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="rightTranslationZButton" alignment="3" min="-2" max="-2" attributes="0"/> - <Component id="translationButton" alignment="3" min="-2" max="-2" attributes="0"/> </Group> <EmptySpace max="-2" attributes="0"/> <Group type="103" groupAlignment="3" attributes="0"> <Component id="translationXFTF" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="translationYFTF" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="translationZFTF" alignment="3" min="-2" max="-2" attributes="0"/> + <Component id="translationButton" alignment="3" min="-2" max="-2" attributes="0"/> </Group> <EmptySpace max="-2" attributes="0"/> <Component id="jSeparator3" min="-2" pref="10" max="-2" attributes="0"/> @@ -288,33 +263,37 @@ <Component id="leftRotationZButton" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="rightRotationYButton" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="rightRotationZButton" alignment="3" min="-2" max="-2" attributes="0"/> - <Component id="rotationButton" alignment="3" min="-2" max="-2" attributes="0"/> </Group> <EmptySpace max="-2" attributes="0"/> <Group type="103" groupAlignment="3" attributes="0"> <Component id="rotationXFTF" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="rotationYFTF" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="rotationZFTF" alignment="3" min="-2" max="-2" attributes="0"/> + <Component id="rotationButton" alignment="3" min="-2" max="-2" attributes="0"/> </Group> <EmptySpace max="-2" attributes="0"/> <Component id="jSeparator4" min="-2" pref="10" max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/> + <Component id="jLabel4" min="-2" max="-2" attributes="0"/> + <EmptySpace max="-2" attributes="0"/> <Group type="103" groupAlignment="3" attributes="0"> <Component id="scaleButton" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="scaleFTF" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="scaleMinusButton" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="scalePlusButton" alignment="3" min="-2" max="-2" attributes="0"/> - <Component id="jLabel4" alignment="3" min="-2" max="-2" attributes="0"/> </Group> <EmptySpace max="-2" attributes="0"/> <Component id="jSeparator5" min="-2" pref="10" max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/> - <Component id="applyButton" min="-2" max="-2" attributes="0"/> + <Group type="103" groupAlignment="3" attributes="0"> + <Component id="applyButton" alignment="3" min="-2" max="-2" attributes="0"/> + <Component id="resetAllButton" alignment="3" min="-2" max="-2" attributes="0"/> + </Group> <EmptySpace max="-2" attributes="0"/> <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 min="-2" max="-2" attributes="0"/> + <EmptySpace min="-2" pref="209" max="-2" attributes="0"/> </Group> </Group> </DimensionLayout> @@ -526,7 +505,6 @@ <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> <Color id="Default Cursor"/> </Property> - <Property name="horizontalAlignment" type="int" value="2"/> <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor"> <Insets value="[2, 2, 2, 2]"/> </Property> @@ -583,15 +561,15 @@ </Property> <Property name="opaque" type="boolean" value="false"/> </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="rightTranslationXButton1ActionPerformed"/> + </Events> </Component> <Component class="javax.swing.JFormattedTextField" name="translationXFTF"> <Properties> <Property name="formatterFactory" type="javax.swing.JFormattedTextField$AbstractFormatterFactory" editor="org.netbeans.modules.form.editors.AbstractFormatterFactoryEditor"> <Format subtype="0" type="0"/> </Property> - <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.translationXFTF.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> - </Property> <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.translationXFTF.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> </Property> @@ -600,7 +578,7 @@ </Property> </Properties> <Events> - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="translationXFTFActionPerformed"/> + <EventHandler event="propertyChange" listener="java.beans.PropertyChangeListener" parameters="java.beans.PropertyChangeEvent" handler="translationXFTFPropertyChange"/> </Events> </Component> <Component class="javax.swing.JButton" name="translationYButton"> @@ -622,12 +600,12 @@ </Component> <Component class="javax.swing.JFormattedTextField" name="translationYFTF"> <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.translationYFTF.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + <Property name="formatterFactory" type="javax.swing.JFormattedTextField$AbstractFormatterFactory" editor="org.netbeans.modules.form.editors.AbstractFormatterFactoryEditor"> + <Format subtype="0" type="0"/> </Property> </Properties> <Events> - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="translationYFTFActionPerformed"/> + <EventHandler event="propertyChange" listener="java.beans.PropertyChangeListener" parameters="java.beans.PropertyChangeEvent" handler="translationYFTFPropertyChange"/> </Events> </Component> <Component class="javax.swing.JButton" name="translationZButton"> @@ -646,18 +624,15 @@ </Property> <Property name="opaque" type="boolean" value="false"/> </Properties> - <Events> - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="translationZButtonActionPerformed"/> - </Events> </Component> <Component class="javax.swing.JFormattedTextField" name="translationZFTF"> <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.translationZFTF.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + <Property name="formatterFactory" type="javax.swing.JFormattedTextField$AbstractFormatterFactory" editor="org.netbeans.modules.form.editors.AbstractFormatterFactoryEditor"> + <Format subtype="0" type="0"/> </Property> </Properties> <Events> - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="translationZFTFActionPerformed"/> + <EventHandler event="propertyChange" listener="java.beans.PropertyChangeListener" parameters="java.beans.PropertyChangeEvent" handler="translationZFTFPropertyChange"/> </Events> </Component> <Component class="javax.swing.JButton" name="rotationButton"> @@ -671,7 +646,6 @@ <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> <Color id="Default Cursor"/> </Property> - <Property name="horizontalAlignment" type="int" value="2"/> <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor"> <Insets value="[2, 2, 2, 2]"/> </Property> @@ -692,7 +666,6 @@ <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> <Color id="Default Cursor"/> </Property> - <Property name="horizontalAlignment" type="int" value="2"/> <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor"> <Insets value="[2, 2, 2, 2]"/> </Property> @@ -729,6 +702,9 @@ </Property> <Property name="opaque" type="boolean" value="false"/> </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="leftTranslationYButtonActionPerformed"/> + </Events> </Component> <Component class="javax.swing.JButton" name="leftTranslationZButton"> <Properties> @@ -743,6 +719,9 @@ </Property> <Property name="opaque" type="boolean" value="false"/> </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="leftTranslationZButtonActionPerformed"/> + </Events> </Component> <Component class="javax.swing.JButton" name="rightTranslationYButton"> <Properties> @@ -757,6 +736,9 @@ </Property> <Property name="opaque" type="boolean" value="false"/> </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="rightTranslationYButtonActionPerformed"/> + </Events> </Component> <Component class="javax.swing.JButton" name="rightTranslationZButton"> <Properties> @@ -771,18 +753,21 @@ </Property> <Property name="opaque" type="boolean" value="false"/> </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="rightTranslationZButtonActionPerformed"/> + </Events> </Component> <Component class="javax.swing.JFormattedTextField" name="rotationXFTF"> <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.rotationXFTF.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + <Property name="formatterFactory" type="javax.swing.JFormattedTextField$AbstractFormatterFactory" editor="org.netbeans.modules.form.editors.AbstractFormatterFactoryEditor"> + <Format subtype="0" type="0"/> </Property> <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.rotationXFTF.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> </Property> </Properties> <Events> - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="rotationXFTFActionPerformed"/> + <EventHandler event="propertyChange" listener="java.beans.PropertyChangeListener" parameters="java.beans.PropertyChangeEvent" handler="rotationXFTFPropertyChange"/> </Events> </Component> <Component class="javax.swing.JButton" name="leftRotationXButton"> @@ -798,6 +783,9 @@ </Property> <Property name="opaque" type="boolean" value="false"/> </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="leftRotationXButtonActionPerformed"/> + </Events> </Component> <Component class="javax.swing.JButton" name="rightRotationXButton"> <Properties> @@ -812,6 +800,9 @@ </Property> <Property name="opaque" type="boolean" value="false"/> </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="rightRotationXButtonActionPerformed"/> + </Events> </Component> <Component class="javax.swing.JButton" name="leftRotationYButton"> <Properties> @@ -826,6 +817,9 @@ </Property> <Property name="opaque" type="boolean" value="false"/> </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="leftRotationYButtonActionPerformed"/> + </Events> </Component> <Component class="javax.swing.JButton" name="leftRotationZButton"> <Properties> @@ -840,6 +834,9 @@ </Property> <Property name="opaque" type="boolean" value="false"/> </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="leftRotationZButtonActionPerformed"/> + </Events> </Component> <Component class="javax.swing.JButton" name="rightRotationYButton"> <Properties> @@ -854,6 +851,9 @@ </Property> <Property name="opaque" type="boolean" value="false"/> </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="rightRotationYButtonActionPerformed"/> + </Events> </Component> <Component class="javax.swing.JButton" name="rightRotationZButton"> <Properties> @@ -868,6 +868,9 @@ </Property> <Property name="opaque" type="boolean" value="false"/> </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="rightRotationZButtonActionPerformed"/> + </Events> </Component> <Component class="javax.swing.JButton" name="rotationXButton"> <Properties> @@ -919,41 +922,38 @@ </Property> <Property name="opaque" type="boolean" value="false"/> </Properties> - <Events> - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="rotationZButtonActionPerformed"/> - </Events> </Component> <Component class="javax.swing.JFormattedTextField" name="rotationYFTF"> <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.rotationYFTF.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + <Property name="formatterFactory" type="javax.swing.JFormattedTextField$AbstractFormatterFactory" editor="org.netbeans.modules.form.editors.AbstractFormatterFactoryEditor"> + <Format subtype="0" type="0"/> </Property> </Properties> <Events> - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="rotationYFTFActionPerformed"/> + <EventHandler event="propertyChange" listener="java.beans.PropertyChangeListener" parameters="java.beans.PropertyChangeEvent" handler="rotationYFTFPropertyChange"/> </Events> </Component> <Component class="javax.swing.JFormattedTextField" name="rotationZFTF"> <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.rotationZFTF.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + <Property name="formatterFactory" type="javax.swing.JFormattedTextField$AbstractFormatterFactory" editor="org.netbeans.modules.form.editors.AbstractFormatterFactoryEditor"> + <Format subtype="0" type="0"/> </Property> </Properties> <Events> - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="rotationZFTFActionPerformed"/> + <EventHandler event="propertyChange" listener="java.beans.PropertyChangeListener" parameters="java.beans.PropertyChangeEvent" handler="rotationZFTFPropertyChange"/> </Events> </Component> <Component class="javax.swing.JFormattedTextField" name="scaleFTF"> <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.scaleFTF.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + <Property name="formatterFactory" type="javax.swing.JFormattedTextField$AbstractFormatterFactory" editor="org.netbeans.modules.form.editors.AbstractFormatterFactoryEditor"> + <Format subtype="0" type="0"/> </Property> <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <ResourceString bundle="cz/fidentis/analyst/gui/tab/Bundle.properties" key="PostRegistrationCP.scaleFTF.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> </Property> </Properties> <Events> - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="scaleFTFActionPerformed"/> + <EventHandler event="propertyChange" listener="java.beans.PropertyChangeListener" parameters="java.beans.PropertyChangeEvent" handler="scaleFTFPropertyChange"/> </Events> </Component> <Component class="javax.swing.JButton" name="scaleMinusButton"> @@ -969,6 +969,9 @@ </Property> <Property name="opaque" type="boolean" value="false"/> </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="scaleMinusButtonActionPerformed"/> + </Events> </Component> <Component class="javax.swing.JButton" name="scalePlusButton"> <Properties> @@ -992,6 +995,9 @@ <Dimension value="[13, 23]"/> </Property> </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="scalePlusButtonActionPerformed"/> + </Events> </Component> <Component class="javax.swing.JSeparator" name="jSeparator3"> </Component> @@ -1041,5 +1047,15 @@ </Property> </Properties> </Component> + <Component class="javax.swing.JButton" name="resetAllButton"> + <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.resetAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + </Property> + </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="resetAllButtonActionPerformed"/> + </Events> + </Component> </SubComponents> </Form> 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 aaa0c2c1..e3b69d33 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 @@ -30,6 +30,7 @@ public class PostRegistrationCP extends javax.swing.JPanel { this.listener = listener; primaryColorPanel.setBackground(listener.getDefaultPrimaryColor()); secondaryColorPanel.setBackground(listener.getDefaultSecondaryColor()); + resetAllButtonActionPerformed(null); } /** @@ -95,6 +96,7 @@ public class PostRegistrationCP extends javax.swing.JPanel { jLabel2 = new javax.swing.JLabel(); jLabel3 = new javax.swing.JLabel(); jLabel4 = new javax.swing.JLabel(); + resetAllButton = new javax.swing.JButton(); setBackground(new java.awt.Color(176, 230, 226)); setPreferredSize(new java.awt.Dimension(310, 500)); @@ -210,7 +212,6 @@ public class PostRegistrationCP extends javax.swing.JPanel { org.openide.awt.Mnemonics.setLocalizedText(translationButton, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.translationButton.text")); // NOI18N translationButton.setToolTipText(org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.translationButton.toolTipText")); // NOI18N translationButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); - translationButton.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); translationButton.setMargin(new java.awt.Insets(2, 2, 2, 2)); translationButton.setOpaque(false); translationButton.addActionListener(new java.awt.event.ActionListener() { @@ -239,14 +240,18 @@ public class PostRegistrationCP extends javax.swing.JPanel { 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() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + rightTranslationXButton1ActionPerformed(evt); + } + }); translationXFTF.setFormatterFactory(new javax.swing.text.DefaultFormatterFactory(new javax.swing.text.NumberFormatter())); - translationXFTF.setText(org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.translationXFTF.text")); // NOI18N translationXFTF.setToolTipText(org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.translationXFTF.toolTipText")); // NOI18N translationXFTF.setCursor(new java.awt.Cursor(java.awt.Cursor.TEXT_CURSOR)); - translationXFTF.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - translationXFTFActionPerformed(evt); + translationXFTF.addPropertyChangeListener(new java.beans.PropertyChangeListener() { + public void propertyChange(java.beans.PropertyChangeEvent evt) { + translationXFTFPropertyChange(evt); } }); @@ -256,10 +261,10 @@ public class PostRegistrationCP extends javax.swing.JPanel { translationYButton.setMargin(new java.awt.Insets(2, 2, 2, 2)); translationYButton.setOpaque(false); - translationYFTF.setText(org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.translationYFTF.text")); // NOI18N - translationYFTF.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - translationYFTFActionPerformed(evt); + translationYFTF.setFormatterFactory(new javax.swing.text.DefaultFormatterFactory(new javax.swing.text.NumberFormatter())); + translationYFTF.addPropertyChangeListener(new java.beans.PropertyChangeListener() { + public void propertyChange(java.beans.PropertyChangeEvent evt) { + translationYFTFPropertyChange(evt); } }); @@ -268,23 +273,17 @@ public class PostRegistrationCP extends javax.swing.JPanel { translationZButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); translationZButton.setMargin(new java.awt.Insets(2, 2, 2, 2)); translationZButton.setOpaque(false); - translationZButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - translationZButtonActionPerformed(evt); - } - }); - translationZFTF.setText(org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.translationZFTF.text")); // NOI18N - translationZFTF.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - translationZFTFActionPerformed(evt); + translationZFTF.setFormatterFactory(new javax.swing.text.DefaultFormatterFactory(new javax.swing.text.NumberFormatter())); + translationZFTF.addPropertyChangeListener(new java.beans.PropertyChangeListener() { + public void propertyChange(java.beans.PropertyChangeEvent evt) { + translationZFTFPropertyChange(evt); } }); org.openide.awt.Mnemonics.setLocalizedText(rotationButton, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.rotationButton.text")); // NOI18N rotationButton.setToolTipText(org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.rotationButton.toolTipText")); // NOI18N rotationButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); - rotationButton.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); rotationButton.setMargin(new java.awt.Insets(2, 2, 2, 2)); rotationButton.setOpaque(false); rotationButton.addActionListener(new java.awt.event.ActionListener() { @@ -296,7 +295,6 @@ public class PostRegistrationCP extends javax.swing.JPanel { org.openide.awt.Mnemonics.setLocalizedText(scaleButton, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.scaleButton.text")); // NOI18N scaleButton.setToolTipText(org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.scaleButton.toolTipText")); // NOI18N scaleButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); - scaleButton.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); scaleButton.setMargin(new java.awt.Insets(2, 2, 2, 2)); scaleButton.setOpaque(false); scaleButton.addActionListener(new java.awt.event.ActionListener() { @@ -314,27 +312,47 @@ public class PostRegistrationCP extends javax.swing.JPanel { leftTranslationYButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); leftTranslationYButton.setMargin(new java.awt.Insets(2, 2, 2, 2)); leftTranslationYButton.setOpaque(false); + leftTranslationYButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + leftTranslationYButtonActionPerformed(evt); + } + }); org.openide.awt.Mnemonics.setLocalizedText(leftTranslationZButton, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.leftTranslationZButton.text")); // NOI18N leftTranslationZButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); leftTranslationZButton.setMargin(new java.awt.Insets(2, 2, 2, 2)); leftTranslationZButton.setOpaque(false); + leftTranslationZButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + leftTranslationZButtonActionPerformed(evt); + } + }); org.openide.awt.Mnemonics.setLocalizedText(rightTranslationYButton, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.rightTranslationYButton.text")); // NOI18N rightTranslationYButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); rightTranslationYButton.setMargin(new java.awt.Insets(2, 2, 2, 2)); rightTranslationYButton.setOpaque(false); + rightTranslationYButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + rightTranslationYButtonActionPerformed(evt); + } + }); org.openide.awt.Mnemonics.setLocalizedText(rightTranslationZButton, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.rightTranslationZButton.text")); // NOI18N rightTranslationZButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); rightTranslationZButton.setMargin(new java.awt.Insets(2, 2, 2, 2)); rightTranslationZButton.setOpaque(false); + rightTranslationZButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + rightTranslationZButtonActionPerformed(evt); + } + }); - rotationXFTF.setText(org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.rotationXFTF.text")); // NOI18N + rotationXFTF.setFormatterFactory(new javax.swing.text.DefaultFormatterFactory(new javax.swing.text.NumberFormatter())); rotationXFTF.setToolTipText(org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.rotationXFTF.toolTipText")); // NOI18N - rotationXFTF.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - rotationXFTFActionPerformed(evt); + rotationXFTF.addPropertyChangeListener(new java.beans.PropertyChangeListener() { + public void propertyChange(java.beans.PropertyChangeEvent evt) { + rotationXFTFPropertyChange(evt); } }); @@ -342,31 +360,61 @@ public class PostRegistrationCP extends javax.swing.JPanel { leftRotationXButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); leftRotationXButton.setMargin(new java.awt.Insets(2, 2, 2, 2)); leftRotationXButton.setOpaque(false); + leftRotationXButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + leftRotationXButtonActionPerformed(evt); + } + }); org.openide.awt.Mnemonics.setLocalizedText(rightRotationXButton, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.rightRotationXButton.text")); // NOI18N rightRotationXButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); rightRotationXButton.setMargin(new java.awt.Insets(2, 2, 2, 2)); rightRotationXButton.setOpaque(false); + rightRotationXButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + rightRotationXButtonActionPerformed(evt); + } + }); org.openide.awt.Mnemonics.setLocalizedText(leftRotationYButton, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.leftRotationYButton.text")); // NOI18N leftRotationYButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); leftRotationYButton.setMargin(new java.awt.Insets(2, 2, 2, 2)); leftRotationYButton.setOpaque(false); + leftRotationYButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + leftRotationYButtonActionPerformed(evt); + } + }); org.openide.awt.Mnemonics.setLocalizedText(leftRotationZButton, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.leftRotationZButton.text")); // NOI18N leftRotationZButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); leftRotationZButton.setMargin(new java.awt.Insets(2, 2, 2, 2)); leftRotationZButton.setOpaque(false); + leftRotationZButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + leftRotationZButtonActionPerformed(evt); + } + }); org.openide.awt.Mnemonics.setLocalizedText(rightRotationYButton, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.rightRotationYButton.text")); // NOI18N rightRotationYButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); rightRotationYButton.setMargin(new java.awt.Insets(2, 2, 2, 2)); rightRotationYButton.setOpaque(false); + rightRotationYButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + rightRotationYButtonActionPerformed(evt); + } + }); org.openide.awt.Mnemonics.setLocalizedText(rightRotationZButton, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.rightRotationZButton.text")); // NOI18N rightRotationZButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); rightRotationZButton.setMargin(new java.awt.Insets(2, 2, 2, 2)); rightRotationZButton.setOpaque(false); + rightRotationZButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + rightRotationZButtonActionPerformed(evt); + } + }); org.openide.awt.Mnemonics.setLocalizedText(rotationXButton, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.rotationXButton.text")); // NOI18N rotationXButton.setToolTipText(org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.rotationXButton.toolTipText")); // NOI18N @@ -385,31 +433,26 @@ public class PostRegistrationCP extends javax.swing.JPanel { rotationZButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); rotationZButton.setMargin(new java.awt.Insets(2, 2, 2, 2)); rotationZButton.setOpaque(false); - rotationZButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - rotationZButtonActionPerformed(evt); - } - }); - rotationYFTF.setText(org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.rotationYFTF.text")); // NOI18N - rotationYFTF.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - rotationYFTFActionPerformed(evt); + rotationYFTF.setFormatterFactory(new javax.swing.text.DefaultFormatterFactory(new javax.swing.text.NumberFormatter())); + rotationYFTF.addPropertyChangeListener(new java.beans.PropertyChangeListener() { + public void propertyChange(java.beans.PropertyChangeEvent evt) { + rotationYFTFPropertyChange(evt); } }); - rotationZFTF.setText(org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.rotationZFTF.text")); // NOI18N - rotationZFTF.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - rotationZFTFActionPerformed(evt); + rotationZFTF.setFormatterFactory(new javax.swing.text.DefaultFormatterFactory(new javax.swing.text.NumberFormatter())); + rotationZFTF.addPropertyChangeListener(new java.beans.PropertyChangeListener() { + public void propertyChange(java.beans.PropertyChangeEvent evt) { + rotationZFTFPropertyChange(evt); } }); - scaleFTF.setText(org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.scaleFTF.text")); // NOI18N + scaleFTF.setFormatterFactory(new javax.swing.text.DefaultFormatterFactory(new javax.swing.text.NumberFormatter())); scaleFTF.setToolTipText(org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.scaleFTF.toolTipText")); // NOI18N - scaleFTF.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - scaleFTFActionPerformed(evt); + scaleFTF.addPropertyChangeListener(new java.beans.PropertyChangeListener() { + public void propertyChange(java.beans.PropertyChangeEvent evt) { + scaleFTFPropertyChange(evt); } }); @@ -417,6 +460,11 @@ public class PostRegistrationCP extends javax.swing.JPanel { scaleMinusButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); scaleMinusButton.setMargin(new java.awt.Insets(2, 2, 2, 2)); scaleMinusButton.setOpaque(false); + scaleMinusButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + scaleMinusButtonActionPerformed(evt); + } + }); org.openide.awt.Mnemonics.setLocalizedText(scalePlusButton, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.scalePlusButton.text")); // NOI18N scalePlusButton.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); @@ -425,6 +473,11 @@ public class PostRegistrationCP extends javax.swing.JPanel { scalePlusButton.setMinimumSize(new java.awt.Dimension(13, 23)); scalePlusButton.setOpaque(false); scalePlusButton.setPreferredSize(new java.awt.Dimension(13, 23)); + scalePlusButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + scalePlusButtonActionPerformed(evt); + } + }); jLabel1.setFont(new java.awt.Font("Tahoma", 1, 14)); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.jLabel1.text")); // NOI18N @@ -437,146 +490,137 @@ public class PostRegistrationCP extends javax.swing.JPanel { org.openide.awt.Mnemonics.setLocalizedText(jLabel4, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.jLabel4.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(resetAllButton, org.openide.util.NbBundle.getMessage(PostRegistrationCP.class, "PostRegistrationCP.resetAllButton.text")); // NOI18N + resetAllButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + resetAllButtonActionPerformed(evt); + } + }); + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addContainerGap() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(jSeparator7) + .addComponent(jSeparator5, javax.swing.GroupLayout.PREFERRED_SIZE, 292, javax.swing.GroupLayout.PREFERRED_SIZE) .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jSeparator7) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) - .addComponent(jSeparator4, javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jSeparator3, javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) - .addComponent(jSeparator2, javax.swing.GroupLayout.PREFERRED_SIZE, 292, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(colorButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGroup(layout.createSequentialGroup() - .addComponent(modelLabel) - .addGap(0, 0, Short.MAX_VALUE))) - .addGap(18, 18, 18) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(primaryLabel) - .addGroup(layout.createSequentialGroup() - .addComponent(primaryColorPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 90, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(28, 28, 28) - .addComponent(secondaryColorPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 90, javax.swing.GroupLayout.PREFERRED_SIZE))))) - .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup() + .addComponent(resetAllButton) + .addGap(131, 131, 131) + .addComponent(applyButton, javax.swing.GroupLayout.PREFERRED_SIZE, 88, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(featurePointsButton, javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jSeparator1, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.PREFERRED_SIZE, 292, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jLabel1, javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jSeparator6, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.PREFERRED_SIZE, 290, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup() + .addComponent(scaleButton, javax.swing.GroupLayout.PREFERRED_SIZE, 59, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(18, 18, 18) + .addComponent(scaleMinusButton, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(jLabel4, javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) + .addComponent(jSeparator3, javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) + .addComponent(jSeparator2, javax.swing.GroupLayout.PREFERRED_SIZE, 292, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(layout.createSequentialGroup() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(translationButton, javax.swing.GroupLayout.PREFERRED_SIZE, 64, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel2, javax.swing.GroupLayout.Alignment.TRAILING)) + .addComponent(colorButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(layout.createSequentialGroup() - .addGap(10, 10, 10) - .addComponent(viewLabel))) + .addComponent(modelLabel) + .addGap(0, 0, Short.MAX_VALUE))) .addGap(18, 18, 18) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(primaryLabel) .addGroup(layout.createSequentialGroup() - .addComponent(frontButton) - .addGap(18, 18, 18) - .addComponent(profileButton)) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) - .addGroup(layout.createSequentialGroup() - .addComponent(leftTranslationXButton) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(rightTranslationXButton1)) - .addComponent(translationXButton, javax.swing.GroupLayout.PREFERRED_SIZE, 59, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGap(18, 18, 18)) - .addGroup(layout.createSequentialGroup() - .addComponent(translationXFTF, javax.swing.GroupLayout.PREFERRED_SIZE, 57, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(20, 20, 20))) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(translationYFTF, javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(translationYButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 57, Short.MAX_VALUE) - .addGroup(layout.createSequentialGroup() - .addComponent(leftTranslationYButton) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(rightTranslationYButton))) - .addGap(18, 18, 18) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addGroup(layout.createSequentialGroup() - .addComponent(leftTranslationZButton) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(rightTranslationZButton)) - .addComponent(translationZButton) - .addComponent(translationZFTF, javax.swing.GroupLayout.PREFERRED_SIZE, 59, javax.swing.GroupLayout.PREFERRED_SIZE))))) - .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) - .addGroup(layout.createSequentialGroup() - .addGap(10, 10, 10) - .addComponent(jLabel4) - .addGap(36, 36, 36) - .addComponent(scaleMinusButton, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 13, Short.MAX_VALUE) - .addComponent(scalePlusButton, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(18, 18, 18) - .addComponent(scaleFTF, javax.swing.GroupLayout.PREFERRED_SIZE, 57, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) - .addGroup(layout.createSequentialGroup() - .addGap(1, 1, 1) - .addComponent(rotationButton, javax.swing.GroupLayout.PREFERRED_SIZE, 63, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(18, 18, 18)) - .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup() - .addGap(10, 10, 10) - .addComponent(jLabel3) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) - .addGroup(layout.createSequentialGroup() - .addComponent(leftRotationXButton) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(rightRotationXButton)) - .addComponent(rotationXButton, javax.swing.GroupLayout.PREFERRED_SIZE, 59, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGap(18, 18, 18)) - .addGroup(layout.createSequentialGroup() - .addComponent(rotationXFTF, javax.swing.GroupLayout.PREFERRED_SIZE, 57, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(20, 20, 20))) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(rotationYFTF, javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(rotationYButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 57, Short.MAX_VALUE) - .addGroup(layout.createSequentialGroup() - .addComponent(leftRotationYButton) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(rightRotationYButton))))) - .addGap(18, 18, 18) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(primaryColorPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 90, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(28, 28, 28) + .addComponent(secondaryColorPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 90, javax.swing.GroupLayout.PREFERRED_SIZE))))) + .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(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) + .addGroup(layout.createSequentialGroup() + .addComponent(leftTranslationXButton) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(rightTranslationXButton1)) + .addComponent(translationXButton, javax.swing.GroupLayout.PREFERRED_SIZE, 59, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGap(18, 18, 18)) + .addGroup(layout.createSequentialGroup() + .addComponent(translationXFTF, javax.swing.GroupLayout.PREFERRED_SIZE, 57, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(20, 20, 20))) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(translationYFTF, javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(translationYButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 57, Short.MAX_VALUE) .addGroup(layout.createSequentialGroup() - .addComponent(leftRotationZButton) + .addComponent(leftTranslationYButton) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(rightRotationZButton)) - .addComponent(rotationZButton) - .addComponent(rotationZFTF, javax.swing.GroupLayout.PREFERRED_SIZE, 59, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addComponent(scaleButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 63, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(secondaryLabel) - .addGroup(layout.createSequentialGroup() - .addComponent(transparencyButton, javax.swing.GroupLayout.PREFERRED_SIZE, 64, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(rightTranslationYButton))) .addGap(18, 18, 18) - .addComponent(transparencySlider, javax.swing.GroupLayout.PREFERRED_SIZE, 208, javax.swing.GroupLayout.PREFERRED_SIZE)))) - .addGap(0, 0, Short.MAX_VALUE)) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addGap(0, 0, Short.MAX_VALUE) - .addComponent(applyButton))) - .addContainerGap()) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jSeparator5, javax.swing.GroupLayout.PREFERRED_SIZE, 292, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, 292, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel1) - .addComponent(jSeparator6, javax.swing.GroupLayout.PREFERRED_SIZE, 290, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(featurePointsButton)) - .addGap(0, 0, Short.MAX_VALUE)))) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addGroup(layout.createSequentialGroup() + .addComponent(leftTranslationZButton) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(rightTranslationZButton)) + .addComponent(translationZButton) + .addComponent(translationZFTF, javax.swing.GroupLayout.PREFERRED_SIZE, 59, javax.swing.GroupLayout.PREFERRED_SIZE))))) + .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(jLabel3) + .addComponent(rotationButton, javax.swing.GroupLayout.PREFERRED_SIZE, 59, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGap(23, 23, 23) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(rotationXFTF, javax.swing.GroupLayout.PREFERRED_SIZE, 57, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addComponent(leftRotationXButton) + .addGap(25, 25, 25) + .addComponent(rightRotationXButton)) + .addComponent(rotationXButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 59, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addGap(115, 115, 115) + .addComponent(scalePlusButton, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addGap(18, 18, 18) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(scaleFTF, javax.swing.GroupLayout.PREFERRED_SIZE, 57, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(rotationYFTF, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 57, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(rotationYButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 57, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(layout.createSequentialGroup() + .addComponent(leftRotationYButton) + .addGap(23, 23, 23) + .addComponent(rightRotationYButton)))) + .addGap(18, 18, 18) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addGroup(layout.createSequentialGroup() + .addComponent(leftRotationZButton) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(rightRotationZButton)) + .addComponent(rotationZButton) + .addComponent(rotationZFTF, javax.swing.GroupLayout.PREFERRED_SIZE, 59, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(secondaryLabel) + .addGroup(layout.createSequentialGroup() + .addComponent(transparencyButton, javax.swing.GroupLayout.PREFERRED_SIZE, 64, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(18, 18, 18) + .addComponent(transparencySlider, javax.swing.GroupLayout.PREFERRED_SIZE, 208, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addComponent(jSeparator4, javax.swing.GroupLayout.Alignment.LEADING))) + .addGap(0, 0, Short.MAX_VALUE))) + .addGap(14, 14, 14)) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -622,13 +666,13 @@ public class PostRegistrationCP extends javax.swing.JPanel { .addComponent(leftTranslationYButton) .addComponent(leftTranslationZButton) .addComponent(rightTranslationYButton) - .addComponent(rightTranslationZButton) - .addComponent(translationButton)) + .addComponent(rightTranslationZButton)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(translationXFTF, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(translationYFTF, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(translationZFTF, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(translationZFTF, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(translationButton)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jSeparator3, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) @@ -644,31 +688,34 @@ public class PostRegistrationCP extends javax.swing.JPanel { .addComponent(leftRotationYButton) .addComponent(leftRotationZButton) .addComponent(rightRotationYButton) - .addComponent(rightRotationZButton) - .addComponent(rotationButton)) + .addComponent(rightRotationZButton)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(rotationXFTF, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(rotationYFTF, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(rotationZFTF, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(rotationZFTF, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(rotationButton)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jSeparator4, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jLabel4) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(scaleButton) .addComponent(scaleFTF, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(scaleMinusButton) - .addComponent(scalePlusButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel4)) + .addComponent(scalePlusButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jSeparator5, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(applyButton) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(applyButton) + .addComponent(resetAllButton)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jSeparator7, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(featurePointsButton) - .addContainerGap()) + .addGap(209, 209, 209)) ); }// </editor-fold>//GEN-END:initComponents @@ -698,42 +745,6 @@ public class PostRegistrationCP extends javax.swing.JPanel { transparencySlider.repaint(); }//GEN-LAST:event_transparencyButtonActionPerformed - private void translationXFTFActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_translationXFTFActionPerformed - // TODO add your handling code here: - }//GEN-LAST:event_translationXFTFActionPerformed - - private void translationYFTFActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_translationYFTFActionPerformed - // TODO add your handling code here: - }//GEN-LAST:event_translationYFTFActionPerformed - - private void translationZFTFActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_translationZFTFActionPerformed - // TODO add your handling code here: - }//GEN-LAST:event_translationZFTFActionPerformed - - private void translationZButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_translationZButtonActionPerformed - // TODO add your handling code here: - }//GEN-LAST:event_translationZButtonActionPerformed - - private void rotationXFTFActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rotationXFTFActionPerformed - // TODO add your handling code here: - }//GEN-LAST:event_rotationXFTFActionPerformed - - private void rotationZButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rotationZButtonActionPerformed - // TODO add your handling code here: - }//GEN-LAST:event_rotationZButtonActionPerformed - - private void rotationYFTFActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rotationYFTFActionPerformed - // TODO add your handling code here: - }//GEN-LAST:event_rotationYFTFActionPerformed - - private void rotationZFTFActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rotationZFTFActionPerformed - // TODO add your handling code here: - }//GEN-LAST:event_rotationZFTFActionPerformed - - private void scaleFTFActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_scaleFTFActionPerformed - // TODO add your handling code here: - }//GEN-LAST:event_scaleFTFActionPerformed - private void transparencySliderStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_transparencySliderStateChanged listener.setTransparency(transparencySlider.getValue()); }//GEN-LAST:event_transparencySliderStateChanged @@ -766,10 +777,116 @@ public class PostRegistrationCP extends javax.swing.JPanel { }//GEN-LAST:event_scaleButtonActionPerformed private void leftTranslationXButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_leftTranslationXButtonActionPerformed - Float newValue = (float) translationXFTF.getValue() - 1f; + double newValue = ((Number)translationXFTF.getValue()).doubleValue() - 1; translationXFTF.setValue(newValue); }//GEN-LAST:event_leftTranslationXButtonActionPerformed + private void resetAllButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_resetAllButtonActionPerformed + colorButtonActionPerformed(evt); + transparencyButtonActionPerformed(evt); + frontButtonActionPerformed(evt); + translationButtonActionPerformed(evt); + rotationButtonActionPerformed(evt); + scaleButtonActionPerformed(evt); + }//GEN-LAST:event_resetAllButtonActionPerformed + + private void rightTranslationXButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rightTranslationXButton1ActionPerformed + double newValue = ((Number)translationXFTF.getValue()).doubleValue() + 1; + translationXFTF.setValue(newValue); + }//GEN-LAST:event_rightTranslationXButton1ActionPerformed + + private void leftTranslationYButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_leftTranslationYButtonActionPerformed + double newValue = ((Number)translationYFTF.getValue()).doubleValue() - 1; + translationYFTF.setValue(newValue); + }//GEN-LAST:event_leftTranslationYButtonActionPerformed + + private void rightTranslationYButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rightTranslationYButtonActionPerformed + double newValue = ((Number)translationYFTF.getValue()).doubleValue() + 1; + translationYFTF.setValue(newValue); + }//GEN-LAST:event_rightTranslationYButtonActionPerformed + + private void leftTranslationZButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_leftTranslationZButtonActionPerformed + double newValue = ((Number)translationZFTF.getValue()).doubleValue() - 1; + translationZFTF.setValue(newValue); + }//GEN-LAST:event_leftTranslationZButtonActionPerformed + + private void rightTranslationZButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rightTranslationZButtonActionPerformed + double newValue = ((Number)translationZFTF.getValue()).doubleValue() + 1; + translationZFTF.setValue(newValue); + }//GEN-LAST:event_rightTranslationZButtonActionPerformed + + private void leftRotationXButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_leftRotationXButtonActionPerformed + double newValue = ((Number)rotationXFTF.getValue()).doubleValue() - 1; + rotationXFTF.setValue(newValue); + }//GEN-LAST:event_leftRotationXButtonActionPerformed + + private void rightRotationXButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rightRotationXButtonActionPerformed + double newValue = ((Number)rotationXFTF.getValue()).doubleValue() + 1; + rotationXFTF.setValue(newValue); + }//GEN-LAST:event_rightRotationXButtonActionPerformed + + private void leftRotationYButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_leftRotationYButtonActionPerformed + double newValue = ((Number)rotationYFTF.getValue()).doubleValue() - 1; + rotationYFTF.setValue(newValue); + }//GEN-LAST:event_leftRotationYButtonActionPerformed + + private void rightRotationYButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rightRotationYButtonActionPerformed + double newValue = ((Number)rotationYFTF.getValue()).doubleValue() + 1; + rotationYFTF.setValue(newValue); + }//GEN-LAST:event_rightRotationYButtonActionPerformed + + private void leftRotationZButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_leftRotationZButtonActionPerformed + double newValue = ((Number)rotationZFTF.getValue()).doubleValue() - 1; + rotationZFTF.setValue(newValue); + }//GEN-LAST:event_leftRotationZButtonActionPerformed + + private void rightRotationZButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rightRotationZButtonActionPerformed + double newValue = ((Number)rotationZFTF.getValue()).doubleValue() + 1; + rotationZFTF.setValue(newValue); + }//GEN-LAST:event_rightRotationZButtonActionPerformed + + private void scaleMinusButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_scaleMinusButtonActionPerformed + double newValue = ((Number)scaleFTF.getValue()).doubleValue() - 1; + scaleFTF.setValue(newValue); + }//GEN-LAST:event_scaleMinusButtonActionPerformed + + private void scalePlusButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_scalePlusButtonActionPerformed + double newValue = ((Number)scaleFTF.getValue()).doubleValue() + 1; + scaleFTF.setValue(newValue); + }//GEN-LAST:event_scalePlusButtonActionPerformed + + private void translationXFTFPropertyChange(java.beans.PropertyChangeEvent evt) {//GEN-FIRST:event_translationXFTFPropertyChange + float value = ((Number)translationXFTF.getValue()).floatValue(); + listener.setXTranslation(value); + }//GEN-LAST:event_translationXFTFPropertyChange + + private void translationYFTFPropertyChange(java.beans.PropertyChangeEvent evt) {//GEN-FIRST:event_translationYFTFPropertyChange + // TODO add your handling code here: + }//GEN-LAST:event_translationYFTFPropertyChange + + private void translationZFTFPropertyChange(java.beans.PropertyChangeEvent evt) {//GEN-FIRST:event_translationZFTFPropertyChange + // TODO add your handling code here: + }//GEN-LAST:event_translationZFTFPropertyChange + + private void rotationXFTFPropertyChange(java.beans.PropertyChangeEvent evt) {//GEN-FIRST:event_rotationXFTFPropertyChange + float value = ((Number)rotationXFTF.getValue()).floatValue(); + listener.setXRotation(value); + }//GEN-LAST:event_rotationXFTFPropertyChange + + private void rotationYFTFPropertyChange(java.beans.PropertyChangeEvent evt) {//GEN-FIRST:event_rotationYFTFPropertyChange + float value = ((Number)rotationYFTF.getValue()).floatValue(); + listener.setYRotation(value); + }//GEN-LAST:event_rotationYFTFPropertyChange + + private void rotationZFTFPropertyChange(java.beans.PropertyChangeEvent evt) {//GEN-FIRST:event_rotationZFTFPropertyChange + float value = ((Number)rotationZFTF.getValue()).floatValue(); + listener.setZRotation(value); + }//GEN-LAST:event_rotationZFTFPropertyChange + + private void scaleFTFPropertyChange(java.beans.PropertyChangeEvent evt) {//GEN-FIRST:event_scaleFTFPropertyChange + // TODO add your handling code here: + }//GEN-LAST:event_scaleFTFPropertyChange + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton applyButton; @@ -797,6 +914,7 @@ public class PostRegistrationCP extends javax.swing.JPanel { private javax.swing.JPanel primaryColorPanel; private javax.swing.JLabel primaryLabel; private javax.swing.JButton profileButton; + private javax.swing.JButton resetAllButton; private javax.swing.JButton rightRotationXButton; private javax.swing.JButton rightRotationYButton; private javax.swing.JButton rightRotationZButton; 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 2945bf41..194d69ce 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 @@ -64,3 +64,4 @@ PostRegistrationCP.rightRotationXButton.text=> PostRegistrationCP.jLabel2.text=Translation: PostRegistrationCP.jLabel3.text=Rotation: PostRegistrationCP.jLabel4.text=Scale: +PostRegistrationCP.resetAllButton.text=reset all -- GitLab