diff --git a/ECTrainer2/ECTrainerGUI.cpp b/ECTrainer2/ECTrainerGUI.cpp index b17c87f..de8d601 100644 --- a/ECTrainer2/ECTrainerGUI.cpp +++ b/ECTrainer2/ECTrainerGUI.cpp @@ -146,7 +146,9 @@ 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); + cvui::printf("S %.1f,%.1f(%.1f)", + Ect()->PWorker()->GetShift().x, Ect()->PWorker()->GetShift().y, + Ect()->PWorker()->GetSoftCalibError()); cvui::text(Ect()->PMarker()->IsDetected() ? "AR Markers OK" : "AR Markers NG"); cvui::printf("Battery %d %%", Ect()->PTobiiREST()->GetBatteryLevel()); if (Ect()->PStimulus()->GetStimNo() >= 0) { diff --git a/ECTrainer2/Worker.h b/ECTrainer2/Worker.h index 46576db..51832b0 100644 --- a/ECTrainer2/Worker.h +++ b/ECTrainer2/Worker.h @@ -100,4 +100,8 @@ bool IsCalibCheckOK(); // 注視点のずれのリセット void ResetShift() { _Shift = cv::Point2f(0, 0); } + // 注視点のずれを取得 + cv::Point2f GetShift() { return _Shift; } + // キャリブレーション検証時の誤差を取得 + float GetSoftCalibError() { return _Error; } }; diff --git a/EcomAnalysis/Form1.cs b/EcomAnalysis/Form1.cs index 246592f..a7314e8 100644 --- a/EcomAnalysis/Form1.cs +++ b/EcomAnalysis/Form1.cs @@ -74,6 +74,7 @@ var scDat = new SceneData(); scDat.SceneNo = sc; var dat = _Data.Where(s => s.SceneNo == sc); + if (dat.Count() == 0) continue; scDat.FBCount = dat.Count(c => c.Feedback > 0); scDat.ECTime = dat.Count(c => c.Feedback == 5) * 15.0 + dat.OrderBy(s => s.SceneTime).Select(s=>s.ContactTime).Last(); @@ -83,7 +84,7 @@ var items = new string[] { $"{scDat.SceneNo}", $"{scDat.FBCount} 回", - $"{scDat.ECTime:0.00} ms", $"{scDat.Latency:0.00} ms", + $"{scDat.ECTime:0.00} 秒", $"{scDat.Latency:0.00} 秒", $"{scDat.MeanRR:0.00} bpm" }; listView1.Items.Add(new ListViewItem(items)); allData.Add(scDat); @@ -92,8 +93,8 @@ listView1.Items.Add(new ListViewItem(new string[] { "平均", $"{allData.Select(s=>s.FBCount).Average():0.00} 回", - $"{allData.Select(s=>s.ECTime).Average():0.00} ms", - $"{allData.Select(s=>s.Latency).Average():0.00} ms", + $"{allData.Select(s=>s.ECTime).Average():0.00} 秒", + $"{allData.Select(s=>s.Latency).Average():0.00} 秒", $"{allData.Select(s=>s.MeanRR).Average():0.00} bpm" })); }