diff --git a/ECTrainer2/ECTrainerGUI.cpp b/ECTrainer2/ECTrainerGUI.cpp index 1df3f6c..23f4cb1 100644 --- a/ECTrainer2/ECTrainerGUI.cpp +++ b/ECTrainer2/ECTrainerGUI.cpp @@ -107,8 +107,8 @@ // UI描画 cvui::beginColumn(_MainFrame, 10, 100, 140, -1, 10); - cvui::printf(0.6, 0xffffff, "Subject: %s", Ect()->Subject().c_str()); - cvui::printf(0.6, 0xffffff, "Visit : %d", Ect()->Visit()); + cvui::printf(0.6, 0xffffff, "Subj: %s", Ect()->Subject().c_str()); + cvui::printf(0.6, 0xffffff, "Visit: %d", Ect()->Visit()); switch (Ect()->PWorker()->GetAppStatus()) { case APP_STATUS::IDLE: if (cvui::button(140, 30, "CALIBRATION")) { diff --git a/ECTrainer2/Stimulus.cpp b/ECTrainer2/Stimulus.cpp index 411b8cd..b119abc 100644 --- a/ECTrainer2/Stimulus.cpp +++ b/ECTrainer2/Stimulus.cpp @@ -35,7 +35,7 @@ _TotalExpTime = 0; _StimInfoSet.clear(); for (int r = 0; r < table.size(); r++) { - if (table[r].size() != 5 || atoi(table[r][0].c_str()) < 1) continue; + if (table[r].size() != 6 || atoi(table[r][0].c_str()) < 1) continue; StimInfo st; st.type = atoi(table[r][0].c_str()); st.filepath = table[r][1]; @@ -44,11 +44,16 @@ st.dulation = (float)atof(table[r][2].c_str()); st.csvfile = table[r][3]; st.smallmovie = table[r][4]; + st.stimno = atoi(table[r][5].c_str()); if (st.filepath.size() > 0) { _StimInfoSet.push_back(st); _TotalExpTime += st.dulation; } } + if (_StimInfoSet.size() < 1) { + std::cerr << "Config file error : " << configFile << std::endl; + return false; + } return true; } diff --git a/ECTrainer2/Stimulus.h b/ECTrainer2/Stimulus.h index 9b5cb35..0af5450 100644 --- a/ECTrainer2/Stimulus.h +++ b/ECTrainer2/Stimulus.h @@ -22,6 +22,7 @@ std::string smallmovie; // 縮小動画ファイル名 float dulation; // 時間(sec) std::string csvfile; // ターゲット座標ファイル(無い場合は_アンダーバー) + int stimno; // 刺激番号 }; class Stimulus : public BaseProcess diff --git a/ECTrainer2/main.cpp b/ECTrainer2/main.cpp index 73625d3..06dca05 100644 --- a/ECTrainer2/main.cpp +++ b/ECTrainer2/main.cpp @@ -9,11 +9,12 @@ HINSTANCE hInstance = ::GetModuleHandle(NULL); // 基本情報入力 + std::cout << "Starting Eye Communication Trainer" << std::endl << std::endl; std::string subj; - std::cout << "Subject ID: "; + std::cout << "Input subject ID: "; std::cin >> subj; int visit; - std::cout << "Visit No.: "; + std::cout << "Input visit no.: "; std::cin >> visit; ECTrainer ect(hInstance, subj, visit); diff --git a/config/visit00.txt b/config/visit00.txt index 46da9c0..baf6188 100644 --- a/config/visit00.txt +++ b/config/visit00.txt @@ -1,20 +1,20 @@ -���,�h���i�摜�E����j,�񎦎��ԁi�b�j,�^�[�Q�b�g���,�k������ +���,�h���i�摜�E����j,�񎦎��ԁi�b�j,�^�[�Q�b�g���,�k������,�h���ԍ� -3,../images/SoftCalib/SoftCalib1.png,3,../images/SoftCalib/SoftCalib1.csv,_ -3,../images/SoftCalib/SoftCalib2.png,3,../images/SoftCalib/SoftCalib2.csv,_ -3,../images/SoftCalib/SoftCalib3.png,3,../images/SoftCalib/SoftCalib3.csv,_ -3,../images/SoftCalib/SoftCalib4.png,3,../images/SoftCalib/SoftCalib4.csv,_ +3,../images/SoftCalib/SoftCalib1.png,3,../images/SoftCalib/SoftCalib1.csv,_, +3,../images/SoftCalib/SoftCalib2.png,3,../images/SoftCalib/SoftCalib2.csv,_, +3,../images/SoftCalib/SoftCalib3.png,3,../images/SoftCalib/SoftCalib3.csv,_, +3,../images/SoftCalib/SoftCalib4.png,3,../images/SoftCalib/SoftCalib4.csv,_, -1,../images/visit01/visit01_001.png,5,_,_ -2,../movies/visit01/visit01_001.avi,10,../movies/visit01/visit01_001.csv,../movies/visit01/visit01_001vga.avi -1,../images/visit01/visit01_003.png,5,_,_ -2,../movies/visit01/visit01_003.avi,10,../movies/visit01/visit01_003.csv,../movies/visit01/visit01_003vga.avi +1,../images/visit01/visit01_001.png,5,_,_,1 +2,../movies/visit01/visit01_001.avi,10,../movies/visit01/visit01_001.csv,../movies/visit01/visit01_001vga.avi, +1,../images/visit01/visit01_003.png,5,_,_,2 +2,../movies/visit01/visit01_003.avi,10,../movies/visit01/visit01_003.csv,../movies/visit01/visit01_003vga.avi, -2,../movies/break/break01.avi,30,../movies/break/break.csv,../movies/break/break01vga.avi +2,../movies/break/break01.avi,30,../movies/break/break.csv,../movies/break/break01vga.avi, -1,../images/visit01/visit01_006.png,5,_,_ -2,../movies/visit01/visit01_006.avi,10,../movies/visit01/visit01_006.csv,../movies/visit01/visit01_006vga.avi -1,../images/visit01/visit01_008.png,5,_,_ -2,../movies/visit01/visit01_008.avi,10,../movies/visit01/visit01_008.csv,../movies/visit01/visit01_008vga.avi +1,../images/visit01/visit01_006.png,5,_,_,3 +2,../movies/visit01/visit01_006.avi,10,../movies/visit01/visit01_006.csv,../movies/visit01/visit01_006vga.avi, +1,../images/visit01/visit01_008.png,5,_,_,4 +2,../movies/visit01/visit01_008.avi,10,../movies/visit01/visit01_008.csv,../movies/visit01/visit01_008vga.avi, 1,../images/visit01/visit01_end.png,15,_,_