fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 10:00:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复adb模式，宽屏下的缩放错误问题

Browse Source
This commit is contained in:
MistEO
2021-08-25 13:05:28 +08:00
parent d3fa659413
commit 3be4eee85b
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
MeoAssistance/AbstractTask.cpp
View File

@@ -59,16 +59,19 @@ cv::Mat AbstractTask::get_format_image(bool raw)
double cur_ratio = static_cast<double>(raw_image.cols) / static_cast<double>(raw_image.rows);
cv::Size scale_size;
double scale = 0.0;
if (cur_ratio >= DefaultRatio) { // 说明是宽屏或默认16:9，按照高度计算缩放
scale_size = cv::Size(cur_ratio * Configer::DefaultWindowWidth, Configer::DefaultWindowHeight);
if (cur_ratio >= DefaultRatio // 说明是宽屏或默认16:9，按照高度计算缩放
|| std::fabs(cur_ratio - DefaultRatio) < DoubleDiff)
{
scale_size = cv::Size(cur_ratio * Configer::DefaultWindowHeight, Configer::DefaultWindowHeight);
scale = static_cast<double>(raw_image.rows) / static_cast<double>(Configer::DefaultWindowHeight);
}
else { // 否则可能是偏正方形的屏幕，按宽度计算
scale_size = cv::Size(Configer::DefaultWindowWidth, cur_ratio * Configer::DefaultWindowHeight);
else
{ // 否则可能是偏正方形的屏幕，按宽度计算
scale_size = cv::Size(Configer::DefaultWindowWidth, Configer::DefaultWindowWidth / cur_ratio);
scale = static_cast<double>(raw_image.cols) / static_cast<double>(Configer::DefaultWindowWidth);
}
cv::Mat resize_mat;
cv::resize(raw_image, resize_mat, cv::Size(Configer::DefaultWindowWidth, Configer::DefaultWindowHeight));
cv::resize(raw_image, resize_mat, scale_size);
set_control_scale(scale);
return resize_mat;