Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2785 files changed
+18754
-18316
No files matched your search
+6
-7
@@ -17,7 +17,6 @@ namespace Evaluations
|
||||
|
||||
TopicEditorEvaluationModel::TopicEditorEvaluationModel(QObject *parent)
|
||||
: NGLTreeModel(parent, new NGLTreeItem(QVariant()), { tr("Id"), tr("Name"), tr("Weight"), tr("Start Time"), tr("Situation"), tr("Video"), tr("Audio") })
|
||||
, m_logger(getLogger("TopicEditorEvaluationModel"))
|
||||
{}
|
||||
|
||||
|
||||
@@ -121,7 +120,7 @@ bool TopicEditorEvaluationModel::initModel(const std::shared_ptr<Interface::Dtc>
|
||||
{
|
||||
if (!dtc)
|
||||
return false;
|
||||
DEBUG_LOG(m_logger) << "initModel Folder";
|
||||
DEBUG_LOG() << "initModel Folder";
|
||||
|
||||
NGLTreeModel::resetModel();
|
||||
|
||||
@@ -145,7 +144,7 @@ bool TopicEditorEvaluationModel::initModel(const std::shared_ptr<Interface::Dtc>
|
||||
|
||||
if (!parentItemIndexCache.contains(parentId))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Invalid folder structure";
|
||||
ERROR_LOG() << "Invalid folder structure";
|
||||
return false;
|
||||
}
|
||||
else
|
||||
@@ -157,7 +156,7 @@ bool TopicEditorEvaluationModel::initModel(const std::shared_ptr<Interface::Dtc>
|
||||
data.setValue(crit);
|
||||
onInsertRow(rowPos, pIndex, data);
|
||||
parentItemIndexCache.insert(criteriumId+10000, index(rowPos, 0, pIndex));
|
||||
DEBUG_LOG(m_logger) << "Added to tree (criterium id, parent id) : (" << criteriumId << ", " << parentId << ")";
|
||||
DEBUG_LOG() << "Added to tree (criterium id, parent id) : (" << criteriumId << ", " << parentId << ")";
|
||||
}
|
||||
|
||||
for (QMap<qint32, Evaluations::EvaluationElement>::const_iterator iter2 = elemMap.constBegin();
|
||||
@@ -171,7 +170,7 @@ bool TopicEditorEvaluationModel::initModel(const std::shared_ptr<Interface::Dtc>
|
||||
|
||||
if (!parentItemIndexCache.contains(parentId))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Invalid folder structure";
|
||||
ERROR_LOG() << "Invalid folder structure";
|
||||
return false;
|
||||
}
|
||||
else
|
||||
@@ -184,7 +183,7 @@ bool TopicEditorEvaluationModel::initModel(const std::shared_ptr<Interface::Dtc>
|
||||
onInsertRow(rowPos, pIndex, data);
|
||||
int elementId = elem.id();
|
||||
parentItemIndexCache.insert(elementId,index(rowPos, 0, pIndex));
|
||||
DEBUG_LOG(m_logger) << "Added to tree (element id, parent id) : (" << elementId << ", " << parentId << ")";
|
||||
DEBUG_LOG() << "Added to tree (element id, parent id) : (" << elementId << ", " << parentId << ")";
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -195,7 +194,7 @@ bool TopicEditorEvaluationModel::initModel(const std::shared_ptr<Interface::Dtc>
|
||||
|
||||
bool TopicEditorEvaluationModel::onInsertRow(int &row, const QModelIndex &parent, const QVariant &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onInsertRow";
|
||||
DEBUG_LOG() << "onInsertRow";
|
||||
|
||||
row = rowCount(parent);
|
||||
NGLTreeItem *item = new NGLTreeItem(data, QIcon());
|
||||
|
||||
-2
@@ -47,8 +47,6 @@ public slots:
|
||||
bool onInsertRow(int &row, const QModelIndex &parent, const QVariant &data);
|
||||
|
||||
private:
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
+12
-13
@@ -23,7 +23,6 @@ EvaluationTopicEditor::EvaluationTopicEditor(LtsSession::LtsSession *session, QW
|
||||
: TopicEditorBase::TopicEditor(parent)
|
||||
, m_session(session)
|
||||
, m_ui(new Ui::EvaluationTopicEditor)
|
||||
, m_logger(getLogger("EvaluationTopicEditor"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
init(m_ui->widget);
|
||||
@@ -60,13 +59,13 @@ bool EvaluationTopicEditor::fetchInterfaces()
|
||||
{
|
||||
if (!m_session->getDtc<Evaluations::DataInterface>(m_evlDtc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Failed to retrieve Evl Dtc";
|
||||
ERROR_LOG() << "Failed to retrieve Evl Dtc";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_session->getForeignGuiInterface<OperatorManagement::ForeignGuiComboboxInterface>(m_opmCbxIfc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Failed to retrieve Evl ForeignGuiInterface";
|
||||
ERROR_LOG() << "Failed to retrieve Evl ForeignGuiInterface";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -75,7 +74,7 @@ bool EvaluationTopicEditor::fetchInterfaces()
|
||||
|
||||
initOperatorComboBox();
|
||||
|
||||
DEBUG_LOG(m_logger) << "fillOperatorComboBox m_operatorId = " << m_operatorId;
|
||||
DEBUG_LOG() << "fillOperatorComboBox m_operatorId = " << m_operatorId;
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -84,19 +83,19 @@ bool EvaluationTopicEditor::fetchInterfaces()
|
||||
|
||||
void EvaluationTopicEditor::updateInternalData()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION;
|
||||
DEBUG_LOG() << Q_FUNC_INFO;
|
||||
|
||||
if (!hasTopicDataProperties())
|
||||
return;
|
||||
|
||||
m_operatorId = getTopicDataValue(QStringLiteral("operatorId")).toInt();
|
||||
DEBUG_LOG(m_logger) << "operator id = " << m_operatorId;
|
||||
DEBUG_LOG() << "operator id = " << m_operatorId;
|
||||
|
||||
m_ui->cbxOperator->setCurrentIndex(m_ui->cbxOperator->findData(m_operatorId));
|
||||
m_model->initModel(m_evlDtc, m_operatorId);
|
||||
|
||||
m_evlElement.id(getTopicDataValue(QStringLiteral("elementId")).toDouble());
|
||||
DEBUG_LOG(m_logger) << "element id = " << m_evlElement.id();
|
||||
DEBUG_LOG() << "element id = " << m_evlElement.id();
|
||||
m_evlElement.timestamp(getTopicDataValue(QStringLiteral("start")).toDouble());
|
||||
m_evlElement.situation(getTopicDataValue(QStringLiteral("situation")).toBool());
|
||||
m_evlElement.audio(getTopicDataValue(QStringLiteral("audio")).toBool());
|
||||
@@ -157,8 +156,8 @@ bool EvaluationTopicEditor::apply2()
|
||||
setTopicDataProperty(QStringLiteral("audio"), m_evlElement.audio());
|
||||
setTopicDataProperty(QStringLiteral("video"), m_evlElement.video());
|
||||
|
||||
DEBUG_LOG(m_logger) << "operator id = " << m_operatorId << ", element id = " << m_evlElement.id();
|
||||
DEBUG_LOG(m_logger) << "timestamp: " << m_evlElement.timestamp();
|
||||
DEBUG_LOG() << "operator id = " << m_operatorId << ", element id = " << m_evlElement.id();
|
||||
DEBUG_LOG() << "timestamp: " << m_evlElement.timestamp();
|
||||
|
||||
if (m_evlElement.situation())
|
||||
{
|
||||
@@ -185,7 +184,7 @@ bool EvaluationTopicEditor::apply2()
|
||||
data.duration = m_evlElement.duration();
|
||||
data.properties = m_topicData.properties;
|
||||
|
||||
DEBUG_LOG(m_logger) << "topicData - properties: " << QJsonDocument(m_topicData.properties).toJson(QJsonDocument::Compact);
|
||||
DEBUG_LOG() << "topicData - properties: " << QJsonDocument(m_topicData.properties).toJson(QJsonDocument::Compact);
|
||||
|
||||
emit topicEditorRequested(data);
|
||||
}
|
||||
@@ -222,7 +221,7 @@ bool EvaluationTopicEditor::apply2()
|
||||
void EvaluationTopicEditor::onOperatorChanged()
|
||||
{
|
||||
m_operatorId = m_ui->cbxOperator->currentData().toInt();
|
||||
DEBUG_LOG(m_logger) << "operator id = " << m_operatorId;
|
||||
DEBUG_LOG() << "operator id = " << m_operatorId;
|
||||
|
||||
m_model->initModel(m_evlDtc, m_operatorId);
|
||||
m_ui->trvEvaluations->expandAll();
|
||||
@@ -233,11 +232,11 @@ void EvaluationTopicEditor::onSelectionChanged(const QItemSelection &selected, c
|
||||
Q_UNUSED(selected);
|
||||
Q_UNUSED(deselected);
|
||||
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION;
|
||||
DEBUG_LOG() << Q_FUNC_INFO;
|
||||
|
||||
QModelIndex index = m_ui->trvEvaluations->currentIndex();
|
||||
m_evlElement = m_model->getEvaluationElement(index);
|
||||
DEBUG_LOG(m_logger) << "element id = " << m_evlElement.id();
|
||||
DEBUG_LOG() << "element id = " << m_evlElement.id();
|
||||
|
||||
m_topicData.description = QString::number(m_evlElement.id());
|
||||
slotChangesMade();
|
||||
|
||||
-2
@@ -54,8 +54,6 @@ private:
|
||||
TopicEditorEvaluationModel *m_model{nullptr};
|
||||
|
||||
Ui::EvaluationTopicEditor *m_ui{nullptr};
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
+8
-9
@@ -24,9 +24,8 @@ CriteriumDialog::CriteriumDialog(const QString &menuGroup, LtsSession::LtsSessio
|
||||
, m_menuGroup(menuGroup)
|
||||
, m_ownEvaluationElements(ownEvlElements)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("CriteriumDialog"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "CriteriumDialog ctor";
|
||||
DEBUG_LOG() << "CriteriumDialog ctor";
|
||||
m_ui->setupUi(this);
|
||||
m_buttonBox->connectButton(LtsWidgets::DialogButton::Print, this, &CriteriumDialog::onPrint);
|
||||
|
||||
@@ -90,13 +89,13 @@ void CriteriumDialog::tableColumnOrganiserSetting()
|
||||
|
||||
void CriteriumDialog::slotAdd()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "CriteriumDialog::slotAdd";
|
||||
DEBUG_LOG() << "CriteriumDialog::slotAdd";
|
||||
editCriterium(0 );
|
||||
}
|
||||
|
||||
void CriteriumDialog::slotEdit()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "CriteriumDialog::slotEdit";
|
||||
DEBUG_LOG() << "CriteriumDialog::slotEdit";
|
||||
|
||||
const QModelIndex srcIdx = m_ui->widget->currentIndex();
|
||||
editCriterium(m_model->getRowData(srcIdx.row()).id() );
|
||||
@@ -104,20 +103,20 @@ void CriteriumDialog::slotEdit()
|
||||
|
||||
void CriteriumDialog::slotRemove()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "CriteriumDialog::slotRemove";
|
||||
DEBUG_LOG() << "CriteriumDialog::slotRemove";
|
||||
const QModelIndex selIndex = m_ui->widget->currentIndex();
|
||||
if (!selIndex.isValid())
|
||||
return;
|
||||
|
||||
Core::RemoveElementRequest req(m_model->getRowData(selIndex.row()).id());
|
||||
DEBUG_LOG(m_logger) << "Removing criterium id = " << req.id();
|
||||
DEBUG_LOG() << "Removing criterium id = " << req.id();
|
||||
m_requestHelper->startSingleRequest([req, this]()
|
||||
{
|
||||
return m_ftc->evlCriteriumRemoveRequest(req, this);
|
||||
});
|
||||
|
||||
if (m_requestHelper->failed())
|
||||
ERROR_LOG(m_logger) << "Failed to remove criterium";
|
||||
ERROR_LOG() << "Failed to remove criterium";
|
||||
}
|
||||
|
||||
|
||||
@@ -146,7 +145,7 @@ bool CriteriumDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
|
||||
int exerciseId,
|
||||
int currentOperatorId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "CriteriumDialog::init";
|
||||
DEBUG_LOG() << "CriteriumDialog::init";
|
||||
m_dtc = dtc;
|
||||
m_ftc = ftc;
|
||||
m_opmCbxDtc = opmCbxDtc;
|
||||
@@ -176,7 +175,7 @@ bool CriteriumDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
|
||||
for (auto i = criteria.constBegin(); i != criteria.constEnd(); ++i)
|
||||
{
|
||||
const EvaluationCriterium &p = (*i);
|
||||
DEBUG_LOG(m_logger) << "Criterium: id = " << p.id() << ", name = " << p.name().c_str() << ", desc = " << p.description().c_str();
|
||||
DEBUG_LOG() << "Criterium: id = " << p.id() << ", name = " << p.name().c_str() << ", desc = " << p.description().c_str();
|
||||
}
|
||||
|
||||
connect(m_ui->widget, &LtsDataView::LtsDataView::signalSelectionChanged, this, &CriteriumDialog::enaDisa, Qt::UniqueConnection);
|
||||
|
||||
@@ -83,9 +83,6 @@ private:
|
||||
int m_currentOperatorId{-1};
|
||||
bool m_ownEvaluationElements{false};
|
||||
LtsUtils::RequestHelper *m_requestHelper{nullptr};
|
||||
|
||||
LOGGER_T m_logger;
|
||||
|
||||
private slots:
|
||||
void slotAdd();
|
||||
void slotEdit();
|
||||
|
||||
+4
-5
@@ -19,9 +19,8 @@ CriteriumEditDialog::CriteriumEditDialog(QWidget *parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkCancel)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_ui(new Ui::CriteriumEditDialog)
|
||||
, m_logger(getLogger("CriteriumEditDialog"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "CriteriumEditDialog ctor";
|
||||
DEBUG_LOG() << "CriteriumEditDialog ctor";
|
||||
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -44,7 +43,7 @@ bool CriteriumEditDialog::init(int criteriumId,
|
||||
const std::shared_ptr<Interface::Ftc> &ftc,
|
||||
const std::shared_ptr<OperatorManagement::ForeignGuiComboboxInterface> &opmCbxDtc)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "CriteriumEditDialog::init";
|
||||
DEBUG_LOG() << "CriteriumEditDialog::init";
|
||||
m_criteriumId = criteriumId;
|
||||
m_dtc = dtc;
|
||||
m_ftc = ftc;
|
||||
@@ -124,9 +123,9 @@ void CriteriumEditDialog::onExportButtonClicked()
|
||||
|
||||
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
|
||||
if (fileId > 0)
|
||||
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
|
||||
DEBUG_LOG() << "Saved file with id = " << fileId;
|
||||
else
|
||||
ERROR_LOG(m_logger) << "Could not save file in library ";
|
||||
ERROR_LOG() << "Could not save file in library ";
|
||||
}
|
||||
|
||||
void CriteriumEditDialog::onImportButtonClicked()
|
||||
|
||||
-3
@@ -64,8 +64,5 @@ private:
|
||||
int m_criteriumId{-1};
|
||||
LtsUtils::RequestHelper *m_requestHelper{nullptr};
|
||||
Ui::CriteriumEditDialog *m_ui{nullptr};
|
||||
|
||||
LOGGER_T m_logger;
|
||||
|
||||
};
|
||||
}
|
||||
+6
-7
@@ -30,9 +30,8 @@ ElementEditDialog::ElementEditDialog(QWidget *)
|
||||
: LtsWidgets::LtsDialog(nullptr, LtsWidgets::ButtonCombination::OkCancel)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_ui(new Ui::ElementEditDialog)
|
||||
, m_logger(getLogger("ElementEditDialog"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "ElementEditDialog ctor";
|
||||
DEBUG_LOG() << "ElementEditDialog ctor";
|
||||
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -74,7 +73,7 @@ bool ElementEditDialog::init(int elementId,
|
||||
const std::shared_ptr<FilterManagement::ForeignFltBuildingComponentGuiInterface> &fltBuildingComponentIfc,
|
||||
LtsSession::LtsSession *session)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "ElementEditDialog::init";
|
||||
DEBUG_LOG() << "ElementEditDialog::init";
|
||||
m_elementId = elementId;
|
||||
m_criteriumId = criteriumId;
|
||||
m_exerciseId = exerciseId;
|
||||
@@ -98,7 +97,7 @@ bool ElementEditDialog::init(int elementId,
|
||||
m_ui->cbxRating->setCurrentIndex(m_ui->cbxRating->findData(eval.rating()));
|
||||
m_ui->teDesc->setText(QString::fromStdString(eval.note()));
|
||||
m_ui->lblStartTime->setText(DTG::toStringMSec(eval.timestamp()));
|
||||
ERROR_LOG(m_logger) << "set start time label to " << m_ui->lblStartTime->text();
|
||||
ERROR_LOG() << "set start time label to " << m_ui->lblStartTime->text();
|
||||
m_startTime = eval.timestamp();
|
||||
|
||||
m_ui->cbSituation->setChecked(eval.situation());
|
||||
@@ -170,7 +169,7 @@ bool ElementEditDialog::apply()
|
||||
if (m_session->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(sitMapIfc))
|
||||
root[QStringLiteral("settings")] = sitMapIfc->operatorMapSettings();
|
||||
else
|
||||
ERROR_LOG(m_logger) << "sit map ifc not available, can't save map settings :(";
|
||||
ERROR_LOG() << "sit map ifc not available, can't save map settings :(";
|
||||
|
||||
root[QStringLiteral("filters")] = getFilterSettings();
|
||||
|
||||
@@ -200,7 +199,7 @@ bool ElementEditDialog::apply()
|
||||
|
||||
void ElementEditDialog::fillPhasesComboBox()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "fillPhasesComboBox";
|
||||
DEBUG_LOG() << "fillPhasesComboBox";
|
||||
QSignalBlocker blocker(m_ui->cbxPhase);
|
||||
m_ui->cbxPhase->clear();
|
||||
m_ui->cbxPhase->addItem(tr("<not set>"), 0);
|
||||
@@ -219,7 +218,7 @@ void ElementEditDialog::fillPhasesComboBox()
|
||||
|
||||
void ElementEditDialog::onCheckBoxClicked()
|
||||
{
|
||||
INFO_LOG(m_logger) << "onCheckBoxClicked";
|
||||
INFO_LOG() << "onCheckBoxClicked";
|
||||
if (m_startTime > 0)
|
||||
return;
|
||||
|
||||
|
||||
-1
@@ -88,7 +88,6 @@ private:
|
||||
qint64 m_startTime { 0 };
|
||||
LtsUtils::RequestHelper *m_requestHelper{nullptr};
|
||||
Ui::ElementEditDialog *m_ui{nullptr};
|
||||
LOGGER_T m_logger;
|
||||
QStringList m_audioStreams;
|
||||
QStringList m_videoStreams;
|
||||
};
|
||||
|
||||
+8
-9
@@ -17,9 +17,8 @@ ElementDialog::ElementDialog(QWidget *parent)
|
||||
, m_model(new ElementDialogModel(this))
|
||||
, m_ui(new Ui::ElementDialog)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("ElementDialog"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "ElementDialog ctor";
|
||||
DEBUG_LOG() << "ElementDialog ctor";
|
||||
m_ui->setupUi(this);
|
||||
|
||||
setOnlineHelpFilename(QStringLiteral("Situation-Own_Evaluation_Criteria"));
|
||||
@@ -47,14 +46,14 @@ void ElementDialog::enaDisa()
|
||||
|
||||
void ElementDialog::slotAdd()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "ElementDialog::slotAdd";
|
||||
DEBUG_LOG() << "ElementDialog::slotAdd";
|
||||
|
||||
addElementEditDialog();
|
||||
}
|
||||
|
||||
void ElementDialog::slotEdit()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "ElementDialog::slotEdit";
|
||||
DEBUG_LOG() << "ElementDialog::slotEdit";
|
||||
|
||||
addElementEditDialog(m_model->getRowData(m_ui->widget->currentIndex().row()).id() );
|
||||
}
|
||||
@@ -76,19 +75,19 @@ void ElementDialog::tableColumnOrganiserSetting()
|
||||
|
||||
void ElementDialog::slotRemove()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "ElementDialog::slotRemove";
|
||||
DEBUG_LOG() << "ElementDialog::slotRemove";
|
||||
QModelIndex selIndex = m_ui->widget->currentIndex();
|
||||
if (!selIndex.isValid())
|
||||
return;
|
||||
|
||||
m_requestHelper->startSingleRequest([this]()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Removing element id = " << m_model->getRowData(m_ui->widget->currentIndex().row()).id();
|
||||
DEBUG_LOG() << "Removing element id = " << m_model->getRowData(m_ui->widget->currentIndex().row()).id();
|
||||
return m_ftc->evlElementRemoveRequest(EvlElementRemoveRequest(m_model->getRowData(m_ui->widget->currentIndex().row()).id(), m_criteriumId), this);
|
||||
});
|
||||
|
||||
if (m_requestHelper->failed())
|
||||
ERROR_LOG(m_logger) << "Failed to remove criterium";
|
||||
ERROR_LOG() << "Failed to remove criterium";
|
||||
}
|
||||
|
||||
QString ElementDialog::dialogIdentifier()
|
||||
@@ -108,7 +107,7 @@ bool ElementDialog::init(int criteriumId,
|
||||
const std::shared_ptr<FilterManagement::ForeignFltBuildingComponentGuiInterface> &fltBuildingComponentIfc,
|
||||
LtsSession::LtsSession *session)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "ElementDialog::init";
|
||||
DEBUG_LOG() << "ElementDialog::init";
|
||||
m_criteriumId = criteriumId;
|
||||
m_exerciseId = exerciseId;
|
||||
m_dtc = dtc;
|
||||
@@ -136,7 +135,7 @@ bool ElementDialog::init(int criteriumId,
|
||||
|
||||
auto cb = [this](const Evaluations::EvaluationElement &e)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Element: id = " << e.id() << ", medium = " << e.rating();
|
||||
DEBUG_LOG() << "Element: id = " << e.id() << ", medium = " << e.rating();
|
||||
};
|
||||
m_dtc->evaluationElements(cb);
|
||||
|
||||
|
||||
-3
@@ -77,9 +77,6 @@ private:
|
||||
LtsSession::LtsSession *m_session{nullptr};
|
||||
LtsUtils::RequestHelper *m_requestHelper{nullptr};
|
||||
QString m_menuGroup;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
|
||||
private slots:
|
||||
void slotAdd();
|
||||
void slotEdit();
|
||||
|
||||
+1
-2
@@ -27,7 +27,6 @@ ElementDialogModel::ElementDialogModel(QObject *parent)
|
||||
tr("Phase")
|
||||
},
|
||||
parent)
|
||||
, m_logger(getLogger("ElementDialogModel"))
|
||||
{}
|
||||
|
||||
bool ElementDialogModel::initModel(const std::shared_ptr<Interface::Dtc> &dtc,
|
||||
@@ -48,7 +47,7 @@ bool ElementDialogModel::initModel(const std::shared_ptr<Interface::Dtc> &dtc,
|
||||
};
|
||||
dtc->evaluationElements(cb);
|
||||
|
||||
INFO_LOG(m_logger) << "initModel - #EvalElements: " << m_vecData.size();
|
||||
INFO_LOG() << "initModel - #EvalElements: " << m_vecData.size();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
-1
@@ -48,7 +48,6 @@ private:
|
||||
std::shared_ptr<AudioVideoManagement::ForeignDataInterface> m_avmDataIfc;
|
||||
std::shared_ptr<ExerciseManagement::Interface::Dtc> m_exmDtc;
|
||||
friend class ElementDialogProxyModel;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
class ElementDialogProxyModel final : public LtsWidgets::LtsColumnFilterProxyModel
|
||||
|
||||
+1
-2
@@ -17,7 +17,6 @@ CriteriumDialogModel::CriteriumDialogModel(QObject *parent)
|
||||
tr("Operator")
|
||||
},
|
||||
parent)
|
||||
, m_logger(getLogger("CriteriumDialogModel"))
|
||||
{}
|
||||
|
||||
|
||||
@@ -30,7 +29,7 @@ bool CriteriumDialogModel::initModel(const std::shared_ptr<Interface::Dtc> &dtc,
|
||||
this, &CriteriumDialogModel::onDataChanged);
|
||||
dtc->evaluationCriteriums([this](const EvaluationCriterium & e) { insertRow(e); });
|
||||
|
||||
INFO_LOG(m_logger) << "initModel - #EvalCriteria: " << m_vecData.size();
|
||||
INFO_LOG() << "initModel - #EvalCriteria: " << m_vecData.size();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -38,8 +38,6 @@ protected:
|
||||
|
||||
private:
|
||||
std::shared_ptr<OperatorManagement::Interface::Dtc> m_opmDtc;
|
||||
LOGGER_T m_logger;
|
||||
|
||||
friend class CriteriumFilterModel;
|
||||
};
|
||||
|
||||
|
||||
+1
-2
@@ -23,7 +23,6 @@ SanNineLinerDialog::SanNineLinerDialog(const QString &menuGroup, QWidget *parent
|
||||
, m_ui(new Ui::SanNineLinerDialog)
|
||||
, m_menuGroup(menuGroup)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("SanNineLinerDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
setOnlineHelpFilename(QStringLiteral("Situation-SanNineLiner"));
|
||||
@@ -117,7 +116,7 @@ void SanNineLinerDialog::onEditSanNineLiner()
|
||||
|
||||
if (san.id() <= 0)
|
||||
return;
|
||||
DEBUG_LOG(m_logger) << "current SanNineLinerId: " << san.id();
|
||||
DEBUG_LOG() << "current SanNineLinerId: " << san.id();
|
||||
|
||||
SanNineLinerEditDialog *dialog = new SanNineLinerEditDialog(this);
|
||||
|
||||
|
||||
-2
@@ -48,7 +48,5 @@ private:
|
||||
std::shared_ptr<Evaluations::Interface::Ftc> m_ftc;
|
||||
QString m_menuGroup;
|
||||
LtsUtils::RequestHelper *m_requestHelper{nullptr};
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+2
-3
@@ -21,8 +21,7 @@ SanNineLinerDialogModel::SanNineLinerDialogModel(QObject *parent)
|
||||
tr("Position"),
|
||||
tr("Radio frequency / Call Sign / Suffix")
|
||||
},
|
||||
parent)
|
||||
, m_logger(getLogger("SanNineLinerDialogModel"))
|
||||
parent)
|
||||
{}
|
||||
|
||||
bool SanNineLinerDialogModel::initModel(const std::shared_ptr<Evaluations::Interface::Dtc> &dtc)
|
||||
@@ -38,7 +37,7 @@ bool SanNineLinerDialogModel::initModel(const std::shared_ptr<Evaluations::Inter
|
||||
insertRow(san);
|
||||
});
|
||||
|
||||
INFO_LOG(m_logger) << "initModel - #sanNineLiner: " << m_vecData.size();
|
||||
INFO_LOG() << "initModel - #sanNineLiner: " << m_vecData.size();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
-2
@@ -34,8 +34,6 @@ public:
|
||||
|
||||
private:
|
||||
std::shared_ptr<Evaluations::Interface::Dtc> m_evlDtc;
|
||||
LOGGER_T m_logger;
|
||||
|
||||
friend class SanNineLinerProxyModel;
|
||||
};
|
||||
|
||||
|
||||
+5
-6
@@ -33,7 +33,6 @@ SanNineLinerEditDialog::SanNineLinerEditDialog(QWidget *parent)
|
||||
, m_ui(new Ui::SanNineLinerEditDialog)
|
||||
, m_validator(new QIntValidator(this))
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("SanNineLinerEditDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -109,7 +108,7 @@ bool SanNineLinerEditDialog::init(LtsSession::LtsSessionDataDds *session,
|
||||
|
||||
QVector<Database::SanCategoryLine> linesCategory = SanCategoryLine::fromJson(data.lines(), data.id());
|
||||
|
||||
INFO_LOG(m_logger) << "linesCategory size: " << linesCategory.size();
|
||||
INFO_LOG() << "linesCategory size: " << linesCategory.size();
|
||||
|
||||
for (const Database::SanCategoryLine &cl : std::as_const(linesCategory))
|
||||
{
|
||||
@@ -118,7 +117,7 @@ bool SanNineLinerEditDialog::init(LtsSession::LtsSessionDataDds *session,
|
||||
QLineEdit *leLineAmount = findChild<QLineEdit*>(leName);
|
||||
if (leLineAmount)
|
||||
{
|
||||
INFO_LOG(m_logger) << "leName: " << leName << ", amount: " << cl.amount;
|
||||
INFO_LOG() << "leName: " << leName << ", amount: " << cl.amount;
|
||||
leLineAmount->setText(QString::number(cl.amount));
|
||||
|
||||
continue;
|
||||
@@ -129,7 +128,7 @@ bool SanNineLinerEditDialog::init(LtsSession::LtsSessionDataDds *session,
|
||||
QRadioButton *rbCategory = findChild<QRadioButton*>(rbName);
|
||||
if (rbCategory)
|
||||
{
|
||||
INFO_LOG(m_logger) << "rbName: " << rbName;
|
||||
INFO_LOG() << "rbName: " << rbName;
|
||||
rbCategory->setChecked(true);
|
||||
continue;
|
||||
}
|
||||
@@ -140,7 +139,7 @@ bool SanNineLinerEditDialog::init(LtsSession::LtsSessionDataDds *session,
|
||||
QCheckBox *cbxCategory = findChild<QCheckBox*>(cbxName);
|
||||
if (cbxCategory)
|
||||
{
|
||||
INFO_LOG(m_logger) << "cbxName: " << cbxName;
|
||||
INFO_LOG() << "cbxName: " << cbxName;
|
||||
cbxCategory->setChecked(true);
|
||||
}
|
||||
}
|
||||
@@ -251,7 +250,7 @@ bool SanNineLinerEditDialog::apply()
|
||||
if (request.id() <= 0)
|
||||
{
|
||||
m_sanNineLinerId = m_requestHelper->getRepliedId();
|
||||
ERROR_LOG(m_logger) << "Created new san nine liner with id " << m_sanNineLinerId;
|
||||
ERROR_LOG() << "Created new san nine liner with id " << m_sanNineLinerId;
|
||||
}
|
||||
|
||||
|
||||
|
||||
-2
@@ -79,7 +79,5 @@ private:
|
||||
QString m_menuGroup;
|
||||
QIntValidator *m_validator{nullptr};
|
||||
LtsUtils::RequestHelper *m_requestHelper{nullptr};
|
||||
LOGGER_T m_logger;
|
||||
|
||||
};
|
||||
}
|
||||
+1
-2
@@ -18,8 +18,7 @@ EvlCommentsView::EvlCommentsView(const std::shared_ptr<Interface::Dtc> &evlDtc,
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly),
|
||||
m_ui(new Ui::EvlCommentsDialog),
|
||||
m_evlDtc(evlDtc),
|
||||
m_opmDtc(opmDtc),
|
||||
m_logger(getLogger("EvlComments::EvlCommentsView"))
|
||||
m_opmDtc(opmDtc)
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
|
||||
@@ -46,6 +46,5 @@ private:
|
||||
|
||||
EvlCommentDataViewModel *m_model{nullptr};
|
||||
EvlCommentDataViewProxyModel *m_proxyModel{nullptr};
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
}
|
||||
+6
-7
@@ -75,7 +75,6 @@ EditSchemaDialog::EditSchemaDialog(bool ocMode, bool runningOnTablet, LtsSession
|
||||
, m_session(session)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_ui(new Ui::EditSchemaDialog)
|
||||
, m_logger(getLogger("EditSchemaDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -302,7 +301,7 @@ void EditSchemaDialog::onNotifyAboutSchema(const Evaluations::EvaluationSchema &
|
||||
|
||||
if (jError.error != QJsonParseError::NoError)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not parse schema with database id " << data.id();
|
||||
WARNING_LOG() << "Could not parse schema with database id " << data.id();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -349,7 +348,7 @@ void EditSchemaDialog::loadSchema(qint32 schemaId)
|
||||
|
||||
if (jError.error != QJsonParseError::NoError)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not load schema with database id " << m_mapSchemata.last().id();
|
||||
WARNING_LOG() << "Could not load schema with database id " << m_mapSchemata.last().id();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -904,12 +903,12 @@ void EditSchemaDialog::onLoadFromLibrary()
|
||||
const QJsonDocument doc(QJsonDocument::fromJson(content, &jError));
|
||||
if (jError.error != QJsonParseError::NoError)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not parse schema !";
|
||||
WARNING_LOG() << "Could not parse schema !";
|
||||
return;
|
||||
}
|
||||
if (!m_pModel->fromQJsonDocument(doc))
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not load schema !";
|
||||
WARNING_LOG() << "Could not load schema !";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -930,11 +929,11 @@ bool EditSchemaDialog::onSaveToLibrary()
|
||||
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::EvaluationSchema, m_session->exerciseId(), byteArray);
|
||||
if (fileId > 0)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
|
||||
DEBUG_LOG() << "Saved file with id = " << fileId;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
ERROR_LOG(m_logger) << "Could not save file in library ";
|
||||
ERROR_LOG() << "Could not save file in library ";
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
-1
@@ -131,7 +131,6 @@ private:
|
||||
|
||||
LtsUtils::RequestHelper *m_requestHelper{nullptr};
|
||||
Ui::EditSchemaDialog *m_ui{nullptr};
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
|
||||
-1
@@ -27,6 +27,5 @@ public:
|
||||
void removeRow(const QModelIndex &idx, bool deleteRootAllowed = false);
|
||||
|
||||
protected:
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+2
-2
@@ -128,7 +128,7 @@ QJsonDocument TreeModelSchema::toJsonDocument() const
|
||||
{
|
||||
Q_UNUSED(idx);
|
||||
Evaluations::ElementData e = v.value<Evaluations::ElementData>();
|
||||
INFO_LOG(m_logger) << "toJsonDocument: Name: " << e.getText() << ", elementId: " << e.m_id << ", parent id: " << e.m_parentId;
|
||||
INFO_LOG() << "toJsonDocument: Name: " << e.getText() << ", elementId: " << e.m_id << ", parent id: " << e.m_parentId;
|
||||
|
||||
QJsonObject obj;
|
||||
obj[QStringLiteral("id")] = e.m_id;
|
||||
@@ -172,7 +172,7 @@ bool TreeModelSchema::fromQJsonDocument(const QJsonDocument &doc)
|
||||
|
||||
|
||||
m_elementId = std::max(m_elementId, d.m_id);
|
||||
INFO_LOG(m_logger) << "fromQJsonDocument: " << d.getText() << ", own id = " << d.m_id << ", parent id = " << d.m_parentId;
|
||||
INFO_LOG() << "fromQJsonDocument: " << d.getText() << ", own id = " << d.m_id << ", parent id = " << d.m_parentId;
|
||||
}
|
||||
|
||||
++m_elementId;
|
||||
|
||||
+1
-2
@@ -11,8 +11,7 @@ namespace Evaluations
|
||||
EvlNewCommentDialog::EvlNewCommentDialog(const std::shared_ptr<OperatorManagement::Interface::Dtc> &opmDtc,
|
||||
QWidget *parent)
|
||||
: QDialog(parent),
|
||||
m_ui(new Ui::EvlNewCommentDialog),
|
||||
m_logger(getLogger("EvlComments::EvlNewCommentDialog"))
|
||||
m_ui(new Ui::EvlNewCommentDialog)
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
setWindowFlags(Qt::Tool);
|
||||
|
||||
-2
@@ -34,7 +34,5 @@ private slots:
|
||||
private:
|
||||
Ui::EvlNewCommentDialog *m_ui{nullptr};
|
||||
const int m_maxChars{255};
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
}
|
||||
Reference in new issue
Block a user