From 3c1ce002171ea640dcb97ef06e8a3c331dcd6228 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sun, 7 Jul 2024 18:39:46 +0800 Subject: [PATCH] update --- CMakeLists.txt | 3 ++- a8k_optalgo | 2 +- src/tab/a8k_opt_tab.cpp | 11 +++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 629f6f9..8f5fc85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,8 @@ include_directories(./) include_directories(src/basic) include_directories(libzqt) -add_compile_options(-Wall ) + +add_compile_options(-Wall -DBUILD_IN_QT) set(PROJECT_SOURCES libzqt/logger.cpp libzqt/zqthread.cpp diff --git a/a8k_optalgo b/a8k_optalgo index 65fed4d..2c8bd88 160000 --- a/a8k_optalgo +++ b/a8k_optalgo @@ -1 +1 @@ -Subproject commit 65fed4d521197fa45d33f68c4407829624a8a34a +Subproject commit 2c8bd882007bd8a5b4cd28de1c6144072634dd9d diff --git a/src/tab/a8k_opt_tab.cpp b/src/tab/a8k_opt_tab.cpp index fb9051f..f1badd7 100644 --- a/src/tab/a8k_opt_tab.cpp +++ b/src/tab/a8k_opt_tab.cpp @@ -320,12 +320,23 @@ void A8kOptTab::construct(QTabWidget *fathertab) { } plot2d->show(); + ISHOW_RAW("---------------------------------scan result---------------------------------"); ISHOW_RAW("Peak,find,pos,startpos,endpos"); ISHOW_RAW("040,%s,%d,%d,%d,%f", result.pin040.find_peak ? "true" : "false", result.pin040.peak_pos, result.pin040.peak_start_pos, result.pin040.peak_end_pos, result.pin040.area); ISHOW_RAW("080,%s,%d,%d,%d,%f", result.pin080.find_peak ? "true" : "false", result.pin080.peak_pos, result.pin080.peak_start_pos, result.pin080.peak_end_pos, result.pin080.area); ISHOW_RAW("120,%s,%d,%d,%d,%f", result.pin120.find_peak ? "true" : "false", result.pin120.peak_pos, result.pin120.peak_start_pos, result.pin120.peak_end_pos, result.pin120.area); ISHOW_RAW("160,%s,%d,%d,%d,%f", result.pin160.find_peak ? "true" : "false", result.pin160.peak_pos, result.pin160.peak_start_pos, result.pin160.peak_end_pos, result.pin160.area); ISHOW_RAW("200,%s,%d,%d,%d,%f", result.pin200.find_peak ? "true" : "false", result.pin200.peak_pos, result.pin200.peak_start_pos, result.pin200.peak_end_pos, result.pin200.area); + ISHOW_RAW("---------------------------------scan data---------------------------------"); + ISHOW_RAW("index,data"); + for (int i = 0; i < result.displayData.size(); i++) { + ISHOW_RAW("%d,%f", i, result.displayData[i]); + } + ISHOW_RAW("---------------------------------scan raw---------------------------------"); + ISHOW_RAW("index,data"); + for (int i = 0; i < result.input.size(); i++) { + ISHOW_RAW("%d,%f", i, result.input[i]); + } }); // });