From dbb395b7d4f384765d86f83edc2f8f6098e3a9a2 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Fri, 29 Jul 2022 17:35:21 +0200
Subject: [PATCH] Clarify erosion/dilation parameters
---
Src/Config.cpp | 12 +++++-----
Src/Config.h | 4 ++--
Src/Model/TrackerParameter.cpp | 4 ++--
Src/Model/TrackerParameter.h | 24 +++++++++----------
.../preprocessor/ImagePreProcessor.cpp | 4 ++--
Src/View/TrackerParameterView.cpp | 16 ++++++-------
Src/View/TrackerParameterView.ui | 12 +++++-----
7 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/Src/Config.cpp b/Src/Config.cpp
index 1f06a68..1bcb863 100644
--- a/Src/Config.cpp
+++ b/Src/Config.cpp
@@ -62,10 +62,10 @@ void Config::load(QString dir, QString file)
config->BinarizationThreshold = tree.get<int>(
globalPrefix + "BinarizationThreshold",
config->BinarizationThreshold);
- config->SizeErode = tree.get<int>(globalPrefix + "SizeErode",
- config->SizeErode);
- config->SizeDilate = tree.get<int>(globalPrefix + "SizeDilate",
- config->SizeDilate);
+ config->OpeningErosionSize = tree.get<int>(globalPrefix + "OpeningErosionSize",
+ config->OpeningErosionSize);
+ config->OpeningDilationSize = tree.get<int>(globalPrefix + "OpeningDilationSize",
+ config->OpeningDilationSize);
config->MinBlobSize = tree.get<int>(globalPrefix + "MinBlobSize",
config->MinBlobSize);
config->MaxBlobSize = tree.get<int>(globalPrefix + "MaxBlobSize",
@@ -100,8 +100,8 @@ void Config::save(QString dir, QString file)
config->UseAbsoluteDifference);
tree.put(globalPrefix + "BinarizationThreshold",
config->BinarizationThreshold);
- tree.put(globalPrefix + "SizeErode", config->SizeErode);
- tree.put(globalPrefix + "SizeDilate", config->SizeDilate);
+ tree.put(globalPrefix + "OpeningErosionSize", config->OpeningErosionSize);
+ tree.put(globalPrefix + "OpeningDilationSize", config->OpeningDilationSize);
tree.put(globalPrefix + "MinBlobSize", config->MinBlobSize);
tree.put(globalPrefix + "MaxBlobSize", config->MaxBlobSize);
tree.put(globalPrefix + "LearningRate", config->LearningRate);
diff --git a/Src/Config.h b/Src/Config.h
index 01bb358..c1648c4 100644
--- a/Src/Config.h
+++ b/Src/Config.h
@@ -10,8 +10,8 @@ public:
bool UseAbsoluteDifference = true;
int BinarizationThreshold = 40;
- int SizeErode = 8;
- int SizeDilate = 8;
+ int OpeningErosionSize = 8;
+ int OpeningDilationSize = 8;
int MinBlobSize = 40;
int MaxBlobSize = 999999;
diff --git a/Src/Model/TrackerParameter.cpp b/Src/Model/TrackerParameter.cpp
index 365bc9e..3a47fd5 100644
--- a/Src/Model/TrackerParameter.cpp
+++ b/Src/Model/TrackerParameter.cpp
@@ -9,8 +9,8 @@ TrackerParameter::TrackerParameter(QObject* parent)
_UseAbsoluteDifference = _cfg->UseAbsoluteDifference;
_BinarizationThreshold = _cfg->BinarizationThreshold;
- _SizeErode = _cfg->SizeErode;
- _SizeDilate = _cfg->SizeDilate;
+ _OpeningErosionSize = _cfg->OpeningErosionSize;
+ _OpeningDilationSize = _cfg->OpeningDilationSize;
_MinBlobSize = _cfg->MinBlobSize;
_MaxBlobSize = _cfg->MaxBlobSize;
diff --git a/Src/Model/TrackerParameter.h b/Src/Model/TrackerParameter.h
index 4ee2f4b..64a268e 100644
--- a/Src/Model/TrackerParameter.h
+++ b/Src/Model/TrackerParameter.h
@@ -27,25 +27,25 @@ public slots:
void setBinarizationThreshold(int x);
int getBinarizationThreshold();
- int getSizeErode()
+ int getOpeningErosionSize()
{
- return _SizeErode;
+ return _OpeningErosionSize;
};
- void setSizeErode(int x)
+ void setOpeningErosionSize(int x)
{
- _SizeErode = x;
- _cfg->SizeErode = x;
+ _OpeningErosionSize = x;
+ _cfg->OpeningErosionSize = x;
Q_EMIT notifyView();
};
- int getSizeDilate()
+ int getOpeningDilationSize()
{
- return _SizeDilate;
+ return _OpeningDilationSize;
};
- void setSizeDilate(int x)
+ void setOpeningDilationSize(int x)
{
- _SizeDilate = x;
- _cfg->SizeDilate = x;
+ _OpeningDilationSize = x;
+ _cfg->OpeningDilationSize = x;
Q_EMIT notifyView();
};
@@ -150,8 +150,8 @@ private:
bool _UseAbsoluteDifference;
int _BinarizationThreshold;
- int _SizeErode;
- int _SizeDilate;
+ int _OpeningErosionSize;
+ int _OpeningDilationSize;
double _LearningRate;
int _MinBlobSize;
int _MaxBlobSize;
diff --git a/Src/Model/TrackingAlgorithm/imageProcessor/preprocessor/ImagePreProcessor.cpp b/Src/Model/TrackingAlgorithm/imageProcessor/preprocessor/ImagePreProcessor.cpp
index ab6d428..f9ff90d 100644
--- a/Src/Model/TrackingAlgorithm/imageProcessor/preprocessor/ImagePreProcessor.cpp
+++ b/Src/Model/TrackingAlgorithm/imageProcessor/preprocessor/ImagePreProcessor.cpp
@@ -48,7 +48,7 @@ cv::Mat ImagePreProcessor::erode(cv::Mat& image)
{
cv::Mat erodedImage;
cv::Mat erodeKernel;
- int sizeErode = m_TrackingParameter->getSizeErode();
+ int sizeErode = m_TrackingParameter->getOpeningErosionSize();
if (sizeErode > 0) {
erodeKernel = cv::getStructuringElement(
cv::MORPH_CROSS,
@@ -65,7 +65,7 @@ cv::Mat ImagePreProcessor::dilate(cv::Mat& image)
{
cv::Mat dilatedImage;
cv::Mat dilateKernel;
- int sizeDilate = m_TrackingParameter->getSizeDilate();
+ int sizeDilate = m_TrackingParameter->getOpeningDilationSize();
if (sizeDilate > 0) {
dilateKernel = cv::getStructuringElement(
cv::MORPH_RECT,
diff --git a/Src/View/TrackerParameterView.cpp b/Src/View/TrackerParameterView.cpp
index 8099a85..6d910e8 100644
--- a/Src/View/TrackerParameterView.cpp
+++ b/Src/View/TrackerParameterView.cpp
@@ -25,20 +25,20 @@ TrackerParameterView::TrackerParameterView(QWidget* parent,
this,
&TrackerParameterView::initSubtractorSpecificUI);
- connect(_ui->lineEdit_3_SizeErode,
+ connect(_ui->lineEdit_3_OpeningErosionSize,
qOverload<int>(&QSpinBox::valueChanged),
parameter,
- &TrackerParameter::setSizeErode);
- connect(_ui->lineEdit_3_SizeErode,
+ &TrackerParameter::setOpeningErosionSize);
+ connect(_ui->lineEdit_3_OpeningErosionSize,
qOverload<int>(&QSpinBox::valueChanged),
this,
&TrackerParameterView::parametersChanged);
- connect(_ui->lineEdit_4_SizeDilate,
+ connect(_ui->lineEdit_4_OpeningDilationSize,
qOverload<int>(&QSpinBox::valueChanged),
parameter,
- &TrackerParameter::setSizeDilate);
- connect(_ui->lineEdit_4_SizeDilate,
+ &TrackerParameter::setOpeningDilationSize);
+ connect(_ui->lineEdit_4_OpeningDilationSize,
qOverload<int>(&QSpinBox::valueChanged),
this,
&TrackerParameterView::parametersChanged);
@@ -159,9 +159,9 @@ void TrackerParameterView::getNotified()
_binThres->setValue(parameter->getBinarizationThreshold());
}
- _ui->lineEdit_3_SizeErode->setValue(parameter->getSizeErode());
+ _ui->lineEdit_3_OpeningErosionSize->setValue(parameter->getOpeningErosionSize());
- _ui->lineEdit_4_SizeDilate->setValue(parameter->getSizeDilate());
+ _ui->lineEdit_4_OpeningDilationSize->setValue(parameter->getOpeningDilationSize());
_ui->lineEdit_8_MinBlob->setValue(parameter->getMinBlobSize());
diff --git a/Src/View/TrackerParameterView.ui b/Src/View/TrackerParameterView.ui
index 59e548d..f1d3dfd 100644
--- a/Src/View/TrackerParameterView.ui
+++ b/Src/View/TrackerParameterView.ui
@@ -231,12 +231,12 @@
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
- <string>Size Erosion:</string>
+ <string>Opening erosion size:</string>
</property>
</widget>
</item>
<item row="0" column="1">
- <widget class="QSpinBox" name="lineEdit_3_SizeErode">
+ <widget class="QSpinBox" name="lineEdit_3_OpeningErosionSize">
<property name="minimumSize">
<size>
<width>132</width>
@@ -244,19 +244,19 @@
</size>
</property>
<property name="toolTip">
- <string>Set the erosion size</string>
+ <string>Set the opening erosion size</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
- <string>Size Dilation:</string>
+ <string>Opening dilation size:</string>
</property>
</widget>
</item>
<item row="1" column="1">
- <widget class="QSpinBox" name="lineEdit_4_SizeDilate">
+ <widget class="QSpinBox" name="lineEdit_4_OpeningDilationSize">
<property name="minimumSize">
<size>
<width>132</width>
@@ -264,7 +264,7 @@
</size>
</property>
<property name="toolTip">
- <string>Set the dilation size</string>
+ <string>Set the opening dilation size</string>
</property>
</widget>
</item>
--
GitLab