diff --git a/DeviceAdapters/ABS/ABSCamera.cpp b/DeviceAdapters/ABS/ABSCamera.cpp index ed6d26fb8..93a16c3f2 100644 --- a/DeviceAdapters/ABS/ABSCamera.cpp +++ b/DeviceAdapters/ABS/ABSCamera.cpp @@ -187,7 +187,6 @@ binSize_(1), cameraCCDXSize_(512), cameraCCDYSize_(512), nComponents_(1), -triggerDevice_(""), dropPixels_(false), saturatePixels_(false), fractionOfPixelsToDropOrSaturate_(0.002) @@ -1315,17 +1314,6 @@ int CABSCamera::ThreadRun (void) } } - // Trigger - if (triggerDevice_.length() > 0) { - MM::Device* triggerDev = GetDevice(triggerDevice_.c_str()); - if (triggerDev != 0) { - //char label[256]; - //triggerDev->GetLabel(label); - LogMessage("trigger requested"); - triggerDev->SetProperty("Trigger","+"); - } - } - if (abortGetImageFired_) return ret; @@ -2959,19 +2947,6 @@ int CABSCamera::OnTemperature(MM::PropertyBase* pProp, MM::ActionType eAct) return DEVICE_OK; } -int CABSCamera::OnTriggerDevice(MM::PropertyBase* pProp, MM::ActionType eAct) -{ - if (eAct == MM::BeforeGet) - { - pProp->Set(triggerDevice_.c_str()); - } - else if (eAct == MM::AfterSet) - { - pProp->Get(triggerDevice_); - } - return DEVICE_OK; -} - /////////////////////////////////////////////////////////////////////////////// // Private CABSCamera methods diff --git a/DeviceAdapters/ABS/ABSCamera.h b/DeviceAdapters/ABS/ABSCamera.h index ff4ab5a79..d420e32cf 100644 --- a/DeviceAdapters/ABS/ABSCamera.h +++ b/DeviceAdapters/ABS/ABSCamera.h @@ -165,7 +165,6 @@ friend class CABSCameraSequenceThread; int OnBayerDemosaic (MM::PropertyBase* pProp, MM::ActionType eAct); int OnStdResolution (MM::PropertyBase* pProp, MM::ActionType eAct); int OnErrorSimulation (MM::PropertyBase* , MM::ActionType ); - int OnTriggerDevice (MM::PropertyBase* pProp, MM::ActionType eAct); int OnSaturatePixels (MM::PropertyBase* pProp, MM::ActionType eAct); // io-ports int OnTriggerInport (MM::PropertyBase* pProp, MM::ActionType eAct); @@ -302,7 +301,6 @@ friend class CABSCameraSequenceThread; long binSize_; long cameraCCDXSize_; long cameraCCDYSize_; - std::string triggerDevice_; bool dropPixels_; bool saturatePixels_; diff --git a/DeviceAdapters/AmScope/AmScope.cpp b/DeviceAdapters/AmScope/AmScope.cpp index 62f32b0f1..812abc7cd 100644 --- a/DeviceAdapters/AmScope/AmScope.cpp +++ b/DeviceAdapters/AmScope/AmScope.cpp @@ -805,17 +805,6 @@ int AmScope::RunSequenceOnThread(MM::MMTime startTime) { int ret=DEVICE_ERR; - // Trigger - if (triggerDevice_.length() > 0) - { - MM::Device* triggerDev = GetDevice(triggerDevice_.c_str()); - if (triggerDev != 0) - { - LogMessage("trigger requested"); - triggerDev->SetProperty("Trigger","+"); - } - } - //double exposure = GetSequenceExposure(); if (!fastImage_) diff --git a/DeviceAdapters/AmScope/AmScope.h b/DeviceAdapters/AmScope/AmScope.h index 319a3e8dc..a23555357 100644 --- a/DeviceAdapters/AmScope/AmScope.h +++ b/DeviceAdapters/AmScope/AmScope.h @@ -131,7 +131,6 @@ class AmScope : public CLegacyCameraBase bool sequenceRunning_; long imageCounter_; MMThreadLock imgPixelsLock_; - std::string triggerDevice_; std::string flipHorizontal_; std::string flipVertical_; bool fastImage_; diff --git a/DeviceAdapters/IDS_uEye/IDS_uEye.cpp b/DeviceAdapters/IDS_uEye/IDS_uEye.cpp index 777f140f2..b87a84151 100644 --- a/DeviceAdapters/IDS_uEye/IDS_uEye.cpp +++ b/DeviceAdapters/IDS_uEye/IDS_uEye.cpp @@ -151,7 +151,6 @@ CIDS_uEye::CIDS_uEye() : ccdT_ (0.0), nComponents_(1), pDemoResourceLock_(0), - triggerDevice_(""), dropPixels_(false), fractionOfPixelsToDropOrSaturate_(0.002) { @@ -533,10 +532,6 @@ int CIDS_uEye::Initialize() return nRet; - // Trigger device - pAct = new CPropertyAction (this, &CIDS_uEye::OnTriggerDevice); - CreateProperty("TriggerDevice","", MM::String, false, pAct); - pAct = new CPropertyAction (this, &CIDS_uEye::OnDropPixels); CreateProperty("DropPixels", "0", MM::Integer, false, pAct); AddAllowedValue("DropPixels", "0"); @@ -1352,15 +1347,6 @@ int CIDS_uEye::ThreadRun (void) int ret=DEVICE_ERR; - // Trigger - if (triggerDevice_.length() > 0) { - MM::Device* triggerDev = GetDevice(triggerDevice_.c_str()); - if (triggerDev != 0) { - LogMessage("trigger requested"); - triggerDev->SetProperty("Trigger","+"); - } - } - ret = SnapImage(); if (ret != DEVICE_OK) { @@ -2111,21 +2097,6 @@ int CIDS_uEye::OnTrigger(MM::PropertyBase* pProp, MM::ActionType eAct) } -int CIDS_uEye::OnTriggerDevice(MM::PropertyBase* pProp, MM::ActionType eAct) -{ - - if (eAct == MM::BeforeGet) - { - pProp->Set(triggerDevice_.c_str()); - } - else if (eAct == MM::AfterSet) - { - pProp->Get(triggerDevice_); - } - return DEVICE_OK; -} - - /** * Handles "FlashMode" property. * The "freerunning" mode can currently not be used: The camera only snaps diff --git a/DeviceAdapters/IDS_uEye/IDS_uEye.h b/DeviceAdapters/IDS_uEye/IDS_uEye.h index 7899251e1..52000b7ac 100644 --- a/DeviceAdapters/IDS_uEye/IDS_uEye.h +++ b/DeviceAdapters/IDS_uEye/IDS_uEye.h @@ -294,7 +294,6 @@ class CIDS_uEye : public CCameraBase int OnCameraCCDXSize(MM::PropertyBase* , MM::ActionType ); int OnCameraCCDYSize(MM::PropertyBase* , MM::ActionType ); int OnTrigger(MM::PropertyBase* pProp, MM::ActionType eAct); - int OnTriggerDevice(MM::PropertyBase* pProp, MM::ActionType eAct); int OnDropPixels(MM::PropertyBase* pProp, MM::ActionType eAct); int OnFractionOfPixelsToDropOrSaturate(MM::PropertyBase* pProp, MM::ActionType eAct); int OnGainMaster(MM::PropertyBase* pProp, MM::ActionType eAct); @@ -332,7 +331,6 @@ class CIDS_uEye : public CCameraBase MM::MMTime sequenceStartTime_; long imageCounter_; double ccdT_; - std::string triggerDevice_; UINT pixelClkMin_; //minimal pixel clock (MHz) UINT pixelClkMax_; //maximal pixel clock (MHz) diff --git a/DeviceAdapters/Mightex_C_Cam/Mightex_USBCamera.cpp b/DeviceAdapters/Mightex_C_Cam/Mightex_USBCamera.cpp index 486e6b6bf..f1f9bc49d 100755 --- a/DeviceAdapters/Mightex_C_Cam/Mightex_USBCamera.cpp +++ b/DeviceAdapters/Mightex_C_Cam/Mightex_USBCamera.cpp @@ -628,7 +628,6 @@ CMightex_BUF_USBCCDCamera::CMightex_BUF_USBCCDCamera() : cameraCCDXSize_(DEFAULT_WIDTH), cameraCCDYSize_(DEFAULT_HEIGHT), ccdT_ (0.0), - triggerDevice_(""), stopOnOverflow_(false), dropPixels_(false), fastImage_(false), @@ -949,10 +948,6 @@ int CMightex_BUF_USBCCDCamera::Initialize() pAct = new CPropertyAction (this, &CMightex_BUF_USBCCDCamera::OnCameraCCDYSize); CreateIntegerProperty("OnCameraCCDYSize", 512, false, pAct); - // Trigger device - pAct = new CPropertyAction (this, &CMightex_BUF_USBCCDCamera::OnTriggerDevice); - CreateStringProperty("TriggerDevice", "", false, pAct); - pAct = new CPropertyAction (this, &CMightex_BUF_USBCCDCamera::OnDropPixels); CreateIntegerProperty("DropPixels", 0, false, pAct); AddAllowedValue("DropPixels", "0"); @@ -1586,15 +1581,6 @@ int CMightex_BUF_USBCCDCamera::ThreadRun (MM::MMTime startTime) int ret=DEVICE_ERR; - // Trigger - if (triggerDevice_.length() > 0) { - MM::Device* triggerDev = GetDevice(triggerDevice_.c_str()); - if (triggerDev != 0) { - LogMessage("trigger requested"); - triggerDev->SetProperty("Trigger","+"); - } - } - ret = InsertImage(); @@ -2346,20 +2332,6 @@ int CMightex_BUF_USBCCDCamera::OnCameraCCDYSize(MM::PropertyBase* pProp, MM::Act } -int CMightex_BUF_USBCCDCamera::OnTriggerDevice(MM::PropertyBase* pProp, MM::ActionType eAct) -{ - - if (eAct == MM::BeforeGet) - { - pProp->Set(triggerDevice_.c_str()); - } - else if (eAct == MM::AfterSet) - { - pProp->Get(triggerDevice_); - } - return DEVICE_OK; -} - int CMightex_BUF_USBCCDCamera::OnCCDTemp(MM::PropertyBase* pProp, MM::ActionType eAct) { diff --git a/DeviceAdapters/Mightex_C_Cam/Mightex_USBCamera.h b/DeviceAdapters/Mightex_C_Cam/Mightex_USBCamera.h index 1afc1af84..bfaf84735 100755 --- a/DeviceAdapters/Mightex_C_Cam/Mightex_USBCamera.h +++ b/DeviceAdapters/Mightex_C_Cam/Mightex_USBCamera.h @@ -122,7 +122,6 @@ class CMightex_BUF_USBCCDCamera : public CCameraBase //int OnErrorSimulation(MM::PropertyBase* , MM::ActionType ); //int OnCameraCCDXSize(MM::PropertyBase* , MM::ActionType ); //int OnCameraCCDYSize(MM::PropertyBase* , MM::ActionType ); - //int OnTriggerDevice(MM::PropertyBase* pProp, MM::ActionType eAct); //int OnDropPixels(MM::PropertyBase* pProp, MM::ActionType eAct); //int OnFastImage(MM::PropertyBase* pProp, MM::ActionType eAct); //int OnSaturatePixels(MM::PropertyBase* pProp, MM::ActionType eAct); @@ -174,7 +173,6 @@ class CMightex_BUF_USBCCDCamera : public CCameraBase long cameraCCDXSize_; long cameraCCDYSize_; double ccdT_; - std::string triggerDevice_; bool stopOnOverflow_; diff --git a/DeviceAdapters/Mightex_SB_Cam/Mightex_SB_Camera.cpp b/DeviceAdapters/Mightex_SB_Cam/Mightex_SB_Camera.cpp index 7a45b1937..50b31e405 100644 --- a/DeviceAdapters/Mightex_SB_Cam/Mightex_SB_Camera.cpp +++ b/DeviceAdapters/Mightex_SB_Cam/Mightex_SB_Camera.cpp @@ -423,7 +423,6 @@ CMightex_SB_Camera::CMightex_SB_Camera() : cameraXSize_(SB_DEFAULT_WIDTH), cameraYSize_(SB_DEFAULT_HEIGHT), cam_T_ (0.0), - triggerDevice_(""), stopOnOverflow_(false), dropPixels_(false), fastImage_(false), @@ -1204,15 +1203,6 @@ int CMightex_SB_Camera::ThreadRun (MM::MMTime startTime) int ret=DEVICE_ERR; - // Trigger - if (triggerDevice_.length() > 0) { - MM::Device* triggerDev = GetDevice(triggerDevice_.c_str()); - if (triggerDev != 0) { - LogMessage("trigger requested"); - triggerDev->SetProperty("Trigger","+"); - } - } - ret = InsertImage(); diff --git a/DeviceAdapters/Mightex_SB_Cam/Mightex_SB_Camera.h b/DeviceAdapters/Mightex_SB_Cam/Mightex_SB_Camera.h index 85a73cdb0..7c249d4d9 100644 --- a/DeviceAdapters/Mightex_SB_Cam/Mightex_SB_Camera.h +++ b/DeviceAdapters/Mightex_SB_Cam/Mightex_SB_Camera.h @@ -160,7 +160,6 @@ class CMightex_SB_Camera : public CCameraBase long cameraXSize_; long cameraYSize_; double cam_T_; - std::string triggerDevice_; bool stopOnOverflow_; diff --git a/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.cpp b/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.cpp index 37c5b66b8..03a45cc7d 100644 --- a/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.cpp +++ b/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.cpp @@ -152,7 +152,6 @@ COpenCVgrabber::COpenCVgrabber() : nComponents_(4), xFlip_(false), yFlip_(false), - triggerDevice_(""), stopOnOverFlow_(false) { // call the base class method to set-up default error codes/messages @@ -845,17 +844,6 @@ int COpenCVgrabber::ThreadRun (void) { int ret=DEVICE_ERR; - // Trigger - if (triggerDevice_.length() > 0) { - MM::Device* triggerDev = GetDevice(triggerDevice_.c_str()); - if (triggerDev != 0) { - //char label[256]; - //triggerDev->GetLabel(label); - LogMessage("trigger requested"); - triggerDev->SetProperty("Trigger","+"); - } - } - ret = SnapImage(); if (ret != DEVICE_OK) return ret; @@ -1514,20 +1502,6 @@ int COpenCVgrabber::OnCameraCCDYSize(MM::PropertyBase* pProp, MM::ActionType eAc } -int COpenCVgrabber::OnTriggerDevice(MM::PropertyBase* pProp, MM::ActionType eAct) -{ - - if (eAct == MM::BeforeGet) - { - pProp->Set(triggerDevice_.c_str()); - } - else if (eAct == MM::AfterSet) - { - pProp->Get(triggerDevice_); - } - return DEVICE_OK; -} - /////////////////////////////////////////////////////////////////////////////// // Private COpenCVgrabber methods diff --git a/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.h b/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.h index f20ee8f13..3af6970f5 100644 --- a/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.h +++ b/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.h @@ -125,7 +125,6 @@ class COpenCVgrabber : public CCameraBase int OnCameraCCDXSize(MM::PropertyBase* , MM::ActionType ); int OnCameraCCDYSize(MM::PropertyBase* , MM::ActionType ); - int OnTriggerDevice(MM::PropertyBase* pProp, MM::ActionType eAct); MM::MMTime CurrentTime(void) { return GetCurrentMMTime(); }; int OnResolution(MM::PropertyBase* pProp, MM::ActionType eAct); int OnFlipX(MM::PropertyBase* pProp, MM::ActionType eAct); @@ -159,7 +158,6 @@ class COpenCVgrabber : public CCameraBase int nComponents_; bool xFlip_; bool yFlip_; - std::string triggerDevice_; bool stopOnOverFlow_; MMThreadLock imgPixelsLock_; diff --git a/DeviceAdapters/RaptorEPIX/RaptorEPIX.cpp b/DeviceAdapters/RaptorEPIX/RaptorEPIX.cpp index b4588f5e2..15b99e756 100644 --- a/DeviceAdapters/RaptorEPIX/RaptorEPIX.cpp +++ b/DeviceAdapters/RaptorEPIX/RaptorEPIX.cpp @@ -937,7 +937,6 @@ CRaptorEPIX::CRaptorEPIX(int nCameraType) : cameraCCDYSize_(888), nComponents_(1), pDemoResourceLock_(0), - triggerDevice_(""), dropPixels_(false), saturatePixels_(false), fractionOfPixelsToDropOrSaturate_(0.002), @@ -3213,10 +3212,6 @@ int CRaptorEPIX::Initialize() CreateProperty("CCD X Pixels", osCCDX.str().c_str(), MM::Integer, true); CreateProperty("CCD Y Pixels", osCCDY.str().c_str(), MM::Integer, true); - // Trigger device -// pAct = new CPropertyAction (this, &CRaptorEPIX::OnTriggerDevice); -// CreateProperty("TriggerDevice","", MM::String, false, pAct); - // TE Cooler pAct = new CPropertyAction (this, &CRaptorEPIX::OnTECooler); nRet = CreateProperty(g_Keyword_TECooler,g_Keyword_Off, MM::String, false, pAct); @@ -5938,17 +5933,6 @@ int CRaptorEPIX::ThreadRun (void) int ret=DEVICE_ERR; - // Trigger - if (triggerDevice_.length() > 0) { - MM::Device* triggerDev = GetDevice(triggerDevice_.c_str()); - if (triggerDev != 0) { - //char label[256]; - //triggerDev->GetLabel(label); - LogMessage("trigger requested"); - triggerDev->SetProperty("Trigger","+"); - } - } - MMThreadGuard g2(g_serialLock_[UNITSOPENMAP]); @@ -10464,20 +10448,6 @@ int CRaptorEPIX::OnCameraCCDYSize(MM::PropertyBase* pProp, MM::ActionType eAct) } -int CRaptorEPIX::OnTriggerDevice(MM::PropertyBase* pProp, MM::ActionType eAct) -{ - - if (eAct == MM::BeforeGet) - { - pProp->Set(triggerDevice_.c_str()); - } - else if (eAct == MM::AfterSet) - { - pProp->Get(triggerDevice_); - } - return DEVICE_OK; -} - /////////////////////////////////////////////////////////////////////////////// // Private CRaptorEPIX methods diff --git a/DeviceAdapters/RaptorEPIX/RaptorEPIX.h b/DeviceAdapters/RaptorEPIX/RaptorEPIX.h index b18ca36db..c26a532bd 100644 --- a/DeviceAdapters/RaptorEPIX/RaptorEPIX.h +++ b/DeviceAdapters/RaptorEPIX/RaptorEPIX.h @@ -298,7 +298,6 @@ class CRaptorEPIX : public CCameraBase int OnErrorSimulation(MM::PropertyBase* , MM::ActionType ); int OnCameraCCDXSize(MM::PropertyBase* , MM::ActionType ); int OnCameraCCDYSize(MM::PropertyBase* , MM::ActionType ); - int OnTriggerDevice(MM::PropertyBase* pProp, MM::ActionType eAct); int OnDropPixels(MM::PropertyBase* pProp, MM::ActionType eAct); int OnSaturatePixels(MM::PropertyBase* pProp, MM::ActionType eAct); int OnFractionOfPixelsToDropOrSaturate(MM::PropertyBase* pProp, MM::ActionType eAct); @@ -531,7 +530,6 @@ class CRaptorEPIX : public CCameraBase long binSize_; long cameraCCDXSize_; long cameraCCDYSize_; - std::string triggerDevice_; const char* cameraDeviceName_; const char* cameraName_; double triggerTimeout_; diff --git a/DeviceAdapters/TUCam/MMTUCam.cpp b/DeviceAdapters/TUCam/MMTUCam.cpp index 7bd6d619d..655296a05 100755 --- a/DeviceAdapters/TUCam/MMTUCam.cpp +++ b/DeviceAdapters/TUCam/MMTUCam.cpp @@ -273,7 +273,6 @@ CMMTUCam::CMMTUCam() : cameraCCDXSize_(512), cameraCCDYSize_(512), ccdT_ (0.0), - triggerDevice_(""), stopOnOverflow_(false), dropPixels_(false), fastImage_(false), @@ -2916,17 +2915,6 @@ int CMMTUCam::RunSequenceOnThread(MM::MMTime startTime) { int ret = DEVICE_ERR; - // Trigger - if (triggerDevice_.length() > 0) - { - MM::Device* triggerDev = GetDevice(triggerDevice_.c_str()); - if (triggerDev != 0) - { - LogMessage("trigger requested"); - triggerDev->SetProperty("Trigger","+"); - } - } - ret = WaitForFrame(img_, INFINITE); /* if (!fastImage_) @@ -7691,19 +7679,6 @@ int CMMTUCam::OnCameraCCDYSize(MM::PropertyBase* pProp, MM::ActionType eAct) } -int CMMTUCam::OnTriggerDevice(MM::PropertyBase* pProp, MM::ActionType eAct) -{ - if (eAct == MM::BeforeGet) - { - pProp->Set(triggerDevice_.c_str()); - } - else if (eAct == MM::AfterSet) - { - pProp->Get(triggerDevice_); - } - return DEVICE_OK; -} - int CMMTUCam::OnCCDTemp(MM::PropertyBase* pProp, MM::ActionType eAct) { diff --git a/DeviceAdapters/TUCam/MMTUCam.h b/DeviceAdapters/TUCam/MMTUCam.h index bd1ec04e9..231c12f0b 100755 --- a/DeviceAdapters/TUCam/MMTUCam.h +++ b/DeviceAdapters/TUCam/MMTUCam.h @@ -342,7 +342,6 @@ class CMMTUCam : public CCameraBase int OnErrorSimulation(MM::PropertyBase* , MM::ActionType ); int OnCameraCCDXSize(MM::PropertyBase* , MM::ActionType ); int OnCameraCCDYSize(MM::PropertyBase* , MM::ActionType ); - int OnTriggerDevice(MM::PropertyBase* pProp, MM::ActionType eAct); int OnDropPixels(MM::PropertyBase* pProp, MM::ActionType eAct); int OnFastImage(MM::PropertyBase* pProp, MM::ActionType eAct); int OnSaturatePixels(MM::PropertyBase* pProp, MM::ActionType eAct); @@ -410,7 +409,6 @@ class CMMTUCam : public CCameraBase long cameraCCDXSize_; long cameraCCDYSize_; double ccdT_; - std::string triggerDevice_; bool stopOnOverflow_; diff --git a/DeviceAdapters/UniversalMMHubUsb/ummhUsb.cpp b/DeviceAdapters/UniversalMMHubUsb/ummhUsb.cpp index d0f17e56c..5d19b1160 100644 --- a/DeviceAdapters/UniversalMMHubUsb/ummhUsb.cpp +++ b/DeviceAdapters/UniversalMMHubUsb/ummhUsb.cpp @@ -3780,15 +3780,6 @@ int UmmhCamera::RunSequenceOnThread(MM::MMTime startTime) { /*int ret=DEVICE_ERR; - // Trigger - if (triggerDevice_.length() > 0) { - MM::Device* triggerDev = GetDevice(triggerDevice_.c_str()); - if (triggerDev != 0) { - LogMessage("trigger requested"); - triggerDev->SetProperty("Trigger","+"); - } - } - double exposure = GetSequenceExposure(); if (!fastImage_)