Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions DeviceAdapters/ASITiger/ASIXYStage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,14 @@ int CXYStage::GetPositionSteps(long& x, long& y)
// return DEVICE_OK;
//}

int CXYStage::SetPositionUm(double x, double y)
{
int ret = CXYStageBase<CXYStage>::SetPositionUm(x, y);
if (ret == DEVICE_OK)
OnXYStagePositionChanged(x, y);
return ret;
}

int CXYStage::SetPositionSteps(long x, long y)
{
std::ostringstream command;
Expand Down
2 changes: 2 additions & 0 deletions DeviceAdapters/ASITiger/ASIXYStage.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ class CXYStage : public ASIPeripheralBase<CXYStageBase, CXYStage>
int AddToXYStageSequence(double positionX, double positionY);
int SendXYStageSequence();

int SetPositionUm(double x, double y);

// leave default implementation which call corresponding "Steps" functions
// while accounting for mirroring and so forth
// int SetPositionUm(double x, double y);
Expand Down
4 changes: 2 additions & 2 deletions DeviceAdapters/DemoCamera/DemoStages.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -371,8 +371,8 @@ int CDemoXYStage::SetPositionSteps(long x, long y)
moveStartTime_ = currentTime;
timeOutTimer_ = new MM::TimeoutMs(currentTime, moveDuration_ms_);

// Optionally, notify listeners of the starting position (as an acknowledgement)
int ret = OnXYStagePositionChanged(startPosX_um_, startPosY_um_);
// Notify listeners of the target position.
int ret = OnXYStagePositionChanged(targetPosX_um_, targetPosY_um_);
if (ret != DEVICE_OK)
return ret;

Expand Down