diff --git a/TIASshot/CameraBase.cs b/TIASshot/CameraBase.cs index db3286b..a3edfc9 100644 --- a/TIASshot/CameraBase.cs +++ b/TIASshot/CameraBase.cs @@ -112,14 +112,14 @@ var filename = Config.GetString("ImageRgbFile"); filename = filename.Replace("0000", $"{idx + 1:0000}"); - var px1 = img.At(0, 0); - Debug.WriteLine($"img (0,0)={px1[0]}, {px1[1]}, {px1[2]}" ); + //var px1 = img.At(0, 0); + //Debug.WriteLine($"img (0,0)={px1[0]}, {px1[1]}, {px1[2]}" ); Cv2.ImWrite(Path.Combine(_saveFolder, filename), img); using (var converted = ConvertImage(img, _convRGB2SRGB)) { - var px2 = converted.At(0, 0); - Debug.WriteLine($"conv(0,0)= {px2[0]}, {px2[1]}, {px2[2]}"); + //var px2 = converted.At(0, 0); + //Debug.WriteLine($"conv(0,0)= {px2[0]}, {px2[1]}, {px2[2]}"); filename = Config.GetString("ImageSrgbFile"); filename = filename.Replace("0000", $"{idx + 1:0000}"); Cv2.ImWrite(Path.Combine(_saveFolder, filename), converted); @@ -200,7 +200,6 @@ // チャートマスク作成 _chartMasks.Clear(); var roiSize = ptsPict.Count < 8 ? 60 : 80; - //_tccRois = img.Clone(); for (int i = 0; i < 24; i++) { var row = i % 6; var col = i / 6; @@ -212,7 +211,6 @@ var maskF = new Mat(img.Size(), MatType.CV_8U); Cv2.WarpPerspective(mask, maskF, matH, maskF.Size()); _chartMasks.Add(maskF); - //_tccRois.SetTo(new Scalar(0, 200, 0), maskF); } } @@ -347,7 +345,7 @@ /// private Mat ExtendMat(Mat src) { if (src.Cols * src.Channels() != 3) return src; - var dst = new Mat(src.Rows, 10, MatType.CV_64FC1); + var dst = new Mat(src.Rows, 17, MatType.CV_64FC1); Parallel.For(0, src.Rows, row => { double b = (src.Cols == 1 ? src.At(row, 0)[0] : src.At(row, 0)); double g = (src.Cols == 1 ? src.At(row, 0)[1] : src.At(row, 1)); @@ -361,14 +359,14 @@ dst.At(row, 6) = r * r; dst.At(row, 7) = g * g; dst.At(row, 8) = b * b; - //dst.At(row, 9) = r * r * b; - //dst.At(row, 10) = r * r * g; - //dst.At(row, 11) = g * g * r; - //dst.At(row, 12) = g * g * b; - //dst.At(row, 13) = b * b * r; - //dst.At(row, 14) = b * b * g; - //dst.At(row, 15) = r * g * b; - dst.At(row, 9) = 1.0; + dst.At(row, 9) = r * r * b; + dst.At(row, 10) = r * r * g; + dst.At(row, 11) = g * g * r; + dst.At(row, 12) = g * g * b; + dst.At(row, 13) = b * b * r; + dst.At(row, 14) = b * b * g; + dst.At(row, 15) = r * g * b; + dst.At(row, 16) = 1.0; }); return dst; } diff --git "a/\350\211\262\345\244\211\346\217\233 XYZ2sRGB 17\346\254\241\345\205\203\345\244\211\346\217\233.xlsx" "b/\350\211\262\345\244\211\346\217\233 XYZ2sRGB 17\346\254\241\345\205\203\345\244\211\346\217\233.xlsx" new file mode 100644 index 0000000..cf50957 --- /dev/null +++ "b/\350\211\262\345\244\211\346\217\233 XYZ2sRGB 17\346\254\241\345\205\203\345\244\211\346\217\233.xlsx" Binary files differ