diff --git a/ECTrainer2/SceneCamera.cpp b/ECTrainer2/SceneCamera.cpp index cf38a6b..34a95e3 100644 --- a/ECTrainer2/SceneCamera.cpp +++ b/ECTrainer2/SceneCamera.cpp @@ -43,7 +43,7 @@ cv::Mat scene; _SceneCam >> scene; _buffer.Put(scene); - ::Sleep(15); // Tobiiのシーンカメラは25FPS 15msのSleepは問題ない + ::Sleep(1); // Tobiiのシーンカメラは25FPS 15msのSleepは問題ない return true; } diff --git a/config/visit00.txt b/config/visit00.txt index 946aef2..1f1c492 100644 --- a/config/visit00.txt +++ b/config/visit00.txt @@ -1,4 +1,4 @@ -���,�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,_,_ @@ -6,9 +6,16 @@ 3,../images/SoftCalib/SoftCalib4.png,3,../images/SoftCalib/SoftCalib4.csv,_,_ 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/visit01/visit01_001.avi,30,../movies/visit01/visit01_001.csv,../movies/visit01/visit01_001vga.avi,_ +1,../images/visit01/visit01_002.png,5,_,_,2 +2,../movies/visit01/visit01_002.avi,30,../movies/visit01/visit01_002.csv,../movies/visit01/visit01_002vga.avi,_ + +2,../movies/break/break01_20.avi,20,../movies/break/break01.csv,../movies/break/break01_20vga.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,_ diff --git a/config/visit01.txt b/config/visit01.txt index 543fbe9..55379da 100644 --- a/config/visit01.txt +++ b/config/visit01.txt @@ -1,4 +1,4 @@ -���,�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,_,_ @@ -49,7 +49,7 @@ 1,../images/visit01/visit01_020.png,5,_,_,20 2,../movies/visit01/visit01_020.avi,30,../movies/visit01/visit01_020.csv,../movies/visit01/visit01_020vga.avi,_ -2,../movies/break/break02_30.avi,30,../movies/break/break01.csv,../movies/break/break02_30vga.avi._ +2,../movies/break/break02_30.avi,30,../movies/break/break01.csv,../movies/break/break02_30vga.avi,_ 1,../images/visit01/visit01_021.png,5,_,_,21 2,../movies/visit01/visit01_021.avi,30,../movies/visit01/visit01_021.csv,../movies/visit01/visit01_021vga.avi,_ diff --git a/config/visit02.txt b/config/visit02.txt index 69f6e51..5bb58cd 100644 --- a/config/visit02.txt +++ b/config/visit02.txt @@ -1,4 +1,4 @@ -���,�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,_,_ @@ -49,7 +49,7 @@ 1,../images/visit02/visit02_020.png,5,_,_,20 2,../movies/visit02/visit02_020.avi,30,../movies/visit02/visit02_020.csv,../movies/visit02/visit02_020vga.avi,_ -2,../movies/break/break02_30.avi,30,../movies/break/break01.csv,../movies/break/break02_30vga.avi._ +2,../movies/break/break02_30.avi,30,../movies/break/break01.csv,../movies/break/break02_30vga.avi,_ 1,../images/visit02/visit02_021.png,5,_,_,21 2,../movies/visit02/visit02_021.avi,30,../movies/visit02/visit02_021.csv,../movies/visit02/visit02_021vga.avi,_ diff --git a/config/visit03.txt b/config/visit03.txt index 43bfa29..e57f1b1 100644 --- a/config/visit03.txt +++ b/config/visit03.txt @@ -1,4 +1,4 @@ -���,�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,_,_ @@ -49,7 +49,7 @@ 1,../images/visit03/visit03_020.png,5,_,_,20 2,../movies/visit03/visit03_020.avi,30,../movies/visit03/visit03_020.csv,../movies/visit03/visit03_020vga.avi,_ -2,../movies/break/break02_30.avi,30,../movies/break/break01.csv,../movies/break/break02_30vga.avi._ +2,../movies/break/break02_30.avi,30,../movies/break/break01.csv,../movies/break/break02_30vga.avi,_ 1,../images/visit03/visit03_021.png,5,_,_,21 2,../movies/visit03/visit03_021.avi,30,../movies/visit03/visit03_021.csv,../movies/visit03/visit03_021vga.avi,_ diff --git a/config/visit04.txt b/config/visit04.txt index 67a47de..3d118bf 100644 --- a/config/visit04.txt +++ b/config/visit04.txt @@ -1,4 +1,4 @@ -���,�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,_,_ @@ -49,7 +49,7 @@ 1,../images/visit04/visit04_020.png,5,_,_,20 2,../movies/visit04/visit04_020.avi,30,../movies/visit04/visit04_020.csv,../movies/visit04/visit04_020vga.avi,_ -2,../movies/break/break02_30.avi,30,../movies/break/break01.csv,../movies/break/break02_30vga.avi._ +2,../movies/break/break02_30.avi,30,../movies/break/break01.csv,../movies/break/break02_30vga.avi,_ 1,../images/visit04/visit04_021.png,5,_,_,21 2,../movies/visit04/visit04_021.avi,30,../movies/visit04/visit04_021.csv,../movies/visit04/visit04_021vga.avi,_ diff --git a/config/visit05.txt b/config/visit05.txt index b2b6acc..1eac9a2 100644 --- a/config/visit05.txt +++ b/config/visit05.txt @@ -1,4 +1,4 @@ -���,�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,_,_ @@ -49,7 +49,7 @@ 1,../images/visit05/visit05_020.png,5,_,_,20 2,../movies/visit05/visit05_020.avi,30,../movies/visit05/visit05_020.csv,../movies/visit05/visit05_020vga.avi,_ -2,../movies/break/break02_30.avi,30,../movies/break/break01.csv,../movies/break/break02_30vga.avi._ +2,../movies/break/break02_30.avi,30,../movies/break/break01.csv,../movies/break/break02_30vga.avi,_ 1,../images/visit05/visit05_021.png,5,_,_,21 2,../movies/visit05/visit05_021.avi,30,../movies/visit05/visit05_021.csv,../movies/visit05/visit05_021vga.avi,_ diff --git a/config/visit06.txt b/config/visit06.txt index 8802662..b726a52 100644 --- a/config/visit06.txt +++ b/config/visit06.txt @@ -1,4 +1,4 @@ -���,�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,_,_ @@ -49,7 +49,7 @@ 1,../images/visit06/visit06_020.png,5,_,_,20 2,../movies/visit06/visit06_020.avi,30,../movies/visit06/visit06_020.csv,../movies/visit06/visit06_020vga.avi,_ -2,../movies/break/break02_30.avi,30,../movies/break/break01.csv,../movies/break/break02_30vga.avi._ +2,../movies/break/break02_30.avi,30,../movies/break/break01.csv,../movies/break/break02_30vga.avi,_ 1,../images/visit06/visit06_021.png,5,_,_,21 2,../movies/visit06/visit06_021.avi,30,../movies/visit06/visit06_021.csv,../movies/visit06/visit06_021vga.avi,_ diff --git a/config/visit07.txt b/config/visit07.txt index 4d3204c..1a2cfd8 100644 --- a/config/visit07.txt +++ b/config/visit07.txt @@ -1,4 +1,4 @@ -���,�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,_,_ @@ -49,7 +49,7 @@ 1,../images/visit07/visit07_020.png,5,_,_,20 2,../movies/visit07/visit07_020.avi,30,../movies/visit07/visit07_020.csv,../movies/visit07/visit07_020vga.avi,_ -2,../movies/break/break02_30.avi,30,../movies/break/break01.csv,../movies/break/break02_30vga.avi._ +2,../movies/break/break02_30.avi,30,../movies/break/break01.csv,../movies/break/break02_30vga.avi,_ 1,../images/visit07/visit07_021.png,5,_,_,21 2,../movies/visit07/visit07_021.avi,30,../movies/visit07/visit07_021.csv,../movies/visit07/visit07_021vga.avi,_ diff --git a/config/visit08.txt b/config/visit08.txt index df22dd4..cbb2cdd 100644 --- a/config/visit08.txt +++ b/config/visit08.txt @@ -1,4 +1,4 @@ -���,�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,_,_ @@ -49,7 +49,7 @@ 1,../images/visit08/visit08_020.png,5,_,_,20 2,../movies/visit08/visit08_020.avi,30,../movies/visit08/visit08_020.csv,../movies/visit08/visit08_020vga.avi,_ -2,../movies/break/break02_30.avi,30,../movies/break/break01.csv,../movies/break/break02_30vga.avi._ +2,../movies/break/break02_30.avi,30,../movies/break/break01.csv,../movies/break/break02_30vga.avi,_ 1,../images/visit08/visit08_021.png,5,_,_,21 2,../movies/visit08/visit08_021.avi,30,../movies/visit08/visit08_021.csv,../movies/visit08/visit08_021vga.avi,_