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

Merge branch '96-introduce-facefilechooser' into 'master' 

Resolve "Introduce FaceFileChooser"

Closes #96

See merge request grp-fidentis/analyst2!99
parents fd5190b5 20c22638

Comparison/src/main/java/cz/fidentis/analyst/face/HumanFace.java

+11 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ public class HumanFace implements MeshListener, Serializable { 
    }

    

    /**

     * Return unique ID of the face.

     * Returns unique ID of the face.

     * 

     * @return unique ID of the face. 

     */
@@ -178,6 +178,16 @@ public class HumanFace implements MeshListener, Serializable { 
        return this.id;

    }

    

    /**

     * Returns short name of the face distilled from the file name. May not be unique.

     * @return short name of the face distilled from the file name

     */

    public String getName() {

        String name = id.substring(0, id.lastIndexOf('.')); // remove extention

        name = name.substring(id.lastIndexOf('/')+1, name.length());

        return name;

    }

    

    /**

     * Returns already computed k-d tree of the triangular mesh or {@code null}.

     * @return Already computed k-d tree of the triangular mesh or {@code null}

GUI/pom.xml

+11 −0
Original line number Diff line number Diff line
@@ -76,6 +76,17 @@ 
            <artifactId>org-openide-modules</artifactId>

            <version>${netbeans.version}</version>

        </dependency>

        <dependency>

            <groupId>org.netbeans.api</groupId>

            <artifactId>org-openide-filesystems-nb</artifactId>

            <version>${netbeans.version}</version>

        </dependency>

        <dependency>

            <groupId>org.netbeans.api</groupId>

            <artifactId>org-netbeans-modules-options-api</artifactId>

            <version>${netbeans.version}</version>

            <type>jar</type>

        </dependency>

        <dependency>

            <groupId>org.jogamp.gluegen</groupId>

            <artifactId>gluegen-rt-main</artifactId>

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

+11 −28
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ import com.jogamp.opengl.GLEventListener; 
import com.jogamp.opengl.GLProfile;

import com.jogamp.opengl.awt.GLCanvas;

import cz.fidentis.analyst.face.HumanFace;

import cz.fidentis.analyst.mesh.io.ModelFileFilter;

import cz.fidentis.analyst.mesh.core.MeshModel;

import com.jogamp.opengl.util.FPSAnimator;
@@ -20,8 +19,9 @@ import java.util.Scanner; 
import java.util.Timer;

import java.util.TimerTask;

import javax.swing.ImageIcon;

import javax.swing.JFileChooser;

import javax.swing.JOptionPane;

import javax.swing.filechooser.FileNameExtensionFilter;

import org.openide.filesystems.FileChooserBuilder;



/**

 * Canvas for displaying models containing GLCanvas and navigation.
@@ -203,35 +203,18 @@ public class Canvas extends javax.swing.JPanel { 
     * Loads model selected in file chooser by user

     */

    public void loadModel () {

        String[] extensions = new String[2];

        extensions[0] = "obj";

        extensions[1] = "OBJ";

        

        //enables to shows just .obj files in file chooser

        ModelFileFilter filter = new ModelFileFilter(extensions, "*.obj");

        JFileChooser jFileChooser1 = new JFileChooser(getPrefferedModelPath());

        jFileChooser1.setPreferredSize(new Dimension (800,500));

       

        jFileChooser1.addChoosableFileFilter(filter);        

       

        //file chooser will appear on top of glCanvas

        jFileChooser1.showOpenDialog(this);

        jFileChooser1.setDialogTitle("Import obj file");

        

        setPrefferedModelPath(jFileChooser1.getCurrentDirectory().toString());

        

        File[] fileArray = new File[1];

        //saves selected file by user as first element in array

        fileArray[0] = jFileChooser1.getSelectedFile();



        //testing getting path TODO

        //JOptionPane.showConfirmDialog(null,

        //        fileArray[0].getAbsoluteFile(), "", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);



        if (fileArray.length <= 0) {

        File file = new FileChooserBuilder(ProjectTopComp.class)

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

                .setDefaultWorkingDirectory(new File (System.getProperty("user.home")))

                //.setApproveText("Add")

                .setFileFilter(new FileNameExtensionFilter("obj files (*.obj)", "obj"))

                .setAcceptAllFileFilterUsed(true)

                .showOpenDialog();

        

        if (file== null) {

            System.out.print("No file chosen.");

        } else {

            this.addModel(fileArray[0]);

            this.addModel(file);

        }       

        glCanvas.setVisible(true);

    }

GUI/src/main/java/cz/fidentis/analyst/gui/PreferencesTopComponent.form

deleted100644 → 0
+0 −173
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" ?>



<!--



    Licensed to the Apache Software Foundation (ASF) under one

    or more contributor license agreements.  See the NOTICE file

    distributed with this work for additional information

    regarding copyright ownership.  The ASF licenses this file

    to you under the Apache License, Version 2.0 (the

    "License"); you may not use this file except in compliance

    with the License.  You may obtain a copy of the License at



      http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing,

    software distributed under the License is distributed on an

    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

    KIND, either express or implied.  See the License for the

    specific language governing permissions and limitations

    under the License.



-->



<Form version="1.5" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">

  <AuxValues>

    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>

    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>

    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>

    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>

    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>

    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>

    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>

    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>

    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>

  </AuxValues>



  <Layout>

    <DimensionLayout dim="0">

      <Group type="103" groupAlignment="0" attributes="0">

          <Group type="102" alignment="1" attributes="0">

              <EmptySpace max="-2" attributes="0"/>

              <Group type="103" groupAlignment="1" attributes="0">

                  <Group type="102" attributes="0">

                      <Group type="103" groupAlignment="0" attributes="0">

                          <Component id="jFormattedTextField1" max="32767" attributes="0"/>

                          <Group type="102" alignment="0" attributes="0">

                              <Component id="jLabel1" min="-2" max="-2" attributes="0"/>

                              <EmptySpace min="0" pref="183" max="32767" attributes="0"/>

                          </Group>

                      </Group>

                      <EmptySpace max="-2" attributes="0"/>

                      <Component id="jButton1" min="-2" max="-2" attributes="0"/>

                  </Group>

                  <Group type="102" attributes="0">

                      <Component id="jLabel3" min="-2" max="-2" attributes="0"/>

                      <EmptySpace max="32767" attributes="0"/>

                      <Component id="jSlider2" min="-2" max="-2" attributes="0"/>

                  </Group>

                  <Group type="102" alignment="1" attributes="0">

                      <Component id="jLabel2" min="-2" max="-2" attributes="0"/>

                      <EmptySpace max="32767" attributes="0"/>

                      <Component id="jSlider1" min="-2" max="-2" attributes="0"/>

                  </Group>

              </Group>

              <EmptySpace min="-2" pref="18" max="-2" attributes="0"/>

          </Group>

      </Group>

    </DimensionLayout>

    <DimensionLayout dim="1">

      <Group type="103" groupAlignment="0" attributes="0">

          <Group type="102" attributes="0">

              <EmptySpace max="-2" attributes="0"/>

              <Component id="jLabel1" min="-2" max="-2" attributes="0"/>

              <EmptySpace max="-2" attributes="0"/>

              <Group type="103" groupAlignment="3" attributes="0">

                  <Component id="jFormattedTextField1" alignment="3" min="-2" max="-2" attributes="0"/>

                  <Component id="jButton1" alignment="3" min="-2" max="-2" attributes="0"/>

              </Group>

              <EmptySpace max="-2" attributes="0"/>

              <Group type="103" groupAlignment="0" attributes="0">

                  <Component id="jSlider1" min="-2" max="-2" attributes="0"/>

                  <Component id="jLabel2" min="-2" max="-2" attributes="0"/>

              </Group>

              <EmptySpace max="-2" attributes="0"/>

              <Group type="103" groupAlignment="0" attributes="0">

                  <Component id="jSlider2" min="-2" max="-2" attributes="0"/>

                  <Component id="jLabel3" min="-2" max="-2" attributes="0"/>

              </Group>

              <EmptySpace pref="172" max="32767" attributes="0"/>

          </Group>

      </Group>

    </DimensionLayout>

  </Layout>

  <SubComponents>

    <Component class="javax.swing.JButton" name="jButton1">

      <Properties>

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

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

        </Property>

      </Properties>

      <Events>

        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>

      </Events>

    </Component>

    <Component class="javax.swing.JFormattedTextField" name="jFormattedTextField1">

      <Properties>

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

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

        </Property>

      </Properties>

      <Events>

        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jFormattedTextField1ActionPerformed"/>

      </Events>

    </Component>

    <Component class="javax.swing.JLabel" name="jLabel1">

      <Properties>

        <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">

          <ComponentRef name="jFormattedTextField1"/>

        </Property>

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

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

        </Property>

      </Properties>

    </Component>

    <Component class="javax.swing.JSlider" name="jSlider1">

      <Properties>

        <Property name="majorTickSpacing" type="int" value="3"/>

        <Property name="maximum" type="int" value="7"/>

        <Property name="minimum" type="int" value="1"/>

        <Property name="minorTickSpacing" type="int" value="3"/>

        <Property name="paintTicks" type="boolean" value="true"/>

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

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

        </Property>

        <Property name="value" type="int" value="4"/>

      </Properties>

      <Events>

        <EventHandler event="stateChanged" listener="javax.swing.event.ChangeListener" parameters="javax.swing.event.ChangeEvent" handler="jSlider1StateChanged"/>

      </Events>

    </Component>

    <Component class="javax.swing.JSlider" name="jSlider2">

      <Properties>

        <Property name="majorTickSpacing" type="int" value="3"/>

        <Property name="maximum" type="int" value="7"/>

        <Property name="minimum" type="int" value="1"/>

        <Property name="minorTickSpacing" type="int" value="3"/>

        <Property name="paintTicks" type="boolean" value="true"/>

        <Property name="snapToTicks" type="boolean" value="true"/>

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

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

        </Property>

        <Property name="value" type="int" value="4"/>

      </Properties>

      <Events>

        <EventHandler event="stateChanged" listener="javax.swing.event.ChangeListener" parameters="javax.swing.event.ChangeEvent" handler="jSlider2StateChanged"/>

      </Events>

    </Component>

    <Component class="javax.swing.JLabel" name="jLabel2">

      <Properties>

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

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

        </Property>

      </Properties>

    </Component>

    <Component class="javax.swing.JLabel" name="jLabel3">

      <Properties>

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

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

        </Property>

      </Properties>

    </Component>

  </SubComponents>

</Form>

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

deleted100644 → 0
+0 −277

File deleted.

Preview size limit exceeded, changes collapsed.