Migrates residual Lts sources to generated rtiddsgen API
Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
This commit is contained in:
1 parent
5485a90385
commit
881d44f4dd
512 files changed
+6887
-6426
No files matched your search
@@ -26,7 +26,7 @@ Database::AvmDeviceConfig toDb(const ExerciseContext &context, const AssetManage
|
||||
deviceConfig.context = context.toString();
|
||||
deviceConfig.type = QStringLiteral("IMPORT_VIDEO_CHANNEL");
|
||||
deviceConfig.name = QStringLiteral("ECRS");
|
||||
deviceConfig.controller = QString::fromStdString(asset.name());
|
||||
deviceConfig.controller = QString::fromStdString(asset.name);
|
||||
deviceConfig.definition = QStringLiteral("recording=ECRS@EXCAVS01");
|
||||
return deviceConfig;
|
||||
}
|
||||
@@ -91,11 +91,11 @@ void ImportHandler::onAssetChanged(const AssetManagement::Asset &asset, DataModi
|
||||
if (!m_isActive)
|
||||
return;
|
||||
|
||||
if (asset.assetTypeId() != AssetManagement::AssetType::Workstation)
|
||||
if (asset.assetTypeId != AssetManagement::AssetType::Workstation)
|
||||
return;
|
||||
|
||||
// Guard against a possible race condition, see comments in onContextActivated().
|
||||
auto found = m_deviceConfigs.find(asset.id());
|
||||
auto found = m_deviceConfigs.find(asset.id);
|
||||
if (found != m_deviceConfigs.end())
|
||||
return;
|
||||
|
||||
@@ -121,14 +121,14 @@ void ImportHandler::addToDb(const AssetManagement::Asset &asset)
|
||||
{
|
||||
Database::AvmDeviceConfig newConfig = ::toDb(m_context, asset);
|
||||
m_db->insert(newConfig);
|
||||
auto insertResult = m_deviceConfigs.insert({asset.id(), newConfig});
|
||||
auto insertResult = m_deviceConfigs.insert({asset.id, newConfig});
|
||||
Q_ASSERT(insertResult.second);
|
||||
emit avDbReloadNeeded();
|
||||
}
|
||||
|
||||
void ImportHandler::removeFromDb(const AssetManagement::Asset &asset)
|
||||
{
|
||||
auto found = m_deviceConfigs.find(asset.id());
|
||||
auto found = m_deviceConfigs.find(asset.id);
|
||||
Q_ASSERT(found != m_deviceConfigs.end());
|
||||
m_db->removeAvmDeviceConfig(found->second.id);
|
||||
m_deviceConfigs.erase(found);
|
||||
|
||||
Reference in new issue
Block a user