From d722a18eb88011c73b38eeb6f4543adb3d632a42 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Fri, 12 Nov 2021 15:56:44 +0100
Subject: [PATCH] Rename "background ratio" -> "learning rate"
---
Src/Config.cpp | 4 ++--
Src/Config.h | 2 +-
Src/Model/TrackerParameter.cpp | 2 +-
Src/Model/TrackerParameter.h | 12 ++++++------
Src/View/TrackerParameterView.cpp | 6 +++---
Src/View/TrackerParameterView.ui | 4 ++--
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/Src/Config.cpp b/Src/Config.cpp
index 4946b5e..ef92d20 100644
--- a/Src/Config.cpp
+++ b/Src/Config.cpp
@@ -56,7 +56,7 @@ void Config::load(QString dir, QString file)
config->SizeDilate = tree.get<int>(globalPrefix+"SizeDilate",config->SizeDilate);
config->MinBlobSize = tree.get<int>(globalPrefix+"MinBlobSize",config->MinBlobSize);
config->MaxBlobSize = tree.get<int>(globalPrefix+"MaxBlobSize",config->MaxBlobSize);
- config->BackgroundRatio = tree.get<double>(globalPrefix+"BackgroundRatio",config->BackgroundRatio);
+ config->LearningRate = tree.get<double>(globalPrefix+"LearningRate",config->LearningRate);
config->DoNetwork = tree.get<int>(globalPrefix+"DoNetwork",config->DoNetwork);
config->NetworkPort = tree.get<int>(globalPrefix+"NetworkPort",config->NetworkPort);
config->DoBackground = tree.get<int>(globalPrefix+"DoBackground",config->DoBackground);
@@ -82,7 +82,7 @@ void Config::save(QString dir, QString file)
tree.put(globalPrefix+"SizeDilate", config->SizeDilate);
tree.put(globalPrefix+"MinBlobSize", config->MinBlobSize);
tree.put(globalPrefix+"MaxBlobSize", config->MaxBlobSize);
- tree.put(globalPrefix+"BackgroundRatio", config->BackgroundRatio);
+ tree.put(globalPrefix+"LearningRate", config->LearningRate);
tree.put(globalPrefix+"DoNetwork", config->DoNetwork);
tree.put(globalPrefix+"NetworkPort", config->NetworkPort);
tree.put(globalPrefix+"DoBackground", config->DoBackground);
diff --git a/Src/Config.h b/Src/Config.h
index db181ca..31f70ba 100644
--- a/Src/Config.h
+++ b/Src/Config.h
@@ -13,7 +13,7 @@ public:
int MinBlobSize = 40;
int MaxBlobSize = 999999;
- double BackgroundRatio = 0.05;
+ double LearningRate = 0.05;
int DoNetwork = false;
int NetworkPort = 54444;
diff --git a/Src/Model/TrackerParameter.cpp b/Src/Model/TrackerParameter.cpp
index 97fe160..b156042 100644
--- a/Src/Model/TrackerParameter.cpp
+++ b/Src/Model/TrackerParameter.cpp
@@ -14,7 +14,7 @@ TrackerParameter::TrackerParameter(QObject *parent) :
_MinBlobSize = _cfg->MinBlobSize;
_MaxBlobSize = _cfg->MaxBlobSize;
- _BackgroundRatio = _cfg->BackgroundRatio;
+ _LearningRate = _cfg->LearningRate;
_doNetwork = _cfg->DoNetwork;
_networkPort = _cfg->NetworkPort;
diff --git a/Src/Model/TrackerParameter.h b/Src/Model/TrackerParameter.h
index 0e4faf0..2a62b7b 100644
--- a/Src/Model/TrackerParameter.h
+++ b/Src/Model/TrackerParameter.h
@@ -28,9 +28,9 @@ public slots:
Q_EMIT notifyView();
};
- double getBackgroundRatio() { return _BackgroundRatio; };
+ double getBackgroundRatio() { return _LearningRate; };
void setBackgroundRatio(double x) {
- _BackgroundRatio = x;
+ _LearningRate = x;
Q_EMIT notifyView();
};
@@ -87,14 +87,14 @@ public slots:
int BinarizationThreshold,
int SizeErode,
int SizeDilate,
- double BackgroundRatio,
+ double LearningRate,
int minBlobSize,
int maxBlobSize)
{
_BinarizationThreshold = BinarizationThreshold;
_SizeErode = SizeErode;
_SizeDilate = SizeDilate;
- _BackgroundRatio = BackgroundRatio;
+ _LearningRate = LearningRate;
_MinBlobSize = minBlobSize;
_MaxBlobSize = maxBlobSize;
_cfg->BinarizationThreshold = BinarizationThreshold;
@@ -102,7 +102,7 @@ public slots:
_cfg->SizeDilate = SizeDilate;
_cfg->MinBlobSize = minBlobSize;
_cfg->MaxBlobSize = maxBlobSize;
- _cfg->BackgroundRatio = BackgroundRatio;
+ _cfg->LearningRate = LearningRate;
Q_EMIT notifyView();
};
@@ -113,7 +113,7 @@ private:
int _BinarizationThreshold;
int _SizeErode;
int _SizeDilate;
- double _BackgroundRatio;
+ double _LearningRate;
int _MinBlobSize;
int _MaxBlobSize;
diff --git a/Src/View/TrackerParameterView.cpp b/Src/View/TrackerParameterView.cpp
index e366d49..a91d559 100644
--- a/Src/View/TrackerParameterView.cpp
+++ b/Src/View/TrackerParameterView.cpp
@@ -26,8 +26,8 @@ TrackerParameterView::TrackerParameterView(QWidget *parent, IController *control
connect(_ui->lineEdit_9MaxBlob, qOverload<int>(&QSpinBox::valueChanged), parameter, &TrackerParameter::setMaxBlobSize);
connect(_ui->lineEdit_9MaxBlob, qOverload<int>(&QSpinBox::valueChanged), this, &TrackerParameterView::parametersChanged);
- connect(_ui->lineEdit_7_bgRatio, qOverload<double>(&QDoubleSpinBox::valueChanged), parameter, &TrackerParameter::setBackgroundRatio);
- connect(_ui->lineEdit_7_bgRatio, qOverload<double>(&QDoubleSpinBox::valueChanged), this, &TrackerParameterView::parametersChanged);
+ connect(_ui->lineEdit_7_learningRate, qOverload<double>(&QDoubleSpinBox::valueChanged), parameter, &TrackerParameter::setBackgroundRatio);
+ connect(_ui->lineEdit_7_learningRate, qOverload<double>(&QDoubleSpinBox::valueChanged), this, &TrackerParameterView::parametersChanged);
}
TrackerParameterView::~TrackerParameterView()
@@ -62,7 +62,7 @@ void TrackerParameterView::getNotified()
_ui->lineEdit_4_SizeDilate->setValue(val);
double dval = parameter->getBackgroundRatio();
- _ui->lineEdit_7_bgRatio->setValue(dval);
+ _ui->lineEdit_7_learningRate->setValue(dval);
val = parameter->getMinBlobSize();
_ui->lineEdit_8_MinBlob->setValue(val);
diff --git a/Src/View/TrackerParameterView.ui b/Src/View/TrackerParameterView.ui
index 71b703d..be7087c 100644
--- a/Src/View/TrackerParameterView.ui
+++ b/Src/View/TrackerParameterView.ui
@@ -99,12 +99,12 @@
<item row="0" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
- <string>Background Ratio:</string>
+ <string>Learning Rate:</string>
</property>
</widget>
</item>
<item row="0" column="1">
- <widget class="QDoubleSpinBox" name="lineEdit_7_bgRatio">
+ <widget class="QDoubleSpinBox" name="lineEdit_7_learningRate">
<property name="minimumSize">
<size>
<width>132</width>
--
GitLab