Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-08-12 12:18:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix OCR value not being assigned to variables with enabled regex

Browse Source
This commit is contained in:
WarmUpTill
2023-08-15 13:55:44 +02:00
committed by WarmUpTill
parent 1a8c894ddf
commit a2d0a7f544
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/macro-external/video/macro-condition-video.cpp
View File

@@ -315,19 +315,17 @@ bool MacroConditionVideo::CheckOCR()
auto text = RunOCR(_ocrParameters.GetOCR(), _screenshotData.image,
_ocrParameters.color, _ocrParameters.colorThreshold);
if (_ocrParameters.regex.Enabled()) {
auto expr = _ocrParameters.regex.GetRegularExpression(
_ocrParameters.text);
if (!expr.isValid()) {
return false;
}
auto match = expr.match(QString::fromStdString(text));
return match.hasMatch();
}
SetVariableValue(text);
return text == std::string(_ocrParameters.text);
if (!_ocrParameters.regex.Enabled()) {
return text == std::string(_ocrParameters.text);
}
auto expr =
_ocrParameters.regex.GetRegularExpression(_ocrParameters.text);
if (!expr.isValid()) {
return false;
}
auto match = expr.match(QString::fromStdString(text));
return match.hasMatch();
}
bool MacroConditionVideo::CheckColor()