diff --git a/ECTrainer2/BaseProcess.cpp b/ECTrainer2/BaseProcess.cpp index 316b1d3..103e7f0 100644 --- a/ECTrainer2/BaseProcess.cpp +++ b/ECTrainer2/BaseProcess.cpp @@ -1,6 +1,6 @@ #include "BaseProcess.h" #include "ECTrainer.h" -#include "MyWinUtils.h" +//#include "MyWinUtils.h" // �R���X�g���N�^ BaseProcess::BaseProcess(ECTrainer* pEct) @@ -29,18 +29,19 @@ _mainThread = true; _threadID = ::GetCurrentThreadId(); // ���C���X���b�hID�擾 } - mwut::DebugPrintf(_T("Thread %d start\n"), _threadID); + //mwut::DebugPrintf(_T("Thread %d start\n"), _threadID); // ���b�Z�[�W���[�v MSG msg; while (1) { if (::PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE)) { if (!::GetMessage(&msg, NULL, 0, 0)) break; + if (!this->EventProc(msg)) break; + if (_mainThread) { // ���C���X���b�h�ł̓E�C���h�E�v���V�[�W���Ƀf�B�X�p�b�`���� ::TranslateMessage(&msg); ::DispatchMessage(&msg); } - if (!this->EventProc(msg)) break; } else { if (!this->Routine()) break; } @@ -57,7 +58,7 @@ // ���b�Z�[�W���� bool BaseProcess::EventProc(MSG &msg) { - mwut::DebugPrintf(_T("BaseProcess::EventProc Thread %d msg %d\n"), _threadID, msg.message); + //mwut::DebugPrintf(_T("BaseProcess::EventProc Thread %d msg %d\n"), _threadID, msg.message); return true; } diff --git a/ECTrainer2/ECTrainer.cpp b/ECTrainer2/ECTrainer.cpp index dca7d3c..2888865 100644 --- a/ECTrainer2/ECTrainer.cpp +++ b/ECTrainer2/ECTrainer.cpp @@ -47,6 +47,7 @@ for (int i = 0; i < (int)PROC::NUM; i++) { if (i != (int)PROC::GUI) _pProcs[i]->Launch(); } + PWorker()->PostMsg(ECTMSG::SOFTWARE_START); _pProcs[(int)PROC::GUI]->MainLoop(); // �X���b�h�I�� diff --git a/ECTrainer2/ECTrainer.h b/ECTrainer2/ECTrainer.h index 8dccd8e..89b7046 100644 --- a/ECTrainer2/ECTrainer.h +++ b/ECTrainer2/ECTrainer.h @@ -19,6 +19,7 @@ class Worker; class KeepAlive; class Marker; +class DShowMovie; // ���b�Z�[�W�ꗗ enum class ECTMSG { @@ -56,6 +57,7 @@ BaseProcess* _pProcs[(int)PROC::NUM]; Marker* _pMarker; + DShowMovie* _pDSMovie; HINSTANCE _hInstance; public: diff --git a/ECTrainer2/ECTrainerGUI.cpp b/ECTrainer2/ECTrainerGUI.cpp index a763dd2..ed85480 100644 --- a/ECTrainer2/ECTrainerGUI.cpp +++ b/ECTrainer2/ECTrainerGUI.cpp @@ -172,6 +172,9 @@ // �C�x���g���� bool ECTrainerGUI::EventProc(MSG& msg) { switch (msg.message) { + case WM_ACTIVATE: + mwut::DebugPrintf(_T("Event Activate\n"), msg.message); + break; default: //mwut::DebugPrintf(_T("Event %04X\n"), msg.message); break; diff --git a/ECTrainer2/ECTrainerGUI.h b/ECTrainer2/ECTrainerGUI.h index 4fc0c96..9400764 100644 --- a/ECTrainer2/ECTrainerGUI.h +++ b/ECTrainer2/ECTrainerGUI.h @@ -4,7 +4,6 @@ #include "GOpenCV.h" #include -class DShowMovie; class ECTrainer; class ECTrainerGUI : public BaseProcess @@ -19,7 +18,6 @@ const int IMAGE_WIDTH = 640; // ���C���E�C���h�E�ɕ\������摜�� const cv::Size DISP_SIZE = cv::Size(IMAGE_WIDTH, 480); // ���C���E�C���h�E�ɕ\������摜�T�C�Y - DShowMovie* _dsm; cv::Mat _MainFrame; // ���C���E�C���h�E�t���[�� cv::Mat _FullDispBuf; // �h����ʁi�팱�җp�j cv::Mat _Logo; // ���S diff --git a/ECTrainer2/Stimulus.cpp b/ECTrainer2/Stimulus.cpp index 284659c..b04182e 100644 --- a/ECTrainer2/Stimulus.cpp +++ b/ECTrainer2/Stimulus.cpp @@ -10,7 +10,7 @@ , _Movie() { _pMovieObject = new MovieObject; - _Movie.Put(L"STOP"); + //_Movie.Put(L"STOP"); } Stimulus::~Stimulus() { @@ -21,12 +21,14 @@ bool Stimulus::Init() { _Display.Put(cv::imread(OPENING_FILE)); + // �ݒ�t�@�C�����e�[�u���ɓǂݍ��� mwut::STR_TABLE table; if (!mwut::ReadTable(STIM_CONFIG_FILE, table)) { mwut::DebugPrintf(_T("Can't open config file : %d\n"), STIM_CONFIG_FILE.c_str()); return false; } + // �e�[�u������\���̂֊i�[ for (int r = 0; r < table.size(); r++) { if (table[r].size() != 4 || atoi(table[r][0].c_str()) < 1) continue; StimInfo st;