diff --git a/MaiMuControl/.vs/MaiMuControl/FileContentIndex/b9d40985-c00d-4cdb-b895-f3b00a0d2f4e.vsidx b/MaiMuControl/.vs/MaiMuControl/FileContentIndex/351808b1-7fe3-43d4-98dc-f23b7e781a84.vsidx similarity index 87% rename from MaiMuControl/.vs/MaiMuControl/FileContentIndex/b9d40985-c00d-4cdb-b895-f3b00a0d2f4e.vsidx rename to MaiMuControl/.vs/MaiMuControl/FileContentIndex/351808b1-7fe3-43d4-98dc-f23b7e781a84.vsidx index 73ff3ce..d031a2a 100644 Binary files a/MaiMuControl/.vs/MaiMuControl/FileContentIndex/b9d40985-c00d-4cdb-b895-f3b00a0d2f4e.vsidx and b/MaiMuControl/.vs/MaiMuControl/FileContentIndex/351808b1-7fe3-43d4-98dc-f23b7e781a84.vsidx differ diff --git a/MaiMuControl/.vs/MaiMuControl/FileContentIndex/13d0fde1-cc7a-49ac-985d-d96969285eb4.vsidx b/MaiMuControl/.vs/MaiMuControl/FileContentIndex/ad321ed6-e998-43ec-9974-6638ce0093b1.vsidx similarity index 64% rename from MaiMuControl/.vs/MaiMuControl/FileContentIndex/13d0fde1-cc7a-49ac-985d-d96969285eb4.vsidx rename to MaiMuControl/.vs/MaiMuControl/FileContentIndex/ad321ed6-e998-43ec-9974-6638ce0093b1.vsidx index 125260d..c3b6ab2 100644 Binary files a/MaiMuControl/.vs/MaiMuControl/FileContentIndex/13d0fde1-cc7a-49ac-985d-d96969285eb4.vsidx and b/MaiMuControl/.vs/MaiMuControl/FileContentIndex/ad321ed6-e998-43ec-9974-6638ce0093b1.vsidx differ diff --git a/MaiMuControl/.vs/MaiMuControl/FileContentIndex/ad914794-5d5d-4cb4-99ce-1b1088d708d0.vsidx b/MaiMuControl/.vs/MaiMuControl/FileContentIndex/ad914794-5d5d-4cb4-99ce-1b1088d708d0.vsidx new file mode 100644 index 0000000..c1f82cf Binary files /dev/null and b/MaiMuControl/.vs/MaiMuControl/FileContentIndex/ad914794-5d5d-4cb4-99ce-1b1088d708d0.vsidx differ diff --git a/MaiMuControl/.vs/MaiMuControl/FileContentIndex/58e791e5-a15a-4406-85e2-95843f2d4f0c.vsidx b/MaiMuControl/.vs/MaiMuControl/FileContentIndex/d47337dd-d854-4bcf-98ed-e55326f15410.vsidx similarity index 99% rename from MaiMuControl/.vs/MaiMuControl/FileContentIndex/58e791e5-a15a-4406-85e2-95843f2d4f0c.vsidx rename to MaiMuControl/.vs/MaiMuControl/FileContentIndex/d47337dd-d854-4bcf-98ed-e55326f15410.vsidx index 3d6c0a2..0f4a9ae 100644 Binary files a/MaiMuControl/.vs/MaiMuControl/FileContentIndex/58e791e5-a15a-4406-85e2-95843f2d4f0c.vsidx and b/MaiMuControl/.vs/MaiMuControl/FileContentIndex/d47337dd-d854-4bcf-98ed-e55326f15410.vsidx differ diff --git a/MaiMuControl/.vs/MaiMuControl/FileContentIndex/e600c0cc-b3c2-46ca-b0b0-8a3dd4c24c9c.vsidx b/MaiMuControl/.vs/MaiMuControl/FileContentIndex/e600c0cc-b3c2-46ca-b0b0-8a3dd4c24c9c.vsidx deleted file mode 100644 index 9110fb5..0000000 Binary files a/MaiMuControl/.vs/MaiMuControl/FileContentIndex/e600c0cc-b3c2-46ca-b0b0-8a3dd4c24c9c.vsidx and /dev/null differ diff --git a/MaiMuControl/.vs/MaiMuControl/FileContentIndex/e9fb156e-67b0-4cd3-a019-59de64afb5c4.vsidx b/MaiMuControl/.vs/MaiMuControl/FileContentIndex/e9fb156e-67b0-4cd3-a019-59de64afb5c4.vsidx new file mode 100644 index 0000000..a1d3a49 Binary files /dev/null and b/MaiMuControl/.vs/MaiMuControl/FileContentIndex/e9fb156e-67b0-4cd3-a019-59de64afb5c4.vsidx differ diff --git a/MaiMuControl/.vs/MaiMuControl/FileContentIndex/f97ae3ef-6f60-4307-90e2-ecd2e973b8ef.vsidx b/MaiMuControl/.vs/MaiMuControl/FileContentIndex/f97ae3ef-6f60-4307-90e2-ecd2e973b8ef.vsidx deleted file mode 100644 index afbff7a..0000000 Binary files a/MaiMuControl/.vs/MaiMuControl/FileContentIndex/f97ae3ef-6f60-4307-90e2-ecd2e973b8ef.vsidx and /dev/null differ diff --git a/MaiMuControl/MaiMuControl/Device/CamDev/MvsCamera/MvsCamDev.cs b/MaiMuControl/MaiMuControl/Device/CamDev/MvsCamera/MvsCamDev.cs index 7d676a2..a913696 100644 --- a/MaiMuControl/MaiMuControl/Device/CamDev/MvsCamera/MvsCamDev.cs +++ b/MaiMuControl/MaiMuControl/Device/CamDev/MvsCamera/MvsCamDev.cs @@ -510,7 +510,7 @@ namespace MaiMuControl.Device.CamDev.MvsCamera this.dBuf[ind] = null; } } - grabStatus = "GrabTimeOut"; + grabStatus = "GrabTimeOut1"; return; } private void ImageConvert(DateTime startTime, int start, int step, int imageNum, ref Acquisition[] acqs, int timeOut = -1)