diff --git a/GUI/src/main/java/cz/fidentis/analyst/project/FaceStatePanel.form b/GUI/src/main/java/cz/fidentis/analyst/project/FaceStatePanel.form
index 99a03f523b182df9fae1d248b02ea3246e3bd90c..994c47ec49ca7d020c01e1c74cc8e202ce8328e6 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/project/FaceStatePanel.form
+++ b/GUI/src/main/java/cz/fidentis/analyst/project/FaceStatePanel.form
@@ -33,9 +33,9 @@
<EmptySpace min="-2" pref="6" max="-2" attributes="0"/>
<Component id="photoPanel" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
- <Component id="filePanel" min="-2" max="-2" attributes="0"/>
+ <Component id="filePanel" max="32767" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
- <Component id="facePanel" max="32767" attributes="0"/>
+ <Component id="facePanel" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
@@ -65,15 +65,23 @@
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="pathLabel" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="sizeLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Component id="featurePointsLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Component id="textureLabel" min="-2" max="-2" attributes="0"/>
+ <Component id="previewLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0">
+ <Component id="sizeLabel" alignment="0" max="32767" attributes="0"/>
+ <Component id="pathLabel" alignment="0" max="32767" attributes="0"/>
+ </Group>
</Group>
- <EmptySpace min="-2" pref="49" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="sizeOutput" min="-2" max="-2" attributes="0"/>
- <Component id="pathOutput" min="-2" max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="10" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="0" max="-2" attributes="0">
+ <Component id="sizeOutput" alignment="1" pref="428" max="32767" attributes="0"/>
+ <Component id="featurePointsOutput" alignment="1" max="32767" attributes="0"/>
+ <Component id="pathOutput" max="32767" attributes="0"/>
+ <Component id="previewOutput" alignment="0" max="32767" attributes="0"/>
+ <Component id="textureOutput" max="32767" attributes="0"/>
</Group>
- <EmptySpace max="32767" attributes="0"/>
+ <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -81,16 +89,31 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="3" attributes="0">
- <Component id="pathLabel" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="pathOutput" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="pathLabel" max="-2" attributes="0"/>
+ <Component id="pathOutput" min="-2" pref="0" max="-2" attributes="0"/>
</Group>
- <EmptySpace min="-2" pref="13" max="-2" attributes="0"/>
+ <EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="sizeLabel" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="sizeOutput" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="sizeOutput" alignment="3" max="-2" attributes="0"/>
+ </Group>
+ <EmptySpace type="unrelated" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="featurePointsLabel" min="-2" max="-2" attributes="0"/>
+ <Component id="featurePointsOutput" min="-2" max="-2" attributes="0"/>
</Group>
- <EmptySpace pref="41" max="32767" attributes="0"/>
+ <EmptySpace type="unrelated" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="previewOutput" alignment="1" min="-2" max="-2" attributes="0"/>
+ <Component id="previewLabel" min="-2" max="-2" attributes="0"/>
+ </Group>
+ <EmptySpace type="unrelated" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="textureOutput" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Component id="textureLabel" min="-2" max="-2" attributes="0"/>
+ </Group>
+ <EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -104,6 +127,13 @@
<Property name="enabled" type="boolean" value="false"/>
</Properties>
</Component>
+ <Component class="javax.swing.JLabel" name="pathOutput">
+ <Properties>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="cz/fidentis/analyst/project/Bundle.properties" key="FaceStatePanel.pathOutput.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </Property>
+ </Properties>
+ </Component>
<Component class="javax.swing.JLabel" name="sizeLabel">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
@@ -112,17 +142,55 @@
<Property name="enabled" type="boolean" value="false"/>
</Properties>
</Component>
- <Component class="javax.swing.JLabel" name="pathOutput">
+ <Component class="javax.swing.JLabel" name="sizeOutput">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="cz/fidentis/analyst/project/Bundle.properties" key="FaceStatePanel.pathOutput.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ <ResourceString bundle="cz/fidentis/analyst/project/Bundle.properties" key="FaceStatePanel.sizeOutput.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
</Property>
</Properties>
</Component>
- <Component class="javax.swing.JLabel" name="sizeOutput">
+ <Component class="javax.swing.JLabel" name="featurePointsLabel">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="cz/fidentis/analyst/project/Bundle.properties" key="FaceStatePanel.sizeOutput.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ <ResourceString bundle="cz/fidentis/analyst/project/Bundle.properties" key="FaceStatePanel.featurePointsLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </Property>
+ <Property name="enabled" type="boolean" value="false"/>
+ </Properties>
+ </Component>
+ <Component class="javax.swing.JLabel" name="featurePointsOutput">
+ <Properties>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="cz/fidentis/analyst/project/Bundle.properties" key="FaceStatePanel.featurePointsOutput.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </Property>
+ </Properties>
+ </Component>
+ <Component class="javax.swing.JLabel" name="previewLabel">
+ <Properties>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="cz/fidentis/analyst/project/Bundle.properties" key="FaceStatePanel.previewLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </Property>
+ <Property name="enabled" type="boolean" value="false"/>
+ </Properties>
+ </Component>
+ <Component class="javax.swing.JLabel" name="previewOutput">
+ <Properties>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="cz/fidentis/analyst/project/Bundle.properties" key="FaceStatePanel.previewOutput.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </Property>
+ </Properties>
+ </Component>
+ <Component class="javax.swing.JLabel" name="textureLabel">
+ <Properties>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="cz/fidentis/analyst/project/Bundle.properties" key="FaceStatePanel.textureLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </Property>
+ <Property name="enabled" type="boolean" value="false"/>
+ </Properties>
+ </Component>
+ <Component class="javax.swing.JLabel" name="textureOutput">
+ <Properties>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="cz/fidentis/analyst/project/Bundle.properties" key="FaceStatePanel.textureOutput.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
</Property>
</Properties>
</Component>
@@ -188,7 +256,7 @@
</Group>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="loadFaceButton" min="-2" max="-2" attributes="0"/>
- <EmptySpace pref="44" max="32767" attributes="0"/>
+ <EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
diff --git a/GUI/src/main/java/cz/fidentis/analyst/project/FaceStatePanel.java b/GUI/src/main/java/cz/fidentis/analyst/project/FaceStatePanel.java
index 1d0eb6d9525c1e22c2fc1767dde128f98b7369b1..4019d1f441486a82e2ad5b0b616bfbebbb664312 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/project/FaceStatePanel.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/project/FaceStatePanel.java
@@ -6,6 +6,7 @@ import java.awt.Dimension;
import java.awt.Image;
import java.awt.Toolkit;
import java.awt.event.ActionListener;
+import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -54,9 +55,15 @@ public class FaceStatePanel extends ControlPanel {
filePanel = new javax.swing.JPanel();
pathLabel = new javax.swing.JLabel();
- sizeLabel = new javax.swing.JLabel();
pathOutput = new javax.swing.JLabel();
+ sizeLabel = new javax.swing.JLabel();
sizeOutput = new javax.swing.JLabel();
+ featurePointsLabel = new javax.swing.JLabel();
+ featurePointsOutput = new javax.swing.JLabel();
+ previewLabel = new javax.swing.JLabel();
+ previewOutput = new javax.swing.JLabel();
+ textureLabel = new javax.swing.JLabel();
+ textureOutput = new javax.swing.JLabel();
facePanel = new javax.swing.JPanel();
kdTreeLabel = new javax.swing.JLabel();
featurePointsLoadedLabel = new javax.swing.JLabel();
@@ -73,13 +80,28 @@ public class FaceStatePanel extends ControlPanel {
org.openide.awt.Mnemonics.setLocalizedText(pathLabel, org.openide.util.NbBundle.getMessage(FaceStatePanel.class, "FaceStatePanel.pathLabel.text")); // NOI18N
pathLabel.setEnabled(false);
+ org.openide.awt.Mnemonics.setLocalizedText(pathOutput, org.openide.util.NbBundle.getMessage(FaceStatePanel.class, "FaceStatePanel.pathOutput.text")); // NOI18N
+
org.openide.awt.Mnemonics.setLocalizedText(sizeLabel, org.openide.util.NbBundle.getMessage(FaceStatePanel.class, "FaceStatePanel.sizeLabel.text")); // NOI18N
sizeLabel.setEnabled(false);
- org.openide.awt.Mnemonics.setLocalizedText(pathOutput, org.openide.util.NbBundle.getMessage(FaceStatePanel.class, "FaceStatePanel.pathOutput.text")); // NOI18N
-
org.openide.awt.Mnemonics.setLocalizedText(sizeOutput, org.openide.util.NbBundle.getMessage(FaceStatePanel.class, "FaceStatePanel.sizeOutput.text")); // NOI18N
+ org.openide.awt.Mnemonics.setLocalizedText(featurePointsLabel, org.openide.util.NbBundle.getMessage(FaceStatePanel.class, "FaceStatePanel.featurePointsLabel.text")); // NOI18N
+ featurePointsLabel.setEnabled(false);
+
+ org.openide.awt.Mnemonics.setLocalizedText(featurePointsOutput, org.openide.util.NbBundle.getMessage(FaceStatePanel.class, "FaceStatePanel.featurePointsOutput.text")); // NOI18N
+
+ org.openide.awt.Mnemonics.setLocalizedText(previewLabel, org.openide.util.NbBundle.getMessage(FaceStatePanel.class, "FaceStatePanel.previewLabel.text")); // NOI18N
+ previewLabel.setEnabled(false);
+
+ org.openide.awt.Mnemonics.setLocalizedText(previewOutput, org.openide.util.NbBundle.getMessage(FaceStatePanel.class, "FaceStatePanel.previewOutput.text")); // NOI18N
+
+ org.openide.awt.Mnemonics.setLocalizedText(textureLabel, org.openide.util.NbBundle.getMessage(FaceStatePanel.class, "FaceStatePanel.textureLabel.text")); // NOI18N
+ textureLabel.setEnabled(false);
+
+ org.openide.awt.Mnemonics.setLocalizedText(textureOutput, org.openide.util.NbBundle.getMessage(FaceStatePanel.class, "FaceStatePanel.textureOutput.text")); // NOI18N
+
javax.swing.GroupLayout filePanelLayout = new javax.swing.GroupLayout(filePanel);
filePanel.setLayout(filePanelLayout);
filePanelLayout.setHorizontalGroup(
@@ -87,26 +109,45 @@ public class FaceStatePanel extends ControlPanel {
.addGroup(filePanelLayout.createSequentialGroup()
.addContainerGap()
.addGroup(filePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(pathLabel)
- .addComponent(sizeLabel))
- .addGap(49, 49, 49)
- .addGroup(filePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(sizeOutput)
- .addComponent(pathOutput))
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addComponent(featurePointsLabel)
+ .addComponent(textureLabel)
+ .addComponent(previewLabel)
+ .addGroup(filePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
+ .addComponent(sizeLabel, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(pathLabel, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
+ .addGap(10, 10, 10)
+ .addGroup(filePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(sizeOutput, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 428, Short.MAX_VALUE)
+ .addComponent(featurePointsOutput, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(pathOutput, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(previewOutput, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(textureOutput, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addGap(0, 0, Short.MAX_VALUE))
);
filePanelLayout.setVerticalGroup(
filePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(filePanelLayout.createSequentialGroup()
.addContainerGap()
- .addGroup(filePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addGroup(filePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(pathLabel)
- .addComponent(pathOutput))
- .addGap(13, 13, 13)
+ .addComponent(pathOutput, javax.swing.GroupLayout.PREFERRED_SIZE, 0, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(filePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(sizeLabel)
.addComponent(sizeOutput))
- .addContainerGap(41, Short.MAX_VALUE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addGroup(filePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(featurePointsLabel)
+ .addComponent(featurePointsOutput))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addGroup(filePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(previewOutput, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(previewLabel))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addGroup(filePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(textureOutput)
+ .addComponent(textureLabel))
+ .addContainerGap())
);
facePanel.setBorder(javax.swing.BorderFactory.createTitledBorder(null, org.openide.util.NbBundle.getMessage(FaceStatePanel.class, "FaceStatePanel.facePanel.border.title"), javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Dialog", 1, 12))); // NOI18N
@@ -172,7 +213,7 @@ public class FaceStatePanel extends ControlPanel {
.addComponent(faceNotLoadedLabel))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(loadFaceButton)
- .addContainerGap(44, Short.MAX_VALUE))
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
photoPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(null, org.openide.util.NbBundle.getMessage(FaceStatePanel.class, "FaceStatePanel.photoPanel.border.title"), javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Dialog", 1, 12))); // NOI18N
@@ -220,9 +261,9 @@ public class FaceStatePanel extends ControlPanel {
.addGap(6, 6, 6)
.addComponent(photoPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(filePanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(filePanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGap(18, 18, 18)
- .addComponent(facePanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(facePanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap())
);
@@ -246,8 +287,13 @@ public class FaceStatePanel extends ControlPanel {
public void showFaceState(HumanFace face, String name, Path path) {
photo.setIcon(getPhoto(face, path));
+
pathOutput.setText(getPathText(path));
sizeOutput.setText(getSizeText(path));
+ featurePointsOutput.setText(getFeaturePointsText(path));
+ previewOutput.setText(getPreviewText(path));
+ textureOutput.setText(getTextureText(path));
+
hasKDOutput.setIcon(getKdTree(face));
hasFPOutput.setIcon(getFeaturePoints(face));
checkFaceLoaded(face);
@@ -337,6 +383,64 @@ public class FaceStatePanel extends ControlPanel {
return "";
}
+ private String getFeaturePointsText(Path path) {
+
+ if (path != null) {
+ featurePointsLabel.setEnabled(true);
+
+ String filePath = path.toString().split(".obj")[0] + "_landmarks.csv";
+ if ((new File(filePath)).exists()) {
+ return filePath;
+ }
+
+ filePath = path.toString().split("_ECA")[0] + "_landmarks.csv";
+ if ((new File(filePath)).exists()) {
+ return filePath;
+ }
+
+ filePath = path.toString().split("_CA")[0] + "_landmarks.csv";
+ if ((new File(filePath)).exists()) {
+ return filePath;
+ }
+ }
+
+ featurePointsLabel.setEnabled(false);
+ return "";
+ }
+
+ private String getPreviewText(Path path) {
+
+ if (path != null) {
+ previewLabel.setEnabled(true);
+
+ String filePath = path.toString().split(".obj")[0] + "_preview.jpg";
+
+ if ((new File(filePath)).exists()) {
+ return filePath;
+ }
+ }
+
+ previewLabel.setEnabled(false);
+ return "";
+ }
+
+ private String getTextureText(Path path) {
+
+ if (path != null) {
+ textureLabel.setEnabled(true);
+
+ String filePath = path.toString().split(".obj")[0] + ".jpg";
+
+ if ((new File(filePath)).exists()) {
+ return filePath;
+ }
+ }
+
+ textureLabel.setEnabled(false);
+ return "";
+
+ }
+
/**
* Gets icon which shows if face has calculated KD-tree
* @param face HumanFace
@@ -414,7 +518,9 @@ public class FaceStatePanel extends ControlPanel {
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JLabel faceNotLoadedLabel;
private javax.swing.JPanel facePanel;
+ private javax.swing.JLabel featurePointsLabel;
private javax.swing.JLabel featurePointsLoadedLabel;
+ private javax.swing.JLabel featurePointsOutput;
private javax.swing.JPanel filePanel;
private javax.swing.JLabel hasFPOutput;
private javax.swing.JLabel hasKDOutput;
@@ -424,8 +530,12 @@ public class FaceStatePanel extends ControlPanel {
private javax.swing.JLabel pathOutput;
private javax.swing.JLabel photo;
private javax.swing.JPanel photoPanel;
+ private javax.swing.JLabel previewLabel;
+ private javax.swing.JLabel previewOutput;
private javax.swing.JLabel sizeLabel;
private javax.swing.JLabel sizeOutput;
+ private javax.swing.JLabel textureLabel;
+ private javax.swing.JLabel textureOutput;
private javax.swing.JLabel warningLabel;
// End of variables declaration//GEN-END:variables
diff --git a/GUI/src/main/resources/cz/fidentis/analyst/project/Bundle.properties b/GUI/src/main/resources/cz/fidentis/analyst/project/Bundle.properties
index da9519e275e361caa36c4b237e5222b59301b43d..5c1b82d3eaa55f23527054b3571e919e25533537 100644
--- a/GUI/src/main/resources/cz/fidentis/analyst/project/Bundle.properties
+++ b/GUI/src/main/resources/cz/fidentis/analyst/project/Bundle.properties
@@ -1,9 +1,3 @@
-FaceStatePanel.filePanel.AccessibleContext.accessibleName=File info
-FaceStatePanel.filePanel.border.title=File info
-FaceStatePanel.pathLabel.text=Path :
-FaceStatePanel.sizeLabel.text=Size :
-FaceStatePanel.pathOutput.text=
-FaceStatePanel.sizeOutput.text=
FaceStatePanel.facePanel.border.title=Face info
FaceStatePanel.kdTreeLabel.text=Has KD - tree :
FaceStatePanel.featurePointsLoadedLabel.text=Feature points loaded :
@@ -31,3 +25,15 @@ ProjectPanel.deselectAllButton.text=Deselect all
ProjectPanel.selectAllButton.text=Select all
ProjectPanel.removeButton.text=Remove
ProjectPanel.addButton.text=Add
+FaceStatePanel.textureOutput.text=
+FaceStatePanel.previewOutput.text=
+FaceStatePanel.featurePointsOutput.text=
+FaceStatePanel.textureLabel.text=Texture File :
+FaceStatePanel.previewLabel.text=Preview File :
+FaceStatePanel.featurePointsLabel.text=Feature Points File :
+FaceStatePanel.sizeOutput.text=
+FaceStatePanel.pathOutput.text=
+FaceStatePanel.sizeLabel.text=Size :
+FaceStatePanel.pathLabel.text=Path :
+FaceStatePanel.filePanel.AccessibleContext.accessibleName=File info
+FaceStatePanel.filePanel.border.title=File info