diff --git a/TIASshot/DBK33UX178.xml b/TIASshot/DBK33UX178.xml
deleted file mode 100644
index 38c40fc..0000000
--- a/TIASshot/DBK33UX178.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-
-
- RGB24 (3072x2048)
- 30.000030
- 0
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
diff --git a/TIASshot/DFK33UX178.xml b/TIASshot/DFK33UX178.xml
new file mode 100644
index 0000000..6c33e9c
--- /dev/null
+++ b/TIASshot/DFK33UX178.xml
@@ -0,0 +1,141 @@
+
+
+ RGB24 (3072x2048)
+ 30.000030
+ 0
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
diff --git a/TIASshot/Form1.cs b/TIASshot/Form1.cs
index 04b9c8d..df72fae 100644
--- a/TIASshot/Form1.cs
+++ b/TIASshot/Form1.cs
@@ -89,6 +89,7 @@
///
///
private void Form1_FormClosing(object sender, FormClosingEventArgs e) {
+ if (_camera == null) return;
_camera.Disconnect();
}
diff --git a/TIASshot/Lucam.cs b/TIASshot/Lucam.cs
index 88c8826..517a409 100644
--- a/TIASshot/Lucam.cs
+++ b/TIASshot/Lucam.cs
@@ -110,7 +110,9 @@
lumVersion = api.EnumCameras();
var id = 0;
if (lumVersion[id].CameraId == 0x49f) DeviceName = "Lw110";
+ SetInfo("カメラ型番", DeviceName);
SerialNumber = lumVersion[id].SerialNumber.ToString();
+ SetInfo("カメラSN", SerialNumber);
// カメラを開く
_hCam = api.CameraOpen(1);
@@ -179,7 +181,19 @@
}
_calibrating--;
if (_calibrating == 0) {
+ Debug.WriteLine($"Gain Blue : {_snap.GainBlue}");
+ Debug.WriteLine($"Gain Green: {_snap.GainGrn1}");
+ Debug.WriteLine($"Gain Red : {_snap.GainRed}");
+
CalcTcc(imgt);
+
+ SetInfo("Exposure(ms)", $"{_snap.Exposure}");
+ SetInfo("Gain", $"{_snap.Gain}");
+ SetInfo("Gain B", $"{_snap.GainBlue}");
+ SetInfo("Gain G", $"{_snap.GainGrn1}");
+ SetInfo("Gain R", $"{_snap.GainRed}");
+ SetInfo("画像幅", $"{imgt.Width}");
+ SetInfo("画像高さ", $"{imgt.Height}");
}
}
@@ -212,6 +226,7 @@
var filename = Config.GetString("File/Info");
using (var csv = new StreamWriter(Path.Combine(_saveFolder, filename))) {
+ WriteInfo(csv);
csv.WriteLine("Shot,Time(ms)");
var watch = Stopwatch.StartNew();
diff --git a/TIASshot/TIASshot.csproj b/TIASshot/TIASshot.csproj
index c973a16..7a736a4 100644
--- a/TIASshot/TIASshot.csproj
+++ b/TIASshot/TIASshot.csproj
@@ -172,7 +172,7 @@
copy /Y $(ProjectDir)config.xml $(TargetDir)
copy /Y $(ProjectDir)tcc_srgb.csv $(TargetDir)
copy /Y $(ProjectDir)tcc_xyz.csv $(TargetDir)
-copy /Y $(ProjectDir)DBK33UX178.xml $(TargetDir)
+copy /Y $(ProjectDir)DFK33UX178.xml $(TargetDir)
copy /Y $(ProjectDir)DFK23UX249.xml $(TargetDir)