diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini index 813334ae..d0668668 100644 --- a/data/locale/en-US.ini +++ b/data/locale/en-US.ini @@ -172,7 +172,8 @@ AdvSceneSwitcher.condition.video.entry="{{videoSources}} {{condition}} {{imagePa AdvSceneSwitcher.condition.video.entry.modelPath="Model data (haar cascade classifier): {{modelDataPath}}" AdvSceneSwitcher.condition.video.entry.minNeighbor="Minimum neighbors: {{minNeighbors}}" AdvSceneSwitcher.condition.video.entry.throttle="{{throttleEnable}}Reduce CPU load by performing check only every {{throttleCount}} milliseconds" -AdvSceneSwitcher.condition.video.entry.checkArea="{{checkAreaEnable}}Perform check only in area {{checkArea}} {{selectArea}}" +AdvSceneSwitcher.condition.video.entry.checkAreaEnable="Perform check only in area" +AdvSceneSwitcher.condition.video.entry.checkArea="{{checkAreaEnable}}{{checkArea}}{{selectArea}}" AdvSceneSwitcher.condition.video.minSize="Minimum size:" AdvSceneSwitcher.condition.video.maxSize="Maximum size:" AdvSceneSwitcher.condition.video.selectArea="Select area" diff --git a/data/locale/es-ES.ini b/data/locale/es-ES.ini index e6be935a..93b8649e 100644 --- a/data/locale/es-ES.ini +++ b/data/locale/es-ES.ini @@ -164,6 +164,7 @@ AdvSceneSwitcher.condition.video.entry="{{videoSources}} {{condition}} {{imagePa AdvSceneSwitcher.condition.video.entry.modelPath="Datos del modelo (haar cascade classifier): {{modelDataPath}}" AdvSceneSwitcher.condition.video.entry.minNeighbor="Mínimo de vecinos: {{minNeighbors}}" AdvSceneSwitcher.condition.video.entry.throttle="{{throttleEnable}}Reduzca la carga de la CPU realizando una comprobación solo cada {{throttleCount}} milisegundos" +AdvSceneSwitcher.condition.video.entry.checkAreaEnable="Realizar comprobación solo en el área" AdvSceneSwitcher.condition.video.entry.checkArea="{{checkAreaEnable}}Realizar comprobación solo en el área {{checkArea}} {{selectArea}}" AdvSceneSwitcher.condition.video.minSize="Tamaño mínimo:" AdvSceneSwitcher.condition.video.maxSize="Tamaño máximo:" diff --git a/src/macro-external/opencv/macro-condition-video.cpp b/src/macro-external/opencv/macro-condition-video.cpp index 16b2ec6f..91c78ec2 100644 --- a/src/macro-external/opencv/macro-condition-video.cpp +++ b/src/macro-external/opencv/macro-condition-video.cpp @@ -312,7 +312,8 @@ MacroConditionVideoEdit::MacroConditionVideoEdit( _minSize(new SizeSelection(0, 1024)), _maxSize(new SizeSelection(0, 4096)), _checkAreaControlLayout(new QHBoxLayout), - _checkAreaEnable(new QCheckBox()), + _checkAreaEnable(new QCheckBox(obs_module_text( + "AdvSceneSwitcher.condition.video.entry.checkAreaEnable"))), _checkArea(new AreaSelection(0, 99999)), _selectArea(new QPushButton(obs_module_text( "AdvSceneSwitcher.condition.video.selectArea"))), @@ -437,9 +438,9 @@ MacroConditionVideoEdit::MacroConditionVideoEdit( mainLayout->addLayout(_neighborsControlLayout); mainLayout->addWidget(_minNeighborsDescription); mainLayout->addLayout(_sizeLayout); - mainLayout->addLayout(showMatchLayout); mainLayout->addLayout(_throttleControlLayout); mainLayout->addLayout(_checkAreaControlLayout); + mainLayout->addLayout(showMatchLayout); setLayout(mainLayout); _entryData = entryData; @@ -693,6 +694,9 @@ void MacroConditionVideoEdit::CheckAreaEnableChanged(int value) _entryData->_checkAreaEnable = value; _checkArea->setEnabled(value); _selectArea->setEnabled(value); + _checkArea->setVisible(value); + _selectArea->setVisible(value); + adjustSize(); } void MacroConditionVideoEdit::CheckAreaChanged(advss::Area value) @@ -825,6 +829,8 @@ void MacroConditionVideoEdit::SetWidgetVisibility() needsThrottleControls(_entryData->_condition)); setLayoutVisible(_checkAreaControlLayout, needsAreaControls(_entryData->_condition)); + _checkArea->setVisible(_entryData->_checkAreaEnable); + _selectArea->setVisible(_entryData->_checkAreaEnable); if (_entryData->_condition == VideoCondition::HAS_CHANGED || _entryData->_condition == VideoCondition::HAS_NOT_CHANGED) {