Session 022: Migrate Lts/Tools (72 submodules) to Qt6
- Copied complete Lts/Tools directory from qt5-before to qt6-after - Updated 32 CMakeLists.txt files (Qt5:: → Qt6::) - Tools subdirectory already included in parent Lts/CMakeLists.txt - All 72 tool submodules now present in qt6-migrated-legatus - Includes: Adler, ArAssets, ConfigX, DBAdministration, DBUpdate, DdsView, InfrastructureManagement, and 67 more tools - C++17 standard (RTI 7.7.0 compatibility maintained) - Tests deferred until final validation phase Migration progress: ✅ Lts/Application (68 files) ✅ Lts/DDS (verified Qt6-ready) ✅ Lts/Plugins (60 submodules, verified) ✅ Lts/Projects (5 submodules, verified) ✅ Lts/Proxies (13 submodules, verified) ✅ Lts/Services (47 submodules, verified) ✅ Lts/Tools (72 submodules, copied + CMake updated) ✅ Lts/Viewer (LtsFileDialog, LtsReportDisplay, SituationMap) 🟡 TetraIF (partial) 🟡 Z (partial: nglwidgets, QtSingleApplication, qsql_informix, WMS_Interface)
This commit is contained in:
1 parent
01dce5fe52
commit
d5c13033e2
1792 files changed
+982018
No files matched your search
@@ -0,0 +1,119 @@
|
||||
/**
|
||||
* 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.m_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.m_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
|
||||
Reference in new issue
Block a user