diff --git a/TIASshot/Lucam.cs b/TIASshot/Lucam.cs index f6541b4..e2f67fa 100644 --- a/TIASshot/Lucam.cs +++ b/TIASshot/Lucam.cs @@ -28,9 +28,9 @@ /// internal class Lucam { - // Todo: TCC逆向き検出 - // Todo: XYZ 変換行列算出 - // Todo: 色補正 前後の保存 + // Todo: RGB->XYZ 変換行列算出 + // Todo: SRGB->XYZ 変換行列算出 + // 光源の輝度設定 public string DeviceName { get; private set; } = "Unknown"; public string SerialNumber { get; private set; } @@ -213,18 +213,25 @@ var ptsPict = new List(); var ptsModel = new List(); Point2f position = new Point2f(); + float y40 = 0, y41 = 0; for (int i = 0; i < ids.Length; i++) { if (ids[i] == 40) { ptsPict.AddRange(corners[i]); ptsModel.AddRange(PointsDst40); position = corners[i][3]; + y40 = corners[i][3].Y; } if (ids[i] == 41) { ptsPict.AddRange(corners[i]); ptsModel.AddRange(PointsDst41); + y41 = corners[i][3].Y; } } if (ptsPict.Count < 8) return; + if (y40 > y41) { + _form.ShowMessage("舌診チャートが上下逆方向です"); + return; + } // チャートの固定判定 var dist = (float)position.DistanceTo(_lastPosition); diff --git a/TIASshot/Properties/AssemblyInfo.cs b/TIASshot/Properties/AssemblyInfo.cs index d0e313f..39323da 100644 --- a/TIASshot/Properties/AssemblyInfo.cs +++ b/TIASshot/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ // ビルド番号 // リビジョン // -[assembly: AssemblyVersion("1.1.0.0")] -[assembly: AssemblyFileVersion("1.1.0.0")] +[assembly: AssemblyVersion("1.2.0.0")] +[assembly: AssemblyFileVersion("1.2.0.0")]