Berrux Kana
3f7beb3c7e
Continue the Qt5->Qt6 migration so the LTS Projects (Group 10) and LTS
Application (Group 11) compile, link, and ctest runs.
Qt5->Qt6 API migration (resolves removed/deprecated Qt6 APIs) across Lts
Tools and Apps, e.g. QAction->QActionGroup, QAbstractSocket::errorOccurred,
Qt::SkipEmptyParts, QRandomGenerator, QInputDevice::DeviceType,
QRegularExpression, QLatin1Literal->QStringLiteral, and the SampleModel
m_description->description rename.
CMake build fixes:
- CMakeLists.txt: add Lts/Common to CMAKE_AUTOMOC_INCLUDE_DIRECTORIES so moc
resolves Q_INTERFACES(ProjectPlugin::Plugin) for the migrated Projects.
- cmake/NGLMacros.cmake: NGL_COMPILE_RESOURCES - replace return() (which aborts
the calling CMakeLists.txt) with an if/else/endif.
- OpApp/THP: guard the ArcGISQt5Hack link with $<IF:$<TARGET_EXISTS:...>> (the
target is absent when the SituationMap viewer is stubbed); matches
CentralEffectSimulation.
- LtsSession: prefer the in-tree svcCoreClient target over a FIND_LIBRARY in
/usr/local/lib.
- CnrProxyTester/DotMatrixDisplay: set AUTOUIC_SEARCH_PATHS for the ui/ subdir.
- TopicDiscover: link NGLLogger.
Export-header visibility stubs (expand the empty *_EXPORT macro to
__attribute__((visibility("default"))); the build sets -fvisibility=hidden and
these stubs shadow the CMake-generated header):
- include/LtsProjectionWorkstation/ltsprojectionworkstation_export.h (fixes
undefined reference to LtsProjectionWorkstation::getInstance /
setProjectionOperatorPreset)
- include/LtsSession/ltssession_export.h, include/LtsUtilsGuiDds/ltsutilsguidds_export.h (same pattern)
New plugin modules (copied from legacy) so LtsAppDescriptorChecker finds the
gui:3 IIDs referenced by the Projects' apps.json:
- TakeHomePackageManager/OldTHP gui:3:tpm.man, gui:3:tpm.usb
- PresentationManagement/.../ScriptEditor gui:3:pre.script.edit
- Timeline/Gui/EventTimelineClassic gui:3:tln.view
new_docker_build.sh: correct group targets to the actual CMake target names,
guard LtsReportDisplay on BUILD_CODIFICATION, and skip modules unavailable in
the prebuilt image (AsmWorkstationCertifier/botan2, TrajectoryWidget,
VideoImport, thp_viewer/VLC).
120 lines
3.1 KiB
C++
Executable File
120 lines
3.1 KiB
C++
Executable File
/**
|
|
* Settings for WlsRandomPositions
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* * Created by Hanna E. Rathje, SLTE, 2022-04-01
|
|
*/
|
|
|
|
#include "settings.h"
|
|
#include <QtCore/QSettings>
|
|
#include <nglsettings/nglsettings_settings.h>
|
|
#include <ngltools/ngltools_filesystem.h>
|
|
|
|
namespace WlsRandomPositions
|
|
{
|
|
|
|
class NGLSettingsClass : public NGL::Settings
|
|
{
|
|
public:
|
|
NGLSettingsClass()
|
|
: NGL::Settings(s_iniFile.isEmpty() ? NGL::findProjectConfigFile() : s_iniFile)
|
|
{}
|
|
static void setIniFile(const QString &fn)
|
|
{
|
|
s_iniFile = fn;
|
|
}
|
|
static QString s_iniFile;
|
|
};
|
|
QString NGLSettingsClass::s_iniFile;
|
|
Q_GLOBAL_STATIC(NGLSettingsClass, s)
|
|
|
|
//-----------------------------------------------------------------------------
|
|
NGL::Settings *Settings::settings()
|
|
{
|
|
return s();
|
|
}
|
|
//-----------------------------------------------------------------------------
|
|
void Settings::setIniFile(const QString &ini)
|
|
{
|
|
NGLSettingsClass::setIniFile(ini);
|
|
}
|
|
|
|
//-----------------------------------------------------------------------------
|
|
QMap<int,Settings::TrainingArea> Settings::trainingAreas()
|
|
{
|
|
QSettings *settings = s()->settings();
|
|
QMap<int, TrainingArea> map;
|
|
|
|
settings->beginGroup(QStringLiteral("TrainingAreas"));
|
|
{
|
|
int size_ta = settings->beginReadArray(QStringLiteral("TrainingArea"));
|
|
for (int i = 0; i < size_ta; ++i)
|
|
{
|
|
settings->setArrayIndex(i);
|
|
TrainingArea ta;
|
|
ta.id = settings->value(QStringLiteral("id")).toInt();
|
|
ta.name = settings->value(QStringLiteral("name")).toString();
|
|
ta.bottomLeft = settings->value(QStringLiteral("bottomLeftMgrs")).toString();
|
|
ta.width = settings->value(QStringLiteral("width"), 1000).toInt();
|
|
ta.height = settings->value(QStringLiteral("height"), 1000).toInt();
|
|
map.insert(ta.id, ta);
|
|
}
|
|
settings->endArray();
|
|
}
|
|
settings->endGroup();
|
|
return map;
|
|
}
|
|
|
|
int Settings::amountPlayers()
|
|
{
|
|
return s()->settings()->value(QStringLiteral("Global/amountPlayers"), 100).toInt();
|
|
}
|
|
|
|
int Settings::firstEquipNo()
|
|
{
|
|
return s()->settings()->value(QStringLiteral("Global/firstEquipNo"), 1000).toInt();
|
|
}
|
|
|
|
QString Settings::firstMacAddress()
|
|
{
|
|
return s()->settings()->value(QStringLiteral("Global/firstMacAddress"), QStringLiteral("01:12:23:34:45:5")).toString();
|
|
}
|
|
|
|
int Settings::msecs()
|
|
{
|
|
return s()->settings()->value(QStringLiteral("Global/msecs"), 100).toInt();
|
|
}
|
|
|
|
int Settings::jitter()
|
|
{
|
|
return s()->settings()->value(QStringLiteral("Global/jitter"), 00).toInt();
|
|
}
|
|
|
|
int Settings::heightMin()
|
|
{
|
|
return s()->settings()->value(QStringLiteral("Global/altitudeMin"), 0).toInt();
|
|
}
|
|
|
|
int Settings::heightMax()
|
|
{
|
|
return s()->settings()->value(QStringLiteral("Global/altitudeMax"), 10).toInt();
|
|
}
|
|
|
|
double Settings::maxDistance()
|
|
{
|
|
return s()->settings()->value(QStringLiteral("Global/naxDistance"), 10).toDouble();
|
|
}
|
|
|
|
QString Settings::serverName()
|
|
{
|
|
return s()->settings()->value(QStringLiteral("Global/serverName"), QStringLiteral("EXCTDS01")).toString();
|
|
}
|
|
|
|
int Settings::serverPort()
|
|
{
|
|
return s()->settings()->value(QStringLiteral("Global/serverPort"), 12002).toInt();
|
|
}
|
|
|
|
} // namespace WlsRandomPositions
|