diff --git a/.gitignore b/.gitignore index 29b334a..5b7bb7e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ ECTrainer2/Log*.txt ECTrainer2/Log*.csv images/ +ECTrainer2/snapshot.jpg diff --git a/ECTrainer2/ECTrainer.h b/ECTrainer2/ECTrainer.h index 995e8e2..963f2d5 100644 --- a/ECTrainer2/ECTrainer.h +++ b/ECTrainer2/ECTrainer.h @@ -6,8 +6,8 @@ #define TOBII_ADDR "192.168.71.50" //#define TOBII_ADDR "192.168.23.156" -#define EYEDEVICE_GLASS2 -//#define EYEDEVICE_NONE +//#define EYEDEVICE_GLASS2 +#define EYEDEVICE_NONE class BaseProcess; class ECTrainerGUI; diff --git a/ECTrainer2/StimConfig.txt b/ECTrainer2/StimConfig.txt index 684ac73..ffef1d7 100644 --- a/ECTrainer2/StimConfig.txt +++ b/ECTrainer2/StimConfig.txt @@ -1,65 +1,65 @@ ���,�h���i�摜�E����j,�񎦎��ԁi�b�j,�^�[�Q�b�g���,�k������ -1,../images/SoftCalib1.png,2,_,_ -1,../images/SoftCalib2.png,2,_,_ -1,../images/SoftCalib3.png,2,_,_ -1,../images/SoftCalib4.png,2,_,_ +1,../images/SoftCalib1.png,5,_,_ +1,../images/SoftCalib2.png,5,_,_ +1,../images/SoftCalib3.png,5,_,_ +1,../images/SoftCalib4.png,5,_,_ -1,../images/visit01/visit01_003.png,2,_,_ -2,../movies/visit01_003.avi,6,../movies/visit01_003.csv,../movies/visit01_003vga.avi -1,../images/visit01/visit01_004.png,2,_,_ -2,../movies/visit01_004.avi,6,../movies/visit01_004.csv,../movies/visit01_004vga.avi -1,../images/visit01/visit01_005.png,2,_,_ -2,../movies/visit01_005.avi,6,../movies/visit01_005.csv,../movies/visit01_005vga.avi -1,../images/visit01/visit01_006.png,2,_,_ -2,../movies/visit01_006.avi,6,../movies/visit01_006.csv,../movies/visit01_006vga.avi -1,../images/visit01/visit01_007.png,2,_,_ -2,../movies/visit01_007.avi,6,../movies/visit01_007.csv,../movies/visit01_007vga.avi -1,../images/visit01/visit01_008.png,2,_,_ -2,../movies/visit01_008.avi,6,../movies/visit01_008.csv,../movies/visit01_008vga.avi +1,../images/visit01/visit01_003.png,5,_,_ +2,../movies/visit01_003.avi,30,../movies/visit01_003.csv,../movies/visit01_003vga.avi +1,../images/visit01/visit01_004.png,5,_,_ +2,../movies/visit01_004.avi,30,../movies/visit01_004.csv,../movies/visit01_004vga.avi +1,../images/visit01/visit01_005.png,5,_,_ +2,../movies/visit01_005.avi,30,../movies/visit01_005.csv,../movies/visit01_005vga.avi +1,../images/visit01/visit01_006.png,5,_,_ +2,../movies/visit01_006.avi,30,../movies/visit01_006.csv,../movies/visit01_006vga.avi +1,../images/visit01/visit01_007.png,5,_,_ +2,../movies/visit01_007.avi,30,../movies/visit01_007.csv,../movies/visit01_007vga.avi +1,../images/visit01/visit01_008.png,5,_,_ +2,../movies/visit01_008.avi,30,../movies/visit01_008.csv,../movies/visit01_008vga.avi -1,../images/visit01/visit01_break1.png,3,_,_ +1,../images/visit01/visit01_break1.png,15,_,_ -1,../images/visit01/visit01_009.png,2,_,_ -2,../movies/visit01_009.avi,6,../movies/visit01_007.csv,../movies/visit01_009vga.avi -1,../images/visit01/visit01_013.png,2,_,_ -2,../movies/visit01_013.avi,6,../movies/visit01_013.csv,../movies/visit01_013vga.avi -1,../images/visit01/visit01_014.png,2,_,_ -2,../movies/visit01_014.avi,6,../movies/visit01_014.csv,../movies/visit01_014vga.avi -1,../images/visit01/visit01_015.png,2,_,_ -2,../movies/visit01_015.avi,6,../movies/visit01_015.csv,../movies/visit01_015vga.avi -1,../images/visit01/visit01_016.png,2,_,_ -2,../movies/visit01_016.avi,6,../movies/visit01_016.csv,../movies/visit01_016vga.avi -1,../images/visit01/visit01_017.png,2,_,_ -2,../movies/visit01_017.avi,6,../movies/visit01_017.csv,../movies/visit01_017vga.avi +1,../images/visit01/visit01_009.png,5,_,_ +2,../movies/visit01_009.avi,30,../movies/visit01_007.csv,../movies/visit01_009vga.avi +1,../images/visit01/visit01_013.png,5,_,_ +2,../movies/visit01_013.avi,30,../movies/visit01_013.csv,../movies/visit01_013vga.avi +1,../images/visit01/visit01_014.png,5,_,_ +2,../movies/visit01_014.avi,30,../movies/visit01_014.csv,../movies/visit01_014vga.avi +1,../images/visit01/visit01_015.png,5,_,_ +2,../movies/visit01_015.avi,30,../movies/visit01_015.csv,../movies/visit01_015vga.avi +1,../images/visit01/visit01_016.png,5,_,_ +2,../movies/visit01_016.avi,30,../movies/visit01_016.csv,../movies/visit01_016vga.avi +1,../images/visit01/visit01_017.png,5,_,_ +2,../movies/visit01_017.avi,30,../movies/visit01_017.csv,../movies/visit01_017vga.avi -1,../images/visit01/visit01_break2.png,3,_,_ +1,../images/visit01/visit01_break2.png,15,_,_ -1,../images/visit01/visit01_018.png,2,_,_ -2,../movies/visit01_018.avi,6,../movies/visit01_018.csv,../movies/visit01_018vga.avi -1,../images/visit01/visit01_019.png,2,_,_ -2,../movies/visit01_019.avi,6,../movies/visit01_019.csv,../movies/visit01_019vga.avi -1,../images/visit01/visit01_023.png,2,_,_ -2,../movies/visit01_023.avi,6,../movies/visit01_023.csv,../movies/visit01_023vga.avi -1,../images/visit01/visit01_024.png,2,_,_ -2,../movies/visit01_024.avi,6,../movies/visit01_024.csv,../movies/visit01_024vga.avi -1,../images/visit01/visit01_025.png,2,_,_ -2,../movies/visit01_025.avi,6,../movies/visit01_025.csv,../movies/visit01_025vga.avi -1,../images/visit01/visit01_033.png,2,_,_ -2,../movies/visit01_033.avi,6,../movies/visit01_033.csv,../movies/visit01_033vga.avi +1,../images/visit01/visit01_018.png,5,_,_ +2,../movies/visit01_018.avi,30,../movies/visit01_018.csv,../movies/visit01_018vga.avi +1,../images/visit01/visit01_019.png,5,_,_ +2,../movies/visit01_019.avi,30,../movies/visit01_019.csv,../movies/visit01_019vga.avi +1,../images/visit01/visit01_023.png,5,_,_ +2,../movies/visit01_023.avi,30,../movies/visit01_023.csv,../movies/visit01_023vga.avi +1,../images/visit01/visit01_024.png,5,_,_ +2,../movies/visit01_024.avi,30,../movies/visit01_024.csv,../movies/visit01_024vga.avi +1,../images/visit01/visit01_025.png,5,_,_ +2,../movies/visit01_025.avi,30,../movies/visit01_025.csv,../movies/visit01_025vga.avi +1,../images/visit01/visit01_033.png,5,_,_ +2,../movies/visit01_033.avi,30,../movies/visit01_033.csv,../movies/visit01_033vga.avi -1,../images/visit01/visit01_break3.png,3,_,_ +1,../images/visit01/visit01_break3.png,15,_,_ -1,../images/visit01/visit01_034.png,2,_,_ -2,../movies/visit01_034.avi,6,../movies/visit01_034.csv,../movies/visit01_034vga.avi -1,../images/visit01/visit01_035.png,2,_,_ -2,../movies/visit01_035.avi,6,../movies/visit01_035.csv,../movies/visit01_035vga.avi -1,../images/visit01/visit01_036.png,2,_,_ -2,../movies/visit01_036.avi,6,../movies/visit01_036.csv,../movies/visit01_036vga.avi -1,../images/visit01/visit01_037.png,2,_,_ -2,../movies/visit01_037.avi,6,../movies/visit01_037.csv,../movies/visit01_037vga.avi -1,../images/visit01/visit01_038.png,2,_,_ -2,../movies/visit01_038.avi,6,../movies/visit01_038.csv,../movies/visit01_038vga.avi -1,../images/visit01/visit01_039.png,2,_,_ -2,../movies/visit01_039.avi,6,../movies/visit01_039.csv,../movies/visit01_039vga.avi +1,../images/visit01/visit01_034.png,5,_,_ +2,../movies/visit01_034.avi,30,../movies/visit01_034.csv,../movies/visit01_034vga.avi +1,../images/visit01/visit01_035.png,5,_,_ +2,../movies/visit01_035.avi,30,../movies/visit01_035.csv,../movies/visit01_035vga.avi +1,../images/visit01/visit01_036.png,5,_,_ +2,../movies/visit01_036.avi,30,../movies/visit01_036.csv,../movies/visit01_036vga.avi +1,../images/visit01/visit01_037.png,5,_,_ +2,../movies/visit01_037.avi,30,../movies/visit01_037.csv,../movies/visit01_037vga.avi +1,../images/visit01/visit01_038.png,5,_,_ +2,../movies/visit01_038.avi,30,../movies/visit01_038.csv,../movies/visit01_038vga.avi +1,../images/visit01/visit01_039.png,5,_,_ +2,../movies/visit01_039.avi,30,../movies/visit01_039.csv,../movies/visit01_039vga.avi -1,../images/visit01/visit01_end.png,3,_,_ +1,../images/visit01/visit01_end.png,15,_,_ diff --git "a/docs/EyeCommunicationTrainer_v1\344\275\277\347\224\250\346\211\213\351\240\206\346\233\270.docx" "b/docs/EyeCommunicationTrainer_v1\344\275\277\347\224\250\346\211\213\351\240\206\346\233\270.docx" new file mode 100644 index 0000000..c9fab94 --- /dev/null +++ "b/docs/EyeCommunicationTrainer_v1\344\275\277\347\224\250\346\211\213\351\240\206\346\233\270.docx" Binary files differ diff --git "a/docs/\343\203\241\343\203\203\343\202\273\343\203\274\343\202\270\345\233\263.xlsx" "b/docs/\343\203\241\343\203\203\343\202\273\343\203\274\343\202\270\345\233\263.xlsx" new file mode 100644 index 0000000..d760099 --- /dev/null +++ "b/docs/\343\203\241\343\203\203\343\202\273\343\203\274\343\202\270\345\233\263.xlsx" Binary files differ diff --git "a/docs/\350\252\254\346\230\216\345\233\263.pptx" "b/docs/\350\252\254\346\230\216\345\233\263.pptx" new file mode 100644 index 0000000..0b2fe02 --- /dev/null +++ "b/docs/\350\252\254\346\230\216\345\233\263.pptx" Binary files differ diff --git "a/\343\203\241\343\203\203\343\202\273\343\203\274\343\202\270\345\233\263.xlsx" "b/\343\203\241\343\203\203\343\202\273\343\203\274\343\202\270\345\233\263.xlsx" deleted file mode 100644 index f76264d..0000000 --- "a/\343\203\241\343\203\203\343\202\273\343\203\274\343\202\270\345\233\263.xlsx" +++ /dev/null Binary files differ