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
+4
-4
@@ -99,7 +99,7 @@ bool HQReportEdit::init(LtsSession::LtsSession *session, int partyId)
|
||||
|
||||
FlmHQReportModel *planModel = new FlmHQReportModel(m_ui->listViewPlan);
|
||||
|
||||
if (!planModel->init(m_session, partyFolderId, FileType::inner_enum::TacticalPlan))
|
||||
if (!planModel->init(m_session, partyFolderId, FileType::TacticalPlan))
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not init planModel for partyId " << partyId;
|
||||
|
||||
@@ -113,7 +113,7 @@ bool HQReportEdit::init(LtsSession::LtsSession *session, int partyId)
|
||||
|
||||
FlmHQReportModel *hqReportModel = new FlmHQReportModel(m_ui->listViewMessage);
|
||||
|
||||
if (!hqReportModel->init(m_session, hqReportFolderId, FileType::inner_enum::AdlerJson))
|
||||
if (!hqReportModel->init(m_session, hqReportFolderId, FileType::AdlerJson))
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not init hqReportModel for partyId " << partyId;
|
||||
|
||||
@@ -176,7 +176,7 @@ void HQReportEdit::createModels(const int partyId)
|
||||
delete m_hqModels.take(partyId);
|
||||
|
||||
auto *planModel = new FlmHQReportModel(m_ui->listViewPlan);
|
||||
if (!planModel->init(m_session, partyFolderId, FileType::inner_enum::TacticalPlan))
|
||||
if (!planModel->init(m_session, partyFolderId, FileType::TacticalPlan))
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not init planModel for partyId " << partyId;
|
||||
delete planModel;
|
||||
@@ -184,7 +184,7 @@ void HQReportEdit::createModels(const int partyId)
|
||||
}
|
||||
|
||||
auto *hqReportModel = new FlmHQReportModel(m_ui->listViewMessage);
|
||||
if (!hqReportModel->init(m_session, hqReportFolderId, FileType::inner_enum::AdlerJson))
|
||||
if (!hqReportModel->init(m_session, hqReportFolderId, FileType::AdlerJson))
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not init hqReportModel for partyId " << partyId;
|
||||
delete planModel;
|
||||
|
||||
+14
-14
@@ -169,38 +169,38 @@ void FileTopicEditor::updateInternalData()
|
||||
switch (m_topicData.topicType)
|
||||
{
|
||||
case TopicEditorBase::TopicType::Image:
|
||||
m_fileTypes << FileManagement::FileType_def::Jpg << FileManagement::FileType_def::Png;
|
||||
m_fileTypes << FileManagement::FileType::Jpg << FileManagement::FileType::Png;
|
||||
break;
|
||||
|
||||
case TopicEditorBase::TopicType::Pdf:
|
||||
m_fileTypes << FileManagement::FileType_def::Pdf;
|
||||
m_fileTypes << FileManagement::FileType::Pdf;
|
||||
break;
|
||||
|
||||
case TopicEditorBase::TopicType::Text:
|
||||
m_fileTypes << FileManagement::FileType_def::Text << FileManagement::FileType_def::EvaluationSchema;
|
||||
m_fileTypes << FileManagement::FileType::Text << FileManagement::FileType::EvaluationSchema;
|
||||
break;
|
||||
|
||||
case TopicEditorBase::TopicType::Xml:
|
||||
m_fileTypes << FileManagement::FileType_def::Xml;
|
||||
m_fileTypes << FileManagement::FileType::Xml;
|
||||
break;
|
||||
|
||||
case TopicEditorBase::TopicType::TacticalPlan:
|
||||
m_fileTypes << FileManagement::FileType_def::TacticalPlan;
|
||||
m_fileTypes << FileManagement::FileType::TacticalPlan;
|
||||
break;
|
||||
|
||||
case TopicEditorBase::TopicType::MSOffice:
|
||||
m_fileTypes << FileManagement::FileType_def::MSOfficeDocument
|
||||
<< FileManagement::FileType_def::MSOfficeDocument97
|
||||
<< FileManagement::FileType_def::MSOfficePresentation
|
||||
<< FileManagement::FileType_def::MSOfficePresentation97
|
||||
<< FileManagement::FileType_def::MSOfficeSpreadsheet
|
||||
<< FileManagement::FileType_def::MSOfficeSpreadsheet97;
|
||||
m_fileTypes << FileManagement::FileType::MSOfficeDocument
|
||||
<< FileManagement::FileType::MSOfficeDocument97
|
||||
<< FileManagement::FileType::MSOfficePresentation
|
||||
<< FileManagement::FileType::MSOfficePresentation97
|
||||
<< FileManagement::FileType::MSOfficeSpreadsheet
|
||||
<< FileManagement::FileType::MSOfficeSpreadsheet97;
|
||||
break;
|
||||
|
||||
case TopicEditorBase::TopicType::OpenOffice:
|
||||
m_fileTypes << FileManagement::FileType_def::OpenOfficeDocument
|
||||
<< FileManagement::FileType_def::OpenOfficePresentation
|
||||
<< FileManagement::FileType_def::OpenOfficeSpreadsheet;
|
||||
m_fileTypes << FileManagement::FileType::OpenOfficeDocument
|
||||
<< FileManagement::FileType::OpenOfficePresentation
|
||||
<< FileManagement::FileType::OpenOfficeSpreadsheet;
|
||||
break;
|
||||
|
||||
default:
|
||||
|
||||
+1
-1
@@ -1290,7 +1290,7 @@ FileManagement::FileType FileManagementDialogWidget::getFileType(const QString&
|
||||
if (fti.extension() == ext)
|
||||
{
|
||||
|
||||
type = static_cast<FileType::type>(fti.id());
|
||||
type = static_cast<FileType>(fti.id());
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
||||
+6
-6
@@ -189,9 +189,9 @@ void FileContentEditDialog::setMetaData()
|
||||
DEBUG_LOG(m_logger) << "setMetaData";
|
||||
|
||||
m_editData.name(m_ui->leName->text().toStdString());
|
||||
m_editData.fileType(static_cast<FileManagement::FileType::type>(m_ui->cbFileType->currentData().toInt()));
|
||||
m_editData.fileCategory(static_cast<FileManagement::FileCategory::type>(m_ui->cbFileCategory->currentData().toInt()));
|
||||
m_editData.fileStatus(static_cast<FileManagement::FileStatus::type>(m_ui->cbFileStatus->currentData().toInt()));
|
||||
m_editData.fileType(static_cast<FileManagement::FileType>(m_ui->cbFileType->currentData().toInt()));
|
||||
m_editData.fileCategory(static_cast<FileManagement::FileCategory>(m_ui->cbFileCategory->currentData().toInt()));
|
||||
m_editData.fileStatus(static_cast<FileManagement::FileStatus>(m_ui->cbFileStatus->currentData().toInt()));
|
||||
m_editData.isTemplate(m_ui->checkTemplate->isChecked());
|
||||
m_editData.isHidden(m_ui->checkHidden->isChecked());
|
||||
m_editData.isUsedBy(m_ui->checkUsed->isChecked());
|
||||
@@ -320,7 +320,7 @@ void FileContentEditDialog::onComboFileTypeChanged(int crt)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onComboFileTypeChanged crt = " << crt;
|
||||
m_ui->cbFileType->setCurrentIndex(crt);
|
||||
m_editData.fileType(static_cast<FileManagement::FileType::type>(m_ui->cbFileType->currentData().toInt()));
|
||||
m_editData.fileType(static_cast<FileManagement::FileType>(m_ui->cbFileType->currentData().toInt()));
|
||||
}
|
||||
|
||||
|
||||
@@ -328,7 +328,7 @@ void FileContentEditDialog::onComboFileStatusChanged(int crt)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onComboFileStatusChanged crt = " << crt;
|
||||
m_ui->cbFileStatus->setCurrentIndex(crt);
|
||||
m_editData.fileStatus(static_cast<FileManagement::FileStatus::type>(m_ui->cbFileStatus->currentData().toInt()));
|
||||
m_editData.fileStatus(static_cast<FileManagement::FileStatus>(m_ui->cbFileStatus->currentData().toInt()));
|
||||
}
|
||||
|
||||
|
||||
@@ -336,7 +336,7 @@ void FileContentEditDialog::onComboFileCategoryChanged(int crt)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onComboFileCategoryChanged crt = " << crt;
|
||||
m_ui->cbFileCategory->setCurrentIndex(crt);
|
||||
m_editData.fileCategory(static_cast<FileManagement::FileCategory::type>(m_ui->cbFileCategory->currentData().toInt()));
|
||||
m_editData.fileCategory(static_cast<FileManagement::FileCategory>(m_ui->cbFileCategory->currentData().toInt()));
|
||||
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -783,7 +783,7 @@ bool InterfaceImpl::TopicReplayInterface::playbackInit(const QJsonObject &attrib
|
||||
if (fileId > 0)
|
||||
fc = m_dtc->fileContent(fileId);
|
||||
else
|
||||
fc.fileType(FileManagement::FileType_def::Text);
|
||||
fc.fileType(FileManagement::FileType::Text);
|
||||
|
||||
if (!m_previewWidget)
|
||||
{
|
||||
|
||||
+19
-19
@@ -87,14 +87,14 @@ bool FileContentPreviewPlaybackWidget::init(const FileContent &data, int pageNo,
|
||||
|
||||
switch (data.fileType().underlying())
|
||||
{
|
||||
case FileManagement::FileType_def::Png:
|
||||
case FileManagement::FileType_def::Jpg:
|
||||
case FileManagement::FileType::Png:
|
||||
case FileManagement::FileType::Jpg:
|
||||
{
|
||||
m_ui->lblPixmap->setPixmap(LtsUtils::getPixmap(m_content));
|
||||
m_ui->lblPixmap->setVisible(true);
|
||||
break;
|
||||
}
|
||||
case FileManagement::FileType_def::Text:
|
||||
case FileManagement::FileType::Text:
|
||||
{
|
||||
if (!m_userText.isEmpty() && m_data.id() == 0)
|
||||
{
|
||||
@@ -105,16 +105,16 @@ bool FileContentPreviewPlaybackWidget::init(const FileContent &data, int pageNo,
|
||||
}
|
||||
break;
|
||||
}
|
||||
case FileManagement::FileType_def::Xml:
|
||||
case FileManagement::FileType_def::TacticalPlan:
|
||||
case FileManagement::FileType_def::OperatorFavourite:
|
||||
case FileManagement::FileType_def::EvaluationSchema:
|
||||
case FileManagement::FileType::Xml:
|
||||
case FileManagement::FileType::TacticalPlan:
|
||||
case FileManagement::FileType::OperatorFavourite:
|
||||
case FileManagement::FileType::EvaluationSchema:
|
||||
{
|
||||
m_ui->teText->setHtml(QString::fromUtf8(LtsUtils::toQByteArray(m_content)));
|
||||
m_ui->teText->setVisible(true);
|
||||
break;
|
||||
}
|
||||
case FileManagement::FileType_def::Pdf:
|
||||
case FileManagement::FileType::Pdf:
|
||||
{
|
||||
m_pdfWidget->setVisible(true);
|
||||
m_pdfWidget->setZoomFactor(m_zoomFactor);
|
||||
@@ -123,22 +123,22 @@ bool FileContentPreviewPlaybackWidget::init(const FileContent &data, int pageNo,
|
||||
m_pdfWidget->showPDF(LtsUtils::toQByteArray(m_content));
|
||||
break;
|
||||
}
|
||||
case FileManagement::FileType_def::OperatorDefinedSymbol:
|
||||
case FileManagement::FileType_def::MSOfficeDocument:
|
||||
case FileManagement::FileType_def::MSOfficeDocument97:
|
||||
case FileManagement::FileType_def::MSOfficePresentation:
|
||||
case FileManagement::FileType_def::MSOfficePresentation97:
|
||||
case FileManagement::FileType_def::MSOfficeSpreadsheet:
|
||||
case FileManagement::FileType_def::MSOfficeSpreadsheet97:
|
||||
case FileManagement::FileType_def::OpenOfficeDocument:
|
||||
case FileManagement::FileType_def::OpenOfficePresentation:
|
||||
case FileManagement::FileType_def::OpenOfficeSpreadsheet:
|
||||
case FileManagement::FileType::OperatorDefinedSymbol:
|
||||
case FileManagement::FileType::MSOfficeDocument:
|
||||
case FileManagement::FileType::MSOfficeDocument97:
|
||||
case FileManagement::FileType::MSOfficePresentation:
|
||||
case FileManagement::FileType::MSOfficePresentation97:
|
||||
case FileManagement::FileType::MSOfficeSpreadsheet:
|
||||
case FileManagement::FileType::MSOfficeSpreadsheet97:
|
||||
case FileManagement::FileType::OpenOfficeDocument:
|
||||
case FileManagement::FileType::OpenOfficePresentation:
|
||||
case FileManagement::FileType::OpenOfficeSpreadsheet:
|
||||
{
|
||||
new LtsWidgets::LtsMessageDialogNew(this, tr("Not yet implemented"));
|
||||
close();
|
||||
break;
|
||||
}
|
||||
case FileManagement::FileType_def::Unknown:
|
||||
case FileManagement::FileType::Unknown:
|
||||
default:
|
||||
{
|
||||
if (!m_userText.isEmpty() && m_data.id() == 0)
|
||||
|
||||
Reference in new issue
Block a user