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

* 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

View File

@@ -17,7 +17,7 @@
#include "../fscommon/simulator_fscommon.h"
#include "blackcore/simulator.h"
#include "blackcore/interpolator_linear.h"
#include "blacksim/simulatorplugininfo.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/simulation/aircraftmodel.h"
#include "blackmisc/simulation/simulatedaircraft.h"
#include "blackmisc/aviation/airportlist.h"
@@ -195,7 +195,7 @@ namespace BlackSimPlugin
uint m_nextObjID = 1; //!< object ID TODO: also used as request id, where to we place other request ids as for facilities
QHash<BlackMisc::Aviation::CCallsign, CSimConnectObject> m_simConnectObjects;
QFutureWatcher<bool> m_watcherConnect;
BlackSim::CSimulatorPluginInfo m_simulatorInfo;
BlackMisc::Simulation::CSimulatorPluginInfo m_simulatorInfo;
// statistics
qint64 m_statsUpdateAircraftTimeTotal = 0;
@@ -203,6 +203,7 @@ namespace BlackSimPlugin
int m_statsUpdateAircraftCount = 0;
};
//! Listener for FSX
class CSimulatorFsxListener : public BlackCore::ISimulatorListener {
Q_OBJECT
@@ -223,6 +224,6 @@ namespace BlackSimPlugin
};
}
} // namespace BlackCore
} // namespace
#endif // guard