From b8f089d5593c14b7435704efcdc9e1b2557ee68b Mon Sep 17 00:00:00 2001 From: "Mark A. Tsuchida" Date: Wed, 18 Dec 2024 16:02:13 -0600 Subject: [PATCH] Remove redundant metadata setting --- DeviceAdapters/Aravis/AravisCamera.cpp | 1 - DeviceAdapters/Basler/BaslerPylonCamera.cpp | 1 - DeviceAdapters/DahengGalaxy/ClassGalaxy.cpp | 1 - DeviceAdapters/Ximea/XIMEACamera.cpp | 1 - 4 files changed, 4 deletions(-) diff --git a/DeviceAdapters/Aravis/AravisCamera.cpp b/DeviceAdapters/Aravis/AravisCamera.cpp index dd90a80c3..ad492ba33 100644 --- a/DeviceAdapters/Aravis/AravisCamera.cpp +++ b/DeviceAdapters/Aravis/AravisCamera.cpp @@ -173,7 +173,6 @@ void AravisCamera::AcquisitionCallback(ArvStreamCallbackType type, ArvBuffer *cb md.put(MM::g_Keyword_Metadata_ROI_Y, CDeviceUtils::ConvertToString((long)img_buffer_height)); md.put(MM::g_Keyword_Metadata_ImageNumber, CDeviceUtils::ConvertToString(counter)); md.put(MM::g_Keyword_Metadata_Exposure, exposure_time); - md.put(MM::g_Keyword_Meatdata_Exposure, exposure_time); md.put(MM::g_Keyword_PixelType, pixel_type); // Pass data to MM. diff --git a/DeviceAdapters/Basler/BaslerPylonCamera.cpp b/DeviceAdapters/Basler/BaslerPylonCamera.cpp index 4164acf33..c0b71a755 100644 --- a/DeviceAdapters/Basler/BaslerPylonCamera.cpp +++ b/DeviceAdapters/Basler/BaslerPylonCamera.cpp @@ -2132,7 +2132,6 @@ void CircularBufferInserter::OnImageGrabbed(CInstantCamera& /* camera */, const md.put(MM::g_Keyword_Metadata_ROI_Y, CDeviceUtils::ConvertToString((long)ptrGrabResult->GetHeight())); md.put(MM::g_Keyword_Metadata_ImageNumber, CDeviceUtils::ConvertToString((long)ptrGrabResult->GetImageNumber())); md.put(MM::g_Keyword_Metadata_Exposure, dev_->GetExposure()); - md.put(MM::g_Keyword_Meatdata_Exposure, dev_->GetExposure()); // Image grabbed successfully? if (ptrGrabResult->GrabSucceeded()) { diff --git a/DeviceAdapters/DahengGalaxy/ClassGalaxy.cpp b/DeviceAdapters/DahengGalaxy/ClassGalaxy.cpp index 70c43c735..a06cfd0bf 100644 --- a/DeviceAdapters/DahengGalaxy/ClassGalaxy.cpp +++ b/DeviceAdapters/DahengGalaxy/ClassGalaxy.cpp @@ -1864,7 +1864,6 @@ void CircularBufferInserter::DoOnImageCaptured(CImageDataPointer& objImageDataPo md.put(MM::g_Keyword_Metadata_ROI_Y, CDeviceUtils::ConvertToString((long)objImageDataPointer->GetHeight())); md.put(MM::g_Keyword_Metadata_ImageNumber, CDeviceUtils::ConvertToString((long)objImageDataPointer->GetFrameID())); md.put(MM::g_Keyword_Metadata_Exposure, dev_->GetExposure()); - md.put(MM::g_Keyword_Meatdata_Exposure, dev_->GetExposure()); // Image grabbed successfully ? if (objImageDataPointer->GetStatus()== GX_FRAME_STATUS_SUCCESS) { diff --git a/DeviceAdapters/Ximea/XIMEACamera.cpp b/DeviceAdapters/Ximea/XIMEACamera.cpp index 9c254d2e8..d4410ef0a 100644 --- a/DeviceAdapters/Ximea/XIMEACamera.cpp +++ b/DeviceAdapters/Ximea/XIMEACamera.cpp @@ -799,7 +799,6 @@ int XimeaCamera::InsertImage() Metadata md; double exp_time = (double)image.GetExpTime() / 1000; md.put(MM::g_Keyword_Metadata_Exposure, CDeviceUtils::ConvertToString(exp_time)); - md.put(MM::g_Keyword_Meatdata_Exposure, CDeviceUtils::ConvertToString(exp_time)); md.put(MM::g_Keyword_Elapsed_Time_ms, CDeviceUtils::ConvertToString((timeStamp - sequenceStartTime_).getMsec())); md.put(MM::g_Keyword_Metadata_ImageNumber, CDeviceUtils::ConvertToString(imageCounter_)); md.put(MM::g_Keyword_Metadata_ROI_X, CDeviceUtils::ConvertToString((long)roiX_));