diff --git a/ISCamRecorder/CvCamera.cs b/ISCamRecorder/CvCamera.cs index 012cede..754afad 100644 --- a/ISCamRecorder/CvCamera.cs +++ b/ISCamRecorder/CvCamera.cs @@ -72,11 +72,17 @@ /// 撮影ループ /// public void CameraLoop() { + var rblabel = Cv2.ImRead("RBlabel398x133.png"); + var roi = new Rect(10, 10, rblabel.Width, rblabel.Height); + // 撮影ループ while (_MF.State != STATE.Exit) { using (var frame = new Mat()) { // 撮影 camera.Read(frame); + if (_MF.IsReverseBlood) { + rblabel.CopyTo(new Mat(frame, roi)); + } var bmp = BitmapConverter.ToBitmap(frame); // 録画 diff --git a/ISCamRecorder/ISCamRecorder.csproj b/ISCamRecorder/ISCamRecorder.csproj index f65a6ec..e92f979 100644 --- a/ISCamRecorder/ISCamRecorder.csproj +++ b/ISCamRecorder/ISCamRecorder.csproj @@ -173,6 +173,7 @@ copy $(ProjectDir)*.iccf $(TargetDir) copy $(ProjectDir)media\*.wav $(TargetDir) +copy $(ProjectDir)media\*.png $(TargetDir) if "$(ConfigurationName)" == "Debug" ( copy $(ProjectDir)media\SubjectListForDebug.txt $(TargetDir)SubjectList.txt copy $(ProjectDir)media\*.csv $(TargetDir) diff --git a/ISCamRecorder/Properties/AssemblyInfo.cs b/ISCamRecorder/Properties/AssemblyInfo.cs index 4a742e6..f0a4857 100644 --- a/ISCamRecorder/Properties/AssemblyInfo.cs +++ b/ISCamRecorder/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // すべての値を指定するか、次を使用してビルド番号とリビジョン番号を既定に設定できます // 既定値にすることができます: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.3.0.0")] -[assembly: AssemblyFileVersion("1.3.0.0")] +[assembly: AssemblyVersion("1.4.0.0")] +[assembly: AssemblyFileVersion("1.4.0.0")] diff --git a/ISCamRecorder/SensorData.cs b/ISCamRecorder/SensorData.cs index 1285ea6..2897827 100644 --- a/ISCamRecorder/SensorData.cs +++ b/ISCamRecorder/SensorData.cs @@ -128,7 +128,7 @@ var vmax = wbvals.Max(); var vmin = wbvals.Min(); sat = (int)(1000F * (vmax - vmin) / vmax); - Debug.WriteLine($"{baseline[0]}, {baseline[1]}, {baseline[2]}, {vmax}, {vmin}, {sat}"); + //Debug.WriteLine($"{baseline[0]}, {baseline[1]}, {baseline[2]}, {vmax}, {vmin}, {sat}"); } // プロット追加 diff --git a/ISCamRecorder/media/RBlabel398x133.png b/ISCamRecorder/media/RBlabel398x133.png new file mode 100644 index 0000000..4498b18 --- /dev/null +++ b/ISCamRecorder/media/RBlabel398x133.png Binary files differ