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:
1718 files changed
+126739
-18495
No files matched your search
+11
-10
@@ -15,6 +15,7 @@ namespace MeteoDataManagement
|
||||
|
||||
MeteoDataView::MeteoDataView(const QString &menuGroup, LtsSession::LtsSession *session, QWidget *parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
|
||||
, m_logger(getLogger("MeteoDataManagementDialog"))
|
||||
, m_menuGroup(menuGroup)
|
||||
, m_model(nullptr)
|
||||
, m_dtc(nullptr)
|
||||
@@ -80,7 +81,7 @@ void MeteoDataView::onSelectionChanged()
|
||||
|
||||
MeteoDataManagement::MeteoData meteoData = m_model->getRowData(row);
|
||||
|
||||
if(meteoData.isStaticMeteoData())
|
||||
if(meteoData.isStaticMeteoData)
|
||||
{
|
||||
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Edit, true);
|
||||
}
|
||||
@@ -102,17 +103,17 @@ void MeteoDataView::onEditStaticMeteoData()
|
||||
MeteoDataManagement::MeteoData meteoData = m_model->getRowData(row);
|
||||
|
||||
DEBUG_LOG(m_logger) << "--- onEditStaticMeteoData() "
|
||||
<< " id: " << meteoData.id()
|
||||
<< " mduId: " << meteoData.weatherStationId()
|
||||
<< " isStaticData: " << meteoData.isStaticMeteoData()
|
||||
<< " WindDirection: " << meteoData.windDirection()
|
||||
<< " WindSpeed: " << meteoData.windSpeed()
|
||||
<< " Temp: " << meteoData.temperature()
|
||||
<< " Pressure: " << meteoData.pressure()
|
||||
<< " Humidity: " << meteoData.humidity()
|
||||
<< " id: " << meteoData.id
|
||||
<< " mduId: " << meteoData.weatherStationId
|
||||
<< " isStaticData: " << meteoData.isStaticMeteoData
|
||||
<< " WindDirection: " << meteoData.windDirection
|
||||
<< " WindSpeed: " << meteoData.windSpeed
|
||||
<< " Temp: " << meteoData.temperature
|
||||
<< " Pressure: " << meteoData.pressure
|
||||
<< " Humidity: " << meteoData.humidity
|
||||
;
|
||||
|
||||
if(meteoData.isStaticMeteoData())
|
||||
if(meteoData.isStaticMeteoData)
|
||||
{
|
||||
StaticMeteoDataEdit *dialog = new StaticMeteoDataEdit(this);
|
||||
dialog->init(m_dtc, m_ftc, m_session);
|
||||
|
||||
+13
-12
@@ -19,6 +19,7 @@ MeteoDataModel::MeteoDataModel(QObject *parent)
|
||||
tr("Pressure [hPa]"),
|
||||
tr("Humidity [%]")},
|
||||
parent)
|
||||
, m_logger(getLogger("MeteoDataModel"))
|
||||
, m_dtc(nullptr)
|
||||
{}
|
||||
|
||||
@@ -45,13 +46,13 @@ QVariant MeteoDataModel::data(const QModelIndex &index, int role) const
|
||||
|
||||
if (role == Qt::BackgroundRole )
|
||||
{
|
||||
if (meteoData.isStaticMeteoData())
|
||||
if (meteoData.isStaticMeteoData)
|
||||
return QVariant();
|
||||
if (index.column() == WindDirection || index.column() == WindSpeed)
|
||||
return meteoData.windOk() ? QVariant() : QColor(Qt::red);
|
||||
return meteoData.windOk ? QVariant() : QColor(Qt::red);
|
||||
|
||||
if (index.column() == Temperature || index.column() == Pressure || index.column() == Humidity)
|
||||
return meteoData.climateOk() ? QVariant() : QColor(Qt::red);
|
||||
return meteoData.climateOk ? QVariant() : QColor(Qt::red);
|
||||
|
||||
return QVariant();
|
||||
}
|
||||
@@ -59,21 +60,21 @@ QVariant MeteoDataModel::data(const QModelIndex &index, int role) const
|
||||
switch (index.column())
|
||||
{
|
||||
case Id:
|
||||
return meteoData.weatherStationId();
|
||||
return meteoData.weatherStationId;
|
||||
case Note:
|
||||
if (meteoData.isStaticMeteoData())
|
||||
return QCoreApplication::translate("dds", meteoData.note().c_str());
|
||||
return QString::fromStdString(meteoData.note());
|
||||
if (meteoData.isStaticMeteoData)
|
||||
return QCoreApplication::translate("dds", meteoData.note.c_str());
|
||||
return QString::fromStdString(meteoData.note);
|
||||
case WindDirection:
|
||||
return qRound((meteoData.windDirection() * 100.0)) / 100.0;
|
||||
return qRound((meteoData.windDirection * 100.0)) / 100.0;
|
||||
case WindSpeed:
|
||||
return qRound(meteoData.windSpeed());
|
||||
return qRound(meteoData.windSpeed);
|
||||
case Temperature:
|
||||
return meteoData.temperature();
|
||||
return meteoData.temperature;
|
||||
case Pressure:
|
||||
return meteoData.pressure();
|
||||
return meteoData.pressure;
|
||||
case Humidity:
|
||||
return meteoData.humidity();
|
||||
return meteoData.humidity;
|
||||
}
|
||||
return QVariant();
|
||||
}
|
||||
|
||||
+16
-15
@@ -13,12 +13,13 @@ namespace MeteoDataManagement
|
||||
|
||||
StaticMeteoDataEdit::StaticMeteoDataEdit(QWidget *parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
|
||||
, m_logger(getLogger("MeteoDataManagementEdit"))
|
||||
, m_dtc(nullptr)
|
||||
, m_ftc(nullptr)
|
||||
, m_session(nullptr)
|
||||
, m_ui(new Ui::StaticMeteoDataEdit)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_meteoDataId(0)
|
||||
, m_meteoDataId(0)
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -72,13 +73,13 @@ bool StaticMeteoDataEdit::apply()
|
||||
return m_requestHelper->startSingleRequest([this]()
|
||||
{
|
||||
StaticMeteoDataModifyRequest requestData;
|
||||
requestData.id(m_meteoDataId);
|
||||
requestData.windDirection(m_ui->sbWindDirection->value());
|
||||
requestData.windSpeed(m_ui->sbWindSpeed->value());
|
||||
requestData.temperature(m_ui->sbTemperature->value());
|
||||
requestData.pressure(m_ui->sbPressure->value());
|
||||
requestData.humidity(m_ui->sbHumidity->value());
|
||||
requestData.timeStamp(m_session->partitionTime());
|
||||
requestData.id = m_meteoDataId;
|
||||
requestData.windDirection = m_ui->sbWindDirection->value();
|
||||
requestData.windSpeed = m_ui->sbWindSpeed->value();
|
||||
requestData.temperature = m_ui->sbTemperature->value();
|
||||
requestData.pressure = m_ui->sbPressure->value();
|
||||
requestData.humidity = m_ui->sbHumidity->value();
|
||||
requestData.timeStamp = m_session->partitionTime();
|
||||
|
||||
return m_ftc->staticMeteoDataModifyRequest(requestData, this);
|
||||
});
|
||||
@@ -91,15 +92,15 @@ void StaticMeteoDataEdit::loadStaticMeteoDataFromDatabase()
|
||||
|
||||
for (const MeteoDataManagement::MeteoData &meteoData : meteoDatas)
|
||||
{
|
||||
if (meteoData.isStaticMeteoData())
|
||||
if (meteoData.isStaticMeteoData)
|
||||
{
|
||||
m_meteoDataId = meteoData.id();
|
||||
m_meteoDataId = meteoData.id;
|
||||
|
||||
m_ui->sbWindDirection->setValue(meteoData.windDirection());
|
||||
m_ui->sbWindSpeed->setValue(meteoData.windSpeed());
|
||||
m_ui->sbTemperature->setValue(meteoData.temperature());
|
||||
m_ui->sbPressure->setValue(meteoData.pressure());
|
||||
m_ui->sbHumidity->setValue(meteoData.humidity());
|
||||
m_ui->sbWindDirection->setValue(meteoData.windDirection);
|
||||
m_ui->sbWindSpeed->setValue(meteoData.windSpeed);
|
||||
m_ui->sbTemperature->setValue(meteoData.temperature);
|
||||
m_ui->sbPressure->setValue(meteoData.pressure);
|
||||
m_ui->sbHumidity->setValue(meteoData.humidity);
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user