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

Merge branch 'master' of dev.vatsim-germany.org:vatpilotclient/client

Browse Source
This commit is contained in:
Klaus Basan
2014-02-08 01:46:33 +01:00
parent 2d54f95fab e7af80abf3
commit 1d35b010f2
20 changed files with 33 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client.pro
View File

@@ -11,9 +11,6 @@ WITH_BLACKSOUND = ON
WITH_SAMPLES = ON
WITH_UNITTESTS = ON
#WITH_DRIVER_FSX = ON
#WITH_DRIVER_FS9 = ON
#WITH_DRIVER_XPLANE = ON
#WITH_DOXYGEN = ON
equals(WITH_BLACKMISC, ON) {
@@ -33,18 +30,6 @@ equals(WITH_BLACKGUI, ON) {
SUBDIRS += src/blackgui
}
equals(WITH_DRIVER_FSX, ON) {
SUBDIRS += src/driver/fsx/driver_fsx.pro
}
equals(WITH_DRIVER_FS9, ON) {
SUBDIRS += src/driver/fs9/driver_fs9.pro
}
equals(WITH_DRIVER_XPLANE, ON) {
SUBDIRS += src/driver/xplane/driver_xplane.pro
}
equals(WITH_SAMPLES, ON) {
SUBDIRS += samples/cli_client/sample_cli_client.pro
SUBDIRS += samples/interpolator/sample_interpolator.pro

2
src/blackcore/network_vatlib.cpp
View File

@@ -402,7 +402,7 @@ namespace BlackCore
// I could send the same message to n frequencies in one step
// if this is really required, I need to group by message
// currently I send individual messages
std::vector<INT> freqsVec;
QVector<INT> freqsVec;
freqsVec.push_back(message.getFrequency().value(CFrequencyUnit::kHz()));
m_net->SendRadioTextMessage(freqsVec.size(), freqsVec.data(), toFSD(message.getMessage()));
}

8
src/blackcore/pluginmgr.cpp
View File

@@ -63,7 +63,7 @@ namespace BlackCore
}
}
const CPluginManager::PluginEntry &CPluginManager::getEntry(size_t index) const
const CPluginManager::PluginEntry &CPluginManager::getEntry(int index) const
{
Q_ASSERT_X(index < getPluginCount(), "Plugin manager", "Plugin index out of bounds");
@@ -80,17 +80,17 @@ namespace BlackCore
return entry;
}
const QString CPluginManager::getName(size_t index) const
const QString CPluginManager::getName(int index) const
{
return getFactory(index)->getName();
}
const QString CPluginManager::getDescription(size_t index) const
const QString CPluginManager::getDescription(int index) const
{
return getFactory(index)->getDescription();
}
BlackMisc::IPlugin *CPluginManager::constructPlugin(size_t index)
BlackMisc::IPlugin *CPluginManager::constructPlugin(int index)
{
BlackMisc::IPlugin *plugin = getFactory(index)->create(BlackMisc::IContext::getInstance());
if (! plugin->isValid())

20
src/blackcore/pluginmgr.h
View File

@@ -45,7 +45,7 @@ namespace BlackCore
Return the total number of plugins loaded so far.
\return
*/
size_t getPluginCount() const
int getPluginCount() const
{
return m_plugins.size();
}
@@ -55,14 +55,14 @@ namespace BlackCore
\param index the plugin's index in the vector of plugins.
\return
*/
const QString getName(size_t index) const;
const QString getName(int index) const;
/*!
Return the description of a plugin.
\param index the plugin's index in the vector of plugins.
\return
*/
const QString getDescription(size_t index) const;
const QString getDescription(int index) const;
/*!
Construct a plugin.
@@ -70,14 +70,14 @@ namespace BlackCore
\return a pointer to the newly created plugin.
\warning You must release this pointer with IPluginFactory::destroy().
*/
BlackMisc::IPlugin *constructPlugin(size_t index);
BlackMisc::IPlugin *constructPlugin(int index);
/*!
Direct access to the factory. You don't usually need this.
\param index
\return
*/
BlackMisc::IPluginFactory *getFactory(size_t index)
BlackMisc::IPluginFactory *getFactory(int index)
{
return const_cast<BlackMisc::IPluginFactory*>(static_cast<const CPluginManager*>(this)->getFactory(index));
}
@@ -87,7 +87,7 @@ namespace BlackCore
\param index
\return
*/
const BlackMisc::IPluginFactory *getFactory(size_t index) const
const BlackMisc::IPluginFactory *getFactory(int index) const
{
return getEntry(index).factory;
}
@@ -97,7 +97,7 @@ namespace BlackCore
\param index
\return
*/
QPluginLoader *getLoader(size_t index)
QPluginLoader *getLoader(int index)
{
return const_cast<QPluginLoader*>(static_cast<const CPluginManager*>(this)->getLoader(index));
}
@@ -107,7 +107,7 @@ namespace BlackCore
\param index
\return
*/
const QPluginLoader *getLoader(size_t index) const
const QPluginLoader *getLoader(int index) const
{
return getEntry(index).loader.data();
}
@@ -123,12 +123,12 @@ namespace BlackCore
QVector<PluginEntry> m_plugins;
PluginEntry &getEntry(size_t index)
PluginEntry &getEntry(int index)
{
return const_cast<PluginEntry&>(static_cast<const CPluginManager*>(this)->getEntry(index));
}
const PluginEntry &getEntry(size_t index) const;
const PluginEntry &getEntry(int index) const;
};
} // namespace BlackCore

4
src/blackmisc/context.h
View File

@@ -93,8 +93,8 @@ namespace BlackMisc
*/
template <class T> bool hasObject(const QString &name = T::staticMetaObject.className()) const
{
QObject *qobj = getQObjectNothrow(name);
return qobj && qobject_cast<T *>(qobj);
const QObject *qobj = getQObjectNothrow(name);
return qobj && qobject_cast<const T *>(qobj);
}
/*!

6
src/blackmisc/mathmatrixbase.cpp
View File

@@ -16,7 +16,7 @@ namespace BlackMisc
/*
* Get element by column / row
*/
template<class ImplMatrix, int Rows, int Columns> double CMatrixBase<ImplMatrix, Rows, Columns>::getElement(size_t row, size_t column) const
template<class ImplMatrix, int Rows, int Columns> double CMatrixBase<ImplMatrix, Rows, Columns>::getElement(int row, int column) const
{
this->checkRange(row, column);
return this->m_matrix(row, column);
@@ -25,7 +25,7 @@ namespace BlackMisc
/*
* Set element by column / row
*/
template<class ImplMatrix, int Rows, int Columns> void CMatrixBase<ImplMatrix, Rows, Columns>::setElement(size_t row, size_t column, double value)
template<class ImplMatrix, int Rows, int Columns> void CMatrixBase<ImplMatrix, Rows, Columns>::setElement(int row, int column, double value)
{
this->checkRange(row, column);
this->m_matrix(row, column) = value;
@@ -34,7 +34,7 @@ namespace BlackMisc
/*
* Check range
*/
template<class ImplMatrix, int Rows, int Columns> void CMatrixBase<ImplMatrix, Rows, Columns>::checkRange(size_t row, size_t column) const
template<class ImplMatrix, int Rows, int Columns> void CMatrixBase<ImplMatrix, Rows, Columns>::checkRange(int row, int column) const
{
bool valid = (row < Rows && column < Columns);
Q_ASSERT_X(valid, "getElement()", "Row or column invalid");

10
src/blackmisc/mathmatrixbase.h
View File

@@ -324,7 +324,7 @@ namespace BlackMisc
* \param column
* \return
*/
double getElement(size_t row, size_t column) const;
double getElement(int row, int column) const;
/*!
* \brief Get element
@@ -332,7 +332,7 @@ namespace BlackMisc
* \param column
* \param value
*/
void setElement(size_t row, size_t column, double value);
void setElement(int row, int column, double value);
/*!
* \brief Get element by operator () modifying
@@ -340,7 +340,7 @@ namespace BlackMisc
* \param column
* \return
*/
double &operator()(size_t row, size_t column)
double &operator()(int row, int column)
{
this->checkRange(row, column);
return this->m_matrix(row, column);
@@ -352,7 +352,7 @@ namespace BlackMisc
* \param column
* \return
*/
double operator()(size_t row, size_t column) const
double operator()(int row, int column) const
{
return this->getElement(row, column);
}
@@ -369,7 +369,7 @@ namespace BlackMisc
* \param column
* \throws std::range_error if index out of bounds
*/
void checkRange(size_t row, size_t column) const;
void checkRange(int row, int column) const;
};
} // namespace

6
src/blackmisc/mathvector3dbase.cpp
View File

@@ -81,7 +81,7 @@ namespace BlackMisc
/*
* Element (return by reference)
*/
template <class ImplVector> double &CVector3DBase<ImplVector>::getElement(size_t row)
template <class ImplVector> double &CVector3DBase<ImplVector>::getElement(int row)
{
switch (row)
{
@@ -100,7 +100,7 @@ namespace BlackMisc
/*
* Element
*/
template <class ImplVector> double CVector3DBase<ImplVector>::getElement(size_t row) const
template <class ImplVector> double CVector3DBase<ImplVector>::getElement(int row) const
{
return const_cast<CVector3DBase<ImplVector>*>(this)->getElement(row);
}
@@ -108,7 +108,7 @@ namespace BlackMisc
/*
* Set given element
*/
template <class ImplVector> void CVector3DBase<ImplVector>::setElement(size_t row, double value)
template <class ImplVector> void CVector3DBase<ImplVector>::setElement(int row, double value)
{
switch (row)
{

10
src/blackmisc/mathvector3dbase.h
View File

@@ -71,7 +71,7 @@ namespace BlackMisc
* \param row
* \return Mutable reference
*/
double &getElement(size_t row);
double &getElement(int row);
/*!
* \brief String for converter
@@ -152,28 +152,28 @@ namespace BlackMisc
* \param row
* \return
*/
double getElement(size_t row) const;
double getElement(int row) const;
/*!
* \brief Set element
* \param row
* \param value
*/
void setElement(size_t row, double value);
void setElement(int row, double value);
/*!
* \brief Operator []
* \param row
* \return
*/
double operator[](size_t row) const { return this->getElement(row); }
double operator[](int row) const { return this->getElement(row); }
/*!
* \brief Operator []
* \param row
* \return Mutable reference
*/
double &operator[](size_t row) { return this->getElement(row); }
double &operator[](int row) { return this->getElement(row); }
/*!
* \brief Equal operator ==

3
src/driver/CMakeLists.txt
View File

@@ -1,3 +0,0 @@
IF(WITH_DRIVER_FSX)
ADD_SUBDIRECTORY(fsx)
ENDIF(WITH_DRIVER_FSX)

33
src/driver/fs9/driver_fs9.cpp
View File

@@ -1,33 +0,0 @@
#include "driver_fs9.h"
extern "C"
{
Q_DECL_EXPORT ISimulator* BB_createISimulatorInstance ()
{
return new CDriverFSX;
}
Q_DECL_EXPORT quint32 BB_InterfaceVersionMajor ()
{
return ISimulator::InterfaceVersionMajor;
}
Q_DECL_EXPORT quint32 BB_InterfaceVersionMinor ()
{
return ISimulator::InterfaceVersionMinor;
}
}
CDriverFS9::CDriverFS9()
{
}
void CDriverFS9::setLibraryContext(BlackMisc::IContext *context)
{
#ifdef Q_OS_WIN
bAssert(!BlackMisc::IContext::isContextInitialised());
#endif
m_libraryContext = new BlackMisc::CLibraryContext(*context);
}

17
src/driver/fs9/driver_fs9.h
View File

@@ -1,17 +0,0 @@
#ifndef DRIVER_FS9_H
#define DRIVER_FS9_H
#include <simulator.h>
class CDriverFS9 : public ISimulator
{
public:
CDriverFS9();
virtual int init() { return 1;}
protected:
BlackMisc::CLibraryContext *m_libraryContext;
};
#endif // DRIVER_FS9_H

17
src/driver/fs9/driver_fs9.pro
View File

@@ -1,17 +0,0 @@
TARGET = bb_driver_fs9
TEMPLATE = lib
CONFIG += dll c++11
INCLUDEPATH += .. ../../
DESTDIR = ../../../bin
DEPENDPATH += .
HEADERS += *.h
SOURCES += *.cpp

20
src/driver/fsx/CMakeLists.txt
View File

@@ -1,20 +0,0 @@
FILE(GLOB driver_fsx_SOURCES *.cpp)
FILE(GLOB driver_fsx_HEADERS *.h)
SET(driver_fsx_HEADERS_QOBJECT )
QT4_WRAP_CPP(driver_fsx_HEADERS_MOC ${driver_fsx_HEADERS_QOBJECT})
SOURCE_GROUP(QtGeneratedMocSrc FILES ${driver_fsx_HEADERS_MOC})
SOURCE_GROUP (Headers FILES ${driver_fsx_HEADERS})
INCLUDE_DIRECTORIES(${SIMCONNECT_INCLUDE_DIR})
LINK_DIRECTORIES(${SIMCONNECT_LIBRARY_DIR})
IF(WITH_STATIC_DRIVERS)
ADD_LIBRARY(bb_driver_fsx STATIC ${driver_fsx_SOURCES} ${driver_fsx_HEADERS_MOC} )
ELSE(WITH_STATIC_DRIVERS)
ADD_LIBRARY(bb_driver_fsx SHARED ${driver_fsx_SOURCES} ${driver_fsx_HEADERS_MOC} )
ENDIF(WITH_STATIC_DRIVERS)
TARGET_LINK_LIBRARIES(bb_driver_fsx blackmisc blackcore SimConnect.lib ${QT_LIBRARIES})
SET_TARGET_PROPERTIES(bb_driver_fsx PROPERTIES PROJECT_LABEL "Driver - FSX")

49
src/driver/fsx/driver_fsx.cpp
View File

@@ -1,49 +0,0 @@
/***************************************************************************
* Copyright (C) 2013 by Roland Winklmeier *
* roland.m.winklmeier@googlemail.com *
* *
* For license information see LICENSE in the root folder of the *
* source code. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Lesser General Public License for more details. *
* *
***************************************************************************/
#include <QtCore/qglobal.h>
#include "driver_fsx.h"
extern "C"
{
Q_DECL_EXPORT ISimulator* BB_createISimulatorInstance ()
{
return new CDriverFSX;
}
Q_DECL_EXPORT quint32 BB_InterfaceVersionMajor ()
{
return ISimulator::InterfaceVersionMajor;
}
Q_DECL_EXPORT quint32 BB_InterfaceVersionMinor ()
{
return ISimulator::InterfaceVersionMinor;
}
}
CDriverFSX::CDriverFSX()
{
}
void CDriverFSX::setLibraryContext(BlackMisc::IContext *context)
{
#ifdef Q_OS_WIN
bAssert(!BlackMisc::IContext::isContextInitialised());
#endif
m_libraryContext = new BlackMisc::CLibraryContext(*context);
}

35
src/driver/fsx/driver_fsx.h
View File

@@ -1,35 +0,0 @@
/***************************************************************************
* Copyright (C) 2013 by Roland Winklmeier *
* roland.m.winklmeier@googlemail.com *
* *
* For license information see LICENSE in the root folder of the *
* source code. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Lesser General Public License for more details. *
* *
***************************************************************************/
#ifndef DRIVER_FSX_H
#define DRIVER_FSX_H
#include <blackmisc/context.h>
#include <blackcore/simulator.h>
class CDriverFSX : public BlackCore::ISimulator
{
public:
CDriverFSX();
virtual void setLibraryContext(BlackMisc::IContext *context);
virtual int init() { return 0; }
protected:
BlackMisc::CLibraryContext *m_libraryContext;
};
#endif // DRIVER_FSX_H

17
src/driver/fsx/driver_fsx.pro
View File

@@ -1,17 +0,0 @@
TARGET = bb_driver_fsx
TEMPLATE = lib
CONFIG += dll c++11
INCLUDEPATH += .. ../../
DESTDIR = ../../../bin
DEPENDPATH += .
HEADERS += *.h
SOURCES += *.cpp

31
src/driver/xplane/driver_xplane.cpp
View File

@@ -1,31 +0,0 @@
#include "driver_xplane.h"
extern "C"
{
Q_DECL_EXPORT ISimulator* BB_createISimulatorInstance()
{
return new CDriverXPlane;
}
}
CDriverXPlane::CDriverXPlane()
{
}
CDriverXPlane::~CDriverXPlane()
{
}
int CDriverXPlane::init()
{
return 1;
}
void CDriverXPlane::setLibraryContext(BlackMisc::IContext *context)
{
#ifdef Q_OS_WIN
bAssert(!BlackMisc::IContext::isContextInitialised());
#endif
mLibraryContext = new BlackMisc::CLibraryContext(*context);
}

15
src/driver/xplane/driver_xplane.h
View File

@@ -1,15 +0,0 @@
#ifndef DRIVER_XPLANE_H
#define DRIVER_XPLANE_H
#include <simulator.h>
class CDriverXPlane : public ISimulator
{
public:
CDriverXPlane();
virtual ~CDriverXPlane();
virtual int init();
};
#endif // DRIVER_XPLANE_H

17
src/driver/xplane/driver_xplane.pro
View File

@@ -1,17 +0,0 @@
TARGET = bb_driver_xplane
TEMPLATE = lib
CONFIG += dll c++11
INCLUDEPATH += .. ../../
DESTDIR = ../../../bin
DEPENDPATH += .
HEADERS += *.h
SOURCES += *.cpp