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

Merge branch 'PopupMenu-bug-fix' into 'master' 

Fix RowHeader PopupMenu not showing

See merge request grp-fidentis/analyst2!429
parents 59311cb3 9ce586ca

GUI/src/main/java/cz/fidentis/analyst/gui/elements/heatmaptable/PopupMenu.java

+16 −7
Original line number Diff line number Diff line
@@ -73,15 +73,24 @@ public class PopupMenu { 
    }



    private boolean isAverageFaceSelected(int clickedRow, int clickedCol) {

        boolean averageFaceSelected = false;

        if (clickedRow >= 0) {

            String rowFace = ((FaceNodeInfo) heatmap.getRowHeaderTable().getValueAt(clickedRow, 0)).getClusteredFaceName();

            List<FaceReference> firstFace = task.getFaces().stream().filter(x -> x.getName().equals(rowFace)).toList();

            if (firstFace.getFirst().isAverageFace()) {

            return true;

                averageFaceSelected = true;

            }

        }

        

        if (clickedCol >= 0) {

            String columnFace = ((FaceNodeInfo) heatmap.getTable().getColumnModel().getColumn(clickedCol).getHeaderValue()).getClusteredFaceName();

            List<FaceReference> secondFace = task.getFaces().stream().filter(x -> x.getName().equals(columnFace)).toList();

        return secondFace.getFirst().isAverageFace();

            if (secondFace.getFirst().isAverageFace()) {

                averageFaceSelected = true;

            }

        }



        return averageFaceSelected;

    }



    public JPopupMenu getPopupMenu() {

GUI/src/main/java/cz/fidentis/analyst/gui/task/batch/distanceheatmap/BatchDistanceHeatmapPanel.java

+0 −5
Original line number Diff line number Diff line
@@ -448,11 +448,6 @@ public class BatchDistanceHeatmapPanel extends ControlPanel implements BatchCont 
        }

    }



//    private void enableSortingButtonsIfDisabled() {

//        jButton5.setEnabled(true);

//        jButton6.setEnabled(true);

//    }



    private boolean isResetHeatmapButtonEnabled() {

        return jButton4.isEnabled();

    }