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
+5
-5
@@ -44,21 +44,21 @@ bool CustomViewGasPipe::init(const QModelIndex &idx)
|
||||
|
||||
bool CustomViewGasPipe::calculateIcon(const AreaEffectSimulation::GasPipe &line, const QColor &color)
|
||||
{
|
||||
if (line.segments().size() == 0)
|
||||
if (line.segments.size() == 0)
|
||||
return false;
|
||||
|
||||
QVector<Database::AesGasPipeSegment> segments;
|
||||
segments.reserve(line.segments().size());
|
||||
segments.reserve(line.segments.size());
|
||||
int counter = 0;
|
||||
for (const Core::GeoPosition2D &s : line.segments())
|
||||
for (const Core::GeoPosition2D &s : line.segments)
|
||||
{
|
||||
Database::AesGasPipeSegment segment;
|
||||
segment.position = QPointF(s.lon(), s.lat());
|
||||
segment.position = QPointF(s.lon, s.lat);
|
||||
segments.append(segment);
|
||||
counter++;
|
||||
}
|
||||
|
||||
QPolygonF poly = AreaEffectSimulation::Polygons::gasPipe(segments, line.width());
|
||||
QPolygonF poly = AreaEffectSimulation::Polygons::gasPipe(segments, line.width);
|
||||
Qt::BrushStyle bStyle = Qt::BrushStyle::NoBrush;
|
||||
const auto pix = Polygons::pixmapFromPolygon(poly, color, ICON_RESOLUTION, bStyle, true);
|
||||
m_ui->lblIcon->setPixmap(pix);
|
||||
|
||||
+14
-14
@@ -76,15 +76,15 @@ void GasPipeEdit::enableUiElements(bool enable)
|
||||
m_ui->leIdentifier->setEnabled(enable || isOnlyNameModifiable());
|
||||
m_ui->cbParty->setEnabled(enable);
|
||||
|
||||
if (m_aesItem.effectStateId() == AesEffectState::EsExpired)
|
||||
if (m_aesItem.effectStateId == AesEffectState::EsExpired)
|
||||
{
|
||||
m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name()));
|
||||
m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name));
|
||||
__unchange__();
|
||||
}
|
||||
if (m_aesItem.effectStateId() == AesEffectState::EsActivated)
|
||||
if (m_aesItem.effectStateId == AesEffectState::EsActivated)
|
||||
{
|
||||
QString name = m_ui->leIdentifier->text();
|
||||
auto baseData = m_dtc->gasPipe(m_aesItem.id());
|
||||
auto baseData = m_dtc->gasPipe(m_aesItem.id);
|
||||
setData(baseData, false);
|
||||
__unchange__();
|
||||
if (name != m_ui->leIdentifier->text())
|
||||
@@ -135,16 +135,16 @@ void GasPipeEdit::setData(const GasPipe &aesItem, bool copy)
|
||||
m_aesItem = aesItem;
|
||||
if (copy)
|
||||
{
|
||||
m_aesItem.id(0);
|
||||
m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default());
|
||||
m_aesItem.id = 0;
|
||||
m_aesItem.effectStateId = AreaEffectSimulation::AesEffectState::EsUnknown;
|
||||
}
|
||||
m_ui->leIdentifier->setText(QString::fromStdString(aesItem.name()));
|
||||
m_ui->sbWidth->setValue(aesItem.width());
|
||||
m_ui->dteEffectStart->setMsecsSinceEpoch(aesItem.effectStart().is_set() ? aesItem.effectStart().get() : 0);
|
||||
if ( aesItem.partyId().is_set())
|
||||
m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(aesItem.partyId().get()));
|
||||
m_ui->leIdentifier->setText(QString::fromStdString(aesItem.name));
|
||||
m_ui->sbWidth->setValue(aesItem.width);
|
||||
m_ui->dteEffectStart->setMsecsSinceEpoch(aesItem.effectStart.has_value() ? aesItem.effectStart.get() : 0);
|
||||
if ( aesItem.partyId.has_value())
|
||||
m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(aesItem.partyId.get()));
|
||||
|
||||
setCoordinates(aesItem.segments());
|
||||
setCoordinates(aesItem.segments);
|
||||
}
|
||||
|
||||
void GasPipeEdit::getPolygon()
|
||||
@@ -190,8 +190,8 @@ bool GasPipeEdit::apply()
|
||||
if (!checkSegementLengths(this))
|
||||
return false;
|
||||
|
||||
const GasPipeModifyRequest req(m_aesItem.id(),
|
||||
LtsUtils::toOptional(effectStart),
|
||||
const GasPipeModifyRequest req(m_aesItem.id,
|
||||
LtsUtils::toOptional(static_cast<int64_t>(effectStart)),
|
||||
LtsUtils::toOptional(partyId),
|
||||
name,
|
||||
getCoordinates(),
|
||||
|
||||
+2
-2
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <AreaEffectSimulation/Base/aes_base_edit.h>
|
||||
#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h>
|
||||
#include <AreaEffectSimulation/aes_ftc.h>
|
||||
|
||||
class QDoubleSpinBox;
|
||||
@@ -28,7 +28,7 @@ public:
|
||||
|
||||
QString dialogIdentifier() const override
|
||||
{
|
||||
return m_aesItem.id() <= 0 ? QStringLiteral("AddGasPipe") : QStringLiteral("EditGasPipe%1").arg(m_aesItem.id());
|
||||
return m_aesItem.id <= 0 ? QStringLiteral("AddGasPipe") : QStringLiteral("EditGasPipe%1").arg(m_aesItem.id);
|
||||
}
|
||||
bool init(int aesItemId, bool copy, LtsSession::LtsSession *session);
|
||||
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <AreaEffectSimulation/Base/aes_base_gui_plugin.h>
|
||||
#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_gui_plugin.h>
|
||||
#include "aes_gas_pipe_gui_plugin_interface.h"
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <AreaEffectSimulation/Base/aes_itemlist.h>
|
||||
#include <AreaEffectSimulation/Base/aes_base_model.h>
|
||||
#include <Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.h>
|
||||
#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
|
||||
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
|
||||
#include "aes_gas_pipes_model.h"
|
||||
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <AreaEffectSimulation/Base/aes_base_model.h>
|
||||
#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user