From 6c9d6095c9618c17d41c107e322188f40553e195 Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Mon, 26 Dec 2022 19:24:49 +0100 Subject: [PATCH] Move slider spinbox to core lib --- CMakeLists.txt | 2 ++ src/macro-external/opencv/CMakeLists.txt | 2 -- src/macro-external/opencv/macro-condition-video.cpp | 6 +++--- src/macro-external/opencv/macro-condition-video.hpp | 8 ++++---- .../slider-spinbox.cpp} | 12 ++++++------ .../slider-spinbox.hpp} | 8 ++++---- 6 files changed, 19 insertions(+), 19 deletions(-) rename src/{macro-external/opencv/threshold-slider.cpp => utils/slider-spinbox.cpp} (79%) rename src/{macro-external/opencv/threshold-slider.hpp => utils/slider-spinbox.hpp} (65%) diff --git a/CMakeLists.txt b/CMakeLists.txt index ab7ab80c..781a990c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -262,6 +262,8 @@ target_sources( src/utils/screenshot-helper.hpp src/utils/section.cpp src/utils/section.hpp + src/utils/slider-spinbox.cpp + src/utils/slider-spinbox.hpp src/utils/transition-selection.cpp src/utils/transition-selection.hpp src/utils/utility.cpp diff --git a/src/macro-external/opencv/CMakeLists.txt b/src/macro-external/opencv/CMakeLists.txt index 0a6faa54..4273abb3 100644 --- a/src/macro-external/opencv/CMakeLists.txt +++ b/src/macro-external/opencv/CMakeLists.txt @@ -27,8 +27,6 @@ target_sources( paramerter-wrappers.hpp preview-dialog.cpp preview-dialog.hpp - threshold-slider.cpp - threshold-slider.hpp video-selection.cpp video-selection.hpp) diff --git a/src/macro-external/opencv/macro-condition-video.cpp b/src/macro-external/opencv/macro-condition-video.cpp index bc61ec90..2b2951a5 100644 --- a/src/macro-external/opencv/macro-condition-video.cpp +++ b/src/macro-external/opencv/macro-condition-video.cpp @@ -285,7 +285,7 @@ MacroConditionVideoEdit::MacroConditionVideoEdit( _usePatternForChangedCheck(new QCheckBox(obs_module_text( "AdvSceneSwitcher.condition.video.usePatternForChangedCheck"))), _imagePath(new FileSelection()), - _patternThreshold(new ThresholdSlider( + _patternThreshold(new SliderSpinBox( 0., 1., obs_module_text( "AdvSceneSwitcher.condition.video.patternThreshold"), @@ -293,7 +293,7 @@ MacroConditionVideoEdit::MacroConditionVideoEdit( "AdvSceneSwitcher.condition.video.patternThresholdDescription"))), _useAlphaAsMask(new QCheckBox(obs_module_text( "AdvSceneSwitcher.condition.video.patternThresholdUseAlphaAsMask"))), - _brightnessThreshold(new ThresholdSlider( + _brightnessThreshold(new SliderSpinBox( 0., 1., obs_module_text( "AdvSceneSwitcher.condition.video.brightnessThreshold"), @@ -302,7 +302,7 @@ MacroConditionVideoEdit::MacroConditionVideoEdit( _currentBrightness(new QLabel), _modelDataPath(new FileSelection()), _modelPathLayout(new QHBoxLayout), - _objectScaleThreshold(new ThresholdSlider( + _objectScaleThreshold(new SliderSpinBox( 1.1, 5., obs_module_text( "AdvSceneSwitcher.condition.video.objectScaleThreshold"), diff --git a/src/macro-external/opencv/macro-condition-video.hpp b/src/macro-external/opencv/macro-condition-video.hpp index c815a6ca..5260029d 100644 --- a/src/macro-external/opencv/macro-condition-video.hpp +++ b/src/macro-external/opencv/macro-condition-video.hpp @@ -1,6 +1,5 @@ #pragma once #include "opencv-helpers.hpp" -#include "threshold-slider.hpp" #include "area-selection.hpp" #include "video-selection.hpp" #include "preview-dialog.hpp" @@ -9,6 +8,7 @@ #include #include #include +#include #include #include @@ -138,15 +138,15 @@ protected: QCheckBox *_usePatternForChangedCheck; FileSelection *_imagePath; - ThresholdSlider *_patternThreshold; + SliderSpinBox *_patternThreshold; QCheckBox *_useAlphaAsMask; - ThresholdSlider *_brightnessThreshold; + SliderSpinBox *_brightnessThreshold; QLabel *_currentBrightness; FileSelection *_modelDataPath; QHBoxLayout *_modelPathLayout; - ThresholdSlider *_objectScaleThreshold; + SliderSpinBox *_objectScaleThreshold; QHBoxLayout *_neighborsControlLayout; QSpinBox *_minNeighbors; QLabel *_minNeighborsDescription; diff --git a/src/macro-external/opencv/threshold-slider.cpp b/src/utils/slider-spinbox.cpp similarity index 79% rename from src/macro-external/opencv/threshold-slider.cpp rename to src/utils/slider-spinbox.cpp index f5f777b2..7c379c56 100644 --- a/src/macro-external/opencv/threshold-slider.cpp +++ b/src/utils/slider-spinbox.cpp @@ -1,8 +1,8 @@ -#include "threshold-slider.hpp" +#include "slider-spinbox.hpp" #include -ThresholdSlider::ThresholdSlider(double min, double max, const QString &label, - const QString &description, QWidget *parent) +SliderSpinBox::SliderSpinBox(double min, double max, const QString &label, + const QString &description, QWidget *parent) : QWidget(parent), _spinBox(new QDoubleSpinBox()), _slider(new QSlider()) @@ -32,7 +32,7 @@ ThresholdSlider::ThresholdSlider(double min, double max, const QString &label, setLayout(mainLayout); } -void ThresholdSlider::SetDoubleValue(double value) +void SliderSpinBox::SetDoubleValue(double value) { const QSignalBlocker b1(_slider); const QSignalBlocker b2(_spinBox); @@ -40,14 +40,14 @@ void ThresholdSlider::SetDoubleValue(double value) _spinBox->setValue(value); } -void ThresholdSlider::SpinBoxValueChanged(double value) +void SliderSpinBox::SpinBoxValueChanged(double value) { int sliderPos = value * _scale; _slider->setValue(sliderPos); emit DoubleValueChanged(value); } -void ThresholdSlider::SliderValueChanged(int value) +void SliderSpinBox::SliderValueChanged(int value) { double doubleValue = value / _scale; _spinBox->setValue(doubleValue); diff --git a/src/macro-external/opencv/threshold-slider.hpp b/src/utils/slider-spinbox.hpp similarity index 65% rename from src/macro-external/opencv/threshold-slider.hpp rename to src/utils/slider-spinbox.hpp index 3ebb6e77..4d319624 100644 --- a/src/macro-external/opencv/threshold-slider.hpp +++ b/src/utils/slider-spinbox.hpp @@ -4,13 +4,13 @@ #include #include -class ThresholdSlider : public QWidget { +class SliderSpinBox : public QWidget { Q_OBJECT public: - ThresholdSlider(double min = 0., double max = 1., - const QString &label = "threshold", - const QString &description = "", QWidget *parent = 0); + SliderSpinBox(double min = 0., double max = 1., + const QString &label = "threshold", + const QString &description = "", QWidget *parent = 0); void SetDoubleValue(double); public slots: void SliderValueChanged(int value);