From 20f888b99190b89d12e59d05f1326605986f508c Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Sun, 30 Apr 2023 00:35:25 +0200 Subject: [PATCH] Fix video condition parameters not saving due to namespace changes --- src/macro-external/video/macro-condition-video.cpp | 12 ++++++------ src/macro-external/video/macro-condition-video.hpp | 6 +++--- src/macro-external/video/paramerter-wrappers.hpp | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/macro-external/video/macro-condition-video.cpp b/src/macro-external/video/macro-condition-video.cpp index 2caed1f6..4cf8cc96 100644 --- a/src/macro-external/video/macro-condition-video.cpp +++ b/src/macro-external/video/macro-condition-video.cpp @@ -506,14 +506,14 @@ MacroConditionVideoEdit::MacroConditionVideoEdit( const NumberVariable &))); QWidget::connect(_minNeighbors, SIGNAL(valueChanged(int)), this, SLOT(MinNeighborsChanged(int))); - QWidget::connect(_minSize, SIGNAL(SizeChanged(advss::Size)), this, - SLOT(MinSizeChanged(advss::Size))); - QWidget::connect(_maxSize, SIGNAL(SizeChanged(advss::Size)), this, - SLOT(MaxSizeChanged(advss::Size))); + QWidget::connect(_minSize, SIGNAL(SizeChanged(Size)), this, + SLOT(MinSizeChanged(Size))); + QWidget::connect(_maxSize, SIGNAL(SizeChanged(Size)), this, + SLOT(MaxSizeChanged(Size))); QWidget::connect(_checkAreaEnable, SIGNAL(stateChanged(int)), this, SLOT(CheckAreaEnableChanged(int))); - QWidget::connect(_checkArea, SIGNAL(AreaChanged(advss::Area)), this, - SLOT(CheckAreaChanged(advss::Area))); + QWidget::connect(_checkArea, SIGNAL(AreaChanged(Area)), this, + SLOT(CheckAreaChanged(Area))); QWidget::connect(_modelDataPath, SIGNAL(PathChanged(const QString &)), this, SLOT(ModelPathChanged(const QString &))); QWidget::connect(_throttleEnable, SIGNAL(stateChanged(int)), this, diff --git a/src/macro-external/video/macro-condition-video.hpp b/src/macro-external/video/macro-condition-video.hpp index abb85e43..3480bd93 100644 --- a/src/macro-external/video/macro-condition-video.hpp +++ b/src/macro-external/video/macro-condition-video.hpp @@ -122,8 +122,8 @@ private slots: void ModelPathChanged(const QString &text); void ObjectScaleThresholdChanged(const NumberVariable &); void MinNeighborsChanged(int value); - void MinSizeChanged(advss::Size value); - void MaxSizeChanged(advss::Size value); + void MinSizeChanged(Size value); + void MaxSizeChanged(Size value); void SelectColorClicked(); void MatchTextChanged(); @@ -131,7 +131,7 @@ private slots: void PageSegModeChanged(int); void CheckAreaEnableChanged(int value); - void CheckAreaChanged(advss::Area); + void CheckAreaChanged(Area); void CheckAreaChanged(QRect area); void SelectAreaClicked(); diff --git a/src/macro-external/video/paramerter-wrappers.hpp b/src/macro-external/video/paramerter-wrappers.hpp index f62a5fdd..8720aa1f 100644 --- a/src/macro-external/video/paramerter-wrappers.hpp +++ b/src/macro-external/video/paramerter-wrappers.hpp @@ -73,8 +73,8 @@ public: cv::CascadeClassifier cascade; NumberVariable scaleFactor = defaultScaleFactor; int minNeighbors = minMinNeighbors; - advss::Size minSize{0, 0}; - advss::Size maxSize{0, 0}; + Size minSize{0, 0}; + Size maxSize{0, 0}; }; class OCRParameters { @@ -115,4 +115,4 @@ public: } // namespace advss -Q_DECLARE_METATYPE(advss::OCRParameters) \ No newline at end of file +Q_DECLARE_METATYPE(advss::OCRParameters)