Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

デバッグログの出力内容の調整 #111

Merged
merged 2 commits into from
Nov 20, 2023
Merged

デバッグログの出力内容の調整 #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc0a0ca
[fix] 認識時に同じイベントを複数回ログに書き込む問題を修正
Nov 4, 2023
b8bdfc4
[fix] ログの関数名を__FUNCTION__に置き換え
Nov 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions UmaUmaChecker/src/Recognizer/CombineImage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ void CombineImage::StartCapture()
BarLength = 0;
Error = L"";

LOG_DEBUG << L"[CombineImage::StartCapture] ウマ娘詳細結合開始";
LOG_DEBUG << L"[" << __FUNCTION__ << L"] ウマ娘詳細結合開始";

while (IsCapture) {
auto start = std::chrono::system_clock::now();
Expand All @@ -71,7 +71,7 @@ void CombineImage::StartCapture()
msec = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() - start).count();
}

LOG_DEBUG << L"[CombineImage::StartCapture] ウマ娘詳細結合終了";
LOG_DEBUG << L"["<< __FUNCTION__ << L"] ウマ娘詳細結合終了";

IsCapture = false;
TemplateImage = cv::Mat();
Expand All @@ -87,12 +87,12 @@ void CombineImage::EndCapture()
IsManualStop = true;
//_EndCapture();

LOG_DEBUG << L"[CombineImage::EndCapture] 結合停止";
LOG_DEBUG << L"[" << __FUNCTION__ << L"] 結合停止";
}

bool CombineImage::Combine()
{
LOG_DEBUG << L"[CombineImage::Combine] 結合数=" << Images.size();
LOG_DEBUG << L"[" << __FUNCTION__ << L"] 結合数=" << Images.size();

if (Images.size() == 0) return false;

Expand Down Expand Up @@ -147,7 +147,7 @@ void CombineImage::Capture()

Gdiplus::Bitmap* image = UmaWindowCapture::ScreenShot();
if (!image) {
LOG_DEBUG << L"[CombineImage::Capture] 停止, !image";
LOG_DEBUG << L"[" << __FUNCTION__ << L"] 停止, !image";
_EndCapture();
return;
}
Expand All @@ -167,7 +167,7 @@ void CombineImage::ProcessDetection(const cv::Mat& mat)

if (!IsScanStarted) {
if (!scroll.IsValid()) {
LOG_DEBUG << L"[CombineImage::Capture] 停止, !scroll.IsValid()";
LOG_DEBUG << L"[" << __FUNCTION__ << L"] 停止, !scroll.IsValid()";
_EndCapture(L"スクロールバーを検出できませんでした。");
return;
}
Expand All @@ -181,13 +181,13 @@ void CombineImage::ProcessDetection(const cv::Mat& mat)
}

if (!PrevImage.empty() && (PrevImage.size().width != mat.size().width || PrevImage.size().height != mat.size().height)) {
LOG_DEBUG << L"[CombineImage::Capture] 停止, !PrevImage.empty() && (PrevImage.size().width != mat.size().width || PrevImage.size().height != mat.size().height)";
LOG_DEBUG << L"[" << __FUNCTION__ << L"] 停止, !PrevImage.empty() && (PrevImage.size().width != mat.size().width || PrevImage.size().height != mat.size().height)";
_EndCapture(L"ウィンドウサイズが変更されました。");
return;
}
else if (BarLength > 0 && std::abs(BarLength - scroll.GetBarLength()) > 1) {
if (IsManualStop) {
LOG_DEBUG << L"[CombineImage::Capture] 停止, BarLength > 0 && std::abs(BarLength - scroll.GetBarLength()) > 1) && IsManualStop";
LOG_DEBUG << L"[" << __FUNCTION__ << L"] 停止, BarLength > 0 && std::abs(BarLength - scroll.GetBarLength()) > 1) && IsManualStop";
_EndCapture(L"スクロールバーの大きさが変わっています。");
}
return;
Expand Down Expand Up @@ -216,7 +216,7 @@ void CombineImage::ProcessDetection(const cv::Mat& mat)

double RoundedMaxVal = std::round(MaxVal * 100.0) / 100.0;

LOG_DEBUG << L"[CombineImage::Capture] matchTemplate結果: MaxVal=" << MaxVal << L", RoundedMaxVal=" << RoundedMaxVal << L", IsLast=" << IsLast << L", IsOutOfRange=" << (MaxPt.y < RecognizePoint.y);
LOG_DEBUG << L"[" << __FUNCTION__ << L"] matchTemplate結果: MaxVal=" << MaxVal << L", RoundedMaxVal=" << RoundedMaxVal << L", IsLast=" << IsLast << L", IsOutOfRange=" << (MaxPt.y < RecognizePoint.y);

// 検出されなかったとき
if (IsLast || RoundedMaxVal < 0.90 || MaxPt.y < RecognizePoint.y) {
Expand Down Expand Up @@ -261,7 +261,7 @@ void CombineImage::ProcessDetection(const cv::Mat& mat)
}

if (IsManualStop) {
LOG_DEBUG << L"[CombineImage::Capture] 停止, IsManualStop";
LOG_DEBUG << L"[" << __FUNCTION__ << L"] 停止, IsManualStop";
_EndCapture();
}
}
Expand Down
6 changes: 3 additions & 3 deletions UmaUmaChecker/src/Recognizer/Uma.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ EventSource* Uma::DetectEvent(const cv::Mat& srcImg, uint64* pHash, std::vector<

auto event = GetCardEvent(events);
if (!event) event = GetEventByBottomOption(srcImg);
if (config->EnableDebug && event) LOG_DEBUG << L"[サポートカード] イベント名: " << event->Name;
if (config->EnableDebug && event && event.get() != CurrentEvent) LOG_DEBUG << L"[サポートカード] イベント名: " << event->Name;
return event.get();
}

Expand All @@ -568,7 +568,7 @@ EventSource* Uma::DetectEvent(const cv::Mat& srcImg, uint64* pHash, std::vector<

auto event = GetCharaEvent(events);
if (!event) event = GetCharaEventByBottomOption(srcImg);
if (config->EnableDebug && event) LOG_DEBUG << L"[育成ウマ娘] イベント名: " << event->Name;
if (config->EnableDebug && event && event.get() != CurrentEvent) LOG_DEBUG << L"[育成ウマ娘] イベント名: " << event->Name;
return event.get();
}
}
Expand All @@ -581,7 +581,7 @@ EventSource* Uma::DetectEvent(const cv::Mat& srcImg, uint64* pHash, std::vector<

auto event = GetScenarioEvent(events);
if (!event) event = GetScenarioEventByBottomOption(srcImg);
if (config->EnableDebug && event) LOG_DEBUG << L"[シナリオイベント] イベント名: " << event->Name;
if (config->EnableDebug && event && event.get() != CurrentEvent) LOG_DEBUG << L"[シナリオイベント] イベント名: " << event->Name;
return event.get();
}

Expand Down
Loading