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

Merge branch '372-release-2025-07' into 'master' 

Resolve "Release 2025.07"

Closes #372

See merge request grp-fidentis/analyst2!431
parents 9d718241 ec7346af

.gitlab-ci.yml

+15 −11
Original line number Diff line number Diff line
@@ -82,18 +82,23 @@ style-checking: 
#

build-bundles:

  stage: build-bundles

  image: ubuntu:latest

  #image: ubuntu:latest

  #script:

    #- apt-get update -qq && apt-get install -y -qq maven openjdk-21-jdk zip unzip curl mkisofs

    #- export VERSION=$(grep -oP '^([^\s]*)' $DEPLOYMENT_INFO_VERSION_FILE)

    #- ./scripts/build.sh

  script:

    - apt-get update -qq && apt-get install -y -qq maven openjdk-21-jdk zip unzip curl mkisofs

    - export VERSION=$(grep -oP '^([^\s]*)' $DEPLOYMENT_INFO_VERSION_FILE)

    - ./scripts/build.sh

    - mvn clean package javadoc:javadoc javadoc:aggregate $MAVEN_JAVADOC_OPTS $MAVEN_CLI_OPTS -DskipTests -Pwin64-bundle

  tags:

    - shared-fi

  when: manual

  artifacts:

    paths:

      - target/site/apidocs/

      - application/target/fidentis-analyst*.tar.gz

      - application/target/target/site/apidocs/

      - application/target/$PROJECT_ARTIFACT_ID-*.jar

      - application/target/$PROJECT_ARTIFACT_ID-*.exe

      - application/target/$PROJECT_ARTIFACT_ID-*.zip

      #- application/target/fidentis-analyst*.tar.gz

    expire_in: 20 mins

    when: on_success
@@ -105,7 +110,7 @@ release-bundles: 
  stage: release-bundles

  image: ubuntu:latest

  script:

    - export VERSION=$(grep -oP '^([^\s]*)' $DEPLOYMENT_INFO_VERSION_FILE)

    - export VERSION=$(grep -oP '^([^\s]*)' $DEPLOYMENT_INFO_VERSION_FILE | head -n 1)

    - apt-get update -qq && apt-get install -y -qq lftp

    #- lftp -c "set ftp:ssl-allow no; open -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST; mirror -Rnev $CI_PROJECT_DIR/application/target ./$FTP_TARGET_DIR --ignore-time --parallel=10 --exclude-glob .git* --exclude .git/"

    - >
@@ -113,10 +118,9 @@ release-bundles: 
      set ssl:verify-certificate false; 

      open -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST; 

      cd $FTP_TARGET_DIR; 

      mput -c $CI_PROJECT_DIR/application/target/$PROJECT_ARTIFACT_ID-$VERSION-jar-with-dependencies.jar;

      mput -c $CI_PROJECT_DIR/application/target/$PROJECT_ARTIFACT_ID-$VERSION.zip;

      mput -c $CI_PROJECT_DIR/application/target/linux-$PROJECT_ARTIFACT_ID-$VERSION.tar.gz;

      mput -c $CI_PROJECT_DIR/application/target/win64-$PROJECT_ARTIFACT_ID-$VERSION.zip"

    - lftp -c "set ftp:ssl-allow no; open -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST; mirror -Rev $CI_PROJECT_DIR/target/site/apidocs ./$FTP_TARGET_DIR/apidocs-all --ignore-time --parallel=10"

    - lftp -c "set ftp:ssl-allow no; open -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST; mirror -Rev $CI_PROJECT_DIR/application/target/site/apidocs ./$FTP_TARGET_DIR/apidocs-all --ignore-time --parallel=10"

  tags:

    - shared-fi

  rules:

GPU/pom.xml

+5 −0
Original line number Diff line number Diff line
@@ -39,8 +39,13 @@ 
    </build>

    <repositories>

        <repository>

            <!--

            <id>jitpack.io</id>

            <url>https://jitpack.io</url>

            -->

            <id>jogamp-remote</id>

            <name>jogamp mirror</name>

            <url>https://www.jogamp.org/deployment/maven/</url>

        </repository>

    </repositories>

    <dependencies>

GUI/src/main/java/cz/fidentis/analyst/gui/elements/landmarks/FpListInfoPanel.java

+4 −1
Original line number Diff line number Diff line
@@ -143,7 +143,10 @@ public class FpListInfoPanel extends FpListAbstractPanel<FpListInfoPanel.Row> { 
     */

    private JLabel createColorIndicator(Landmark featurePoint, DrawableFeaturePoints drFeaturePoints) {

        Color color = Color.GRAY;

        MeshVicinity.Location fpType = featurePoint.getMeshVicinity().getPositionType(drFeaturePoints.getDistanceThreshold());

        MeshVicinity vicinity = featurePoint.getMeshVicinity();

        MeshVicinity.Location fpType = (vicinity == null) ?

                MeshVicinity.Location.ON_THE_MESH :

                featurePoint.getMeshVicinity().getPositionType(drFeaturePoints.getDistanceThreshold());

        String toolTipText = "";



        if (featurePoint.isUserDefinedLandmark()) {

GUI/src/main/java/cz/fidentis/analyst/gui/task/featurepoints/FeaturePointsAction.java

+10 −15
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ public class FeaturePointsAction extends ControlPanelAction<FeaturePointsPanel> 
    private Landmark workingFP;

    private String workingFpMode = DISABLE;

    

    private String featurePointsVisible = DISABLE;



    private final DrawableFpSkeleton skeleton;

    private boolean skeletonVisible = false;
@@ -67,6 +65,9 @@ public class FeaturePointsAction extends ControlPanelAction<FeaturePointsPanel> 


    private AbstractAddEditWindow addEditWindow;



    private boolean showLandmarksState;

    private boolean showSkeletonState;



    /**

     * Constructor.

     * A new {@code FeaturePointsPanel} is instantiated and added to the {@code topControlPane}
@@ -87,13 +88,17 @@ public class FeaturePointsAction extends ControlPanelAction<FeaturePointsPanel> 


        setShowHideCode(

                () -> { // SHOW

                    showLandmarksState = getPrimaryFeaturePoints().isShown();

                    getCanvas().getScene().setDefaultColors();

                    setColorsOfFeaturePoints();

                    showFeaturePoints(true);

                    getPrimaryFeaturePoints().show(true);

                    skeleton.show(showSkeletonState);

                    getControlPanel().setShowSkeletonCheckBox(showSkeletonState);

                },

                () -> { // HIDE

                    getPrimaryFeaturePoints().resetAllColorsToDefault();

                    showFeaturePoints(false);

                    getPrimaryFeaturePoints().show(showLandmarksState);

                    showSkeletonState = skeleton.isShown();

                    skeleton.show(false);

                    getControlPanel().setShowSkeletonCheckBox(false);

                }
@@ -780,16 +785,6 @@ public class FeaturePointsAction extends ControlPanelAction<FeaturePointsPanel> 
                .refreshPanel(this, getPrimaryFeaturePoints(), selectedFeaturePoints);

    }



    private void showFeaturePoints(boolean show) {

        if (show && featurePointsVisible.equals(DISABLE)) {

            getPrimaryFeaturePoints().show(true);

            featurePointsVisible = ENABLE;

        } else if (!show && featurePointsVisible.equals(ENABLE)) {

            getPrimaryFeaturePoints().show(false);

            featurePointsVisible = DISABLE;

        }

    }



    protected void recognizeLandmarks(int faceSlot) {

        if (getPrimaryFace().getLandmarks().hasLandmarks()) {

            JOptionPane.showMessageDialog(getCanvas(), "Currently, this function is available only if there are no feature points defined yet.");
@@ -801,7 +796,7 @@ public class FeaturePointsAction extends ControlPanelAction<FeaturePointsPanel> 
            return;

        }



        var worker = new RemoteServiceWorker<List<Landmark>>(getCanvas(), "https://gitlab.fi.muni.cz/grp-fidentis/analyst2/-/wikis/landmarks-autodetection") {

        var worker = new RemoteServiceWorker<List<Landmark>>(getCanvas(), "https://gitlab.fi.muni.cz/grp-fidentis/analyst2/-/wikis/landmarks#autodetection") {

            @Override

            protected List<Landmark> doInBackground() throws RemoteServiceException {

                return FaceLandmarksServices.automaticallyDetectLandmarks(

GUI/src/main/java/cz/fidentis/analyst/gui/task/featurepoints/FeaturePointsPanel.form

+125 −79
Original line number Diff line number Diff line
@@ -25,21 +25,24 @@ 
          <Group type="102" attributes="0">

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

              <Group type="103" groupAlignment="0" max="-2" attributes="0">

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

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

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

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

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

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

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

                  </Group>

              <Group type="103" groupAlignment="0" max="-2" attributes="0">

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

              </Group>

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

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

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

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

                  </Group>

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

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

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

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

                  </Group>

              </Group>

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

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

          </Group>

      </Group>

    </DimensionLayout>
@@ -47,19 +50,23 @@ 
      <Group type="103" groupAlignment="0" attributes="0">

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

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

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

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

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

              <Group type="103" groupAlignment="0" max="-2" attributes="0">

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

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

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

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

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

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

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

                  </Group>

              </Group>

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

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

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

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

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

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

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

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

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

                  </Group>

              </Group>

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

          </Group>

      </Group>

    </DimensionLayout>
@@ -210,7 +217,7 @@ 
      <Layout>

        <DimensionLayout dim="0">

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

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

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

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

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

                      <Group type="102" alignment="0" attributes="0">
@@ -231,6 +238,7 @@ 
                          </Group>

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

                      </Group>

                      <Component id="jPanel3" alignment="1" max="32767" attributes="0"/>

                  </Group>

              </Group>

          </Group>
@@ -253,7 +261,9 @@ 
                  </Group>

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

                  <Component id="selectPrimaryFpButtonsPanel" min="-2" pref="50" max="-2" attributes="0"/>

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

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

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

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

              </Group>

          </Group>

        </DimensionLayout>
@@ -346,8 +356,6 @@ 
        </Component>

        <Component class="cz.fidentis.analyst.gui.task.featurepoints.SelectFpButtonsPanel" name="selectPrimaryFpButtonsPanel">

        </Component>

      </SubComponents>

    </Container>

        <Container class="javax.swing.JPanel" name="jPanel3">

          <Properties>

            <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
@@ -425,6 +433,8 @@ 
            </Component>

          </SubComponents>

        </Container>

      </SubComponents>

    </Container>

    <Container class="javax.swing.JPanel" name="sizePanel">

      <Properties>

        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
@@ -442,7 +452,7 @@ 
          <Group type="103" groupAlignment="0" attributes="0">

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

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

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

                  <Component id="sizeFpSlider" pref="328" max="32767" attributes="0"/>

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

              </Group>

          </Group>
@@ -462,5 +472,41 @@ 
        </Component>

      </SubComponents>

    </Container>

    <Container class="javax.swing.JPanel" name="helpPanel">

      <Properties>

        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">

          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">

            <TitledBorder title="Help">

              <ResourceString PropertyName="titleX" bundle="cz/fidentis/analyst/gui/task/featurepoints/Bundle.properties" key="FeaturePointsPanel.helpPanel.border.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>

              <Font PropertyName="font" name="Dialog" size="14" style="1"/>

            </TitledBorder>

          </Border>

        </Property>

      </Properties>

      <AuxValues>

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

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

      </AuxValues>



      <Layout>

        <DimensionLayout dim="0">

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

              <Component id="helpButton" alignment="0" pref="59" max="32767" attributes="0"/>

          </Group>

        </DimensionLayout>

        <DimensionLayout dim="1">

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

              <Component id="helpButton" alignment="0" pref="42" max="32767" attributes="0"/>

          </Group>

        </DimensionLayout>

      </Layout>

      <SubComponents>

        <Component class="cz.fidentis.analyst.gui.elements.InfoLinkButton" name="helpButton">

          <Events>

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

          </Events>

        </Component>

      </SubComponents>

    </Container>

  </SubComponents>

</Form>