torstenandCopilot
7173785915
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
102 lines
2.6 KiB
C++
102 lines
2.6 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
*
|
|
* Abstract Dialog with ButtonBox and some pass-throughs
|
|
*
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#include "detailviewdlg.h"
|
|
#include "ui_detailviewdlg.h"
|
|
|
|
#include "detailview.h"
|
|
#include <QTimer>
|
|
|
|
|
|
DetailViewDlg::DetailViewDlg(QWidget *parent)
|
|
: NGLDialog(parent)
|
|
, m_ui(new Ui::DetailViewDlg)
|
|
, m_bConnected(false)
|
|
, m_logger(DdsView::getLogger("DetailView"))
|
|
{
|
|
m_ui->setupUi(this);
|
|
connect(m_ui->nglDialogButtonBox, &NGLDialogButtonBox::onClose, this, &DetailViewDlg::accept);
|
|
connect(m_ui->nglDialogButtonBox, &NGLDialogButtonBox::onSend, this, &DetailViewDlg::onSend);
|
|
connect(m_ui->nglDialogButtonBox, &NGLDialogButtonBox::onOk, this, &DetailViewDlg::onOk);
|
|
connect(m_ui->nglDialogButtonBox, &NGLDialogButtonBox::onCancel, this, &DetailViewDlg::reject);
|
|
}
|
|
|
|
DetailViewDlg::~DetailViewDlg()
|
|
{
|
|
delete m_ui;
|
|
}
|
|
|
|
void DetailViewDlg::setBtnsOkCancel()
|
|
{
|
|
m_ui->nglDialogButtonBox->setStandardButtons(NGLStandardButton::Ok | NGLStandardButton::Cancel);
|
|
}
|
|
|
|
void DetailViewDlg::setBtnsSendOkCancel()
|
|
{
|
|
m_ui->nglDialogButtonBox->setStandardButtons(NGLStandardButton::Send | NGLStandardButton::Ok | NGLStandardButton::Cancel);
|
|
setConnected(m_bConnected);
|
|
}
|
|
|
|
void DetailViewDlg::setBtnsSendClose()
|
|
{
|
|
m_ui->nglDialogButtonBox->setStandardButtons(NGLStandardButton::Close | NGLStandardButton::Send);
|
|
setConnected(m_bConnected);
|
|
}
|
|
|
|
void DetailViewDlg::setConnected(bool bConnected)
|
|
{
|
|
m_bConnected = bConnected;
|
|
m_ui->nglDialogButtonBox->setEnabled(NGLStandardButton::Send, m_bConnected);
|
|
}
|
|
|
|
|
|
bool DetailViewDlg::init(const dds::core::xtypes::DynamicData &data, const QString &topicName, RwMode mode)
|
|
{
|
|
bool retVal = m_ui->detailView->init(data, topicName, mode);
|
|
setWindowTitle(m_ui->detailView->windowTitle());
|
|
return retVal;
|
|
}
|
|
|
|
bool DetailViewDlg::init(const dds::core::xtypes::DynamicType &type, const QString &topicName, RwMode mode)
|
|
{
|
|
bool retVal = m_ui->detailView->init(type, topicName, mode);
|
|
setWindowTitle(m_ui->detailView->windowTitle());
|
|
QTimer::singleShot(0, this, [this]() { resize(sizeHint());});
|
|
return retVal;
|
|
}
|
|
|
|
bool DetailViewDlg::fill(const dds::core::xtypes::DynamicData &data)
|
|
{
|
|
bool retVal = m_ui->detailView->setData(data);
|
|
m_ui->scrollArea->resize(m_ui->detailView->size());
|
|
return retVal;
|
|
}
|
|
|
|
void DetailViewDlg::onSend()
|
|
{
|
|
const QString topicName = m_ui->detailView->getTopicName();
|
|
auto val = m_ui->detailView->getData();
|
|
if (val)
|
|
emit send(val, topicName);
|
|
}
|
|
|
|
void DetailViewDlg::onOk()
|
|
{
|
|
auto val = m_ui->detailView->getData();
|
|
if (val)
|
|
{
|
|
const QString topicName = m_ui->detailView->getTopicName();
|
|
emit dataChanged(val, topicName);
|
|
accept();
|
|
}
|
|
else
|
|
reject();
|
|
}
|