Commit da5bea19 authored by Radek Ošlejšek's avatar Radek Ošlejšek
Browse files

Project top component moved to core package

parent 452de280

GUI/src/main/java/cz/fidentis/analyst/gui/ProjectTopComp.form→GUI/src/main/java/cz/fidentis/analyst/core/ProjectTopComp.form

+7 −7
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ 
                  <Font name="Tahoma" size="12" style="0"/>

                </Property>

                <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">

                  <ResourceString bundle="cz/fidentis/analyst/gui/Bundle.properties" key="ProjectTopComp.addButton1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>

                  <ResourceString bundle="cz/fidentis/analyst/core/Bundle.properties" key="ProjectTopComp.addButton1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>

                </Property>

              </Properties>

              <Events>
@@ -178,7 +178,7 @@ 
                  <Font name="Tahoma" size="12" style="0"/>

                </Property>

                <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">

                  <ResourceString bundle="cz/fidentis/analyst/gui/Bundle.properties" key="ProjectTopComp.removeButton1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>

                  <ResourceString bundle="cz/fidentis/analyst/core/Bundle.properties" key="ProjectTopComp.removeButton1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>

                </Property>

              </Properties>

              <Events>
@@ -196,7 +196,7 @@ 
                  <Font name="Tahoma" size="12" style="0"/>

                </Property>

                <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">

                  <ResourceString bundle="cz/fidentis/analyst/gui/Bundle.properties" key="ProjectTopComp.selectAllButton1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>

                  <ResourceString bundle="cz/fidentis/analyst/core/Bundle.properties" key="ProjectTopComp.selectAllButton1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>

                </Property>

              </Properties>

              <Constraints>
@@ -211,7 +211,7 @@ 
                  <Font name="Tahoma" size="12" style="0"/>

                </Property>

                <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">

                  <ResourceString bundle="cz/fidentis/analyst/gui/Bundle.properties" key="ProjectTopComp.deselectAllButton1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>

                  <ResourceString bundle="cz/fidentis/analyst/core/Bundle.properties" key="ProjectTopComp.deselectAllButton1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>

                </Property>

              </Properties>

              <Constraints>
@@ -226,7 +226,7 @@ 
                  <Font name="Tahoma" size="12" style="0"/>

                </Property>

                <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">

                  <ResourceString bundle="cz/fidentis/analyst/gui/Bundle.properties" key="ProjectTopComp.collapseButton1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>

                  <ResourceString bundle="cz/fidentis/analyst/core/Bundle.properties" key="ProjectTopComp.collapseButton1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>

                </Property>

              </Properties>

              <Constraints>
@@ -241,7 +241,7 @@ 
                  <Font name="Tahoma" size="12" style="0"/>

                </Property>

                <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">

                  <ResourceString bundle="cz/fidentis/analyst/gui/Bundle.properties" key="ProjectTopComp.inflateButton1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>

                  <ResourceString bundle="cz/fidentis/analyst/core/Bundle.properties" key="ProjectTopComp.inflateButton1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>

                </Property>

                <Property name="alignmentX" type="float" value="0.5"/>

              </Properties>
@@ -260,7 +260,7 @@ 
                  <Font name="Tahoma" size="12" style="0"/>

                </Property>

                <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">

                  <ResourceString bundle="cz/fidentis/analyst/gui/Bundle.properties" key="ProjectTopComp.analyzeButton1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>

                  <ResourceString bundle="cz/fidentis/analyst/core/Bundle.properties" key="ProjectTopComp.analyzeButton1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>

                </Property>

                <Property name="alignmentX" type="float" value="0.5"/>

              </Properties>

GUI/src/main/java/cz/fidentis/analyst/gui/ProjectTopComp.java→GUI/src/main/java/cz/fidentis/analyst/core/ProjectTopComp.java

+4 −3
Original line number Diff line number Diff line
@@ -3,16 +3,14 @@ 
 * To change this template file, choose Tools | Templates

 * and open the template in the editor.

 */

package cz.fidentis.analyst.gui;

package cz.fidentis.analyst.core;



import cz.fidentis.analyst.core.SingleFaceTab;

import org.netbeans.api.settings.ConvertAsProperties;

import org.openide.awt.ActionID;

import org.openide.awt.ActionReference;

import org.openide.windows.TopComponent;

import org.openide.util.NbBundle.Messages;

import cz.fidentis.analyst.Project;

import cz.fidentis.analyst.core.FaceToFaceTab;

import cz.fidentis.analyst.face.HumanFace;

import cz.fidentis.analyst.face.HumanFaceFactory;

import java.io.File;
@@ -314,6 +312,9 @@ public final class ProjectTopComp extends TopComponent { 
        } 

    }

    

    /**

     * Load two models for 1:1 comparison

     */

    public void loadTwoModels () {

        File file1 = new FileChooserBuilder(ProjectTopComp.class)

                .setTitle("Open human face(s)")

GUI/src/main/java/cz/fidentis/analyst/gui/Canvas.java

+1 −0
Original line number Diff line number Diff line 
package cz.fidentis.analyst.gui;



import cz.fidentis.analyst.core.ProjectTopComp;

import com.jogamp.opengl.GLCapabilities;

import com.jogamp.opengl.GLEventListener;

import com.jogamp.opengl.GLProfile;

GUI/src/main/java/cz/fidentis/analyst/registration/PostRegistrationTestTC.java

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ package cz.fidentis.analyst.registration; 
import cz.fidentis.analyst.face.HumanFace;

import cz.fidentis.analyst.face.HumanFaceFactory;

import cz.fidentis.analyst.feature.FeaturePoint;

import cz.fidentis.analyst.gui.ProjectTopComp;

import cz.fidentis.analyst.core.ProjectTopComp;

import cz.fidentis.analyst.scene.DrawableFace;

import java.io.File;

import java.util.ArrayList;

GUI/src/main/resources/cz/fidentis/analyst/core/Bundle.properties

+7 −0
Original line number Diff line number Diff line
@@ -9,3 +9,10 @@ PostRegistrationCP.rotationZFTF.text=0 
PostRegistrationCP.rotationYFTF.text=0

PostRegistrationCP.jFormattedTextField1.text=jFormattedTextField1

SingleFaceTab.jButton2.text=jButton2

ProjectTopComp.addButton1.text=Add

ProjectTopComp.analyzeButton1.text=Open 1:1

ProjectTopComp.inflateButton1.text=Inflate

ProjectTopComp.collapseButton1.text=Collapse

ProjectTopComp.deselectAllButton1.text=Deselect all

ProjectTopComp.selectAllButton1.text=Select all

ProjectTopComp.removeButton1.text=Remove