use keyword for Camera tag

micro-manager · Jun 19, 2024 · 98881cf · 98881cf
1 parent de9d70a
commit 98881cf
Show file tree

Hide file tree

Showing 36 changed files with 281 additions and 280 deletions.
diff --git a/DeviceAdapters/ABS/ABSCamera.cpp b/DeviceAdapters/ABS/ABSCamera.cpp
@@ -704,7 +704,7 @@ int CABSCamera::Initialize()
         temperatureIndex_ = 0;
 
         pAct = new CPropertyAction (this, &CABSCamera::OnTemperature);
-        nRet = CreateProperty(MM::g_Keyword_CCDTemperature, "20.0 °C", MM::String, true, pAct);
+        nRet = CreateProperty(MM::g_Keyword_CCDTemperature, "20.0 �C", MM::String, true, pAct);
         assert(nRet == DEVICE_OK);
       }
     }
@@ -1258,7 +1258,7 @@ int CABSCamera::InsertImage()
 
   // Important: metadata about the image are generated here:
   Metadata md;
-  md.put("Camera", label);
+  md.put(MM::g_Keyword_Metadata_CameraLabel, label);
   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) GetImageWidth()));
@@ -2956,7 +2956,7 @@ int CABSCamera::OnTemperature(MM::PropertyBase* pProp, MM::ActionType eAct)
     if ( IsNoError( rc ) )
     {
       string temperature;
-      str::sprintf( temperature, "%3.2f °C \0\0", sTR.wSensorValue / temperatureUnit_ );
+      str::sprintf( temperature, "%3.2f �C \0\0", sTR.wSensorValue / temperatureUnit_ );
       pProp->Set( temperature.c_str() );
     }
     return convertApiErrorCode( rc, __FUNCTION__ );

diff --git a/DeviceAdapters/AlliedVisionCamera/AlliedVisionCamera.cpp b/DeviceAdapters/AlliedVisionCamera/AlliedVisionCamera.cpp
@@ -1384,7 +1384,7 @@ void AlliedVisionCamera::insertFrame(VmbFrame_t *frame)
 
         // TODO implement metadata
         Metadata md;
-        md.put("Camera", m_cameraName);
+        md.put(MM::g_Keyword_Metadata_CameraLabel, m_cameraName);
 
         VmbUint8_t *buffer = reinterpret_cast<VmbUint8_t *>(frame->buffer);
         err = GetCoreCallback()->InsertImage(this, buffer, GetImageWidth(), GetImageHeight(), m_currentPixelFormat.getBytesPerPixel(),

diff --git a/DeviceAdapters/AmScope/AmScope.cpp b/DeviceAdapters/AmScope/AmScope.cpp
@@ -769,7 +769,7 @@ int AmScope::InsertImage()
    MMThreadGuard g(imgPixelsLock_);
    // Important:  metadata about the image are generated here:
    Metadata md;
-   md.put("Camera", label);
+   md.put(MM::g_Keyword_Metadata_CameraLabel, label);
   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_));

diff --git a/DeviceAdapters/Andor/Andor.cpp b/DeviceAdapters/Andor/Andor.cpp
@@ -5780,7 +5780,7 @@ unsigned int AndorCamera::PopulateROIDropdownFVB()
       // remove first .put deprecated and check if any changes. Perhaps take 5seq MDA first using current build, then rebuild and check difference
       // Check both MM Metadata, and .text file generated by stack images.
       // add SRRF - may need better timings, perhaps a new m_var_ but can decide during impl.
-      //md.put("Camera", label);
+      //md.put(MM::g_Keyword_Metadata_CameraLabel, label);
       //md.put(MM::g_Keyword_Elapsed_Time_ms, CDeviceUtils::ConvertToString((timestamp - startTime_).getMsec()));
       //md.put(MM::g_Keyword_Metadata_ImageNumber, CDeviceUtils::ConvertToString(imageCounter_));
       //md.put(MM::g_Keyword_Binning, binSize_);

diff --git a/DeviceAdapters/Aravis/AravisCamera.cpp b/DeviceAdapters/Aravis/AravisCamera.cpp
@@ -168,7 +168,7 @@ void AravisCamera::AcquisitionCallback(ArvStreamCallbackType type, ArvBuffer *cb
     ArvBufferUpdate(cb_arv_buffer);
 
     // Image metadata.
-    md.put("Camera", "");
+    md.put(MM::g_Keyword_Metadata_CameraLabel, "");
     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));

diff --git a/DeviceAdapters/Atik/Atik.cpp b/DeviceAdapters/Atik/Atik.cpp
@@ -880,7 +880,7 @@ int Atik::InsertImage()
 	// Important:  metadata about the image are generated here:
 	Metadata md;
 
-	md.put("Camera", "Atik SDK Camera");
+	md.put(MM::g_Keyword_Metadata_CameraLabel, "Atik SDK Camera");
 
 	string serialised = md.Serialize();
 

diff --git a/DeviceAdapters/Basler/BaslerPylonCamera.cpp b/DeviceAdapters/Basler/BaslerPylonCamera.cpp
@@ -2127,7 +2127,7 @@ void CircularBufferInserter::OnImageGrabbed(CInstantCamera& /* camera */, const
 
 	// Important:  meta data about the image are generated here:
 	Metadata md;
-	md.put("Camera", "");
+	md.put(MM::g_Keyword_Metadata_CameraLabel, "");
 	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()));

diff --git a/DeviceAdapters/BaumerOptronic/BaumerOptronic.cpp b/DeviceAdapters/BaumerOptronic/BaumerOptronic.cpp
@@ -2273,7 +2273,7 @@ int CBaumerOptronic::SendImageToCore()
    char label[MM::MaxStrLength];
    this->GetLabel(label);
    Metadata md;
-   md.put("Camera", label);
+   md.put(MM::g_Keyword_Metadata_CameraLabel, label);
 
    int err = WaitForImageAndCopyToBuffer();
    if (err != DEVICE_OK)