Skip to content

Add keyword 'g_Keyword_Metadata_Exposure' #503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marktsuchida merged 3 commits into from
Dec 18, 2024
Merged

Add keyword 'g_Keyword_Metadata_Exposure' #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5239fa6
Add keyword 'g_Keyword_Metadata_Exposure' to replace 'g_Keyword_Meatd…
Oct 12, 2024
c924204
Use compiler deprecation for 'Meatdata'
marktsuchida Dec 18, 2024
b8f089d
Remove redundant metadata setting
marktsuchida Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DeviceAdapters/Aravis/AravisCamera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +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_Meatdata_Exposure, exposure_time);
md.put(MM::g_Keyword_Metadata_Exposure, exposure_time);
md.put(MM::g_Keyword_PixelType, pixel_type);

// Pass data to MM.
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/Basler/BaslerPylonCamera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2131,7 +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_Meatdata_Exposure, dev_->GetExposure());
md.put(MM::g_Keyword_Metadata_Exposure, dev_->GetExposure());
// Image grabbed successfully?
if (ptrGrabResult->GrabSucceeded())
{
Expand Down
4 changes: 2 additions & 2 deletions DeviceAdapters/DahengGalaxy/ClassGalaxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1863,7 +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_Meatdata_Exposure, dev_->GetExposure());
md.put(MM::g_Keyword_Metadata_Exposure, dev_->GetExposure());
// Image grabbed successfully ?
if (objImageDataPointer->GetStatus()== GX_FRAME_STATUS_SUCCESS)
{
Expand Down Expand Up @@ -2160,4 +2160,4 @@ void ClassGalaxy::SaveRaw(CImageDataPointer& objCImageDataPointer, const std::st
::WriteFile(hFile, pbuffer, dwImageSize, &dwBytesRead, NULL);
CloseHandle(hFile);
}
}
}
4 changes: 2 additions & 2 deletions DeviceAdapters/Ximea/XIMEACamera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +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_Meatdata_Exposure, CDeviceUtils::ConvertToString(exp_time));
md.put(MM::g_Keyword_Metadata_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_));
Expand Down Expand Up @@ -1742,4 +1742,4 @@ int XiSequenceThread::svc(void) throw()
return ret;
}

///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
14 changes: 0 additions & 14 deletions MMDevice/MMDevice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,6 @@
#include <string>
#include <vector>


#ifdef MMDEVICE_CLIENT_BUILD
// Hide deprecation warnings when building MMCore
# define MM_DEPRECATED(prototype) prototype
#else
# ifdef _MSC_VER
# define MM_DEPRECATED(prototype) __declspec(deprecated) prototype
# elif defined(__GNUC__)
# define MM_DEPRECATED(prototype) prototype __attribute__((deprecated))
# else
# define MM_DEPRECATED(prototype) prototype
# endif
#endif

// To be removed once the deprecated Get/SetModuleHandle() is removed:
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
Expand Down
16 changes: 15 additions & 1 deletion MMDevice/MMDeviceConstants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,19 @@

#pragma once

#ifdef MMDEVICE_CLIENT_BUILD
// Hide deprecation warnings when building MMCore
# define MM_DEPRECATED(prototype) prototype
#else
# ifdef _MSC_VER
# define MM_DEPRECATED(prototype) __declspec(deprecated) prototype
# elif defined(__GNUC__)
# define MM_DEPRECATED(prototype) prototype __attribute__((deprecated))
# else
# define MM_DEPRECATED(prototype) prototype
# endif
#endif

///////////////////////////////////////////////////////////////////////////////
// Global error codes
//
Expand Down Expand Up @@ -144,7 +157,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";
MM_DEPRECATED(const char* const g_Keyword_Meatdata_Exposure) = "Exposure-ms"; // Typo
const char* const g_Keyword_Metadata_Score = "Score";
const char* const g_Keyword_Metadata_ImageNumber = "ImageNumber";
// Removed: g_Keyword_Metadata_StartTime = "StartTime-ms";
Expand Down