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

refs #396, move subproject BlackSim into BlackMisc::Simulation

Browse Source 
* removed unused samples / tests
* fixed found Doxygen issues
* removed blacksimfreefunctions, now in BlackMisc::Simulation::registerMetadata()
* samples_vetcor_geo to samples_geo
This commit is contained in:
Klaus Basan
2015-04-03 18:17:54 +02:00
committed by Roland Winklmeier
parent a6ca57265e
commit 32f60722c8
148 changed files with 2577 additions and 2792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackgui/blackgui.pro
View File

@@ -7,7 +7,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = blackgui
TEMPLATE = lib
CONFIG += staticlib
CONFIG += blackmisc blacksim blackcore
CONFIG += blackmisc blackcore
INCLUDEPATH += ..
DEPENDPATH += . ..
@@ -19,8 +19,8 @@ precompile_header:!isEmpty(PRECOMPILED_HEADER) {
DEFINES += LOG_IN_FILE
win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib ../../lib/blacksim.lib ../../lib/blackcore.lib
else: PRE_TARGETDEPS += ../../lib/libblackmisc.a ../../lib/libblacksim.a ../../lib/libblackcore.a
win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib ../../lib/blackcore.lib
else: PRE_TARGETDEPS += ../../lib/libblackmisc.a ../../lib/libblackcore.a
HEADERS += *.h

12
src/blackgui/components/settingsfsxcomponent.cpp
View File

@@ -14,15 +14,15 @@
#include "blackmisc/networkutils.h"
#include "blackmisc/statusmessage.h"
#include "blackmisc/logmessage.h"
#include "blacksim/fsx/fsxsimulatorsetup.h"
#include "blacksim/fsx/simconnectutilities.h"
#include "blackmisc/simulation/fsx/fsxsimulatorsetup.h"
#include "blackmisc/simulation/fsx/simconnectutilities.h"
#include <QDesktopServices>
#include <QFile>
#include <QDir>
#include <QFileInfo>
using namespace BlackMisc;
using namespace BlackSim::Fsx;
using namespace BlackMisc::Simulation::Fsx;
using namespace BlackMisc::Network;
namespace BlackGui
@@ -114,7 +114,7 @@ namespace BlackGui
// write either local or remote file
bool localSimulatorObject = this->getIContextSimulator()->isUsingImplementingObject();
bool success = localSimulatorObject ?
BlackSim::Fsx::CSimConnectUtilities::writeSimConnectCfg(fileName, address, p) :
BlackMisc::Simulation::Fsx::CSimConnectUtilities::writeSimConnectCfg(fileName, address, p) :
this->getIContextApplication()->writeToFile(fileName, CSimConnectUtilities::simConnectCfg(address, p));
if (success)
{
@@ -148,7 +148,7 @@ namespace BlackGui
else if (sender == this->ui->pb_SettingsFsxDeleteSimconnectCfg)
{
if (!this->getIContextSimulator()) return;
QString fileName = BlackSim::Fsx::CSimConnectUtilities::getLocalSimConnectCfgFilename();
QString fileName = BlackMisc::Simulation::Fsx::CSimConnectUtilities::getLocalSimConnectCfgFilename();
QString m = QString("Deleted %1 ").append(fileName);
if (this->getIContextSimulator()->isUsingImplementingObject())
{
@@ -166,7 +166,7 @@ namespace BlackGui
else if (sender == this->ui->pb_SettingsFsxExistsSimconncetCfg)
{
if (!this->getIContextSimulator()) return;
QString fileName = BlackSim::Fsx::CSimConnectUtilities::getLocalSimConnectCfgFilename();
QString fileName = BlackMisc::Simulation::Fsx::CSimConnectUtilities::getLocalSimConnectCfgFilename();
bool exists = this->getIContextSimulator()->isUsingImplementingObject() ?
QFile::exists(fileName) :
this->getIContextApplication()->existsFile(fileName);

8
src/blackgui/components/settingssimulatorcomponent.cpp
View File

@@ -4,8 +4,8 @@
#include "blackcore/context_settings.h"
#include "blackcore/context_simulator.h"
#include "blackcore/context_network.h"
#include "blacksim/simulatorinfolist.h"
#include "blacksim/setsimulator.h"
#include "blackmisc/simulation/simulatorinfolist.h"
#include "blackmisc/simulation/setsimulator.h"
#include "blackmisc/simulation/simulatedaircraftlist.h"
#include "blackmisc/settingutilities.h"
#include "blackmisc/logmessage.h"
@@ -18,8 +18,8 @@ using namespace BlackMisc::Settings;
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::Aviation;
using namespace BlackSim;
using namespace BlackSim::Settings;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::Simulation::Settings;
using namespace BlackCore;
namespace BlackGui

4
src/blackgui/components/settingssimulatorcomponent.h
View File

@@ -10,7 +10,7 @@
#ifndef BLACKGUI_SETTINGSSIMULATORCOMPONENT_H
#define BLACKGUI_SETTINGSSIMULATORCOMPONENT_H
#include "blacksim/setsimulator.h"
#include "blackmisc/simulation/setsimulator.h"
#include "enableforruntime.h"
#include "enableforruntime.h"
#include <QFrame>
@@ -65,7 +65,7 @@ namespace BlackGui
QScopedPointer<Ui::CSettingsSimulatorComponent> ui; //!< UI
//! Smarter way to set current driver, avoids unnecessary signals and less formatting dependend
void setCurrentPlugin(const BlackSim::CSimulatorPluginInfo &plugin);
void setCurrentPlugin(const BlackMisc::Simulation::CSimulatorPluginInfo &plugin);
//! Set the GUI values
void setRestrictedValues();

2
src/blackgui/foreignwindows.h
View File

@@ -12,7 +12,7 @@
#ifndef BLACKGUI_FOREIGNWINDOWS_H
#define BLACKGUI_FOREIGNWINDOWS_H
#include "blacksim/simulatorplugininfo.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "windowfinder.h"
#include <QWindow>
#include <QWidget>