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>
105 lines
3.0 KiB
C++
105 lines
3.0 KiB
C++
#include "mainwindow.h"
|
|
#include "ui_mainwindow.h"
|
|
|
|
#include <LtsScriptTimeline/track_entry.h>
|
|
|
|
#include <QLabel>
|
|
#include <QDialog>
|
|
|
|
|
|
MainWindow::MainWindow(QWidget *parent)
|
|
: QMainWindow(parent)
|
|
, ui(new Ui::MainWindow)
|
|
, m_selectedTe(nullptr)
|
|
, m_currentNewTopicEditor(nullptr)
|
|
, m_currentEditTopicEditor(nullptr)
|
|
{
|
|
ui->setupUi(this);
|
|
|
|
ui->masterSplitter->setStretchFactor(ui->masterSplitter->indexOf(ui->masterSplitter), 20);
|
|
ui->masterSplitter->setStretchFactor(ui->masterSplitter->indexOf(ui->toolBox), 0);
|
|
|
|
ui->detailSplitter->setStretchFactor(ui->masterSplitter->indexOf(ui->scriptTimeline), 20);
|
|
ui->detailSplitter->setStretchFactor(ui->masterSplitter->indexOf(ui->detailLayout), 0);
|
|
|
|
|
|
connect(ui->scriptTimeline, &LtsScriptTimeline::ScriptTimeline::signalTrackEntrySelectionChanged, this, &MainWindow::slotTrackEntrySelectionChanged);
|
|
|
|
connect(ui->pbTopicAddAudio, &QPushButton::clicked, // TODO: to method >> addTopic(type, new XTopicEditor);
|
|
this, [this]()
|
|
{
|
|
LtsScriptTimeline::TrackEntry *te = new LtsScriptTimeline::TrackEntry(LtsScriptTimeline::TrackEntryType::Audio); //newTrackEntry(); <= adds an track to a model, with set id & type
|
|
te->time = -1; // .......
|
|
te->length = 30;
|
|
te->topicId = 3; // TODO: get unique id!
|
|
|
|
if (m_currentNewTopicEditor)
|
|
delete m_currentNewTopicEditor; // FIXME: Timing! see: *
|
|
|
|
LtsScriptTimeline::AudioTopicEditor *ate = new LtsScriptTimeline::AudioTopicEditor(te);
|
|
connect(ate, &LtsScriptTimeline::AudioTopicEditor::destroyed, this, [this]() { m_currentNewTopicEditor = nullptr; }); // FIXME: *
|
|
m_currentNewTopicEditor = ate;
|
|
ui->newTopicTab->layout()->addWidget(ate);
|
|
ui->detailLayout->setCurrentWidget(ui->newTopicTab);
|
|
});
|
|
|
|
|
|
ui->scriptTimeline->addTrack(ui->scriptTimeline->newTrackName());
|
|
|
|
|
|
|
|
|
|
qCritical() << "THIS EXAMPLE NO LONGER WORKS!";
|
|
//ui->scriptTimeline->addTopic(te);
|
|
|
|
|
|
}
|
|
|
|
|
|
void MainWindow::disconnectTrackEntry()
|
|
{
|
|
if (!m_selectedTe)
|
|
return;
|
|
|
|
m_selectedTe = nullptr;
|
|
|
|
if (m_currentEditTopicEditor)
|
|
{
|
|
//m_currentEditTopicEditor->deleteLater();
|
|
delete m_currentEditTopicEditor; // FIXME: ! otherwise the label-trigger wont work properly (timing) ... :(
|
|
m_currentEditTopicEditor = nullptr;
|
|
ui->lblNoTopicSelected->setVisible(true);
|
|
}
|
|
|
|
ui->lblNoTopicSelected->setVisible(true);
|
|
}
|
|
|
|
|
|
void MainWindow::slotTrackEntrySelectionChanged(LtsScriptTimeline::TrackEntry *te)
|
|
{
|
|
qDeleteAll(ui->topicEditorTab->layout()->children());
|
|
disconnectTrackEntry();
|
|
|
|
if (!te)
|
|
return;
|
|
|
|
ui->lblNoTopicSelected->setVisible(false);
|
|
|
|
m_selectedTe = te;
|
|
|
|
// TODO: select correct tab ...
|
|
//ui->topicEditorTab->setEnabled(true);
|
|
|
|
LtsScriptTimeline::AudioTopicEditor *ate = new LtsScriptTimeline::AudioTopicEditor(te); // TODO: make method (with TopicEditor detection)
|
|
connect(ate, &LtsScriptTimeline::AudioTopicEditor::destroyed,
|
|
this, [this]() { m_currentEditTopicEditor = nullptr; });
|
|
m_currentEditTopicEditor = ate;
|
|
ui->topicEditorTab->layout()->addWidget(ate);
|
|
}
|
|
|
|
|
|
MainWindow::~MainWindow()
|
|
{
|
|
delete ui;
|
|
}
|