diff --git a/ECTrainer2/Marker.cpp b/ECTrainer2/Marker.cpp index 0212ce7..d8670cf 100644 --- a/ECTrainer2/Marker.cpp +++ b/ECTrainer2/Marker.cpp @@ -45,29 +45,13 @@ #endif return; } - //cv::Mat marker; - //cv::aruco::drawMarker(_Dictionary, 1, _Size, marker); - //cv::Rect r = cv::Rect(10, 10, _Size, _Size); - //cv::Mat roi(img, r); - //marker.copyTo(roi); - //return; + cv::Mat marker; - - for (int i = 0; i < _Corners.size(); i++) { cv::aruco::drawMarker(_Dictionary, i, _Size, marker); cv::cvtColor(marker, marker, cv::COLOR_GRAY2BGR); - //if (i == 0) imshow("marker", marker); cv::Point p = cv::Point((int)(_Corners[i][0].x * img.cols), (int)(_Corners[i][0].y * img.rows)); - cv::Rect r = cv::Rect(p, cv::Size(_Size, _Size)); - //cv::Rect r = cv::Rect(10, 10, 100, 100); - cv::Mat roi(img, r); - //cv::resize(marker, roi, roi.size()); - //std::cout << roi.size(); - //marker.copyTo() - //roi = marker; + cv::Mat roi(img, cv::Rect(p, cv::Size(_Size, _Size))); marker.copyTo(roi); - cv::circle(img, p, 10, CV_RGB(0, 0, 255), 2); - cv::rectangle(img, r, CV_RGB(0, 255, 0), 2); } } diff --git a/ECTrainer2/Stimulus.cpp b/ECTrainer2/Stimulus.cpp index 83f2d3b..5b4de59 100644 --- a/ECTrainer2/Stimulus.cpp +++ b/ECTrainer2/Stimulus.cpp @@ -38,9 +38,3 @@ _pMarker->DrawMarker(img); _pEct->SetDispBuffer(img); } - -// �摜�Ƀ}�[�J�[��t�^ -void Stimulus::AddMarker(cv::Mat& img) { - cv::Ptr dictionary = cv::aruco::getPredefinedDictionary(cv::aruco::DICT_4X4_50); - cv::aruco::drawMarker(dictionary, 23, 200, img, 1); -} diff --git a/ECTrainer2/Stimulus.h b/ECTrainer2/Stimulus.h index 416dc21..551ba3c 100644 --- a/ECTrainer2/Stimulus.h +++ b/ECTrainer2/Stimulus.h @@ -16,7 +16,6 @@ Stimulus(ECTrainer* pEct, Marker* pMarker); bool Init(); bool MainLoop(); - void AddMarker(cv::Mat& img); void StartCalib(); void StartImage(); void StartMovie();