Enable Codification/OHP/PlanEditor/OrgChart plugin groups (G12 225); harden new_docker_build.sh
First-build fixes (DDS members, Qt6 transitive WebChannel/PrintSupport drops, logger init, Qt5 guard); script: log_warn, BUILD_WLS default ON, Poppler image+APT, XmlPatterns 6.0 wording
This commit is contained in:
11 files changed
+278
-61
No files matched your search
+7
-7
@@ -64,20 +64,20 @@ bool AssignCodificationDataTable::init(const std::shared_ptr<CodificationManagem
|
||||
for (const ParticipantManagement::Party& party : std::as_const(userVisibleParties))
|
||||
{
|
||||
|
||||
if (party.id() != 2 && party.id() != 3)
|
||||
if (party.id != 2 && party.id != 3)
|
||||
continue;
|
||||
|
||||
QString partyName;
|
||||
if (party.id() == 2)
|
||||
if (party.id == 2)
|
||||
partyName = tr("OPFOR:");
|
||||
else if (party.id() == 3)
|
||||
else if (party.id == 3)
|
||||
partyName = tr("BLUFOR:");
|
||||
else
|
||||
partyName = ParticipantManagement::trPartyName(party.name());
|
||||
partyName = ParticipantManagement::trPartyName(party.name);
|
||||
m_ui->partyLayout->addWidget(new QLabel(partyName, this), i, 0, 1, 1);
|
||||
|
||||
LtsWidgets::LtsComboBox* cb = new LtsWidgets::LtsComboBox(this);
|
||||
cb->setProperty(QLatin1String("partyId").data(), party.id());
|
||||
cb->setProperty(QLatin1String("partyId").data(), party.id);
|
||||
m_tableVec.append(cb);
|
||||
cb->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
|
||||
cb->addItem(QStringLiteral("---"), 0);
|
||||
@@ -88,7 +88,7 @@ bool AssignCodificationDataTable::init(const std::shared_ptr<CodificationManagem
|
||||
m_model->data(m_model->index(row, CodificationDataOverviewModel::Id), Qt::DisplayRole));
|
||||
|
||||
DEBUG_LOG(m_logger)
|
||||
<< "Init Combobox[" << row << "]: PartyId: " << party.id() << " Identifier: "
|
||||
<< "Init Combobox[" << row << "]: PartyId: " << party.id << " Identifier: "
|
||||
<< m_model->data(m_model->index(row, CodificationDataOverviewModel::Identifier), Qt::DisplayRole)
|
||||
.toString()
|
||||
<< " CodTabId: "
|
||||
@@ -105,7 +105,7 @@ bool AssignCodificationDataTable::init(const std::shared_ptr<CodificationManagem
|
||||
.toInt();
|
||||
DEBUG_LOG(m_logger) << "Assignment[" << row << "]: assignedPartyId: " << assignedPartyId;
|
||||
|
||||
if (party.id() == assignedPartyId)
|
||||
if (party.id == assignedPartyId)
|
||||
{
|
||||
tableId =
|
||||
m_model->data(m_model->index(row, CodificationDataOverviewModel::Id), Qt::DisplayRole).toInt();
|
||||
|
||||
Reference in new issue
Block a user