From 923a12946fc4ad26d0ce8f7754a0fec077cf68df Mon Sep 17 00:00:00 2001
From: Daniel Schramm <xschramm@fi.muni.cz>
Date: Mon, 27 Sep 2021 22:28:37 +0200
Subject: [PATCH] Initially select all feature points for the weighted
Hausdorff distance
---
.../java/cz/fidentis/analyst/distance/DistanceAction.java | 8 +++++++-
.../java/cz/fidentis/analyst/distance/DistancePanel.java | 2 +-
2 files changed, 8 insertions(+), 2 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 b2f1f80a..8264d4f5 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/distance/DistanceAction.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/distance/DistanceAction.java
@@ -33,7 +33,7 @@ public class DistanceAction extends ControlPanelAction {
* Attributes handling the state
*/
private HausdorffDistancePrioritized visitor = null;
- private final Map<FeaturePointType, Double> featurePointTypes = new HashMap<>();
+ private final Map<FeaturePointType, Double> featurePointTypes;
private String strategy = DistancePanel.STRATEGY_POINT_TO_POINT;
private boolean relativeDist = false;
private boolean weightedDist = false;
@@ -55,6 +55,12 @@ public class DistanceAction extends ControlPanelAction {
super(canvas, topControlPanel);
this.controlPanel = new DistancePanel(this, getSecondaryFeaturePoints().getFeaturePoints());
+ this.featurePointTypes = getSecondaryFeaturePoints().getFeaturePoints()
+ .stream()
+ .collect(Collectors.toMap(
+ FeaturePoint::getFeaturePointType,
+ featurePoint -> DrawableFeaturePoints.DEFAULT_SIZE));
+
// Place control panel to the topControlPanel
topControlPanel.addTab(controlPanel.getName(), controlPanel.getIcon(), controlPanel);
topControlPanel.addChangeListener(e -> {
diff --git a/GUI/src/main/java/cz/fidentis/analyst/distance/DistancePanel.java b/GUI/src/main/java/cz/fidentis/analyst/distance/DistancePanel.java
index 07009dcc..a520e95e 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/distance/DistancePanel.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/distance/DistancePanel.java
@@ -89,7 +89,7 @@ public class DistancePanel extends ControlPanel {
final FeaturePoint featurePoint = featurePoints.get(i);
final JCheckBox checkBox = fpBuilder.addCheckBox(
- false,
+ true,
createListener(action, ACTION_COMMAND_DISTANCE_RECOMPUTE)
);
checkBox.setText(featurePoint.getFeaturePointType().getName());
--
GitLab