diff --git a/DeviceAdapters/Aravis/AravisCamera.cpp b/DeviceAdapters/Aravis/AravisCamera.cpp index 7c740b3d3..dd90a80c3 100644 --- a/DeviceAdapters/Aravis/AravisCamera.cpp +++ b/DeviceAdapters/Aravis/AravisCamera.cpp @@ -172,6 +172,7 @@ void AravisCamera::AcquisitionCallback(ArvStreamCallbackType type, ArvBuffer *cb md.put(MM::g_Keyword_Metadata_ROI_X, CDeviceUtils::ConvertToString((long)img_buffer_width)); 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); diff --git a/DeviceAdapters/Basler/BaslerPylonCamera.cpp b/DeviceAdapters/Basler/BaslerPylonCamera.cpp index c6403320e..4164acf33 100644 --- a/DeviceAdapters/Basler/BaslerPylonCamera.cpp +++ b/DeviceAdapters/Basler/BaslerPylonCamera.cpp @@ -2131,6 +2131,7 @@ void CircularBufferInserter::OnImageGrabbed(CInstantCamera& /* camera */, const md.put(MM::g_Keyword_Metadata_ROI_X, CDeviceUtils::ConvertToString((long)ptrGrabResult->GetWidth())); 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 55414a544..70c43c735 100644 --- a/DeviceAdapters/DahengGalaxy/ClassGalaxy.cpp +++ b/DeviceAdapters/DahengGalaxy/ClassGalaxy.cpp @@ -1863,6 +1863,7 @@ void CircularBufferInserter::DoOnImageCaptured(CImageDataPointer& objImageDataPo md.put(MM::g_Keyword_Metadata_ROI_X, CDeviceUtils::ConvertToString((long)objImageDataPointer->GetWidth())); 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) @@ -2160,4 +2161,4 @@ void ClassGalaxy::SaveRaw(CImageDataPointer& objCImageDataPointer, const std::st ::WriteFile(hFile, pbuffer, dwImageSize, &dwBytesRead, NULL); CloseHandle(hFile); } -} \ No newline at end of file +} diff --git a/DeviceAdapters/Ximea/XIMEACamera.cpp b/DeviceAdapters/Ximea/XIMEACamera.cpp index 1c9a3e003..9c254d2e8 100644 --- a/DeviceAdapters/Ximea/XIMEACamera.cpp +++ b/DeviceAdapters/Ximea/XIMEACamera.cpp @@ -798,6 +798,7 @@ int XimeaCamera::InsertImage() // Important: metadata about the image are generated here: 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_)); @@ -1742,4 +1743,4 @@ int XiSequenceThread::svc(void) throw() return ret; } -/////////////////////////////////////////////////////////////////////////////// \ No newline at end of file +/////////////////////////////////////////////////////////////////////////////// diff --git a/MMDevice/MMDeviceConstants.h b/MMDevice/MMDeviceConstants.h index 62aa53ce6..e67217a68 100644 --- a/MMDevice/MMDeviceConstants.h +++ b/MMDevice/MMDeviceConstants.h @@ -144,7 +144,8 @@ namespace MM { // image annotations const char* const g_Keyword_Metadata_CameraLabel = "Camera"; - const char* const g_Keyword_Meatdata_Exposure = "Exposure-ms"; + const char* const g_Keyword_Metadata_Exposure = "Exposure-ms"; + const char* const g_Keyword_Meatdata_Exposure = "Exposure-ms"; // Deprecated, use g_Keyword_Metadata_Exposure. const char* const g_Keyword_Metadata_Score = "Score"; const char* const g_Keyword_Metadata_ImageNumber = "ImageNumber"; // Removed: g_Keyword_Metadata_StartTime = "StartTime-ms";