refs #198 , refs #199 adjusted samples

This commit is contained in:
Klaus Basan
2014-04-01 12:36:20 +02:00
parent 4e8e2eb0d4
commit 6e3b081fd2
3 changed files with 24 additions and 21 deletions

View File

@@ -3,11 +3,15 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "blackcore/coreruntime.h"
#include "blackcore/context_runtime.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackcore/context_settings.h"
#include "tool.h"
#include <QtConcurrent/QtConcurrent>
#include <QMetaType>
#include <QMetaMethod>
/*!
* DBus tests, tests marshalling / unmarshalling of many value classes.
@@ -17,11 +21,10 @@ int main(int argc, char *argv[])
{
// metadata are registered in runtime
QCoreApplication a(argc, argv);
BlackCore::CCoreRuntime *core = new BlackCore::CCoreRuntime(true, &a);
BlackCore::CRuntime *core = new BlackCore::CRuntime(BlackCore::CRuntimeConfig::forCore(), &a);
QtConcurrent::run(BlackMiscTest::Tool::serverLoop, core); // QFuture<void> future
qDebug() << "Server event loop, pid:" << BlackMiscTest::Tool::getPid();
// loop
// end
return a.exec();
}

View File

@@ -1,7 +1,8 @@
#include "tool.h"
#include "blackcore/coreruntime.h"
#include "blackcore/context_runtime.h"
#include "blackcore/context_network.h"
#include "blackcore/context_audio.h"
#include "blackcore/context_settings.h"
#include "blackmisc/valuemap.h"
#include "blackmisc/avallclasses.h"
#include "blackmisc/pqallquantities.h"
@@ -42,23 +43,16 @@ namespace BlackMiscTest
QString line;
while (line != "x")
{
const BlackCore::IContextNetwork *networkContext = core->getIContextNetwork();
const BlackCore::IContextAudio *audioContext = core->getIContextAudio();
const BlackCore::IContextNetwork *networkContext = runtime->getIContextNetwork();
const BlackCore::IContextAudio *audioContext = runtime->getIContextAudio();
const BlackCore::IContextSettings *settingsContext = runtime->getIContextSettings();
// display current status
qDebug() << "-------------";
qDebug() << "ATC booked";
qDebug() << networkContext->getAtcStationsBooked().toQString();
qDebug() << "-------------";
qDebug() << "ATC online";
qDebug() << networkContext->getAtcStationsOnline().toQString();
// next round? Server
qDebug() << "-------------";
qDebug() << "Connected with network: " << networkContext->isConnected();
qDebug() << "-------------";
qDebug() << "Key x to exit";
qDebug() << "0 .. settings";
qDebug() << "1 .. ATC booked";
qDebug() << "2 .. ATC online";
qDebug() << "3 .. Aircrafts in range";
@@ -67,7 +61,13 @@ namespace BlackMiscTest
line = qtin.readLine();
if (line.startsWith("1"))
if (line.startsWith("0"))
{
qDebug() << "-------------";
qDebug() << "Settings:" << settingsContext->getSettingsFileName();
qDebug() << settingsContext->getSettingsAsJsonString();
}
else if (line.startsWith("1"))
{
qDebug() << "-------------";
qDebug() << "ATC booked";

View File

@@ -22,8 +22,8 @@ int main(int argc, char *argv[])
BlackMisc::initResources();
QCoreApplication a(argc, argv);
CSamplesJson::samples();
// CSamplesChangeObject::samples();
// CSamplesContainer::samples();
// CSamplesMetadata::samples();
return a.exec();
CSamplesChangeObject::samples();
CSamplesContainer::samples();
CSamplesMetadata::samples();
return 0;
}