From f1ddef1d684d6a5a9ae8a4122026f88c44857c58 Mon Sep 17 00:00:00 2001
From: Daniel Schramm <xschramm@fi.muni.cz>
Date: Wed, 13 Oct 2021 17:32:27 +0200
Subject: [PATCH] Heatmap of weighted HD replaced with a saturated heatmap of
regular HD
---
.../cz/fidentis/analyst/distance/DistanceAction.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/GUI/src/main/java/cz/fidentis/analyst/distance/DistanceAction.java b/GUI/src/main/java/cz/fidentis/analyst/distance/DistanceAction.java
index a4ec60f2..ff1e56b8 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/distance/DistanceAction.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/distance/DistanceAction.java
@@ -142,6 +142,7 @@ public class DistanceAction extends ControlPanelAction {
getSecondaryDrawableFace().setRenderHeatmap(isHeatmapDisplayed());
} else {
weightedFeaturePoints.hide();
+ getSecondaryDrawableFace().clearHeatMapSaturation();
}
});
topControlPanel.setSelectedComponent(controlPanel); // Focus Hausdorff distance panel
@@ -227,20 +228,22 @@ public class DistanceAction extends ControlPanelAction {
setHausdorffDistanceStatistics();
}
- final Map<MeshFacet, List<Double>> heatmap;
switch (heatmapDisplayed) {
case DistancePanel.HEATMAP_HAUSDORFF_DISTANCE:
- heatmap = visitor.getDistances();
+ getSecondaryDrawableFace().clearHeatMapSaturation();
break;
case DistancePanel.HEATMAP_WEIGHTED_HAUSDORFF_DISTANCE:
- heatmap = weightedHausdorffDistance;
+ getSecondaryDrawableFace().setHeatMapSaturation(
+ visitor.getMergedPriorities()
+ .get(getSecondaryDrawableFace().getHumanFace())
+ );
break;
case DistancePanel.HEATMAP_HIDE:
return;
default:
throw new UnsupportedOperationException(heatmapDisplayed);
}
- getSecondaryDrawableFace().setHeatMap(heatmap);
+ getSecondaryDrawableFace().setHeatMap(visitor.getDistances());
}
/**
--
GitLab