Commit c374cbc1 authored by Jan Smid's avatar Jan Smid
Browse files

[multi_face_heatmap] Fixes Clustering tab heatmap

parent 052d263d

GUI/src/main/java/cz/fidentis/analyst/gui/task/batch/distance/BatchDistanceAction.java

+9 −6
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ import java.io.BufferedWriter; 
import java.io.File;

import java.io.FileWriter;

import java.io.IOException;

import java.util.ArrayList;

import java.util.List;



/**

 * Action listener for batch registration phase.
@@ -32,8 +34,8 @@ public class BatchDistanceAction extends ControlPanelAction<BatchDistancePanel> 
    private double[][] distances;

    private double[][] deviations;



    private BatchDistanceListener faceListener;

    private BatchDistanceListener distanceListener;

    private final List<BatchDistanceListener> faceListeners = new ArrayList<>();

    private final List<BatchDistanceListener> distanceListeners = new ArrayList<>();



    /**

     * Constructor.
@@ -67,7 +69,7 @@ public class BatchDistanceAction extends ControlPanelAction<BatchDistancePanel> 
     * @param l listener

     */

    public void addDistanceListener(BatchDistanceListener l) {

        distanceListener = l;

        distanceListeners.add(l);

    }



    /**
@@ -76,7 +78,7 @@ public class BatchDistanceAction extends ControlPanelAction<BatchDistancePanel> 
     * @param l listener

     */

    public void addRegistrationListener(BatchDistanceListener l) {

        faceListener = l;

        faceListeners.add(l);

    }



    @Override
@@ -85,7 +87,7 @@ public class BatchDistanceAction extends ControlPanelAction<BatchDistancePanel> 
        switch (action) {

            case BatchDistancePanel.ACTION_COMMAND_COMPUTE_SIMILARITY:

                computeSimilarity();

                distanceListener.symmetryCompleted(distances);

                distanceListeners.forEach(l -> l.symmetryCompleted(distances));

                break;

            case BatchDistancePanel.ACTION_COMMAND_SHOW_SELECTED_FACE:

                showSelectedFace();
@@ -110,7 +112,8 @@ public class BatchDistanceAction extends ControlPanelAction<BatchDistancePanel> 
     */

    public void showFace() {

        showSelectedFace();

        faceListener.registrationCompleted(getControlPanel().getSelectedFace());

        StoredHumanFace face = getControlPanel().getSelectedFace();

        faceListeners.forEach(l -> l.registrationCompleted(face));

    }



    private void computeSimilarity() {

GUI/src/main/java/cz/fidentis/analyst/gui/task/batch/visualization/BatchVisualizationAction.java

+0 −1
Original line number Diff line number Diff line
@@ -286,7 +286,6 @@ public class BatchVisualizationAction 
            scene.setFaceAsSecondary(secondarySlot);

        }



        scene.setDefaultColors();

        getCanvas().getCamera().zoomToFit(scene);

    }