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
@@ -44,6 +44,7 @@ if(QT6_GUI_AVAILABLE)
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
Qt6::OpenGL
|
||||
Qt6::OpenGLWidgets
|
||||
LtsSession
|
||||
LtsWidgets
|
||||
LtsUtilsGuiDds
|
||||
|
||||
+9
-9
@@ -117,9 +117,9 @@ bool ControlDialog::init(LtsSession::LtsSession *session,
|
||||
auto getLocationIdFunc =
|
||||
[sessionData, this](const AssetManagement::Asset & data) -> bool
|
||||
{
|
||||
if (data.id() == sessionData->getWorkstationId())
|
||||
if (data.id == sessionData->getWorkstationId())
|
||||
{
|
||||
m_locationId = data.locationId();
|
||||
m_locationId = data.locationId;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@@ -201,7 +201,7 @@ void ControlDialog::slotOnWebSocketConnected()
|
||||
int userId = sessioData->getOperatorId();
|
||||
int exerciseId = m_exerciseId;
|
||||
OperatorManagement::User user = m_opmDtc->user(userId);
|
||||
if (user.id() > 0)
|
||||
if (user.id > 0)
|
||||
{
|
||||
|
||||
|
||||
@@ -230,12 +230,12 @@ void ControlDialog::slotOnWebSocketConnected()
|
||||
|
||||
|
||||
INFO_LOG(m_logger) << " connect userId=" << userId
|
||||
<< ", with prio=" << user.projectionPriority()
|
||||
<< ", with prio=" << user.projectionPriority
|
||||
<< ", PwsWorkspace/Id='" << workspaceIdToUse << "'";
|
||||
|
||||
LtsProjectionWorkstation::CTS::LoginRequest req(QUuid::createUuid().toString(),
|
||||
userId,
|
||||
user.projectionPriority(),
|
||||
user.projectionPriority,
|
||||
exerciseId, opSettingsData);
|
||||
m_webSocketClient->addReply(req.toReplyMessage());
|
||||
}
|
||||
@@ -310,13 +310,13 @@ void ControlDialog::fillCombobox()
|
||||
m_asmDtc->assets([this](const AssetManagement::Asset & data)
|
||||
{
|
||||
if (m_ui->chbProjectionWSOnly->isChecked() &&
|
||||
data.assetTypeId() != AssetManagement::AssetType::ProjectionWorkstation)
|
||||
data.assetTypeId != AssetManagement::AssetType::ProjectionWorkstation)
|
||||
return;
|
||||
if (m_ui->chbInThisLocationOnly->isChecked() &&
|
||||
data.locationId() != m_locationId)
|
||||
data.locationId != m_locationId)
|
||||
return;
|
||||
|
||||
m_ui->cbxWorkstations->addItem(QString::fromStdString(data.name()));
|
||||
m_ui->cbxWorkstations->addItem(QString::fromStdString(data.name));
|
||||
});
|
||||
m_ui->cbxWorkstations->model()->sort(0);
|
||||
|
||||
@@ -372,7 +372,7 @@ void ControlDialog::handleMessage(LtsWebSocket::AbstractClientMessage *message)
|
||||
break;
|
||||
case LoginRequestReply::OtherUser:
|
||||
errMsg = tr("The connection is blocked by user %1")
|
||||
.arg(QString::fromStdString(m_opmDtc->user(login->reasonUserId()).name()));
|
||||
.arg(QString::fromStdString(m_opmDtc->user(login->reasonUserId()).name));
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -13,8 +13,8 @@
|
||||
#include <LtsProjectionWorkstation/WebSocket/message_factory.h>
|
||||
|
||||
#include <OperatorManagement/opm_settings_gui_plugin_interface.h>
|
||||
#include <OperatorManagement/opm_data_plugin.h>
|
||||
#include <AssetManagement/asm_data_plugin.h>
|
||||
#include <Plugins/OperatorManagement/Data/opm_data_plugin.h>
|
||||
#include <Plugins/AssetManagement/Data/asm_data_plugin.h>
|
||||
|
||||
namespace Ui { class ControlDialog; }
|
||||
namespace LtsSession { class LtsSession; }
|
||||
|
||||
+2
-2
@@ -5,9 +5,9 @@
|
||||
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <LtsProjectionWorkstation/logger.h>
|
||||
#include <OperatorManagement/opm_data_plugin.h>
|
||||
#include <Plugins/OperatorManagement/Data/opm_data_plugin.h>
|
||||
#include <OperatorManagement/opm_settings_gui_plugin_interface.h>
|
||||
#include <AssetManagement/asm_data_plugin.h>
|
||||
#include <Plugins/AssetManagement/Data/asm_data_plugin.h>
|
||||
#include <memory>
|
||||
|
||||
namespace ProjectionWorkstation
|
||||
|
||||
+2
-2
@@ -49,8 +49,8 @@ bool OperatorSettingsLoader::loadOperatorRights()
|
||||
{
|
||||
OperatorManagement::OperatorApplyForeignAclsRequest req;
|
||||
|
||||
req.id(localUserId);
|
||||
req.remoteOperatorId(m_userId);
|
||||
req.id = localUserId;
|
||||
req.remoteOperatorId = m_userId;
|
||||
|
||||
auto cb = [this, &req]() -> bool
|
||||
{
|
||||
|
||||
-1
@@ -33,7 +33,6 @@ private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
bool loadOperatorRights();
|
||||
|
||||
LtsProjectionWorkstation::
|
||||
std::shared_ptr<OperatorManagement::Interface::Ftc> m_opmFtc;
|
||||
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
|
||||
+3
-3
@@ -119,7 +119,7 @@ void VncViewerDialog::mousePressEvent(QMouseEvent *event)
|
||||
event->accept();
|
||||
if (event->button() == Qt::LeftButton)
|
||||
m_mouseButtonMask |= (1 << 0);
|
||||
else if (event->button() == Qt::MidButton)
|
||||
else if (event->button() == Qt::MiddleButton)
|
||||
m_mouseButtonMask |= (1 << 1);
|
||||
else if (event->button() == Qt::RightButton)
|
||||
m_mouseButtonMask |= (1 << 2);
|
||||
@@ -135,7 +135,7 @@ void VncViewerDialog::mouseReleaseEvent(QMouseEvent *event)
|
||||
event->accept();
|
||||
if (event->button() == Qt::LeftButton)
|
||||
m_mouseButtonMask &= ~(1 << 0);
|
||||
else if (event->button() == Qt::MidButton)
|
||||
else if (event->button() == Qt::MiddleButton)
|
||||
m_mouseButtonMask &= ~(1 << 1);
|
||||
else if (event->button() == Qt::RightButton)
|
||||
m_mouseButtonMask &= ~(1 << 2);
|
||||
@@ -177,7 +177,7 @@ void VncViewerDialog::wheelEvent(QWheelEvent *event)
|
||||
else if (event->angleDelta().y() < 0)
|
||||
m_mouseButtonMask |= (1 << 4);
|
||||
|
||||
QPoint mapped = mapMousePosition(event->pos());
|
||||
QPoint mapped = mapMousePosition(event->position().toPoint());
|
||||
|
||||
QByteArray data = RfbProtocol::CTS::RfbPointerEvent(m_mouseButtonMask, mapped.x(), mapped.y());
|
||||
m_handler->writeData(data);
|
||||
|
||||
+3
-4
@@ -9,7 +9,7 @@
|
||||
#include <QtCore/QMutex>
|
||||
#include <QOpenGLFramebufferObject>
|
||||
#include <QOpenGLTextureBlitter>
|
||||
#include <QtWidgets/QOpenGLWidget>
|
||||
#include <QtOpenGLWidgets/QOpenGLWidget>
|
||||
#include <QtGui/QOpenGLFunctions>
|
||||
#include <QtNetwork/QHostAddress>
|
||||
|
||||
@@ -40,7 +40,6 @@ NGL::INGLLogger &m_logger;
|
||||
mutable QMutex m_mutex;
|
||||
QSize m_scaledSize;
|
||||
QSize m_scaledSizeAspectRatio;
|
||||
LtsProjectionWorkstation::
|
||||
};
|
||||
|
||||
class VncRenderArea : public QOpenGLWidget, protected QOpenGLFunctions
|
||||
@@ -75,7 +74,7 @@ private:
|
||||
QOpenGLFramebufferObject *m_fbo;
|
||||
QOpenGLTextureBlitter m_blitter;
|
||||
|
||||
LtsProjectionWorkstation::
|
||||
LtsProjectionWorkstation::LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
|
||||
@@ -128,7 +127,7 @@ private:
|
||||
QString m_name;
|
||||
bool m_isConnected;
|
||||
|
||||
LtsProjectionWorkstation::
|
||||
LtsProjectionWorkstation::LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user