Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
1 parent
eb1d949edc
commit
815e16368e
1718 files changed
+126739
-18495
No files matched your search
+109
-109
@@ -64,81 +64,81 @@ bool EquipmentEditDialog::init()
|
||||
void EquipmentEditDialog::loadUiStandards()
|
||||
{
|
||||
|
||||
m_ui->cmbDisplayLanguage->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageGerman), WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageGerman);
|
||||
m_ui->cmbDisplayLanguage->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageEnglish), WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageEnglish);
|
||||
m_ui->cmbDisplayLanguage->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageFrench), WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageFrench);
|
||||
m_ui->cmbDisplayLanguage->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageGerman), static_cast<int>(WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageGerman));
|
||||
m_ui->cmbDisplayLanguage->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageEnglish), static_cast<int>(WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageEnglish));
|
||||
m_ui->cmbDisplayLanguage->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageFrench), static_cast<int>(WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageFrench));
|
||||
|
||||
|
||||
m_ui->cmbMhgrOperatingMode->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnTrainingEquipment), WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnTrainingEquipment);
|
||||
m_ui->cmbMhgrOperatingMode->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnOtherVehicle), WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnOtherVehicle);
|
||||
m_ui->cmbMhgrOperatingMode->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnSrVehicle), WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnSrVehicle);
|
||||
m_ui->cmbMhgrOperatingMode->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnTrainingEquipment), static_cast<int>(WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnTrainingEquipment));
|
||||
m_ui->cmbMhgrOperatingMode->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnOtherVehicle), static_cast<int>(WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnOtherVehicle));
|
||||
m_ui->cmbMhgrOperatingMode->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnSrVehicle), static_cast<int>(WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnSrVehicle));
|
||||
|
||||
|
||||
m_ui->cmbConfAgdusHv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAgdusHV::AgdusHWNoHelmetNoWest), WarehouseGuez::ConfigurationAgdusHV::AgdusHWNoHelmetNoWest);
|
||||
m_ui->cmbConfAgdusHv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAgdusHV::AgdusHWWithHelmetNoVest), WarehouseGuez::ConfigurationAgdusHV::AgdusHWWithHelmetNoVest);
|
||||
m_ui->cmbConfAgdusHv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAgdusHV::AgdusHWWithHelmetWithVest), WarehouseGuez::ConfigurationAgdusHV::AgdusHWWithHelmetWithVest);
|
||||
m_ui->cmbConfAgdusHv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAgdusHV::AgdusHWNoHelmetNoWest), static_cast<int>(WarehouseGuez::ConfigurationAgdusHV::AgdusHWNoHelmetNoWest));
|
||||
m_ui->cmbConfAgdusHv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAgdusHV::AgdusHWWithHelmetNoVest), static_cast<int>(WarehouseGuez::ConfigurationAgdusHV::AgdusHWWithHelmetNoVest));
|
||||
m_ui->cmbConfAgdusHv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAgdusHV::AgdusHWWithHelmetWithVest), static_cast<int>(WarehouseGuez::ConfigurationAgdusHV::AgdusHWWithHelmetWithVest));
|
||||
|
||||
m_ui->cmbConfPositionUpdate->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationPositionUpdate::PositionUpdateVehicle), WarehouseGuez::ConfigurationPositionUpdate::PositionUpdateVehicle);
|
||||
m_ui->cmbConfPositionUpdate->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationPositionUpdate::PositionUpdatePerson), WarehouseGuez::ConfigurationPositionUpdate::PositionUpdatePerson);
|
||||
m_ui->cmbConfPositionUpdate->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationPositionUpdate::PositionUpdateAirUnit), WarehouseGuez::ConfigurationPositionUpdate::PositionUpdateAirUnit);
|
||||
m_ui->cmbConfPositionUpdate->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationPositionUpdate::PositionUpdateVehicle), static_cast<int>(WarehouseGuez::ConfigurationPositionUpdate::PositionUpdateVehicle));
|
||||
m_ui->cmbConfPositionUpdate->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationPositionUpdate::PositionUpdatePerson), static_cast<int>(WarehouseGuez::ConfigurationPositionUpdate::PositionUpdatePerson));
|
||||
m_ui->cmbConfPositionUpdate->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationPositionUpdate::PositionUpdateAirUnit), static_cast<int>(WarehouseGuez::ConfigurationPositionUpdate::PositionUpdateAirUnit));
|
||||
|
||||
m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagNoDisplay), WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagNoDisplay);
|
||||
m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAbe), WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAbe);
|
||||
m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusPassiveAbe), WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusPassiveAbe);
|
||||
m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusHW), WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusHW);
|
||||
m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusBt46), WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusBt46);
|
||||
m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagNoDisplay), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagNoDisplay));
|
||||
m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAbe), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAbe));
|
||||
m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusPassiveAbe), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusPassiveAbe));
|
||||
m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusHW), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusHW));
|
||||
m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusBt46), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusBt46));
|
||||
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASNoDisplayAll), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASNoDisplayAll);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAbeAll), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAbeAll);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeDefault), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeDefault);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeUnarmouredWheeledVehicle), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeUnarmouredWheeledVehicle);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeCraneVehicle), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeCraneVehicle);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeExcavatorVehicle), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeExcavatorVehicle);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeNbcDetectionFuchs), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeNbcDetectionFuchs);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeArmouredWheeledVehicle), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeArmouredWheeledVehicle);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeM113BasedVehicles), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeM113BasedVehicles);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPAssiveAbeMiwSkorpion), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPAssiveAbeMiwSkorpion);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePiPzDachs), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePiPzDachs);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeMiRPzKeiler), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeMiRPzKeiler);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeBPzBueffel), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeBPzBueffel);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePrLPzBiber), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePrLPzBiber);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePZh2000), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePZh2000);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeMinethrowerMiv), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeMinethrowerMiv);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeWieselAff), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeWieselAff);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeFlarakwatrgozelot), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeFlarakwatrgozelot);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusHWAll), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusHWAll);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46Default), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46Default);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46KPzLeopard), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46KPzLeopard);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46SPzMarder), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46SPzMarder);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46LLPzWieselMk), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46LLPzWieselMk);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46LLPzWieselTow), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46LLPzWieselTow);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46SpehwgFennek), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46SpehwgFennek);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GtkBoxer), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GtkBoxer);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GefKl_1_4), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GefKl_1_4);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GTFKl_1_4), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GTFKl_1_4);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46TPzFuchs), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46TPzFuchs);
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASNoDisplayAll), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASNoDisplayAll));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAbeAll), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAbeAll));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeDefault), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeDefault));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeUnarmouredWheeledVehicle), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeUnarmouredWheeledVehicle));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeCraneVehicle), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeCraneVehicle));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeExcavatorVehicle), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeExcavatorVehicle));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeNbcDetectionFuchs), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeNbcDetectionFuchs));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeArmouredWheeledVehicle), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeArmouredWheeledVehicle));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeM113BasedVehicles), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeM113BasedVehicles));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPAssiveAbeMiwSkorpion), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPAssiveAbeMiwSkorpion));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePiPzDachs), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePiPzDachs));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeMiRPzKeiler), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeMiRPzKeiler));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeBPzBueffel), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeBPzBueffel));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePrLPzBiber), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePrLPzBiber));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePZh2000), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePZh2000));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeMinethrowerMiv), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeMinethrowerMiv));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeWieselAff), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeWieselAff));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeFlarakwatrgozelot), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeFlarakwatrgozelot));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusHWAll), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusHWAll));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46Default), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46Default));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46KPzLeopard), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46KPzLeopard));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46SPzMarder), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46SPzMarder));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46LLPzWieselMk), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46LLPzWieselMk));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46LLPzWieselTow), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46LLPzWieselTow));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46SpehwgFennek), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46SpehwgFennek));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GtkBoxer), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GtkBoxer));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GefKl_1_4), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GefKl_1_4));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GTFKl_1_4), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GTFKl_1_4));
|
||||
m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46TPzFuchs), static_cast<int>(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46TPzFuchs));
|
||||
|
||||
m_ui->cmbConfEffectModelAgdus->addItem(QObject::tr("NONE"), 0);
|
||||
auto cb = [this](const WarehouseGuez::InjuryModelAgdusWh &injModel)
|
||||
{
|
||||
m_ui->cmbConfEffectModelAgdus->addItem(QString::fromStdString(injModel.name()), injModel.id());
|
||||
m_ui->cmbConfEffectModelAgdus->addItem(QString::fromStdString(injModel.name), injModel.id);
|
||||
};
|
||||
m_dtc->injuryModelAgdusWhs(cb);
|
||||
|
||||
|
||||
m_ui->cmbSpecialSensorFir->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirNoConfiguration), WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirNoConfiguration);
|
||||
m_ui->cmbSpecialSensorFir->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirFir), WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirFir);
|
||||
m_ui->cmbSpecialSensorFir->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirFirSpzMarder), WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirFirSpzMarder);
|
||||
m_ui->cmbSpecialSensorFir->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirNoConfiguration), static_cast<int>(WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirNoConfiguration));
|
||||
m_ui->cmbSpecialSensorFir->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirFir), static_cast<int>(WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirFir));
|
||||
m_ui->cmbSpecialSensorFir->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirFirSpzMarder), static_cast<int>(WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirFirSpzMarder));
|
||||
|
||||
m_ui->cmbSpecialSensorMv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineFitNoConfiguration), WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineFitNoConfiguration);
|
||||
m_ui->cmbSpecialSensorMv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineMv), WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineMv);
|
||||
m_ui->cmbSpecialSensorMv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineWmv), WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineWmv);
|
||||
m_ui->cmbSpecialSensorMv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineFitNoConfiguration), static_cast<int>(WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineFitNoConfiguration));
|
||||
m_ui->cmbSpecialSensorMv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineMv), static_cast<int>(WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineMv));
|
||||
m_ui->cmbSpecialSensorMv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineWmv), static_cast<int>(WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineWmv));
|
||||
|
||||
m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdNoConfiguration), WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdNoConfiguration);
|
||||
m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdZabc), WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdZabc);
|
||||
m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdCsf), WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdCsf);
|
||||
m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdPzBr), WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdPzBr);
|
||||
m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdMrf), WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdMrf);
|
||||
m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdNoConfiguration), static_cast<int>(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdNoConfiguration));
|
||||
m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdZabc), static_cast<int>(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdZabc));
|
||||
m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdCsf), static_cast<int>(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdCsf));
|
||||
m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdPzBr), static_cast<int>(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdPzBr));
|
||||
m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdMrf), static_cast<int>(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdMrf));
|
||||
|
||||
}
|
||||
|
||||
@@ -147,43 +147,43 @@ void EquipmentEditDialog::loadUiValues()
|
||||
WarehouseGuez::EquipmentTypeWh eq = m_dtc->equipmentTypeWh(m_equipmentId);
|
||||
|
||||
|
||||
m_ui->lblId->setText(QString::number(eq.id()));
|
||||
m_ui->leName->setText(QString::fromStdString(eq.name()));
|
||||
m_ui->sbGroup->setValue(eq.equipGroup());
|
||||
m_ui->lblId->setText(QString::number(eq.id));
|
||||
m_ui->leName->setText(QString::fromStdString(eq.name));
|
||||
m_ui->sbGroup->setValue(eq.equipGroup);
|
||||
|
||||
|
||||
|
||||
m_ui->sbMinEquipNo->setMaximum(50000);
|
||||
m_ui->sbMaxEquipNo->setMaximum(50000);
|
||||
|
||||
m_ui->sbMinEquipNo->setValue(eq.minEquipNo());
|
||||
m_ui->sbMaxEquipNo->setValue(eq.maxEquipNo());
|
||||
m_ui->sbMinEquipNo->setValue(eq.minEquipNo);
|
||||
m_ui->sbMaxEquipNo->setValue(eq.maxEquipNo);
|
||||
|
||||
setCanDevicesInUi(eq.canDevices());
|
||||
m_ui->sbCanStartUpTime->setValue(eq.configurationStartupTime());
|
||||
setCanDevicesInUi(eq.canDevices);
|
||||
m_ui->sbCanStartUpTime->setValue(eq.configurationStartupTime);
|
||||
|
||||
m_ui->cmbDisplayLanguage->setCurrentText(WarehouseGuez::toString(eq.configurationAbeLanguage()));
|
||||
m_ui->chbDisplayAudioFeedback->setChecked(eq.configurationAudioResponse());
|
||||
m_ui->cmbDisplayLanguage->setCurrentText(WarehouseGuez::toString(eq.configurationAbeLanguage));
|
||||
m_ui->chbDisplayAudioFeedback->setChecked(eq.configurationAudioResponse);
|
||||
|
||||
m_ui->cmbMhgrOperatingMode->setCurrentText(WarehouseGuez::toString(eq.configurationMhgrOperatingMode()));
|
||||
m_ui->chbMhgrEnergySaveMode->setChecked(eq.configurationMhgrEnergieSave());
|
||||
m_ui->cmbMhgrOperatingMode->setCurrentText(WarehouseGuez::toString(eq.configurationMhgrOperatingMode));
|
||||
m_ui->chbMhgrEnergySaveMode->setChecked(eq.configurationMhgrEnergieSave);
|
||||
|
||||
m_ui->cmbConfAgdusHv->setCurrentText(WarehouseGuez::toString(eq.configurationAgdusHV()));
|
||||
m_ui->cmbConfPositionUpdate->setCurrentText(WarehouseGuez::toString(eq.posUpdate()));
|
||||
m_ui->cmbConfDisplayAdag->setCurrentText(WarehouseGuez::toString(eq.configurationDisplayAdag()));
|
||||
m_ui->cmbConfDisplayAdagSubunit->setCurrentText(WarehouseGuez::toString(eq.configurationDisplayAdagSubUnit()));
|
||||
m_ui->cmbConfEffectModelAgdus->setCurrentIndex(m_ui->cmbConfEffectModelAgdus->findData(eq.vbAgdusId()));
|
||||
m_ui->sbConfEffectModelMineIed->setValue(eq.vbMineIed());
|
||||
m_ui->sbConfEffectModelHighAngleFire->setValue(eq.vbFireArea());
|
||||
m_ui->sbConfEffectModelResources->setValue(eq.vbAirSupport());
|
||||
m_ui->sbConfEffectModelAcWeapon->setValue(eq.vbNc());
|
||||
m_ui->cmbConfAgdusHv->setCurrentText(WarehouseGuez::toString(eq.configurationAgdusHV));
|
||||
m_ui->cmbConfPositionUpdate->setCurrentText(WarehouseGuez::toString(eq.posUpdate));
|
||||
m_ui->cmbConfDisplayAdag->setCurrentText(WarehouseGuez::toString(eq.configurationDisplayAdag));
|
||||
m_ui->cmbConfDisplayAdagSubunit->setCurrentText(WarehouseGuez::toString(eq.configurationDisplayAdagSubUnit));
|
||||
m_ui->cmbConfEffectModelAgdus->setCurrentIndex(m_ui->cmbConfEffectModelAgdus->findData(eq.vbAgdusId));
|
||||
m_ui->sbConfEffectModelMineIed->setValue(eq.vbMineIed);
|
||||
m_ui->sbConfEffectModelHighAngleFire->setValue(eq.vbFireArea);
|
||||
m_ui->sbConfEffectModelResources->setValue(eq.vbAirSupport);
|
||||
m_ui->sbConfEffectModelAcWeapon->setValue(eq.vbNc);
|
||||
|
||||
m_ui->chbEffSimPyrotechnic->setChecked(eq.configurationCedPyrotechnic());
|
||||
m_ui->chbEffSimPyrotechnic->setChecked(eq.configurationCedPyrotechnic);
|
||||
|
||||
m_ui->chbSpecialSensorFirSan->setChecked(eq.configurationSsFirSan());
|
||||
m_ui->cmbSpecialSensorFir->setCurrentText(WarehouseGuez::toString(eq.configurationSsFirFunction()));
|
||||
m_ui->cmbSpecialSensorMv->setCurrentText(WarehouseGuez::toString(eq.configurationSsMineFitFunction()));
|
||||
m_ui->cmbSpecialSensorStd->setCurrentText(WarehouseGuez::toString(eq.configurationSsStandardFunction()));
|
||||
m_ui->chbSpecialSensorFirSan->setChecked(eq.configurationSsFirSan);
|
||||
m_ui->cmbSpecialSensorFir->setCurrentText(WarehouseGuez::toString(eq.configurationSsFirFunction));
|
||||
m_ui->cmbSpecialSensorMv->setCurrentText(WarehouseGuez::toString(eq.configurationSsMineFitFunction));
|
||||
m_ui->cmbSpecialSensorStd->setCurrentText(WarehouseGuez::toString(eq.configurationSsStandardFunction));
|
||||
|
||||
|
||||
|
||||
@@ -239,38 +239,38 @@ quint32 EquipmentEditDialog::canDevicesFromUi()
|
||||
{
|
||||
quint32 ret = 0;
|
||||
|
||||
if (m_ui->chbCanAgdus->isChecked()) { ret |= WarehouseGuez::CanDevices::AGDUS; }
|
||||
if (m_ui->chbCanDisplayUnit->isChecked()) { ret |= WarehouseGuez::CanDevices::ABE; }
|
||||
if (m_ui->chbCanSpecialSensorFir->isChecked()) { ret |= WarehouseGuez::CanDevices::SS_FIR; }
|
||||
if (m_ui->chbCanSpecialSensorMv->isChecked()) { ret |= WarehouseGuez::CanDevices::SS_MV; }
|
||||
if (m_ui->chbCanSpecialSensorStd->isChecked()) { ret |= WarehouseGuez::CanDevices::SS_STD; }
|
||||
if (m_ui->chbCanMhgrSensor->isChecked()) { ret |= WarehouseGuez::CanDevices::MHGR; }
|
||||
if (m_ui->chbCanOverpressureSensor->isChecked()) { ret |= WarehouseGuez::CanDevices::ABC_UEBERDR; }
|
||||
if (m_ui->chbCanNbcFlowSensor->isChecked()) { ret |= WarehouseGuez::CanDevices::ABC_STROEM; }
|
||||
if (m_ui->chbCanEffectSimulator->isChecked()) { ret |= WarehouseGuez::CanDevices::WIRKDARST; }
|
||||
if (m_ui->chbCanOcLaptop->isChecked()) { ret |= WarehouseGuez::CanDevices::SRT; }
|
||||
if (m_ui->chbCanFireMarker->isChecked()) { ret |= WarehouseGuez::CanDevices::DMF; }
|
||||
if (m_ui->chbCanIedSensor->isChecked()) { ret |= WarehouseGuez::CanDevices::IED_SENSOR; }
|
||||
if (m_ui->chbCanIedControlUnit->isChecked()) { ret |= WarehouseGuez::CanDevices::IED_KONT_EINH; }
|
||||
if (m_ui->chbCanAgdus->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::AGDUS); }
|
||||
if (m_ui->chbCanDisplayUnit->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::ABE); }
|
||||
if (m_ui->chbCanSpecialSensorFir->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::SS_FIR); }
|
||||
if (m_ui->chbCanSpecialSensorMv->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::SS_MV); }
|
||||
if (m_ui->chbCanSpecialSensorStd->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::SS_STD); }
|
||||
if (m_ui->chbCanMhgrSensor->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::MHGR); }
|
||||
if (m_ui->chbCanOverpressureSensor->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::ABC_UEBERDR); }
|
||||
if (m_ui->chbCanNbcFlowSensor->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::ABC_STROEM); }
|
||||
if (m_ui->chbCanEffectSimulator->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::WIRKDARST); }
|
||||
if (m_ui->chbCanOcLaptop->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::SRT); }
|
||||
if (m_ui->chbCanFireMarker->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::DMF); }
|
||||
if (m_ui->chbCanIedSensor->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::IED_SENSOR); }
|
||||
if (m_ui->chbCanIedControlUnit->isChecked()) { ret |= static_cast<quint32>(WarehouseGuez::CanDevices::IED_KONT_EINH); }
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
void EquipmentEditDialog::setCanDevicesInUi(quint32 devices)
|
||||
{
|
||||
m_ui->chbCanAgdus->setChecked(devices & WarehouseGuez::CanDevices::AGDUS);
|
||||
m_ui->chbCanDisplayUnit->setChecked(devices & WarehouseGuez::CanDevices::ABE);
|
||||
m_ui->chbCanSpecialSensorFir->setChecked(devices & WarehouseGuez::CanDevices::SS_FIR);
|
||||
m_ui->chbCanSpecialSensorMv->setChecked(devices & WarehouseGuez::CanDevices::SS_MV);
|
||||
m_ui->chbCanSpecialSensorStd->setChecked(devices & WarehouseGuez::CanDevices::SS_STD);
|
||||
m_ui->chbCanMhgrSensor->setChecked(devices & WarehouseGuez::CanDevices::MHGR);
|
||||
m_ui->chbCanOverpressureSensor->setChecked(devices & WarehouseGuez::CanDevices::ABC_UEBERDR);
|
||||
m_ui->chbCanNbcFlowSensor->setChecked(devices & WarehouseGuez::CanDevices::ABC_STROEM);
|
||||
m_ui->chbCanEffectSimulator->setChecked(devices & WarehouseGuez::CanDevices::WIRKDARST);
|
||||
m_ui->chbCanOcLaptop->setChecked(devices & WarehouseGuez::CanDevices::SRT);
|
||||
m_ui->chbCanFireMarker->setChecked(devices & WarehouseGuez::CanDevices::DMF);
|
||||
m_ui->chbCanIedSensor->setChecked(devices & WarehouseGuez::CanDevices::IED_SENSOR);
|
||||
m_ui->chbCanIedControlUnit->setChecked(devices & WarehouseGuez::CanDevices::IED_KONT_EINH);
|
||||
m_ui->chbCanAgdus->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::AGDUS));
|
||||
m_ui->chbCanDisplayUnit->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::ABE));
|
||||
m_ui->chbCanSpecialSensorFir->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::SS_FIR));
|
||||
m_ui->chbCanSpecialSensorMv->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::SS_MV));
|
||||
m_ui->chbCanSpecialSensorStd->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::SS_STD));
|
||||
m_ui->chbCanMhgrSensor->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::MHGR));
|
||||
m_ui->chbCanOverpressureSensor->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::ABC_UEBERDR));
|
||||
m_ui->chbCanNbcFlowSensor->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::ABC_STROEM));
|
||||
m_ui->chbCanEffectSimulator->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::WIRKDARST));
|
||||
m_ui->chbCanOcLaptop->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::SRT));
|
||||
m_ui->chbCanFireMarker->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::DMF));
|
||||
m_ui->chbCanIedSensor->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::IED_SENSOR));
|
||||
m_ui->chbCanIedControlUnit->setChecked(devices & static_cast<quint32>(WarehouseGuez::CanDevices::IED_KONT_EINH));
|
||||
}
|
||||
|
||||
}
|
||||
-1
@@ -58,7 +58,6 @@ private:
|
||||
std::shared_ptr<WarehouseGuez::Interface::Dtc> m_dtc;
|
||||
std::shared_ptr<WarehouseGuez::Interface::Ftc> m_ftc;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
WarehouseGuez::
|
||||
Ui::EquipmentEditDialog *m_ui;
|
||||
};
|
||||
|
||||
|
||||
+4
-4
@@ -111,7 +111,7 @@ void EquipmentList::enaDisa()
|
||||
void EquipmentList::onRemoveEquipment()
|
||||
{
|
||||
QModelIndex idx = m_ui->widget->currentIndex();
|
||||
Core::RemoveElementRequest req = Core::RemoveElementRequest(m_model->getRowData(idx.row()).id());
|
||||
Core::RemoveElementRequest req = Core::RemoveElementRequest(m_model->getRowData(idx.row()).id);
|
||||
|
||||
m_requestHelper->startSingleRequest([req, this]()
|
||||
{
|
||||
@@ -129,7 +129,7 @@ void EquipmentList::onAddEquipment()
|
||||
void EquipmentList::onNewEquipment(int id, int copyOf)
|
||||
{
|
||||
WarehouseGuez::EquipmentTypeWh equ = m_dtc->equipmentTypeWh(copyOf);
|
||||
equ.id(0-id);
|
||||
equ.id = 0-id;
|
||||
m_requestHelper->startSingleRequest([equ, this]()
|
||||
{
|
||||
return m_ftc->modifyEquipmentTypeWhRequest(equ, this);
|
||||
@@ -141,10 +141,10 @@ void EquipmentList::onEditEquipment()
|
||||
const QModelIndex idx = m_ui->widget->currentIndex();
|
||||
WarehouseGuez::EquipmentTypeWh equip = m_model->getRowData(idx.row());
|
||||
|
||||
if (equip.id() < 0)
|
||||
if (equip.id < 0)
|
||||
return;
|
||||
|
||||
editEquipment(equip.id());
|
||||
editEquipment(equip.id);
|
||||
}
|
||||
|
||||
|
||||
|
||||
-1
@@ -51,7 +51,6 @@ private:
|
||||
std::shared_ptr<WarehouseGuez::Interface::Ftc> m_ftc;
|
||||
std::shared_ptr<WarehouseGuez::Interface::Dtc> m_dtc;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
WarehouseGuez::
|
||||
Ui::EquipmentList *m_ui;
|
||||
|
||||
void editEquipment(int id);
|
||||
|
||||
+24
-24
@@ -87,49 +87,49 @@ QVariant EquipmentModel::data(const QModelIndex &index, int role) const
|
||||
switch (index.column())
|
||||
{
|
||||
case ID:
|
||||
return equip.id();
|
||||
return equip.id;
|
||||
case Name:
|
||||
return QString::fromStdString(equip.name());
|
||||
return QString::fromStdString(equip.name);
|
||||
case Group:
|
||||
return equip.equipGroup();
|
||||
return equip.equipGroup;
|
||||
case GroupRange:
|
||||
return QStringLiteral("%1 - %2").arg(equip.minEquipNo()).arg(getUnsignedShortValue(equip.maxEquipNo()));
|
||||
return QStringLiteral("%1 - %2").arg(equip.minEquipNo).arg(getUnsignedShortValue(equip.maxEquipNo));
|
||||
case PositionUpdate:
|
||||
return WarehouseGuez::toString(equip.posUpdate());
|
||||
return WarehouseGuez::toString(equip.posUpdate);
|
||||
case DisplayAdag:
|
||||
return WarehouseGuez::toString(equip.configurationDisplayAdag());
|
||||
return WarehouseGuez::toString(equip.configurationDisplayAdag);
|
||||
case DisplayAdagSubUnit:
|
||||
return WarehouseGuez::toString(equip.configurationDisplayAdagSubUnit());
|
||||
return WarehouseGuez::toString(equip.configurationDisplayAdagSubUnit);
|
||||
case AgdusHv:
|
||||
return WarehouseGuez::toString(equip.configurationAgdusHV());
|
||||
return WarehouseGuez::toString(equip.configurationAgdusHV);
|
||||
case AgdusName:
|
||||
return m_injuryModelNames.value(equip.vbAgdusId());
|
||||
return m_injuryModelNames.value(equip.vbAgdusId);
|
||||
case MineIed:
|
||||
return equip.vbMineIed();
|
||||
return equip.vbMineIed;
|
||||
case FireArea:
|
||||
return equip.vbFireArea();
|
||||
return equip.vbFireArea;
|
||||
case AirSupport:
|
||||
return equip.vbAirSupport();
|
||||
return equip.vbAirSupport;
|
||||
case Nc:
|
||||
return equip.vbNc();
|
||||
return equip.vbNc;
|
||||
case Language:
|
||||
return WarehouseGuez::toString(equip.configurationAbeLanguage());
|
||||
return WarehouseGuez::toString(equip.configurationAbeLanguage);
|
||||
case AudioResponse:
|
||||
return equip.configurationAudioResponse() ? tr("Yes") : tr("No");
|
||||
return equip.configurationAudioResponse ? tr("Yes") : tr("No");
|
||||
case MhgrMode:
|
||||
return WarehouseGuez::toString(equip.configurationMhgrOperatingMode());
|
||||
return WarehouseGuez::toString(equip.configurationMhgrOperatingMode);
|
||||
case MhgrEnergySave:
|
||||
return equip.configurationMhgrEnergieSave() ? tr("Yes") : tr("No");;
|
||||
return equip.configurationMhgrEnergieSave ? tr("Yes") : tr("No");;
|
||||
case Pyrotechnic:
|
||||
return equip.configurationCedPyrotechnic() ? tr("Yes") : tr("No");
|
||||
return equip.configurationCedPyrotechnic ? tr("Yes") : tr("No");
|
||||
case SensorFir:
|
||||
return WarehouseGuez::toString(equip.configurationSsFirFunction());
|
||||
return WarehouseGuez::toString(equip.configurationSsFirFunction);
|
||||
case SensorMineFit:
|
||||
return WarehouseGuez::toString(equip.configurationSsMineFitFunction());
|
||||
return WarehouseGuez::toString(equip.configurationSsMineFitFunction);
|
||||
case SensorStandard:
|
||||
return WarehouseGuez::toString(equip.configurationSsStandardFunction());
|
||||
return WarehouseGuez::toString(equip.configurationSsStandardFunction);
|
||||
case StartupTime:
|
||||
return equip.configurationStartupTime();
|
||||
return equip.configurationStartupTime;
|
||||
}
|
||||
return QVariant();
|
||||
}
|
||||
@@ -138,13 +138,13 @@ QMap<int, QString> EquipmentModel::equipmentTypeNames() const
|
||||
{
|
||||
QMap<int, QString> retVal;
|
||||
for(auto val : m_vecData)
|
||||
retVal.insert(val.id(), QString::fromStdString(val.name()));
|
||||
retVal.insert(val.id, QString::fromStdString(val.name));
|
||||
return retVal;
|
||||
}
|
||||
|
||||
void EquipmentModel::onInjuryModelChanged(const WarehouseGuez::InjuryModelAgdusWh &im)
|
||||
{
|
||||
m_injuryModelNames[im.id()] = QString::fromStdString(im.name());
|
||||
m_injuryModelNames[im.id] = QString::fromStdString(im.name);
|
||||
}
|
||||
|
||||
|
||||
|
||||
-1
@@ -57,7 +57,6 @@ NGL::INGLLogger &m_logger;
|
||||
private:
|
||||
std::shared_ptr<WarehouseGuez::Interface::Dtc> m_dtc;
|
||||
QHash<qint32, QString> m_injuryModelNames;
|
||||
WarehouseGuez::
|
||||
};
|
||||
|
||||
}
|
||||
+4
-4
@@ -59,10 +59,10 @@ void InjuryModelEditDialog::loadUiValues()
|
||||
{
|
||||
WarehouseGuez::InjuryModelAgdusWh inj = m_dtc->injuryModelAgdusWh(m_injuryModelId);
|
||||
|
||||
m_ui->lblId->setText(QString::number(inj.id()));
|
||||
m_ui->leName->setText(QString::fromStdString(inj.name()));
|
||||
m_ui->leVersion->setText(QString::fromStdString(inj.version()));
|
||||
m_ui->pteDescription->insertPlainText(QString::fromStdString(inj.description()));
|
||||
m_ui->lblId->setText(QString::number(inj.id));
|
||||
m_ui->leName->setText(QString::fromStdString(inj.name));
|
||||
m_ui->leVersion->setText(QString::fromStdString(inj.version));
|
||||
m_ui->pteDescription->insertPlainText(QString::fromStdString(inj.description));
|
||||
}
|
||||
|
||||
void InjuryModelEditDialog::onModifyInjuryModelAgdusWhReply(const Core::FunctionReplyObject &reply)
|
||||
|
||||
-1
@@ -53,7 +53,6 @@ private:
|
||||
std::shared_ptr<WarehouseGuez::Interface::Dtc> m_dtc;
|
||||
std::shared_ptr<WarehouseGuez::Interface::Ftc> m_ftc;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
WarehouseGuez::
|
||||
Ui::InjuryModelEditDialog *m_ui;
|
||||
};
|
||||
}
|
||||
+4
-4
@@ -104,7 +104,7 @@ void InjuryModelList::enaDisa()
|
||||
void InjuryModelList::onRemoveInjuryModel()
|
||||
{
|
||||
QModelIndex idx = m_ui->widget->currentIndex();
|
||||
Core::RemoveElementRequest req(m_model->getRowData(idx.row()).id());
|
||||
Core::RemoveElementRequest req(m_model->getRowData(idx.row()).id);
|
||||
|
||||
m_requestHelper->startSingleRequest([req, this]()
|
||||
{
|
||||
@@ -145,9 +145,9 @@ void InjuryModelList::onEditInjuryModel()
|
||||
void InjuryModelList::onNewInjuryModel(int id)
|
||||
{
|
||||
WarehouseGuez::InjuryModelAgdusWh im;
|
||||
im.id(0-id);
|
||||
im.name(tr("New Name").toStdString());
|
||||
im.version("-");
|
||||
im.id = 0-id;
|
||||
im.name = tr("New Name").toStdString();
|
||||
im.version = "-";
|
||||
m_requestHelper->startSingleRequest([im, this]()
|
||||
{
|
||||
return m_ftc->modifyInjuryModelAgdusWhRequest(im, this);
|
||||
|
||||
@@ -51,7 +51,6 @@ private:
|
||||
std::shared_ptr<WarehouseGuez::Interface::Ftc> m_ftc;
|
||||
std::shared_ptr<WarehouseGuez::Interface::Dtc> m_dtc;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
WarehouseGuez::
|
||||
Ui::InjuryModelList *m_ui;
|
||||
|
||||
void editInjuryModel(int id);
|
||||
|
||||
+5
-5
@@ -55,13 +55,13 @@ QVariant InjuryModelModel::data(const QModelIndex &index, int role) const
|
||||
switch (index.column())
|
||||
{
|
||||
case ID:
|
||||
return inj.id();
|
||||
return inj.id;
|
||||
case Name:
|
||||
return QString::fromStdString(inj.name());
|
||||
return QString::fromStdString(inj.name);
|
||||
case Version:
|
||||
return QString::fromStdString(inj.version());
|
||||
return QString::fromStdString(inj.version);
|
||||
case Description:
|
||||
return QString::fromStdString(inj.description());
|
||||
return QString::fromStdString(inj.description);
|
||||
}
|
||||
return QVariant();
|
||||
}
|
||||
@@ -71,7 +71,7 @@ QSet<int> InjuryModelModel::takenIds() const
|
||||
QSet<int> set;
|
||||
set.reserve(m_vecData.size());
|
||||
for(const auto &m : m_vecData)
|
||||
set << m.id();
|
||||
set << m.id;
|
||||
return set;
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -35,6 +35,5 @@ private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<WarehouseGuez::Interface::Dtc> m_dtc;
|
||||
WarehouseGuez::
|
||||
};
|
||||
}
|
||||
Reference in new issue
Block a user