diff --git a/ECTrainer1/ECTrainer1Dlg.cpp b/ECTrainer1/ECTrainer1Dlg.cpp index de0d709..8349ae9 100644 --- a/ECTrainer1/ECTrainer1Dlg.cpp +++ b/ECTrainer1/ECTrainer1Dlg.cpp @@ -15,8 +15,18 @@ #define new DEBUG_NEW #endif -const char* FILE_LIST[] = { "man2", "manL1", "manL2", "manL1", "manL3", "manL1" , "manL4", "manL1", - "manS1", "manS2", "manS1", "manS3", "manS1" , "manS4", "manS1" }; +const char* FILE_LIST[] = { + //"man2", "manL1", "manL2", "manL1", "manL3", "manL1" , "manL4", "manL1", + //"manS1", "manS2", "manS1", "manS3", "manS1" , "manS4", "manS1" + "instruction", + "circle1", "circle2", "circle3", + "break", + "face_I_L_E","face_I_L_M","face_F_L_E","face_F_L_M","face_M_L_E","face_M_L_M", + "break", + "face_I_M_E","face_I_M_M","face_F_M_E","face_F_M_M", + "break", + "face_F_S_E","face_F_S_M","face_F_SS_E","face_F_SS_M", +}; const int NUM_FILES = sizeof(FILE_LIST) / sizeof(char*); diff --git a/ECTrainer1/ECTrainer1Dlg.h b/ECTrainer1/ECTrainer1Dlg.h index 30a8253..d1217a2 100644 --- a/ECTrainer1/ECTrainer1Dlg.h +++ b/ECTrainer1/ECTrainer1Dlg.h @@ -31,7 +31,7 @@ static const int PORT = 49152; //The port on which to listen for incoming data static const int BUFLEN = 512; //Max length of buffer static const int FRAMES = 2; - static const int DURATION = 3000; // Time for one image (ms) + static const int DURATION = 5000; // Time for one image (ms) static const int NOLOG = 1000; // Time for no logging (ms) static const int DATA_MEAN_SIZE = 10; diff --git a/RESTtest/RESTtest.cpp b/RESTtest/RESTtest.cpp index 91b1200..1ca3f5a 100644 --- a/RESTtest/RESTtest.cpp +++ b/RESTtest/RESTtest.cpp @@ -152,6 +152,7 @@ } else { std::wcout << _T("Calibration successful.") << std::endl; } + getchar(); } catch (const std::exception & e) { diff --git a/images/break.PNG b/images/break.PNG new file mode 100644 index 0000000..3366812 --- /dev/null +++ b/images/break.PNG Binary files differ diff --git a/images/circle1.PNG b/images/circle1.PNG new file mode 100644 index 0000000..dc81eb8 --- /dev/null +++ b/images/circle1.PNG Binary files differ diff --git a/images/circle2.PNG b/images/circle2.PNG new file mode 100644 index 0000000..85e2f63 --- /dev/null +++ b/images/circle2.PNG Binary files differ diff --git a/images/circle3.PNG b/images/circle3.PNG new file mode 100644 index 0000000..a04a05a --- /dev/null +++ b/images/circle3.PNG Binary files differ diff --git a/images/face_F_L_E.PNG b/images/face_F_L_E.PNG new file mode 100644 index 0000000..2cff64f --- /dev/null +++ b/images/face_F_L_E.PNG Binary files differ diff --git a/images/face_F_L_M.PNG b/images/face_F_L_M.PNG new file mode 100644 index 0000000..cfb8d66 --- /dev/null +++ b/images/face_F_L_M.PNG Binary files differ diff --git a/images/face_F_M_E.PNG b/images/face_F_M_E.PNG new file mode 100644 index 0000000..213238e --- /dev/null +++ b/images/face_F_M_E.PNG Binary files differ diff --git a/images/face_F_M_M.PNG b/images/face_F_M_M.PNG new file mode 100644 index 0000000..a774dad --- /dev/null +++ b/images/face_F_M_M.PNG Binary files differ diff --git a/images/face_F_SS_E.PNG b/images/face_F_SS_E.PNG new file mode 100644 index 0000000..fde0327 --- /dev/null +++ b/images/face_F_SS_E.PNG Binary files differ diff --git a/images/face_F_SS_M.PNG b/images/face_F_SS_M.PNG new file mode 100644 index 0000000..1cc4ff7 --- /dev/null +++ b/images/face_F_SS_M.PNG Binary files differ diff --git a/images/face_F_S_E.PNG b/images/face_F_S_E.PNG new file mode 100644 index 0000000..3a7817b --- /dev/null +++ b/images/face_F_S_E.PNG Binary files differ diff --git a/images/face_F_S_M.PNG b/images/face_F_S_M.PNG new file mode 100644 index 0000000..5a056b4 --- /dev/null +++ b/images/face_F_S_M.PNG Binary files differ diff --git a/images/face_I_L_E.PNG b/images/face_I_L_E.PNG new file mode 100644 index 0000000..2a9d95d --- /dev/null +++ b/images/face_I_L_E.PNG Binary files differ diff --git a/images/face_I_L_M.PNG b/images/face_I_L_M.PNG new file mode 100644 index 0000000..f0f29c3 --- /dev/null +++ b/images/face_I_L_M.PNG Binary files differ diff --git a/images/face_I_M_E.PNG b/images/face_I_M_E.PNG new file mode 100644 index 0000000..7724211 --- /dev/null +++ b/images/face_I_M_E.PNG Binary files differ diff --git a/images/face_I_M_M.PNG b/images/face_I_M_M.PNG new file mode 100644 index 0000000..dab26a9 --- /dev/null +++ b/images/face_I_M_M.PNG Binary files differ diff --git a/images/face_M_L_E.PNG b/images/face_M_L_E.PNG new file mode 100644 index 0000000..1a031c5 --- /dev/null +++ b/images/face_M_L_E.PNG Binary files differ diff --git a/images/face_M_L_M.PNG b/images/face_M_L_M.PNG new file mode 100644 index 0000000..87090d9 --- /dev/null +++ b/images/face_M_L_M.PNG Binary files differ diff --git a/images/instruction.png b/images/instruction.png new file mode 100644 index 0000000..4deec0c --- /dev/null +++ b/images/instruction.png Binary files differ