Skip to content

LibMCCore (scanlab, libmcenv): Fix microvector delay tick conversion and implement scatterplot channel fill #68

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
alexanderoster merged 1 commit into from
Jan 30, 2026
Merged

LibMCCore (scanlab, libmcenv): Fix microvector delay tick conversion and implement scatterplot channel fill #68

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
14 changes: 11 additions & 3 deletions Drivers/ScanLab/Implementation/libmcdriver_scanlab_rtccontext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1114,6 +1114,15 @@ void CRTCContext::AddMarkMovement(const LibMCDriver_ScanLab_double dTargetX, con
m_nCurrentScanPositionY = intY;
}

int32_t CRTCContext::ConvertDelaySecondsToTicks(double delay)
{
// 1 tick = 1/64 us = 1e-6 / 64 s
// ticks = delay / (1e-6/64) = delay * 64e6
const int64_t ticks = static_cast<int64_t>(std::llround(delay * 64.0e6));

// Clamp to [0 .. 32767]
return static_cast<int32_t>( (ticks < 0) ? 0 : (ticks > 32767) ? 32767 : ticks );
}

void CRTCContext::AddMicrovectorMovement(const LibMCDriver_ScanLab_uint64 nMicrovectorArrayBufferSize, const LibMCDriver_ScanLab::sMicroVector* pMicrovectorArrayBuffer)
{
Expand All @@ -1131,9 +1140,8 @@ void CRTCContext::AddMicrovectorMovement(const LibMCDriver_ScanLab_uint64 nMicro

int32_t intX = (int32_t)dX;
int32_t intY = (int32_t)dY;

int32_t intDelayLaserOn = (pMicroVector->m_LaserOnDelay < 0.0) ? -1 : round(pMicroVector->m_LaserOnDelay * 100000);
int32_t intDelayLaserOff = (pMicroVector->m_LaserOffDelay < 0.0) ? -1 : round(pMicroVector->m_LaserOffDelay * 100000);
int32_t intDelayLaserOn = (pMicroVector->m_LaserOnDelay < 0.0) ? -1 : ConvertDelaySecondsToTicks(pMicroVector->m_LaserOnDelay);
int32_t intDelayLaserOff = (pMicroVector->m_LaserOffDelay < 0.0) ? -1 : ConvertDelaySecondsToTicks(pMicroVector->m_LaserOffDelay);

m_pScanLabSDK->n_micro_vector_abs(m_CardNo, intX, intY, intDelayLaserOn, intDelayLaserOff);

Expand Down
3 changes: 3 additions & 0 deletions Drivers/ScanLab/Implementation/libmcdriver_scanlab_rtccontext.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,9 @@ class CRTCContext : public virtual IRTCContext, public virtual CBase {
// Calls the SetTriggerX Call that is necessary for the specific OIE board
void callSetTriggerOIE(uint32_t nPeriod);

// Converts a delay in seconds to RTC ticks
int32_t ConvertDelaySecondsToTicks(double delay);

public:

CRTCContext(PRTCContextOwnerData pOwnerData, uint32_t nCardNo, bool bIsNetwork, LibMCEnv::PDriverEnvironment pDriverEnvironment);
Expand Down
29 changes: 27 additions & 2 deletions Implementation/LibMCEnv/libmcenv_datatable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,9 +841,34 @@ class CDataTableColumn_Int32 : public CDataTableColumn

void fillScatterplotChannel(AMC::CScatterplot* pScatterplot, const std::string& sChannel, const std::string& sColumn, double dScaleFactor, double dOffset) override
{
throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_NOTIMPLEMENTED);
}
if (pScatterplot == nullptr)
throw ELibMCEnvInterfaceException(LIBMCENV_ERROR_INVALIDPARAM);

auto& channelEntries = pScatterplot->getChannelEntries();
auto channelIter = channelEntries.find(sChannel);

if (channelIter == channelEntries.end()) {
channelEntries[sChannel][sColumn] = std::vector<double>();
}
else {
auto& columnEntries = channelIter->second;

if (columnEntries.find(sColumn) == columnEntries.end())
columnEntries[sColumn] = std::vector<double>();
else {
std::string sException = "The channel = " + sChannel + " with the column = " + sColumn + " already exists";
throw std::runtime_error(sException.c_str());
}
}

auto& vecColumn = channelEntries[sChannel][sColumn];

vecColumn.resize(m_Rows.size());

for (size_t nIndex = 0; nIndex < m_Rows.size(); nIndex++) {
vecColumn[nIndex] = (double)m_Rows.at(nIndex) * dScaleFactor + dOffset;
}
}
};


Expand Down