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
+6
-6
@@ -175,11 +175,11 @@ bool NewMessageDialog::init(const std::shared_ptr<Messaging::Interface::Dtc> &dt
|
||||
bool NewMessageDialog::initAnswerDialog(const Messaging::OperatorMessage &msg)
|
||||
{
|
||||
m_ui->leSubject->setText(tr("Re: %1").arg(QString::fromStdString(msg.subject())));
|
||||
if (msg.senderType() == Messaging::AddressType_def::ObserverController)
|
||||
if (msg.senderType() == Messaging::AddressType::ObserverController)
|
||||
m_ui->cbxAddrType->setChecked(true);
|
||||
fillAddressBox();
|
||||
|
||||
if (msg.senderType() == Messaging::AddressType_def::ObserverController)
|
||||
if (msg.senderType() == Messaging::AddressType::ObserverController)
|
||||
{
|
||||
int idx = m_ui->cmbOperators->findData(0-msg.senderId());
|
||||
INFO_LOG(m_logger) << "senderId=" << 0-msg.senderId()
|
||||
@@ -241,9 +241,9 @@ bool NewMessageDialog::apply()
|
||||
DEBUG_LOG(m_logger) << "request for Operators";
|
||||
comr.senderId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
|
||||
comr.subject(subject.toStdString());
|
||||
comr.senderType(Messaging::AddressType_def::type::Operator);
|
||||
comr.senderType(Messaging::AddressType::Operator);
|
||||
comr.message(message.toStdString());
|
||||
comr.recipientType() = Messaging::AddressType_def::type::Operator;
|
||||
comr.recipientType() = Messaging::AddressType::Operator;
|
||||
comr.recipientIds().reserve(recvOperators.size());
|
||||
|
||||
comr.exerciseId(m_session->exerciseId());
|
||||
@@ -267,9 +267,9 @@ bool NewMessageDialog::apply()
|
||||
DEBUG_LOG(m_logger) << "request for OCs";
|
||||
comrOC.senderId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
|
||||
comrOC.subject(subject.toStdString());
|
||||
comrOC.senderType(Messaging::AddressType_def::type::Operator);
|
||||
comrOC.senderType(Messaging::AddressType::Operator);
|
||||
comrOC.message(message.toStdString());
|
||||
comrOC.recipientType() = Messaging::AddressType_def::type::ObserverController;
|
||||
comrOC.recipientType() = Messaging::AddressType::ObserverController;
|
||||
comrOC.recipientIds().reserve(recvOperators.size());
|
||||
comrOC.exerciseId(m_session->exerciseId());
|
||||
for (const RecipientModel::Recipient &r : recvOCs)
|
||||
|
||||
+1
-1
@@ -80,7 +80,7 @@ bool ShowMessageDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
|
||||
m_ui->msgContent->setTextCursor(cursor);
|
||||
|
||||
m_buttonBox->setButtonVisible(LtsWidgets::DialogButton::Add, ((operatorMessage.recipientId() > 0) && (operatorMessage.correspondingOutboxMessageId() > 0))
|
||||
|| (operatorMessage.recipientId() == Messaging::AddressType_def::ObserverController));
|
||||
|| (operatorMessage.recipientId() == Messaging::AddressType::ObserverController));
|
||||
m_buttonBox->setText(LtsWidgets::DialogButton::Add, tr("Answer"));
|
||||
if (box == MessagingModel::Box::InBox)
|
||||
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Add, true);
|
||||
|
||||
Reference in new issue
Block a user