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>
81 lines
2.1 KiB
C++
Executable File
81 lines
2.1 KiB
C++
Executable File
/**
|
|
* @RDE_HEADER@
|
|
* Handle bulding display in thp
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#include "thp_building_widget.h"
|
|
#include "ui_thp_situation_building_base.h"
|
|
#include "thp_building_settings.h"
|
|
#include "thp_plugin_provider.h"
|
|
|
|
#include <QMenu>
|
|
|
|
#include <BuildingViewer/Common/bdv_controller.h>
|
|
#include <BuildingViewer/Common/bdv_plugin_provider.h>
|
|
#include <LtsScriptTimeline/track_entry.h>
|
|
#include <LtsWidgets/lts_dialog_helper.h>
|
|
|
|
#include <SituationReplay/handler_situation_replay_sqlite.h>
|
|
|
|
namespace THP
|
|
{
|
|
using namespace SituationReplay;
|
|
|
|
BuildingWidget::BuildingWidget(QWidget *parent)
|
|
: SituationBuildingBase("THP.BuildingWidget", parent)
|
|
{
|
|
QMenu *m = new QMenu(m_ui->btnFilter);
|
|
m->addAction(tr("Global Settings"), this, &BuildingWidget::onGlobalSettings);
|
|
m_ui->btnFilter->setMenu(m);
|
|
}
|
|
|
|
BuildingWidget::~BuildingWidget()
|
|
{
|
|
delete m_bgvController;
|
|
}
|
|
|
|
bool BuildingWidget::init(SituationReplay::MainHandlerSqlite *mhs, BuildingPluginProvider *pp, const QString &homePath)
|
|
{
|
|
if (!SituationBuildingBase::init(mhs))
|
|
return false;
|
|
m_replayHandler = mhs;
|
|
m_pluginProvider = pp;
|
|
|
|
// parse json, create xml, init buildingviewer
|
|
delete m_bgvController;
|
|
m_bgvController = new BuildingViewer::BgViewerController(this);
|
|
if (!m_bgvController->init(m_pluginProvider, true, homePath + QStringLiteral("/BuildingModels/")))
|
|
return false;
|
|
|
|
auto w = m_bgvController->getBgViewerWidget();
|
|
w->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
|
|
m_ui->vLayout->insertWidget(0, w);
|
|
return true;
|
|
}
|
|
|
|
bool BuildingWidget::showSituationInternal()
|
|
{
|
|
m_bgvController->excRestoreViewState(m_attributes[QStringLiteral("arrBuildingStates")]);
|
|
if (!SituationBuildingBase::showSituationInternal())
|
|
return false;
|
|
onInitDone();
|
|
return true;
|
|
}
|
|
|
|
void BuildingWidget::emitPartitionTimeChanged(qint64 curTime)
|
|
{
|
|
m_pluginProvider->emitPartitionTimeChanged(curTime);
|
|
}
|
|
|
|
void BuildingWidget::onGlobalSettings()
|
|
{
|
|
if (!m_globalSettingsDialog)
|
|
m_globalSettingsDialog = new BgViewerSettingsView(m_bgvController, this);
|
|
m_globalSettingsDialog->show();
|
|
}
|
|
|
|
}
|