diff --git a/ECTrainer2/ECTrainerGUI.cpp b/ECTrainer2/ECTrainerGUI.cpp index 4f42d5b..f2d79d1 100644 --- a/ECTrainer2/ECTrainerGUI.cpp +++ b/ECTrainer2/ECTrainerGUI.cpp @@ -44,15 +44,18 @@ cv::moveWindow(WIN_DISP, displays[0].left, displays[0].top); cv::resizeWindow(WIN_DISP, cv::Size(640, 400)); cv::setWindowProperty(WIN_DISP, cv::WND_PROP_FULLSCREEN, cv::WINDOW_FULLSCREEN); - _FullDispBuf.create(cv::Size(displays[0].right - displays[0].left, - displays[0].bottom - displays[0].top), CV_8UC3); } else { // �V���O�����j�^�̏ꍇ + cv::moveWindow(WIN_MAIN, displays[0].left + 100, displays[0].top + 100); + + displays[0].right /= 2; + displays[0].bottom /= 2; cv::namedWindow(WIN_DISP, cv::WINDOW_AUTOSIZE); cv::moveWindow(WIN_DISP, displays[0].left, displays[0].top); - _FullDispBuf.create(cv::Size(640, 480), CV_8UC3); - cv::moveWindow(WIN_MAIN, displays[0].left + 100, displays[0].top + 100); } + + _FullDispBuf.create(cv::Size(displays[0].right - displays[0].left, + displays[0].bottom - displays[0].top), CV_8UC3); _hWndMain = ::FindWindowA(NULL, WIN_MAIN.c_str()); _blank = cv::Mat(DISP_SIZE, CV_8UC3, cv::Scalar(0)); _Logo = cv::imread(HEADER_FILE); @@ -186,6 +189,7 @@ ((BaseProcess*)_pEct->PWorker())->PostMsg(ECTMSG::SOFTWARE_END); #endif } + mwut::DebugPrintf(_T("Key '%c'\n"), msg.wParam); break; case (int)ECTMSG::MOVIE_START: diff --git a/ECTrainer2/StimConfig.txt b/ECTrainer2/StimConfig.txt index e86cb7f..f28ca23 100644 --- a/ECTrainer2/StimConfig.txt +++ b/ECTrainer2/StimConfig.txt @@ -1,6 +1,6 @@ -1,../images/CalibCheck1.png,4,_ -1,../images/CalibCheck2.png,4,_ -1,../images/CalibCheck3.png,4,_ -1,../images/CalibCheck4.png,4,_ -1,../images/visit01_004.png,5,_ +1,../images/SoftCalib1.png,4,_ +#1,../images/SoftCalib2.png,4,_ +#1,../images/SoftCalib3.png,4,_ +#1,../images/SoftCalib4.png,4,_ +1,../images/visit01/visit01_004.png,5,_ 2,../movies/visit01_004.avi,30,../movies/visit01_004.csv