Skip to content

Remove copy-pasted camera 'triggerDevice_' code #1010

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 1 commit into from
Oct 21, 2026
Merged

Remove copy-pasted camera 'triggerDevice_' code #1010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 0 additions & 25 deletions DeviceAdapters/ABS/ABSCamera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ binSize_(1),
cameraCCDXSize_(512),
cameraCCDYSize_(512),
nComponents_(1),
triggerDevice_(""),
dropPixels_(false),
saturatePixels_(false),
fractionOfPixelsToDropOrSaturate_(0.002)
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions DeviceAdapters/ABS/ABSCamera.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -302,7 +301,6 @@ friend class CABSCameraSequenceThread;
long binSize_;
long cameraCCDXSize_;
long cameraCCDYSize_;
std::string triggerDevice_;

bool dropPixels_;
bool saturatePixels_;
Expand Down
11 changes: 0 additions & 11 deletions DeviceAdapters/AmScope/AmScope.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_)
Expand Down
1 change: 0 additions & 1 deletion DeviceAdapters/AmScope/AmScope.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ class AmScope : public CLegacyCameraBase<AmScope>
bool sequenceRunning_;
long imageCounter_;
MMThreadLock imgPixelsLock_;
std::string triggerDevice_;
std::string flipHorizontal_;
std::string flipVertical_;
bool fastImage_;
Expand Down
29 changes: 0 additions & 29 deletions DeviceAdapters/IDS_uEye/IDS_uEye.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ CIDS_uEye::CIDS_uEye() :
ccdT_ (0.0),
nComponents_(1),
pDemoResourceLock_(0),
triggerDevice_(""),
dropPixels_(false),
fractionOfPixelsToDropOrSaturate_(0.002)
{
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions DeviceAdapters/IDS_uEye/IDS_uEye.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,6 @@ class CIDS_uEye : public CCameraBase<CIDS_uEye>
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);
Expand Down Expand Up @@ -332,7 +331,6 @@ class CIDS_uEye : public CCameraBase<CIDS_uEye>
MM::MMTime sequenceStartTime_;
long imageCounter_;
double ccdT_;
std::string triggerDevice_;

UINT pixelClkMin_; //minimal pixel clock (MHz)
UINT pixelClkMax_; //maximal pixel clock (MHz)
Expand Down
28 changes: 0 additions & 28 deletions DeviceAdapters/Mightex_C_Cam/Mightex_USBCamera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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();


Expand Down Expand Up @@ -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)
{
Expand Down
2 changes: 0 additions & 2 deletions DeviceAdapters/Mightex_C_Cam/Mightex_USBCamera.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ class CMightex_BUF_USBCCDCamera : public CCameraBase<CMightex_BUF_USBCCDCamera>
//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);
Expand Down Expand Up @@ -174,7 +173,6 @@ class CMightex_BUF_USBCCDCamera : public CCameraBase<CMightex_BUF_USBCCDCamera>
long cameraCCDXSize_;
long cameraCCDYSize_;
double ccdT_;
std::string triggerDevice_;

bool stopOnOverflow_;

Expand Down
10 changes: 0 additions & 10 deletions DeviceAdapters/Mightex_SB_Cam/Mightex_SB_Camera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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();


Expand Down
1 change: 0 additions & 1 deletion DeviceAdapters/Mightex_SB_Cam/Mightex_SB_Camera.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ class CMightex_SB_Camera : public CCameraBase<CMightex_SB_Camera>
long cameraXSize_;
long cameraYSize_;
double cam_T_;
std::string triggerDevice_;

bool stopOnOverflow_;

Expand Down
26 changes: 0 additions & 26 deletions DeviceAdapters/OpenCVgrabber/OpenCVgrabber.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions DeviceAdapters/OpenCVgrabber/OpenCVgrabber.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ class COpenCVgrabber : public CCameraBase<COpenCVgrabber>

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);
Expand Down Expand Up @@ -159,7 +158,6 @@ class COpenCVgrabber : public CCameraBase<COpenCVgrabber>
int nComponents_;
bool xFlip_;
bool yFlip_;
std::string triggerDevice_;
bool stopOnOverFlow_;

MMThreadLock imgPixelsLock_;
Expand Down
30 changes: 0 additions & 30 deletions DeviceAdapters/RaptorEPIX/RaptorEPIX.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,6 @@ CRaptorEPIX::CRaptorEPIX(int nCameraType) :
cameraCCDYSize_(888),
nComponents_(1),
pDemoResourceLock_(0),
triggerDevice_(""),
dropPixels_(false),
saturatePixels_(false),
fractionOfPixelsToDropOrSaturate_(0.002),
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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]);

Expand Down Expand Up @@ -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
Expand Down
Loading
Loading