diff --git a/ECTrainer2/ECTrainerGUI.cpp b/ECTrainer2/ECTrainerGUI.cpp index 1fa0a64..1df3f6c 100644 --- a/ECTrainer2/ECTrainerGUI.cpp +++ b/ECTrainer2/ECTrainerGUI.cpp @@ -107,6 +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()); switch (Ect()->PWorker()->GetAppStatus()) { case APP_STATUS::IDLE: if (cvui::button(140, 30, "CALIBRATION")) { @@ -117,26 +119,15 @@ } break; case APP_STATUS::STIM: - //if (cvui::button(140, 30, "NEXT")) { - // Ect()->PDSMovie()->StopMovie(); - // ((BaseProcess*)Ect()->PWorker())->PostMsg(ECTMSG::EXP_STOP); - //} if (cvui::button(140, 30, "STOP")) { Ect()->PDSMovie()->StopMovie(); Ect()->PWorker()->PostMsg((int)ECTMSG::EXP_STOP); } - //cvui::trackbar(140, &targetSize, (float)0, (float)3.0); - //cvui::checkbox("Show Eyes", &fShowEyesPos); - //cvui::text(fContact ? "Eyes Contact!" : "No contact"); break; } - cvui::printf(0.5, 0xffffff, "Subject: %s", Ect()->Subject().c_str()); - cvui::printf(0.5, 0xffffff, "Visit : %d", Ect()->Visit()); cvui::beginRow(); cvui::printf("Level "); - auto trlevel = Ect()->PWorker()->GetTrainingLevel(); - cvui::counter(&trlevel); - if (trlevel != Ect()->PWorker()->GetTrainingLevel()) Ect()->PWorker()->SetTrainingLevel(trlevel); + cvui::counter(Ect()->PWorker()->TrainingLevelPtr()); cvui::endRow(); cvui::printf("View Gaze %.0f, %.0f", Ect()->PEyeTrack()->GetGazeV().x, Ect()->PEyeTrack()->GetGazeV().y); //cvui::printf("Img Gaze %.2f, %.2f", Ect()->GetGazeI().x, Ect()->GetGazeI().y); diff --git a/ECTrainer2/Worker.h b/ECTrainer2/Worker.h index 27f771d..7ca1536 100644 --- a/ECTrainer2/Worker.h +++ b/ECTrainer2/Worker.h @@ -82,10 +82,8 @@ double GetExpTime(); // トリガーセット void SetTrigger() { ::SetEvent(_Trigger); } - // トレーニングレベル取得 - int GetTrainingLevel() { return _TrainingLevel; } - // トレーニングレベル設定 - void SetTrainingLevel(int lv) { if (lv > 0) _TrainingLevel = lv; } + // トレーニングレベルのポインタ + int* TrainingLevelPtr() { return &_TrainingLevel; } // ずれ記録のクリア void ClearShift() { _ShiftLog.clear(); } };