flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Move interpolation-related files to new subdirectory

Browse Source
This commit is contained in:
Lars Toenning
2024-01-09 23:31:52 +01:00
parent b53b266ded
commit 3af2fe2304
55 changed files with 131 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cppcheck.supp
View File

@@ -9,7 +9,7 @@
// [error id]
// Issues introduced by refactoring - expected to be fixed
knownConditionTrueFalse:src/blackmisc/simulation/interpolator.cpp
knownConditionTrueFalse:src/blackmisc/simulation/interpolation/interpolator.cpp
knownConditionTrueFalse:src/blackmisc/aviation/aircraftsituationchange.cpp
// Ignore noExplicitConstructor for now.

2
src/blackcore/context/contextsimulator.h
View File

@@ -20,7 +20,7 @@
#include "blackmisc/simulation/simulatorplugininfolist.h"
#include "blackmisc/simulation/simulatorinternals.h"
#include "blackmisc/simulation/matchingstatistics.h"
#include "blackmisc/simulation/interpolationrenderingsetup.h"
#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
#include "blackmisc/aviation/airportlist.h"
#include "blackmisc/geo/elevationplane.h"
#include "blackmisc/pq/length.h"

2
src/blackcore/context/contextsimulatorimpl.h
View File

@@ -20,7 +20,7 @@
#include "blackmisc/simulation/aircraftmodelsetprovider.h"
#include "blackmisc/simulation/backgroundvalidation.h"
#include "blackmisc/simulation/aircraftmodellist.h"
#include "blackmisc/simulation/interpolationsetuplist.h"
#include "blackmisc/simulation/interpolation/interpolationsetuplist.h"
#include "blackmisc/simulation/remoteaircraftprovider.h"
#include "blackmisc/simulation/simulatorplugininfolist.h"
#include "blackmisc/simulation/simulatorinternals.h"

6
src/blackcore/simulator.h
View File

@@ -12,13 +12,13 @@
#include "blackmisc/simulation/aircraftmodellist.h"
#include "blackmisc/simulation/simulatedaircraft.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/simulation/interpolationrenderingsetup.h"
#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
#include "blackmisc/simulation/simulatorinternals.h"
#include "blackmisc/simulation/interpolatormulti.h"
#include "blackmisc/simulation/interpolation/interpolatormulti.h"
#include "blackmisc/simulation/ownaircraftprovider.h"
#include "blackmisc/simulation/remoteaircraftprovider.h"
#include "blackmisc/simulation/simulationenvironmentprovider.h"
#include "blackmisc/simulation/interpolationsetupprovider.h"
#include "blackmisc/simulation/interpolation/interpolationsetupprovider.h"
#include "blackmisc/simulation/autopublishdata.h"
#include "blackmisc/aviation/airportlist.h"
#include "blackmisc/aviation/callsignset.h"

4
src/blackgui/components/internalscomponent.cpp
View File

@@ -10,8 +10,8 @@
#include "blackcore/context/contextnetwork.h"
#include "blackcore/context/contextownaircraft.h"
#include "blackcore/context/contextsimulator.h"
#include "blackmisc/simulation/interpolationlogger.h"
#include "blackmisc/simulation/interpolationrenderingsetup.h"
#include "blackmisc/simulation/interpolation/interpolationlogger.h"
#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/network/client.h"
#include "blackmisc/network/textmessage.h"

2
src/blackgui/components/interpolationlogdisplay.h
View File

@@ -9,7 +9,7 @@
#include "blackgui/overlaymessagesframe.h"
#include "blackgui/blackguiexport.h"
#include "blackcore/simulator.h"
#include "blackmisc/simulation/interpolationlogger.h"
#include "blackmisc/simulation/interpolation/interpolationlogger.h"
#include "blackmisc/aviation/aircraftsituationlist.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/logcategories.h"

2
src/blackgui/components/interpolationsetupcomponent.cpp
View File

@@ -6,7 +6,7 @@
#include "blackgui/views/interpolationsetupview.h"
#include "blackgui/guiapplication.h"
#include "blackcore/context/contextsimulator.h"
#include "blackmisc/simulation/interpolationsetuplist.h"
#include "blackmisc/simulation/interpolation/interpolationsetuplist.h"
#include "blackmisc/statusmessage.h"
#include <QPointer>

2
src/blackgui/components/interpolationsetupcomponent.h
View File

@@ -6,7 +6,7 @@
#ifndef BLACKGUI_COMPONENTS_INTERPOLATIONSETUPCOMPONENT_H
#define BLACKGUI_COMPONENTS_INTERPOLATIONSETUPCOMPONENT_H
#include "blackmisc/simulation/interpolationsetuplist.h"
#include "blackmisc/simulation/interpolation/interpolationsetuplist.h"
#include "blackgui/overlaymessagesframe.h"
#include <QFrame>
#include <QScopedPointer>

2
src/blackgui/editors/interpolationsetupform.h
View File

@@ -7,7 +7,7 @@
#define BLACKGUI_EDITORS_INTERPOLATIONSETUPFORM_H
#include "blackgui/editors/form.h"
#include "blackmisc/simulation/interpolationrenderingsetup.h"
#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
#include "blackmisc/pq/angle.h"
#include "blackmisc/statusmessagelist.h"

2
src/blackgui/models/allmodelcontainers.h
View File

@@ -6,7 +6,7 @@
#include "blackmisc/simulation/aircraftmodellist.h"
#include "blackmisc/simulation/distributorlist.h"
#include "blackmisc/simulation/interpolationsetuplist.h"
#include "blackmisc/simulation/interpolation/interpolationsetuplist.h"
#include "blackmisc/simulation/simulatedaircraftlist.h"
#include "blackmisc/simulation/matchingstatistics.h"
#include "blackmisc/aviation/aircrafticaocodelist.h"

2
src/blackgui/models/interpolationsetupmodel.h
View File

@@ -6,7 +6,7 @@
#ifndef BLACKGUI_MODELS_INTERPOLATIONSETUPMODEL_H
#define BLACKGUI_MODELS_INTERPOLATIONSETUPMODEL_H
#include "blackmisc/simulation/interpolationsetuplist.h"
#include "blackmisc/simulation/interpolation/interpolationsetuplist.h"
#include "blackgui/models/listmodelcallsignobjects.h"
#include "blackgui/blackguiexport.h"
#include <QString>

50
src/blackmisc/CMakeLists.txt
View File

@@ -534,26 +534,26 @@ add_library(misc SHARED
simulation/fscommon/vpilotmodelruleset.h
simulation/aircraftmodel.cpp
simulation/distributor.cpp
simulation/interpolatorspline.h
simulation/interpolation/interpolatorspline.h
simulation/distributorlist.cpp
simulation/registermetadatasimulation.cpp
simulation/interpolatormulti.h
simulation/interpolationsetupprovider.h
simulation/interpolation/interpolatormulti.h
simulation/interpolation/interpolationsetupprovider.h
simulation/aircraftmodellist.h
simulation/interpolationsetupprovider.cpp
simulation/interpolationstatus.cpp
simulation/interpolationstatus.h
simulation/interpolatorlinear.h
simulation/interpolation/interpolationsetupprovider.cpp
simulation/interpolation/interpolationstatus.cpp
simulation/interpolation/interpolationstatus.h
simulation/interpolation/interpolatorlinear.h
simulation/backgroundvalidation.cpp
simulation/airspaceaircraftsnapshot.cpp
simulation/autopublishdata.h
simulation/interpolationrenderingsetup.h
simulation/interpolationresult.cpp
simulation/interpolationresult.h
simulation/interpolation/interpolationrenderingsetup.h
simulation/interpolation/interpolationresult.cpp
simulation/interpolation/interpolationresult.h
simulation/matchingscriptmisc.h
simulation/interpolationsetuplist.cpp
simulation/interpolation/interpolationsetuplist.cpp
simulation/remoteaircraftprovider.h
simulation/interpolant.h
simulation/interpolation/interpolant.h
simulation/ownaircraftprovider.cpp
simulation/backgroundvalidation.h
simulation/xplane/xswiftbusconfigwriter.cpp
@@ -567,23 +567,23 @@ add_library(misc SHARED
simulation/xplane/xswiftbusconfigwriter.h
simulation/matchingutils.h
simulation/registermetadatasimulation.h
simulation/interpolatorlinearpbh.h
simulation/interpolation/interpolatorlinearpbh.h
simulation/fsx/simconnectutilities.h
simulation/fsx/simconnectutilities.cpp
simulation/fsx/fsx.h
simulation/aircraftmodelinterfaces.h
simulation/interpolationlogger.h
simulation/interpolatormulti.cpp
simulation/interpolation/interpolationlogger.h
simulation/interpolation/interpolatormulti.cpp
simulation/remoteaircraftprovider.cpp
simulation/modelconverterx.cpp
simulation/simulatorinfolist.h
simulation/simulationenvironmentprovider.cpp
simulation/interpolator.h
simulation/interpolatorspline.cpp
simulation/interpolation/interpolator.h
simulation/interpolation/interpolatorspline.cpp
simulation/aircraftmodelloaderprovider.cpp
simulation/simulatorplugininfolist.h
simulation/remoteaircraftproviderdummy.cpp
simulation/interpolationlogger.cpp
simulation/interpolation/interpolationlogger.cpp
simulation/matchingscript.h
simulation/categorymatcher.h
simulation/flightgear/flightgearutil.h
@@ -594,20 +594,20 @@ add_library(misc SHARED
simulation/simulatedaircraft.cpp
simulation/aircraftmodellist.cpp
simulation/aircraftmodel.h
simulation/interpolatorlinear.cpp
simulation/interpolation/interpolatorlinear.cpp
simulation/data/lastmodel.h
simulation/data/modelcaches.h
simulation/data/modelcaches.cpp
simulation/airspaceaircraftsnapshot.h
simulation/interpolatorfunctions.h
simulation/interpolation/interpolatorfunctions.h
simulation/ownaircraftprovider.h
simulation/distributorlistpreferences.cpp
simulation/interpolatorlinearpbh.cpp
simulation/interpolation/interpolatorlinearpbh.cpp
simulation/reverselookup.h
simulation/autopublishdata.cpp
simulation/simulationenvironmentprovider.h
simulation/simulatorplugininfo.h
simulation/interpolationrenderingsetup.cpp
simulation/interpolation/interpolationrenderingsetup.cpp
simulation/simulatorinfo.cpp
simulation/matchingstatistics.cpp
simulation/ownaircraftproviderdummy.cpp
@@ -623,7 +623,7 @@ add_library(misc SHARED
simulation/simulatorinternals.h
simulation/distributorlist.h
simulation/aircraftmodelutils.h
simulation/interpolator.cpp
simulation/interpolation/interpolator.cpp
simulation/matchingstatistics.h
simulation/modelconverterx.h
simulation/settings/modelsettings.cpp
@@ -647,8 +647,8 @@ add_library(misc SHARED
simulation/aircraftmodelutils.cpp
simulation/simulatedaircraftlist.cpp
simulation/matchingstatisticsentry.h
simulation/interpolationsetuplist.h
simulation/interpolatorpbh.h
simulation/interpolation/interpolationsetuplist.h
simulation/interpolation/interpolatorpbh.h
# Test
test/testdata.cpp

6
src/blackmisc/simulation/interpolant.h → src/blackmisc/simulation/interpolation/interpolant.h
View File

@@ -3,10 +3,10 @@
//! \file
#ifndef BLACKMISC_SIMULATION_INTERPOLANT_H
#define BLACKMISC_SIMULATION_INTERPOLANT_H
#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLANT_H
#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLANT_H
#include "blackmisc/simulation/interpolatorlinearpbh.h"
#include "blackmisc/simulation/interpolation/interpolatorlinearpbh.h"
namespace BlackMisc::Simulation
{

2
src/blackmisc/simulation/interpolationlogger.cpp → src/blackmisc/simulation/interpolation/interpolationlogger.cpp
View File

@@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
#include "blackmisc/simulation/interpolationlogger.h"
#include "blackmisc/simulation/interpolation/interpolationlogger.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/aviation/heading.h"
#include "blackmisc/geo/kmlutils.h"

6
src/blackmisc/simulation/interpolationlogger.h → src/blackmisc/simulation/interpolation/interpolationlogger.h
View File

@@ -3,10 +3,10 @@
//! \file
#ifndef BLACKMISC_SIMULATION_INTERPOLATIONLOGGER_H
#define BLACKMISC_SIMULATION_INTERPOLATIONLOGGER_H
#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONLOGGER_H
#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONLOGGER_H
#include "blackmisc/simulation/interpolationrenderingsetup.h"
#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
#include "blackmisc/simulation/remoteaircraftprovider.h"
#include "blackmisc/aviation/aircraftsituationlist.h"
#include "blackmisc/aviation/aircraftpartslist.h"

2
src/blackmisc/simulation/interpolationrenderingsetup.cpp → src/blackmisc/simulation/interpolation/interpolationrenderingsetup.cpp
View File

@@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
#include "blackmisc/simulation/interpolationrenderingsetup.h"
#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
#include "blackmisc/network/client.h"
#include "blackmisc/stringutils.h"
#include "blackmisc/verify.h"

4
src/blackmisc/simulation/interpolationrenderingsetup.h → src/blackmisc/simulation/interpolation/interpolationrenderingsetup.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKMISC_SIMULATION_INTERPOLATIONRENDERINGSETUP_H
#define BLACKMISC_SIMULATION_INTERPOLATIONRENDERINGSETUP_H
#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONRENDERINGSETUP_H
#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONRENDERINGSETUP_H
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/pq/length.h"

2
src/blackmisc/simulation/interpolationresult.cpp → src/blackmisc/simulation/interpolation/interpolationresult.cpp
View File

@@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
#include "blackmisc/simulation/interpolationresult.h"
#include "blackmisc/simulation/interpolation/interpolationresult.h"
using namespace BlackMisc::Aviation;

8
src/blackmisc/simulation/interpolationresult.h → src/blackmisc/simulation/interpolation/interpolationresult.h
View File

@@ -3,15 +3,15 @@
//! \file
#ifndef BLACKMISC_SIMULATION_INTERPOLATIONRESULT_H
#define BLACKMISC_SIMULATION_INTERPOLATIONRESULT_H
#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONRESULT_H
#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONRESULT_H
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/aviation/aircraftsituation.h"
#include "blackmisc/aviation/aircraftparts.h"
#include "blackmisc/simulation/interpolationstatus.h"
#include "blackmisc/simulation/interpolation/interpolationstatus.h"
#include "blackmisc/simulation/partsstatus.h"
namespace BlackMisc::Simulation
@@ -68,4 +68,4 @@ namespace BlackMisc::Simulation
}
#endif // BLACKMISC_SIMULATION_INTERPOLATIONRESULT_H
#endif // BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONRESULT_H

2
src/blackmisc/simulation/interpolationsetuplist.cpp → src/blackmisc/simulation/interpolation/interpolationsetuplist.cpp
View File

@@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
#include "blackmisc/simulation/interpolationsetuplist.h"
#include "blackmisc/simulation/interpolation/interpolationsetuplist.h"
BLACK_DEFINE_SEQUENCE_MIXINS(BlackMisc::Simulation, CInterpolationAndRenderingSetupPerCallsign, CInterpolationSetupList)

6
src/blackmisc/simulation/interpolationsetuplist.h → src/blackmisc/simulation/interpolation/interpolationsetuplist.h
View File

@@ -3,10 +3,10 @@
//! \file
#ifndef BLACKMISC_SIMULATION_INTERPOLATIONSETUPLIST_H
#define BLACKMISC_SIMULATION_INTERPOLATIONSETUPLIST_H
#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONSETUPLIST_H
#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONSETUPLIST_H
#include "blackmisc/simulation/interpolationrenderingsetup.h"
#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
#include "blackmisc/aviation/callsignobjectlist.h"
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/collection.h"

2
src/blackmisc/simulation/interpolationsetupprovider.cpp → src/blackmisc/simulation/interpolation/interpolationsetupprovider.cpp
View File

@@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
#include "blackmisc/simulation/interpolationsetupprovider.h"
#include "blackmisc/simulation/interpolation/interpolationsetupprovider.h"
using namespace BlackMisc::Aviation;

10
src/blackmisc/simulation/interpolationsetupprovider.h → src/blackmisc/simulation/interpolation/interpolationsetupprovider.h
View File

@@ -3,12 +3,12 @@
//! \file
#ifndef BLACKMISC_SIMULATION_INTERPOLATIONSETUPPROVIDER_H
#define BLACKMISC_SIMULATION_INTERPOLATIONSETUPPROVIDER_H
#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONSETUPPROVIDER_H
#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONSETUPPROVIDER_H
#include "blackmisc/simulation/interpolationsetuplist.h"
#include "blackmisc/simulation/interpolationrenderingsetup.h"
#include "blackmisc/simulation/interpolationsetuplist.h"
#include "blackmisc/simulation/interpolation/interpolationsetuplist.h"
#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
#include "blackmisc/simulation/interpolation/interpolationsetuplist.h"
#include "blackmisc/aviation/callsignset.h"
#include "blackmisc/provider.h"
#include <QMap>

2
src/blackmisc/simulation/interpolationstatus.cpp → src/blackmisc/simulation/interpolation/interpolationstatus.cpp
View File

@@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
#include "blackmisc/simulation/interpolationstatus.h"
#include "blackmisc/simulation/interpolation/interpolationstatus.h"
using namespace BlackMisc::Aviation;

6
src/blackmisc/simulation/interpolationstatus.h → src/blackmisc/simulation/interpolation/interpolationstatus.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKMISC_SIMULATION_INTERPOLATIONSTATUS_H
#define BLACKMISC_SIMULATION_INTERPOLATIONSTATUS_H
#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONSTATUS_H
#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONSTATUS_H
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/aviation/aircraftsituation.h"
@@ -59,4 +59,4 @@ namespace BlackMisc::Simulation
};
}
#endif // BLACKMISC_SIMULATION_INTERPOLATIONSTATUS_H
#endif // BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATIONSTATUS_H

8
src/blackmisc/simulation/interpolator.cpp → src/blackmisc/simulation/interpolation/interpolator.cpp
View File

@@ -1,11 +1,11 @@
// SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
#include "blackmisc/simulation/interpolator.h"
#include "blackmisc/simulation/interpolation/interpolator.h"
#include "blackconfig/buildconfig.h"
#include "blackmisc/simulation/interpolationlogger.h"
#include "blackmisc/simulation/interpolatorlinear.h"
#include "blackmisc/simulation/interpolatorspline.h"
#include "blackmisc/simulation/interpolation/interpolationlogger.h"
#include "blackmisc/simulation/interpolation/interpolatorlinear.h"
#include "blackmisc/simulation/interpolation/interpolatorspline.h"
#include "blackmisc/aviation/aircraftsituationchange.h"
#include "blackmisc/aviation/aircraftsituation.h"
#include "blackmisc/network/fsdsetup.h"

16
src/blackmisc/simulation/interpolator.h → src/blackmisc/simulation/interpolation/interpolator.h
View File

@@ -3,18 +3,18 @@
//! \file
#ifndef BLACKMISC_SIMULATION_INTERPOLATOR_H
#define BLACKMISC_SIMULATION_INTERPOLATOR_H
#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATOR_H
#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATOR_H
#include "blackmisc/simulation/interpolationresult.h"
#include "blackmisc/simulation/interpolationstatus.h"
#include "blackmisc/simulation/interpolation/interpolationresult.h"
#include "blackmisc/simulation/interpolation/interpolationstatus.h"
#include "blackmisc/simulation/partsstatus.h"
#include "blackmisc/simulation/interpolationrenderingsetup.h"
#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
#include "blackmisc/simulation/remoteaircraftprovider.h"
#include "blackmisc/simulation/interpolationsetupprovider.h"
#include "blackmisc/simulation/interpolation/interpolationsetupprovider.h"
#include "blackmisc/simulation/simulationenvironmentprovider.h"
#include "blackmisc/simulation/interpolationlogger.h"
#include "blackmisc/simulation/interpolant.h"
#include "blackmisc/simulation/interpolation/interpolationlogger.h"
#include "blackmisc/simulation/interpolation/interpolant.h"
#include "blackmisc/simulation/aircraftmodel.h"
#include "blackmisc/aviation/aircraftsituationchange.h"
#include "blackmisc/aviation/aircraftsituation.h"

4
src/blackmisc/simulation/interpolatorfunctions.h → src/blackmisc/simulation/interpolation/interpolatorfunctions.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKMISC_SIMULATION_INTERPOLATORFUNCTIONS_H
#define BLACKMISC_SIMULATION_INTERPOLATORFUNCTIONS_H
#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORFUNCTIONS_H
#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORFUNCTIONS_H
namespace BlackMisc::Simulation
{

4
src/blackmisc/simulation/interpolatorlinear.cpp → src/blackmisc/simulation/interpolation/interpolatorlinear.cpp
View File

@@ -1,8 +1,8 @@
// SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
#include "blackmisc/simulation/interpolatorlinear.h"
#include "blackmisc/simulation/interpolatorfunctions.h"
#include "blackmisc/simulation/interpolation/interpolatorlinear.h"
#include "blackmisc/simulation/interpolation/interpolatorfunctions.h"
#include "blackmisc/aviation/aircraftsituationlist.h"
#include "blackmisc/aviation/altitude.h"
#include "blackmisc/geo/coordinategeodetic.h"

10
src/blackmisc/simulation/interpolatorlinear.h → src/blackmisc/simulation/interpolation/interpolatorlinear.h
View File

@@ -3,12 +3,12 @@
//! \file
#ifndef BLACKMISC_SIMULATION_INTERPOLATORLINEAR_H
#define BLACKMISC_SIMULATION_INTERPOLATORLINEAR_H
#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORLINEAR_H
#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORLINEAR_H
#include "blackmisc/simulation/interpolator.h"
#include "blackmisc/simulation/interpolationlogger.h"
#include "blackmisc/simulation/interpolant.h"
#include "blackmisc/simulation/interpolation/interpolator.h"
#include "blackmisc/simulation/interpolation/interpolationlogger.h"
#include "blackmisc/simulation/interpolation/interpolant.h"
#include "blackmisc/aviation/aircraftsituation.h"
#include "blackmisc/blackmiscexport.h"

4
src/blackmisc/simulation/interpolatorlinearpbh.cpp → src/blackmisc/simulation/interpolation/interpolatorlinearpbh.cpp
View File

@@ -1,8 +1,8 @@
// SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
#include "blackmisc/simulation/interpolatorlinearpbh.h"
#include "blackmisc/simulation/interpolatorfunctions.h"
#include "blackmisc/simulation/interpolation/interpolatorlinearpbh.h"
#include "blackmisc/simulation/interpolation/interpolatorfunctions.h"
#include "blackmisc/verify.h"
#include "blackconfig/buildconfig.h"

6
src/blackmisc/simulation/interpolatorlinearpbh.h → src/blackmisc/simulation/interpolation/interpolatorlinearpbh.h
View File

@@ -3,15 +3,15 @@
//! \file
#ifndef BLACKMISC_SIMULATION_INTERPOLATORLINEARPBH_H
#define BLACKMISC_SIMULATION_INTERPOLATORLINEARPBH_H
#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORLINEARPBH_H
#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORLINEARPBH_H
#include "blackmisc/aviation/aircraftsituation.h"
#include "blackmisc/aviation/heading.h"
#include "blackmisc/pq/angle.h"
#include "blackmisc/pq/speed.h"
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/simulation/interpolatorpbh.h"
#include "blackmisc/simulation/interpolation/interpolatorpbh.h"
namespace BlackMisc::Simulation
{

2
src/blackmisc/simulation/interpolatormulti.cpp → src/blackmisc/simulation/interpolation/interpolatormulti.cpp
View File

@@ -3,7 +3,7 @@
//! \file
#include "blackmisc/simulation/interpolatormulti.h"
#include "blackmisc/simulation/interpolation/interpolatormulti.h"
using namespace BlackMisc::Aviation;

8
src/blackmisc/simulation/interpolatormulti.h → src/blackmisc/simulation/interpolation/interpolatormulti.h
View File

@@ -3,11 +3,11 @@
//! \file
#ifndef BLACKMISC_SIMULATION_INTERPOLATORMULTI_H
#define BLACKMISC_SIMULATION_INTERPOLATORMULTI_H
#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORMULTI_H
#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORMULTI_H
#include "blackmisc/simulation/interpolatorlinear.h"
#include "blackmisc/simulation/interpolatorspline.h"
#include "blackmisc/simulation/interpolation/interpolatorlinear.h"
#include "blackmisc/simulation/interpolation/interpolatorspline.h"
#include "blackmisc/statusmessagelist.h"
namespace BlackMisc::Simulation

6
src/blackmisc/simulation/interpolatorpbh.h → src/blackmisc/simulation/interpolation/interpolatorpbh.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKMISC_SIMULATION_INTERPOLATORPBH_H
#define BLACKMISC_SIMULATION_INTERPOLATORPBH_H
#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORPBH_H
#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORPBH_H
#include "blackmisc/aviation/heading.h"
#include "blackmisc/pq/angle.h"
@@ -31,4 +31,4 @@ namespace BlackMisc::Simulation
};
}
#endif // BLACKMISC_SIMULATION_INTERPOLATORPBH_H
#endif // BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORPBH_H

4
src/blackmisc/simulation/interpolatorspline.cpp → src/blackmisc/simulation/interpolation/interpolatorspline.cpp
View File

@@ -1,8 +1,8 @@
// SPDX-FileCopyrightText: Copyright (C) 2017 swift Project Community / Contributors
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
#include "blackmisc/simulation/interpolatorspline.h"
#include "blackmisc/simulation/interpolatorfunctions.h"
#include "blackmisc/simulation/interpolation/interpolatorspline.h"
#include "blackmisc/simulation/interpolation/interpolatorfunctions.h"
#include "blackmisc/network/fsdsetup.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/verify.h"

10
src/blackmisc/simulation/interpolatorspline.h → src/blackmisc/simulation/interpolation/interpolatorspline.h
View File

@@ -3,12 +3,12 @@
//! \file
#ifndef BLACKMISC_SIMULATION_INTERPOLATORSPLINE_H
#define BLACKMISC_SIMULATION_INTERPOLATORSPLINE_H
#ifndef BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORSPLINE_H
#define BLACKMISC_SIMULATION_INTERPOLATION_INTERPOLATORSPLINE_H
#include "blackmisc/simulation/interpolator.h"
#include "blackmisc/simulation/interpolationlogger.h"
#include "blackmisc/simulation/interpolant.h"
#include "blackmisc/simulation/interpolation/interpolator.h"
#include "blackmisc/simulation/interpolation/interpolationlogger.h"
#include "blackmisc/simulation/interpolation/interpolant.h"
#include "blackmisc/aviation/aircraftsituation.h"
#include "blackmisc/blackmiscexport.h"

4
src/blackmisc/simulation/registermetadatasimulation.cpp
View File

@@ -9,8 +9,8 @@
#include "blackmisc/simulation/airspaceaircraftsnapshot.h"
#include "blackmisc/simulation/distributorlist.h"
#include "blackmisc/simulation/distributorlistpreferences.h"
#include "blackmisc/simulation/interpolationrenderingsetup.h"
#include "blackmisc/simulation/interpolationsetuplist.h"
#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
#include "blackmisc/simulation/interpolation/interpolationsetuplist.h"
#include "blackmisc/simulation/matchingstatistics.h"
#include "blackmisc/simulation/matchinglog.h"
#include "blackmisc/simulation/reverselookup.h"

2
src/blackmisc/simulation/settings/interpolationrenderingsetupsettings.h
View File

@@ -6,7 +6,7 @@
#ifndef BLACKMISC_SIMULATION_SETTINGS_INTERPOLATIONRENDERINGSETUP_H
#define BLACKMISC_SIMULATION_SETTINGS_INTERPOLATIONRENDERINGSETUP_H
#include "blackmisc/simulation/interpolationrenderingsetup.h"
#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
#include "blackmisc/settingscache.h"
namespace BlackMisc::Simulation::Settings

6
src/plugins/simulator/emulated/simulatoremulated.h
View File

@@ -8,9 +8,9 @@
#include "../plugincommon/simulatorplugincommon.h"
#include "blackmisc/aviation/comsystem.h"
#include "blackmisc/simulation/interpolatormulti.h"
#include "blackmisc/simulation/interpolationrenderingsetup.h"
#include "blackmisc/simulation/interpolationlogger.h"
#include "blackmisc/simulation/interpolation/interpolatormulti.h"
#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
#include "blackmisc/simulation/interpolation/interpolationlogger.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/simulation/settings/swiftpluginsettings.h"
#include "blackmisc/pq/time.h"

2
src/plugins/simulator/flightgear/flightgearmpaircraft.cpp
View File

@@ -3,7 +3,7 @@
#include "flightgearmpaircraft.h"
#include "blackcore/simulator.h"
#include "blackmisc/simulation/interpolatormulti.h"
#include "blackmisc/simulation/interpolation/interpolatormulti.h"
using namespace BlackCore;
using namespace BlackMisc;

2
src/plugins/simulator/flightgear/flightgearmpaircraft.h
View File

@@ -7,7 +7,7 @@
#define BLACKSIMPLUGIN_FLIGHTGEAR_FGPLANEMPAIRCRAFT_H
#include "blackmisc/simulation/simulatedaircraft.h"
#include "blackmisc/simulation/interpolatormulti.h"
#include "blackmisc/simulation/interpolation/interpolatormulti.h"
#include <QSharedPointer>
#include <QStringList>

2
src/plugins/simulator/fs9/fs9client.h
View File

@@ -5,7 +5,7 @@
#define DIRECTPLAY_CLIENT_H
#include "directplaypeer.h"
#include "blackmisc/simulation/interpolatormulti.h"
#include "blackmisc/simulation/interpolation/interpolatormulti.h"
#include "blackmisc/aviation/aircraftsituation.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/pq/time.h"

2
src/plugins/simulator/fs9/simulatorfs9.h
View File

@@ -12,7 +12,7 @@
#include "../fscommon/simulatorfscommon.h"
#include "blackcore/simulator.h"
#include "blackmisc/simulation/settings/simulatorsettings.h"
#include "blackmisc/simulation/interpolator.h"
#include "blackmisc/simulation/interpolation/interpolator.h"
#include "blackmisc/simulation/simulatedaircraft.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/pixmap.h"

2
src/plugins/simulator/fscommon/simulatorfscommon.h
View File

@@ -7,7 +7,7 @@
#define BLACKSIMPLUGIN_FSCOMMON_SIMULATORFSCOMMON_H
#include "plugins/simulator/plugincommon/simulatorplugincommon.h"
#include "blackmisc/simulation/interpolator.h"
#include "blackmisc/simulation/interpolation/interpolator.h"
#include "blackmisc/simulation/fscommon/aircraftcfgparser.h"
#include "plugins/simulator/fscommon/fscommonexport.h"

2
src/plugins/simulator/fsxcommon/simconnectobject.cpp
View File

@@ -6,7 +6,7 @@
#include "simulatorfsxcommon.h"
#include "blackcore/simulator.h"
#include "blackcore/simulator.h"
#include "blackmisc/simulation/interpolatormulti.h"
#include "blackmisc/simulation/interpolation/interpolatormulti.h"
#include "blackconfig/buildconfig.h"
using namespace BlackConfig;

2
src/plugins/simulator/fsxcommon/simconnectobject.h
View File

@@ -9,7 +9,7 @@
#include "plugins/simulator/fsxcommon/fsxcommonexport.h"
#include "plugins/simulator/fsxcommon/simconnectdatadefinition.h"
#include "blackmisc/simulation/simulatedaircraft.h"
#include "blackmisc/simulation/interpolatormulti.h"
#include "blackmisc/simulation/interpolation/interpolatormulti.h"
#include <QSharedPointer>
#include <QStringList>
#include <QByteArray>

2
src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
View File

@@ -12,7 +12,7 @@
#include "blackmisc/simulation/fscommon/fscommonutil.h"
#include "blackmisc/simulation/settings/simulatorsettings.h"
#include "blackmisc/simulation/aircraftmodel.h"
#include "blackmisc/simulation/interpolatormulti.h"
#include "blackmisc/simulation/interpolation/interpolatormulti.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/aviation/airportlist.h"
#include "blackmisc/geo/elevationplane.h"

2
src/plugins/simulator/fsxcommon/simulatorfsxcommon.h
View File

@@ -12,7 +12,7 @@
#include "plugins/simulator/fsxcommon/simconnectwindows.h"
#include "plugins/simulator/fscommon/simulatorfscommon.h"
#include "blackcore/simulator.h"
#include "blackmisc/simulation/interpolatorlinear.h"
#include "blackmisc/simulation/interpolation/interpolatorlinear.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/simulation/settings/simulatorsettings.h"
#include "blackmisc/simulation/aircraftmodel.h"

2
src/plugins/simulator/xplane/xplanempaircraft.cpp
View File

@@ -3,7 +3,7 @@
#include "xplanempaircraft.h"
#include "blackcore/simulator.h"
#include "blackmisc/simulation/interpolatormulti.h"
#include "blackmisc/simulation/interpolation/interpolatormulti.h"
using namespace BlackCore;
using namespace BlackMisc;

2
src/plugins/simulator/xplane/xplanempaircraft.h
View File

@@ -7,7 +7,7 @@
#define BLACKSIMPLUGIN_XPLANE_XPLANEMPAIRCRAFT_H
#include "blackmisc/simulation/simulatedaircraft.h"
#include "blackmisc/simulation/interpolatormulti.h"
#include "blackmisc/simulation/interpolation/interpolatormulti.h"
#include <QSharedPointer>
#include <QStringList>

4
tests/blackmisc/simulation/testinterpolatorlinear/testinterpolatorlinear.cpp
View File

@@ -5,8 +5,8 @@
//! \file
//! \ingroup testblackmisc
#include "blackmisc/simulation/interpolator.h"
#include "blackmisc/simulation/interpolatorlinear.h"
#include "blackmisc/simulation/interpolation/interpolator.h"
#include "blackmisc/simulation/interpolation/interpolatorlinear.h"
#include "blackmisc/simulation/remoteaircraftproviderdummy.h"
#include "blackmisc/aviation/aircraftengine.h"
#include "blackmisc/aviation/aircraftenginelist.h"

2
tests/blackmisc/simulation/testinterpolatorlinearpbh/testinterpolatorlinearpbh.cpp
View File

@@ -7,7 +7,7 @@
#include "blackmisc/aviation/aircraftsituation.h"
#include "blackmisc/aviation/heading.h"
#include "blackmisc/simulation/interpolatorlinearpbh.h"
#include "blackmisc/simulation/interpolation/interpolatorlinearpbh.h"
#include "blackmisc/math/mathutils.h"
#include "test.h"

2
tests/blackmisc/simulation/testinterpolatormisc/testinterpolatormisc.cpp
View File

@@ -6,7 +6,7 @@
//! \ingroup testblackmisc
#include "blackmisc/aviation/aircraftsituation.h"
#include "blackmisc/simulation/interpolationrenderingsetup.h"
#include "blackmisc/simulation/interpolation/interpolationrenderingsetup.h"
#include "test.h"
#include <QDebug>

2
tests/blackmisc/simulation/testinterpolatorparts/testinterpolatorparts.cpp
View File

@@ -5,7 +5,7 @@
//! \file
//! \ingroup testblackmisc
#include "blackmisc/simulation/interpolatorspline.h"
#include "blackmisc/simulation/interpolation/interpolatorspline.h"
#include "blackmisc/simulation/remoteaircraftproviderdummy.h"
#include "test.h"
#include <QTest>