WIP: Build fixes und EXTERNAL_DEPENDENCIES.md
This commit is contained in:
300 files changed
+983
-417
No files matched your search
+14
-2
@@ -11,6 +11,12 @@
|
||||
#include <LtsWidgets/lts_combo_box.h>
|
||||
#include <ProjectDataManagement/pdm_translation.h>
|
||||
|
||||
// External DDS types - only available when external dependencies are present
|
||||
#ifdef BUILD_WITH_EXTERNAL_DDS
|
||||
#include <ProjectDataManagement/pdm_dtc.h>
|
||||
#include <training_area_telegrams.h>
|
||||
#endif
|
||||
|
||||
namespace ProjectDataManagement
|
||||
{
|
||||
namespace PdmComboBox
|
||||
@@ -56,6 +62,7 @@ bool ChargeTypeFilterProxyModel::filterAcceptsRow(int source_row, const QModelIn
|
||||
return obj.value(m_property) == m_value;
|
||||
}
|
||||
|
||||
#ifdef BUILD_WITH_EXTERNAL_DDS
|
||||
void fillGearClass(QComboBox *cbx, GearClass gearClass, const std::shared_ptr<Interface::Dtc> &dtc)
|
||||
{
|
||||
QStandardItemModel *itemModel = new QStandardItemModel(cbx);
|
||||
@@ -205,6 +212,7 @@ void fillFirePurpose(QComboBox *cbx, const std::shared_ptr<Interface::Dtc> &dtc)
|
||||
}
|
||||
itemModel->sort(0, Qt::AscendingOrder);
|
||||
}
|
||||
#endif // BUILD_WITH_EXTERNAL_DDS
|
||||
|
||||
bool fill(QComboBox *cbx, PdmComboBoxType type)
|
||||
{
|
||||
@@ -218,13 +226,14 @@ bool fill(QComboBox *cbx, PdmComboBoxType type)
|
||||
|
||||
switch (type)
|
||||
{
|
||||
#ifdef BUILD_WITH_EXTERNAL_DDS
|
||||
case PdmComboBoxType::CbLanguage:
|
||||
{
|
||||
const QString languages = LtsUtils::ProjectSettings::getInstance()->value(QStringLiteral("pdm"), QStringLiteral("EquipmentLanguages")).toString();
|
||||
const QStringList slLang = languages.split(QLatin1Char(','));
|
||||
QSet<int> alreadySeen;
|
||||
alreadySeen += LanguageConfiguration::NoChange;
|
||||
cbx->addItem(toString(LanguageConfiguration::NoChange), LanguageConfiguration::NoChange);
|
||||
alreadySeen += Language::NoChange;
|
||||
cbx->addItem(toString(Language::NoChange), Language::NoChange);
|
||||
for (const QString &r : slLang)
|
||||
{
|
||||
const int langId = r.toInt();
|
||||
@@ -289,6 +298,7 @@ bool fill(QComboBox *cbx, PdmComboBoxType type)
|
||||
cbx->addItem(toString(ABCProtectionMode::Off), ABCProtectionMode::Off);
|
||||
break;
|
||||
}
|
||||
#endif // BUILD_WITH_EXTERNAL_DDS
|
||||
case PdmComboBoxType::CbUnkown:
|
||||
break;
|
||||
}
|
||||
@@ -302,6 +312,7 @@ bool fill(QComboBox *cbx, PdmComboBoxType type)
|
||||
return true;
|
||||
}
|
||||
|
||||
#ifdef BUILD_WITH_EXTERNAL_DDS
|
||||
bool fill(QComboBox *cbx, GearClass gearClass, const std::shared_ptr<Interface::Dtc> &dtc)
|
||||
{
|
||||
if (!cbx)
|
||||
@@ -321,6 +332,7 @@ bool fill(QComboBox *cbx, GearClass gearClass, const std::shared_ptr<Interface::
|
||||
|
||||
return true;
|
||||
}
|
||||
#endif // BUILD_WITH_EXTERNAL_DDS
|
||||
|
||||
bool setChargeTypePropertyFilter(QComboBox *cbx, const QString &property, const QVariant &value)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user