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

Merge branch '256-update-libraries' into 'master' 

Resolve "Update libraries"

Closes #256

See merge request grp-fidentis/analyst2!272
parents 163e83d1 c130f6ff

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ variables: 
  PROJECT_ARTIFACT_ID: FIDENTIS-Analyst-app

  DEPLOYMENT_INFO_VERSION_FILE: VERSION.txt

  MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -Dcheckstyle.fail=false"

  MAVEN_JAVADOC_OPTS: "-Dauthor=false -DadditionalJOption=-Xdoclint:none"

  MAVEN_JAVADOC_OPTS: "-Dauthor=false"



stages:

    - build

GUI/pom.xml

+2 −6
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
                        <phase>validate</phase>

                        <configuration>

                            <configLocation>codestyle.xml</configLocation>

                            <encoding>UTF-8</encoding>

                            <consoleOutput>true</consoleOutput>

                            <failOnViolation>${checkstyle.fail}</failOnViolation>

                            <violationSeverity>${checkstyle.severity}</violationSeverity>
@@ -53,11 +52,6 @@ 
        </plugins>

    </build>

    <dependencies>

        <dependency>

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

            <artifactId>org-netbeans-api-annotations-common</artifactId>

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

        </dependency>

        <dependency>

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

            <artifactId>org-openide-util</artifactId>
@@ -68,11 +62,13 @@ 
            <artifactId>org-openide-awt</artifactId>

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

        </dependency>

        <!--

        <dependency>

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

            <artifactId>org-openide-dialogs</artifactId>

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

        </dependency>

        -->

        <dependency>

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

            <artifactId>org-openide-modules</artifactId>

GUI/src/main/java/cz/fidentis/analyst/gui/builder/PanelBuilder.java

+8 −6
Original line number Diff line number Diff line
@@ -33,26 +33,28 @@ import javax.swing.text.DefaultFormatterFactory; 


/**

 * This builder is used to build control panels (e.g. RegistrationPanel)

 *

 * <p>

 * You can build panel from inside it's class by giving it's reference into the

 * builder constructor. This builder can be used only on blank panels, if there

 * are already any components inside the panel given, the builder won't work as

 * intended. Before building your own panel, set the builder set functions as

 * they have influence over the builder behaviour.

 *

 * <p>

 * </p>

 * Components are added into cells, if you need to add more than 1 components

 * into a single cell, call createSubPanel() method. Every upcoming components

 * is added into this sub panel, until addSubPanel() method is called. This sub

 * panel is then added into single cell.

 *

 * <p>

 * </p>

 * If you need reference for component you just added, use getElement() method.

 * This builder adds components from left to right on a single line, until

 * nextLine() method is called.

 *

 * <p>

 * For concrete example of this builder usage, check RegistrationPanel,

 * TripleAxisAnimationPanel or FeaturePointsPanel. These panels were created

 * using this builder.

 *

 * </p>

 * @author Lukas Machalek

 */

public class PanelBuilder {
@@ -640,7 +642,7 @@ public class PanelBuilder { 
            return this;

        }



        JComboBox box = new JComboBox(content);

        JComboBox<String> box = new JComboBox<>(content);

        box.setFont(font);



        updateInsets();

GUI/src/main/java/cz/fidentis/analyst/gui/elements/FaceInfoPanel.java

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ public class FaceInfoPanel extends JPanel { 
    }

    

    private void showFeaturePoints(HumanFace face) {

        DefaultComboBoxModel model = new DefaultComboBoxModel();

        DefaultComboBoxModel<String> model = new DefaultComboBoxModel<>();

        if (face != null && !face.getFeaturePoints().isEmpty()) {            

            jComboBox1.setEnabled(true);

            jComboBox1.setVisible(true);

GUI/src/main/java/cz/fidentis/analyst/gui/elements/FeaturePointListPanel.java

+3 −3
Original line number Diff line number Diff line
@@ -320,8 +320,8 @@ public class FeaturePointListPanel extends JPanel { 
    /**

     * (De)selects feature points

     *

     * @param selected {@code true} if all feature point checkboxes are to be

     * selected, {@code false} otherwise

     * @param featurePoints all feature points

     * @param selectedFeaturePoints selected feature points

     */

    public void selectFeaturePoints(List<FeaturePoint> featurePoints, List<FeaturePointType> selectedFeaturePoints) {

        for (int i = 0; i < featurePoints.size(); i++) {
@@ -337,7 +337,7 @@ public class FeaturePointListPanel extends JPanel { 
     * Updates GUI elements that display the weights of feature points used to

     * calculate the weighted Hausdorff distance.

     *

     * @param featurePointWeights Map of feature point types and their weights

     * @param featurePointValues Map of feature point types and their weights

     */

    public void updateFeaturePointValues(Map<FeaturePointType, Double> featurePointValues) {

        featurePointStats.forEach((fpType, fpWeightLabel) -> {