flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-03 15:45:46 +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:
Roland Winklmeier
2014-01-17 18:20:56 +01:00
parent 4d6564af64 b20523a8f7
commit c384e3d12e
59 changed files with 1161 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
samples/blackgui/infowindow.cpp
View File

@@ -16,10 +16,7 @@ CInfoWindow::CInfoWindow(QWidget *parent) :
/*
* Destructor
*/
CInfoWindow::~CInfoWindow()
{
delete ui;
}
CInfoWindow::~CInfoWindow() { }
/*
* Info message for some time

5
samples/blackgui/infowindow.h
View File

@@ -7,10 +7,11 @@
#define SAMPLE_INFOWINDOW_H
#include <QWizardPage>
#include <QScopedPointer>
namespace Ui
{
class InfoWindow;
class InfoWindow;
}
class CInfoWindow : public QWizardPage
@@ -37,7 +38,7 @@ public:
void setInfoMessage(const QString &message, int displayTimeMs = 4000);
private:
Ui::InfoWindow *ui;
QScopedPointer<Ui::InfoWindow> ui;
};
#endif // guard

12
samples/blackgui/introwindow.cpp
View File

@@ -17,10 +17,7 @@ CIntroWindow::CIntroWindow(QWidget *parent) :
/*
* Destructor
*/
CIntroWindow::~CIntroWindow()
{
delete ui;
}
CIntroWindow::~CIntroWindow() { }
/*
* Window mode
@@ -52,9 +49,12 @@ GuiModes::CoreMode CIntroWindow::getCoreMode() const
void CIntroWindow::buttonClicked() const
{
QObject *sender = QObject::sender();
if (sender == this->ui->pb_ModelDb) {
if (sender == this->ui->pb_ModelDb)
{
QDesktopServices::openUrl(QUrl("http://vatrep.vatsim-germany.org/page/index.php", QUrl::TolerantMode));
} else if (sender == this->ui->pb_WebSite) {
}
else if (sender == this->ui->pb_WebSite)
{
QDesktopServices::openUrl(QUrl("https://dev.vatsim-germany.org/", QUrl::TolerantMode));
}
}

6
samples/blackgui/introwindow.h
View File

@@ -8,11 +8,11 @@
#include "guimodeenums.h"
#include <QDialog>
#include <QScopedPointer>
namespace Ui
{
class CIntroWindow;
class CIntroWindow;
}
class CIntroWindow : public QDialog
@@ -50,7 +50,7 @@ private slots:
void buttonClicked() const;
private:
Ui::CIntroWindow *ui;
QScopedPointer<Ui::CIntroWindow> ui;
};
#endif // guard

51
samples/blackgui/mainwindow.cpp
View File

@@ -27,10 +27,7 @@ MainWindow::MainWindow(GuiModes::WindowMode windowMode, QWidget *parent) :
m_dBusConnection("dummy"), m_coreRuntime(nullptr),
m_atcListOnline(nullptr), m_atcListBooked(nullptr),
m_trafficServerList(nullptr), m_aircraftsInRange(nullptr),
m_contextApplication(nullptr),
m_contextNetwork(nullptr), m_contextVoice(nullptr),
m_contextSettings(nullptr),
m_ownAircraft(), m_voiceRoomCom1(), m_voiceRoomCom2(),
m_contextApplication(nullptr), m_contextNetwork(nullptr), m_contextVoice(nullptr), m_contextSettings(nullptr),
m_timerUpdateAtcStationsOnline(nullptr), m_timerUpdateAircraftsInRange(nullptr),
m_timerCollectedCockpitUpdates(nullptr), m_timerContextWatchdog(nullptr),
m_contextMenuAudio(nullptr)
@@ -48,11 +45,7 @@ MainWindow::MainWindow(GuiModes::WindowMode windowMode, QWidget *parent) :
/*
* Destructor
*/
MainWindow::~MainWindow()
{
this->gracefulShutdown();
delete ui;
}
MainWindow::~MainWindow() {}
/*
* Graceful shutdown
@@ -61,37 +54,44 @@ void MainWindow::gracefulShutdown()
{
if (!this->m_init) return;
this->m_init = false;
if (this->m_infoWindow)
{
this->m_infoWindow->close();
this->m_infoWindow = nullptr;
}
// if we have a context, we shut some things down
if (this->m_contextNetworkAvailable)
{
this->m_contextNetwork->disconnectFromNetwork();
}
if (this->m_contextVoiceAvailable)
{
this->m_contextVoice->leaveAllVoiceRooms();
if (this->m_contextNetwork->isConnected())
{
if (this->m_contextVoiceAvailable)
{
this->m_contextVoice->leaveAllVoiceRooms();
}
this->m_contextNetwork->disconnectFromNetwork();
}
}
if (this->m_timerUpdateAircraftsInRange)
{
this->m_timerUpdateAircraftsInRange->disconnect(this);
this->m_timerUpdateAircraftsInRange->stop();
this->m_timerUpdateAircraftsInRange->disconnect(this);
}
if (this->m_timerUpdateAtcStationsOnline)
{
this->m_timerUpdateAtcStationsOnline->disconnect(this);
this->m_timerUpdateAtcStationsOnline->stop();
this->m_timerUpdateAtcStationsOnline->disconnect(this);
}
if (this->m_timerContextWatchdog)
{
this->m_timerContextWatchdog->disconnect(this);
this->m_timerContextWatchdog->stop();
this->m_timerContextWatchdog->disconnect(this);
}
if (this->m_timerCollectedCockpitUpdates)
{
this->m_timerCollectedCockpitUpdates->disconnect(this);
this->m_timerCollectedCockpitUpdates->stop();
this->m_timerCollectedCockpitUpdates->disconnect(this);
}
}
@@ -228,6 +228,8 @@ void MainWindow::displayStatusMessage(const CStatusMessage &message)
{
this->ui->sb_MainStatusBar->showMessage(message.getMessage(), 3000);
this->ui->te_StatusMessages->insertPlainText(message.toQString(true).append("\n"));
if (message.getSeverity() == CStatusMessage::SeverityError) this->displayOverlayInfo(message);
}
/*
@@ -393,7 +395,9 @@ void MainWindow::changeWindowOpacity(int opacity)
return;
}
qreal o = opacity / 100.0;
o = o < 0.3 ? 0.3 : o;
QWidget::setWindowOpacity(o);
this->ui->hs_SettingsGuiOpacity->setValue(o * 100.0);
}
/*
@@ -416,3 +420,12 @@ void MainWindow::displayOverlayInfo(const QString &message)
this->m_infoWindow->setInfoMessage(message);
}
}
/*
* Info window by
*/
void MainWindow::displayOverlayInfo(const CStatusMessage &message)
{
this->displayOverlayInfo(message.getMessage());
// further code goes here, such as marking errors as red ...
}

42
samples/blackgui/mainwindow.h
View File

@@ -10,22 +10,22 @@
#pragma push_macro("interface")
#undef interface
#include <QMainWindow>
#include <QTextEdit>
#include <QItemSelection>
#include <QTimer>
#include "blackgui/atcstationlistmodel.h"
#include "blackgui/serverlistmodel.h"
#include "blackgui/aircraftlistmodel.h"
#include "blackmisc/statusmessage.h"
#include "blackmisc/nwtextmessage.h"
#include "infowindow.h"
#include "guimodeenums.h"
#include "blackcore/context_voice.h"
#include "blackcore/context_network_interface.h"
#include "blackcore/context_settings_interface.h"
#include "blackcore/context_application_interface.h"
#include "blackcore/coreruntime.h"
#include "infowindow.h"
#include "guimodeenums.h"
#include "blackgui/atcstationlistmodel.h"
#include "blackgui/serverlistmodel.h"
#include "blackgui/aircraftlistmodel.h"
#include "blackmisc/statusmessage.h"
#include "blackmisc/nwtextmessage.h"
#include <QMainWindow>
#include <QTextEdit>
#include <QItemSelection>
#include <QTimer>
namespace Ui
{
@@ -97,7 +97,7 @@ protected:
};
private:
Ui::MainWindow *ui;
QScopedPointer<Ui::MainWindow> ui;
CInfoWindow *m_infoWindow;
bool m_init;
GuiModes::WindowMode m_windowMode;
@@ -106,7 +106,7 @@ private:
bool m_contextNetworkAvailable;
bool m_contextVoiceAvailable;
QDBusConnection m_dBusConnection;
BlackCore::CCoreRuntime *m_coreRuntime; /*!< runtime, if working with local core */
QScopedPointer<BlackCore::CCoreRuntime> m_coreRuntime; /*!< runtime, if working with local core */
BlackGui::CAtcListModel *m_atcListOnline;
BlackGui::CAtcListModel *m_atcListBooked;
BlackGui::CServerListModel *m_trafficServerList;
@@ -130,6 +130,7 @@ private:
QPixmap m_resPixmapVoiceMuted;
QPoint m_dragPosition; /*!< position, if moving is handled with frameless window */
QMenu *m_contextMenuAudio; /*! Audio context menu */
QString m_transponderResetValue; /*! Temp. storage of XPdr mode to reset, req. until timer allows singleShoot with Lambdas */
/*!
* \brief GUI status update
@@ -233,6 +234,12 @@ private:
*/
void displayOverlayInfo(const QString &message = "");
/*!
* \brief Overlay info by status message
* \param message
*/
void displayOverlayInfo(const BlackMisc::CStatusMessage &message);
/*!
* \brief Is given main page selected?
* \param mainPage
@@ -415,14 +422,9 @@ private slots:
void audioDeviceSelected(int index);
/*!
* \brief Reset transponder to standby
* \brief Reset transponder to Standby / Charly
*/
void resetTransponderModerToStandby();
/*!
* \brief Reset transponder to Charly
*/
void resetTransponderModerToCharly();
void resetTransponderMode();
/*!
* \brief Override voice room (allows to set an arbitrary voice room for testing purposes)

41
samples/blackgui/mainwindow_cockpit.cpp
View File

@@ -40,7 +40,16 @@ void MainWindow::cockpitValuesChanged()
else if (sender == this->ui->pb_CockpitIdent)
{
// trigger the real button
this->ui->cb_CockpitTransponderMode->setCurrentText("I");
if (this->ui->cb_CockpitTransponderMode->currentText() == "I")
{
this->ui->pb_CockpitIdent->setStyleSheet("");
this->resetTransponderMode();
}
else
{
this->ui->pb_CockpitIdent->setStyleSheet("background: red");
this->ui->cb_CockpitTransponderMode->setCurrentText("I"); // trigger real button and whole process
}
return;
}
@@ -138,19 +147,16 @@ void MainWindow::updateCockpitFromContext()
}
/*
* Reset transponder mode to Standby
* Reset transponder mode to Standby / Charly
*/
void MainWindow::resetTransponderModerToStandby()
void MainWindow::resetTransponderMode()
{
this->ui->cb_CockpitTransponderMode->setCurrentText("S");
}
/*
* Reset transponder mode to Standby
*/
void MainWindow::resetTransponderModerToCharly()
{
this->ui->cb_CockpitTransponderMode->setCurrentText("C");
this->ui->pb_CockpitIdent->setStyleSheet("");
if (this->ui->cb_CockpitTransponderMode->currentText() == "I")
{
// only reset if still "I"
this->ui->cb_CockpitTransponderMode->setCurrentText(this->m_transponderResetValue);
}
}
/*
@@ -185,10 +191,16 @@ void MainWindow::sendCockpitUpdates()
{
// ident shall be sent for some time, then reset
transponder.setTransponderMode(CTransponder::StateIdent);
this->ui->pb_CockpitIdent->setStyleSheet("background: red");
if (this->m_ownAircraft.getTransponderMode() == CTransponder::ModeS)
QTimer::singleShot(5000, this, SLOT(resetTransponderModerToStandby()));
{
this->m_transponderResetValue = "S";
}
else
QTimer::singleShot(5000, this, SLOT(resetTransponderModerToCharly()));
{
this->m_transponderResetValue = "C";
}
QTimer::singleShot(5000, this, SLOT(resetTransponderMode()));
}
//
@@ -199,7 +211,6 @@ void MainWindow::sendCockpitUpdates()
com2.setFrequencyActiveMHz(this->ui->ds_CockpitCom2Active->value());
com2.setFrequencyStandbyMHz(this->ui->ds_CockpitCom2Standby->value());
//
// Send to context
//

56
samples/blackgui/mainwindow_init.cpp
View File

@@ -96,7 +96,7 @@ void MainWindow::init(GuiModes::CoreMode coreMode)
}
else
{
this->m_coreRuntime = new CCoreRuntime(false, this);
this->m_coreRuntime.reset(new CCoreRuntime(false, this));
this->m_contextNetwork = this->m_coreRuntime->getIContextNetwork();
this->m_contextVoice = this->m_coreRuntime->getIContextVoice();
this->m_contextSettings = this->m_coreRuntime->getIContextSettings();
@@ -114,44 +114,18 @@ void MainWindow::init(GuiModes::CoreMode coreMode)
this->m_resPixmapVoiceHigh = QPixmap(":/blackgui/icons/audiovolumehigh.png");
this->m_resPixmapVoiceMuted = QPixmap(":/blackgui/icons/audiovolumemuted.png");
// relay status messages
// signal / slots
bool connect;
connect = this->connect(this->m_contextNetwork, SIGNAL(statusMessage(BlackMisc::CStatusMessage)),
this, SLOT(displayStatusMessage(BlackMisc::CStatusMessage)));
Q_ASSERT_X(connect, "init", "cannot connect status message");
connect = this->connect(this->m_contextNetwork, SIGNAL(connectionTerminated()),
this, SLOT(connectionTerminated()));
Q_ASSERT_X(connect, "init", "cannot connect terminating");
connect = this->connect(this->m_contextNetwork, SIGNAL(connectionStatusChanged(uint, uint)),
this, SLOT(connectionStatusChanged(uint, uint)));
Q_ASSERT_X(connect, "init", "cannot connect change connection status");
connect = this->connect(this->m_contextSettings, SIGNAL(changedNetworkSettings()),
this, SLOT(changedNetworkSettings()));
Q_ASSERT_X(connect, "init", "cannot connect change network status");
connect = this->connect(this->m_contextNetwork, SIGNAL(textMessagesReceived(BlackMisc::Network::CTextMessageList)),
this, SLOT(appendTextMessagesToGui(BlackMisc::Network::CTextMessageList)));
Q_ASSERT_X(connect, "init", "cannot connect text message received");
connect = this->connect(this->m_timerUpdateAircraftsInRange, SIGNAL(timeout()),
this, SLOT(timerBasedUpdates()));
Q_ASSERT_X(connect, "init", "cannot connect timer");
connect = this->connect(this->m_timerUpdateAtcStationsOnline, SIGNAL(timeout()),
this, SLOT(timerBasedUpdates()));
Q_ASSERT_X(connect, "init", "cannot connect timer");
connect = this->connect(this->m_timerContextWatchdog, SIGNAL(timeout()),
this, SLOT(timerBasedUpdates()));
Q_ASSERT_X(connect, "init", "cannot connect timer (watchdog)");
connect = this->connect(this->m_timerCollectedCockpitUpdates, SIGNAL(timeout()),
this, SLOT(sendCockpitUpdates()));
Q_ASSERT_X(connect, "init", "cannot connect timer (cockpit updates)");
Q_UNUSED(connect);
this->connect(this->m_contextNetwork, &IContextNetwork::statusMessage, this, &MainWindow::displayStatusMessage);
this->connect(this->m_contextNetwork, &IContextNetwork::connectionTerminated, this, &MainWindow::connectionTerminated);
this->connect(this->m_contextNetwork, &IContextNetwork::connectionStatusChanged, this, &MainWindow::connectionStatusChanged);
this->connect(this->m_contextSettings, &IContextSettings::changedNetworkSettings, this, &MainWindow::changedNetworkSettings);
connect = this->connect(this->m_contextNetwork, SIGNAL(textMessagesReceived(BlackMisc::Network::CTextMessageList)), this, SLOT(appendTextMessagesToGui(BlackMisc::Network::CTextMessageList)));
Q_ASSERT(connect);
this->connect(this->m_timerUpdateAircraftsInRange, &QTimer::timeout, this, &MainWindow::timerBasedUpdates);
this->connect(this->m_timerUpdateAtcStationsOnline, &QTimer::timeout, this, &MainWindow::timerBasedUpdates);
this->connect(this->m_timerContextWatchdog, &QTimer::timeout, this, &MainWindow::timerBasedUpdates);
this->connect(this->m_timerCollectedCockpitUpdates, &QTimer::timeout, this, &MainWindow::sendCockpitUpdates);
// start timers
this->m_timerUpdateAircraftsInRange->start(10 * 1000);
@@ -210,8 +184,10 @@ void MainWindow::initGuiSignals()
Q_ASSERT(connected);
connected = this->connect(this->ui->pb_MainWeather, SIGNAL(released()), this, SLOT(setMainPage()));
Q_ASSERT(connected);
this->connect(this->ui->pb_MainKeypadOpacity050, &QPushButton::clicked, this, &MainWindow::changeWindowOpacity);
this->connect(this->ui->pb_MainKeypadOpacity100, &QPushButton::clicked, this, &MainWindow::changeWindowOpacity);
connected = this->connect(this->ui->pb_MainKeypadOpacity050, SIGNAL(clicked()), this, SLOT(changeWindowOpacity()));
Q_ASSERT(connected);
connected = this->connect(this->ui->pb_MainKeypadOpacity100, SIGNAL(clicked()), this, SLOT(changeWindowOpacity()));
Q_ASSERT(connected);
// Sound buttons
this->connect(this->ui->pb_SoundMute, &QPushButton::clicked, this, &MainWindow::audioVolumes);

3
src/blackcore/context_network.cpp
View File

@@ -248,7 +248,8 @@ namespace BlackCore
// send as message
QString m("connection status changed ");
m.append(this->m_network->connectionStatusToString(from)).append(" ").append(this->m_network->connectionStatusToString(to));
msgs.push_back(CStatusMessage(CStatusMessage::TypeTrafficNetwork, CStatusMessage::SeverityInfo, m));
msgs.push_back(CStatusMessage(CStatusMessage::TypeTrafficNetwork,
to == INetwork::DisconnectedError ? CStatusMessage::SeverityError : CStatusMessage::SeverityInfo, m));
emit this->statusMessage(msgs[0]);
// send as own signal

12
src/blackcore/context_settings.cpp
View File

@@ -22,14 +22,12 @@ namespace BlackCore
// create some dummy settings
// this would actually be reading the settings from disk ..
this->m_settingsNetwork.setCurrentNetworkServer(
CServer("Testserver", "Client project testserver", "vatsim-germany.org", 6809,
CUser("guest", "Guest Client project", "", "guest")));
this->m_settingsNetwork.setCurrentNetworkServer(CServer("Testserver", "Client project testserver", "vatsim-germany.org", 6809, CUser("guest", "Guest Client project", "", "guest")));
this->m_settingsNetwork.addTrafficNetworkServer(this->m_settingsNetwork.getCurrentNetworkServer());
this->m_settingsNetwork.addTrafficNetworkServer(
CServer("Europe C2", "Real VATSIM Server", "88.198.19.202", 6809,
CUser("vatsimid", "Black Client", "", "vatsimpw"))
);
this->m_settingsNetwork.addTrafficNetworkServer(CServer("Europe C2", "VATSIM Server", "88.198.19.202", 6809, CUser("vatsimid", "Black Client", "", "vatsimpw")));
this->m_settingsNetwork.addTrafficNetworkServer(CServer("Europe CC", "VATSIM Server", "5.9.155.43", 6809, CUser("vatsimid", "Black Client", "", "vatsimpw")));
this->m_settingsNetwork.addTrafficNetworkServer(CServer("UK", "VATSIM Server", "109.169.48.148", 6809, CUser("vatsimid", "Black Client", "", "vatsimpw")));
this->m_settingsNetwork.addTrafficNetworkServer(CServer("USA-W", "VATSIM Server", "64.151.108.52", 6809, CUser("vatsimid", "Black Client", "", "vatsimpw")));
}
/*

17
src/blackcore/network_vatlib.cpp
View File

@@ -120,7 +120,7 @@ namespace BlackCore
{
try
{
if (m_net->IsValid() && m_net->IsSessionExists())
if (m_net->IsValid() && m_net->IsSessionExists() && isConnected())
{
if (this->m_loginMode == LoginAsObserver)
{
@@ -271,6 +271,10 @@ namespace BlackCore
info);
}
m_net->ConnectAndLogon();
if (! m_updateTimer.isActive())
{
m_updateTimer.start(c_updateIntervalMsec);
}
}
catch (...)
{
@@ -283,6 +287,7 @@ namespace BlackCore
{
try
{
m_updateTimer.stop();
m_net->LogoffAndDisconnect(c_logoffTimeoutSec);
}
catch (...) { exceptionDispatcher(Q_FUNC_INFO); }
@@ -297,21 +302,11 @@ namespace BlackCore
{
m_ownAircraft.setPosition(position);
m_ownAircraft.setAltitude(altitude);
if (! m_updateTimer.isActive())
{
m_updateTimer.start(c_updateIntervalMsec);
}
}
void CNetworkVatlib::setOwnAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &situation)
{
m_ownAircraft.setSituation(situation);
if (! m_updateTimer.isActive())
{
m_updateTimer.start(c_updateIntervalMsec);
}
}
void CNetworkVatlib::setOwnAircraftAvionics(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2,

27
src/blackmisc/avaircraft.cpp
View File

@@ -124,15 +124,32 @@ namespace BlackMisc
return BlackMisc::calculateHash(hashs, "CAircraft");
}
/*
* metaTypeId
*/
int CAircraft::getMetaTypeId() const
{
return qMetaTypeId<CAircraft>();
}
/*
* is a
*/
bool CAircraft::isA(int metaTypeId) const
{
if (metaTypeId == qMetaTypeId<CAircraft>()) { return true; }
return this->CValueObject::isA(metaTypeId);
}
/*
* Compare
*/
int CAircraft::compare(const QVariant &qv) const
int CAircraft::compareImpl(const CValueObject &otherBase) const
{
Q_ASSERT(qv.canConvert<CAircraft>());
Q_ASSERT(!qv.isNull() && qv.isValid());
CAircraft aircraft = qv.value<CAircraft>();
return this->getCallsign().compare(aircraft.getCallsign());
const auto &other = static_cast<const CAircraft &>(otherBase);
return this->getCallsign().asString().compare(other.getCallsign().asString(), Qt::CaseInsensitive);
}
/*

20
src/blackmisc/avaircraft.h
View File

@@ -278,11 +278,6 @@ namespace BlackMisc
*/
virtual uint getValueHash() const;
/*!
* \copydoc BlackObject::compare
*/
virtual int compare(const QVariant &qv) const;
/*!
* \brief Register metadata
*/
@@ -337,6 +332,21 @@ namespace BlackMisc
*/
virtual QString convertToQString(bool i18n = false) const;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
/*!
* \brief Stream to DBus <<
* \param argument

34
src/blackmisc/avaircrafticao.cpp
View File

@@ -1,5 +1,6 @@
#include "avaircrafticao.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include <tuple>
namespace BlackMisc
{
@@ -19,6 +20,39 @@ namespace BlackMisc
return s;
}
/*
* metaTypeId
*/
int CAircraftIcao::getMetaTypeId() const
{
return qMetaTypeId<CAircraftIcao>();
}
/*
* is a
*/
bool CAircraftIcao::isA(int metaTypeId) const
{
if (metaTypeId == qMetaTypeId<CAircraftIcao>()) { return true; }
return this->CValueObject::isA(metaTypeId);
}
/*
* Compare
*/
int CAircraftIcao::compareImpl(const CValueObject &otherBase) const
{
const auto &other = static_cast<const CAircraftIcao &>(otherBase);
const auto lhs = std::tie(this->m_designator, this->m_color, this->m_airline, this->m_livery);
const auto rhs = std::tie(other.m_designator, other.m_color, other.m_airline, other.m_livery);
if (lhs < rhs) { return -1; }
if (lhs > rhs) { return 1; }
return 0;
}
/*
* Marshall to DBus
*/

15
src/blackmisc/avaircrafticao.h
View File

@@ -214,6 +214,21 @@ namespace BlackMisc
*/
virtual QString convertToQString(bool i18n = false) const;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
/*!
* \brief Stream to DBus <<
* \param argument

27
src/blackmisc/avaircraftsituation.cpp
View File

@@ -23,6 +23,33 @@ namespace BlackMisc
return s;
}
/*
* metaTypeId
*/
int CAircraftSituation::getMetaTypeId() const
{
return qMetaTypeId<CAircraftSituation>();
}
/*
* is a
*/
bool CAircraftSituation::isA(int metaTypeId) const
{
if (metaTypeId == qMetaTypeId<CAircraftSituation>()) { return true; }
return this->CValueObject::isA(metaTypeId);
}
/*
* Compare
*/
int CAircraftSituation::compareImpl(const CValueObject &/*otherBase*/) const
{
qFatal("not implemented");
return 0;
}
/*
* Marshall to DBus
*/

15
src/blackmisc/avaircraftsituation.h
View File

@@ -233,6 +233,21 @@ namespace BlackMisc
*/
virtual QString convertToQString(bool i18n = false) const;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
/*!
* \brief Stream to DBus <<
* \param argument

42
src/blackmisc/avaltitude.cpp
View File

@@ -58,26 +58,36 @@ namespace BlackMisc
return !((*this) == other);
}
/*
* metaTypeId
*/
int CAltitude::getMetaTypeId() const
{
return qMetaTypeId<CAltitude>();
}
/*
* is a
*/
bool CAltitude::isA(int metaTypeId) const
{
if (metaTypeId == qMetaTypeId<CAltitude>()) { return true; }
return this->CLength::isA(metaTypeId);
}
/*
* Compare
*/
int CAltitude::compare(const QVariant &qv) const
int CAltitude::compareImpl(const CValueObject &otherBase) const
{
Q_ASSERT(qv.canConvert<CAltitude>() || qv.canConvert<CLength>());
Q_ASSERT(qv.isValid() && !qv.isNull());
if (qv.canConvert<CAltitude>())
{
CAltitude other = qv.value<CAltitude>();
if (this->isMeanSeaLevel() && other.isAboveGroundLevel()) return 1;
if (this->isAboveGroundLevel() && other.isMeanSeaLevel()) return -1;
return this->compare(other);
}
else if (qv.canConvert<CLength>())
{
return this->compare(qv.value<CLength>());
}
qFatal("Invalid comparison");
return 0; // just for compiler
const auto &other = static_cast<const CAltitude &>(otherBase);
if (this->isMeanSeaLevel() && other.isAboveGroundLevel()) { return 1; }
if (this->isAboveGroundLevel() && other.isMeanSeaLevel()) { return -1; }
if (*this < other) { return -1; }
if (*this > other) { return 1; }
return 0;
}
/*

26
src/blackmisc/avaltitude.h
View File

@@ -39,6 +39,21 @@ namespace BlackMisc
*/
virtual QString convertToQString(bool i18n) const;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
/*!
* \brief Stream to DBus <<
* \param argument
@@ -122,17 +137,6 @@ namespace BlackMisc
return m_datum;
}
/*!
* \copydoc BlackObject::compare
*/
virtual int compare(const QVariant &qv) const;
/*!
* \todo this is a hack, to avoid hiding inherited names in CPhysicalQuantity
* (see Effective C++ item 33) CPhysicalQuantity::compare is the real culprit
*/
int compare(const CLength &other) const { return static_cast<const CLength *>(this)->compare(other); }
/*!
* \brief Register metadata
*/

27
src/blackmisc/avatcstation.cpp
View File

@@ -429,15 +429,32 @@ namespace BlackMisc
}
}
/*
* metaTypeId
*/
int CAtcStation::getMetaTypeId() const
{
return qMetaTypeId<CAtcStation>();
}
/*
* is a
*/
bool CAtcStation::isA(int metaTypeId) const
{
if (metaTypeId == qMetaTypeId<CAtcStation>()) { return true; }
return this->CValueObject::isA(metaTypeId);
}
/*
* Compare
*/
int CAtcStation::compare(const QVariant &qv) const
int CAtcStation::compareImpl(const CValueObject &otherBase) const
{
Q_ASSERT(qv.canConvert<CAtcStation>());
Q_ASSERT(!qv.isNull() && qv.isValid());
CAtcStation atc = qv.value<CAtcStation>();
return this->getCallsign().compare(atc.getCallsign());
const auto &other = static_cast<const CAtcStation &>(otherBase);
return this->getCallsign().asString().compare(other.getCallsign().asString(), Qt::CaseInsensitive);
}
/*

20
src/blackmisc/avatcstation.h
View File

@@ -453,11 +453,6 @@ namespace BlackMisc
*/
static void registerMetadata();
/*!
* \copydoc BlackObject::compare
*/
virtual int compare(const QVariant &qv) const;
protected:
/*!
* \brief Meaningful string representation
@@ -466,6 +461,21 @@ namespace BlackMisc
*/
virtual QString convertToQString(bool i18n = false) const;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
/*!
* \brief Stream to DBus <<
* \param argument

24
src/blackmisc/avcallsign.cpp
View File

@@ -98,21 +98,31 @@ namespace BlackMisc
}
/*
* Compare
* metaTypeId
*/
int CCallsign::compare(const QVariant &qv) const
int CCallsign::getMetaTypeId() const
{
Q_ASSERT(qv.canConvert<CCallsign>());
Q_ASSERT(!qv.isNull() && qv.isValid());
return this->compare(qv.value<CCallsign>());
return qMetaTypeId<CCallsign>();
}
/*
* is a
*/
bool CCallsign::isA(int metaTypeId) const
{
if (metaTypeId == qMetaTypeId<CCallsign>()) { return true; }
return this->CValueObject::isA(metaTypeId);
}
/*
* Compare
*/
int CCallsign::compare(const CCallsign &callsign) const
int CCallsign::compareImpl(const CValueObject &otherBase) const
{
return this->m_callsign.compare(callsign.asString(), Qt::CaseInsensitive);
const auto &other = static_cast<const CCallsign &>(otherBase);
return this->m_callsign.compare(other.asString(), Qt::CaseInsensitive);
}
/*

26
src/blackmisc/avcallsign.h
View File

@@ -121,17 +121,6 @@ namespace BlackMisc
*/
virtual uint getValueHash() const;
/*!
* \copydoc BlackObject::compare
*/
virtual int compare(const QVariant &qv) const;
/*!
* Compare with other callsign
* \return
*/
virtual int compare(const CCallsign &callsign) const;
/*!
* \brief Register metadata
*/
@@ -145,6 +134,21 @@ namespace BlackMisc
*/
virtual QString convertToQString(bool i18n = false) const;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
/*!
* \brief Stream to DBus <<
* \param argument

30
src/blackmisc/avinformationmessage.cpp
View File

@@ -13,6 +13,36 @@ namespace BlackMisc
return this->m_message;
}
/*
* metaTypeId
*/
int CInformationMessage::getMetaTypeId() const
{
return qMetaTypeId<CInformationMessage>();
}
/*
* is a
*/
bool CInformationMessage::isA(int metaTypeId) const
{
if (metaTypeId == qMetaTypeId<CInformationMessage>()) { return true; }
return this->CValueObject::isA(metaTypeId);
}
/*
* Compare
*/
int CInformationMessage::compareImpl(const CValueObject &otherBase) const
{
const auto &other = static_cast<const CInformationMessage &>(otherBase);
if (this->m_type < other.m_type) { return -1; }
if (this->m_type > other.m_type) { return 1; }
return this->m_message.compare(other.m_message);
}
/*
* Marshall to DBus
*/

15
src/blackmisc/avinformationmessage.h
View File

@@ -164,6 +164,21 @@ namespace BlackMisc
*/
virtual QString convertToQString(bool i18n = false) const;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
/*!
* \brief Stream to DBus <<
* \param argument

20
src/blackmisc/aviobase.h
View File

@@ -58,6 +58,26 @@ namespace BlackMisc
return this->m_name == other.m_name;
}
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const { return 0; }
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const { return this->CValueObject::isA(metaTypeId); }
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const
{
Q_UNUSED(other);
qFatal("not implemented");
return 0;
}
/*!
* \brief Stream to DBus <<
* \param argument

2
src/blackmisc/blackmiscfreefunctions.cpp
View File

@@ -221,7 +221,7 @@ int BlackMisc:: compareQVariants(const QVariant &v1, const QVariant &v2)
const CValueObject *cs2 = CValueObject::fromQVariant(v2);
if (cs1 && cs2)
{
return cs1->compare(v2); // Note, that I have to compare against QVariant
return compare(*cs1, *cs2);
}
}

30
src/blackmisc/containerbase.h
View File

@@ -152,6 +152,36 @@ namespace BlackMisc
return str += "}";
}
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const { return qMetaTypeId<C<T>>(); }
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const
{
if (metaTypeId == qMetaTypeId<C<T>>()) { return true; }
return CValueObject::isA(metaTypeId);
}
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &/*other*/) const
{
//const auto &o = static_cast<const CContainerBase &>(other);
//if (derived().size() < o.derived().size()) { return -1; }
//if (derived().size() > o.derived().size()) { return 1; }
//for (auto i1 = derived().begin(), i2 = o.derived().begin(); i1 != derived().end() && i2 != o.derived().end(); ++i1, ++i2)
//{
// if (*i1 < *i2) { return -1; }
// if (*i1 > *i2) { return 1; }
//}
return 0;
}
virtual void marshallToDbus(QDBusArgument &argument) const
{
argument.beginArray(qMetaTypeId<T>());

32
src/blackmisc/coordinategeodetic.cpp
View File

@@ -25,6 +25,38 @@ namespace BlackMisc
return s.arg(this->m_latitude.valueRoundedWithUnit(6, i18n)).arg(this->m_longitude.valueRoundedWithUnit(6, i18n)).arg(this->m_height.valueRoundedWithUnit(i18n));
}
/*
* metaTypeId
*/
int CCoordinateGeodetic::getMetaTypeId() const
{
return qMetaTypeId<CCoordinateGeodetic>();
}
/*
* is a
*/
bool CCoordinateGeodetic::isA(int metaTypeId) const
{
if (metaTypeId == qMetaTypeId<CCoordinateGeodetic>()) { return true; }
return this->CValueObject::isA(metaTypeId);
}
/*
* Compare
*/
int CCoordinateGeodetic::compareImpl(const CValueObject &otherBase) const
{
const auto &other = static_cast<const CCoordinateGeodetic &>(otherBase);
int cmp = compare(this->m_latitude, other.m_latitude);
if (cmp) { return cmp; }
cmp = compare(this->m_longitude, other.m_longitude);
if (cmp) { return cmp; }
return compare(this->m_height, other.m_height);
}
/*
* Marshall to Dbus
*/

15
src/blackmisc/coordinategeodetic.h
View File

@@ -82,6 +82,21 @@ namespace BlackMisc
*/
virtual QString convertToQString(bool i18n = false) const;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
/*!
* \brief Stream to DBus
* \param argument

31
src/blackmisc/geoearthangle.cpp
View File

@@ -71,17 +71,34 @@ namespace BlackMisc
return LATorLON(a);
}
/*
* metaTypeId
*/
template <class LATorLON> int CEarthAngle<LATorLON>::getMetaTypeId() const
{
return qMetaTypeId<LATorLON>();
}
/*
* is a
*/
template <class LATorLON> bool CEarthAngle<LATorLON>::isA(int metaTypeId) const
{
if (metaTypeId == qMetaTypeId<LATorLON>()) { return true; }
return this->CAngle::isA(metaTypeId);
}
/*
* Compare
*/
template <class LATorLON> int CEarthAngle<LATorLON>::compare(const QVariant &qv) const
template <class LATorLON> int CEarthAngle<LATorLON>::compareImpl(const CValueObject &otherBase) const
{
Q_ASSERT(qv.canConvert<LATorLON>() || qv.canConvert<CAngle>());
Q_ASSERT(qv.isValid() && !qv.isNull());
if (qv.canConvert<LATorLON>())
return this->toAngle().compare(qv.value<LATorLON>().toAngle());
else
return this->toAngle().compare(qv.value<CAngle>());
const auto &other = static_cast<const CEarthAngle &>(otherBase);
if (*this < other) { return -1; }
else if (*this > other) { return 1; }
else { return 0; }
}
// see here for the reason of thess forward instantiations

45
src/blackmisc/geoearthangle.h
View File

@@ -45,6 +45,21 @@ namespace BlackMisc
return this->valueRoundedWithUnit(BlackMisc::PhysicalQuantities::CAngleUnit::deg(), 6, i18n);
}
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
/*!
* \brief Stream to DBus <<
* \param argument
@@ -74,7 +89,7 @@ namespace BlackMisc
* \param latOrLon
* \return
*/
bool operator==(const LATorLON &latOrLon) const
bool operator==(const CEarthAngle &latOrLon) const
{
return this->CAngle::operator ==(latOrLon);
}
@@ -84,7 +99,7 @@ namespace BlackMisc
* \param latOrLon
* \return
*/
bool operator!=(const LATorLON &latOrLon) const
bool operator!=(const CEarthAngle &latOrLon) const
{
return this->CAngle::operator !=(latOrLon);
}
@@ -116,7 +131,7 @@ namespace BlackMisc
* \param latOrLon
* \return
*/
bool operator >(const LATorLON &latOrLon) const
bool operator >(const CEarthAngle &latOrLon) const
{
return this->CAngle::operator >(latOrLon);
}
@@ -126,7 +141,7 @@ namespace BlackMisc
* \param latOrLon
* \return
*/
bool operator <(const LATorLON &latOrLon) const
bool operator <(const CEarthAngle &latOrLon) const
{
return this->CAngle::operator >(latOrLon);
}
@@ -136,7 +151,7 @@ namespace BlackMisc
* \param latOrLon
* \return
*/
bool operator <=(const LATorLON &latOrLon) const
bool operator <=(const CEarthAngle &latOrLon) const
{
return this->CAngle::operator <=(latOrLon);
}
@@ -146,7 +161,7 @@ namespace BlackMisc
* \param latOrLon
* \return
*/
bool operator >=(const LATorLON &latOrLon) const
bool operator >=(const CEarthAngle &latOrLon) const
{
return this->CAngle::operator >=(latOrLon);
}
@@ -156,7 +171,7 @@ namespace BlackMisc
* \param latOrLon
* \return
*/
LATorLON operator +(const LATorLON &latOrLon) const
LATorLON operator +(const CEarthAngle &latOrLon) const
{
LATorLON l(*this);
l += latOrLon;
@@ -168,27 +183,13 @@ namespace BlackMisc
* \param latOrLon
* \return
*/
LATorLON operator -(const LATorLON &latOrLon) const
LATorLON operator -(const CEarthAngle &latOrLon) const
{
LATorLON l(*this);
l -= latOrLon;
return l;
}
/*!
* \brief To angle
* \return
*/
BlackMisc::PhysicalQuantities::CAngle toAngle() const
{
return BlackMisc::PhysicalQuantities::CAngle(static_cast<BlackMisc::PhysicalQuantities::CAngle>(*this));
}
/*!
* Compare
*/
int compare(const QVariant &qv) const;
/*!
* Register metadata
*/

36
src/blackmisc/mathmatrixbase.cpp
View File

@@ -138,6 +138,42 @@ namespace BlackMisc
return s;
}
/*
* metaTypeId
*/
template <class ImplMatrix, int Rows, int Columns> int CMatrixBase<ImplMatrix, Rows, Columns>::getMetaTypeId() const
{
return qMetaTypeId<ImplMatrix>();
}
/*
* is a
*/
template <class ImplMatrix, int Rows, int Columns> bool CMatrixBase<ImplMatrix, Rows, Columns>::isA(int metaTypeId) const
{
if (metaTypeId == qMetaTypeId<ImplMatrix>()) { return true; }
return this->CValueObject::isA(metaTypeId);
}
/*
* Compare
*/
template <class ImplMatrix, int Rows, int Columns> int CMatrixBase<ImplMatrix, Rows, Columns>::compareImpl(const CValueObject &otherBase) const
{
const auto &other = static_cast<const CMatrixBase &>(otherBase);
for (int r = 0; r < Rows; ++r)
{
for (int c = 0; c < Columns; ++c)
{
if (this->m_matrix(r, c) < other.m_matrix(r, c)) { return -1; }
if (this->m_matrix(r, c) > other.m_matrix(r, c)) { return 1; }
}
}
return 0;
}
/*
* Hash
*/

15
src/blackmisc/mathmatrixbase.h
View File

@@ -51,6 +51,21 @@ namespace BlackMisc
*/
QString convertToQString(bool i18n = false) const;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
/*!
* \brief Stream to DBus
* \param argument

34
src/blackmisc/mathvector3dbase.cpp
View File

@@ -8,6 +8,7 @@
#include "blackmisc/coordinateecef.h"
#include "blackmisc/coordinatened.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include <tuple>
namespace BlackMisc
{
@@ -26,6 +27,39 @@ namespace BlackMisc
return s;
}
/*
* metaTypeId
*/
template <class ImplVector> int CVector3DBase<ImplVector>::getMetaTypeId() const
{
return qMetaTypeId<ImplVector>();
}
/*
* is a
*/
template <class ImplVector> bool CVector3DBase<ImplVector>::isA(int metaTypeId) const
{
if (metaTypeId == qMetaTypeId<ImplVector>()) { return true; }
return this->CValueObject::isA(metaTypeId);
}
/*
* Compare
*/
template <class ImplVector> int CVector3DBase<ImplVector>::compareImpl(const CValueObject &otherBase) const
{
const auto &other = static_cast<const CVector3DBase &>(otherBase);
const auto lhs = std::tie(this->m_i, this->m_j, this->m_k);
const auto rhs = std::tie(other.m_i, other.m_j, other.m_k);
if (lhs < rhs) { return -1; }
if (lhs > rhs) { return 1; }
return 0;
}
/*
* Vector to zero
*/

15
src/blackmisc/mathvector3dbase.h
View File

@@ -80,6 +80,21 @@ namespace BlackMisc
*/
virtual QString convertToQString(bool i18n = false) const;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
/*!
* \brief Unmarshall from Dbus
* \param argument

34
src/blackmisc/nwserver.cpp
View File

@@ -1,5 +1,6 @@
#include "nwserver.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include <tuple>
namespace BlackMisc
{
@@ -18,6 +19,39 @@ namespace BlackMisc
return s;
}
/*
* metaTypeId
*/
int CServer::getMetaTypeId() const
{
return qMetaTypeId<CServer>();
}
/*
* is a
*/
bool CServer::isA(int metaTypeId) const
{
if (metaTypeId == qMetaTypeId<CServer>()) { return true; }
return this->CValueObject::isA(metaTypeId);
}
/*
* Compare
*/
int CServer::compareImpl(const CValueObject &otherBase) const
{
const auto &other = static_cast<const CServer &>(otherBase);
const auto lhs = std::tie(this->m_name, this->m_description, this->m_address, this->m_port);
const auto rhs = std::tie(other.m_name, other.m_description, other.m_address, other.m_port);
if (lhs < rhs) { return -1; }
if (lhs > rhs) { return 1; }
return compare(this->m_user, other.m_user);
}
/*
* Marshall to DBus
*/

15
src/blackmisc/nwserver.h
View File

@@ -181,6 +181,21 @@ namespace BlackMisc
*/
virtual QString convertToQString(bool i18n = false) const;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
/*!
* \brief Stream to DBus <<
* \param argument

28
src/blackmisc/nwtextmessage.cpp
View File

@@ -28,6 +28,34 @@ namespace BlackMisc
return s;
}
/*
* metaTypeId
*/
int CTextMessage::getMetaTypeId() const
{
return qMetaTypeId<CTextMessage>();
}
/*
* is a
*/
bool CTextMessage::isA(int metaTypeId) const
{
if (metaTypeId == qMetaTypeId<CTextMessage>()) { return true; }
return this->CValueObject::isA(metaTypeId);
}
/*
* Compare
*/
int CTextMessage::compareImpl(const CValueObject &otherBase) const
{
const auto &other = static_cast<const CTextMessage &>(otherBase);
return this->m_message.compare(other.m_message);
}
/*
* Marshall to DBus
*/

15
src/blackmisc/nwtextmessage.h
View File

@@ -234,6 +234,21 @@ namespace BlackMisc
*/
virtual QString convertToQString(bool i18n = false) const;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
/*!
* \brief Stream to DBus <<
* \param argument

34
src/blackmisc/nwuser.cpp
View File

@@ -1,5 +1,6 @@
#include "nwuser.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include <tuple>
namespace BlackMisc
{
@@ -19,6 +20,39 @@ namespace BlackMisc
return s;
}
/*
* metaTypeId
*/
int CUser::getMetaTypeId() const
{
return qMetaTypeId<CUser>();
}
/*
* is a
*/
bool CUser::isA(int metaTypeId) const
{
if (metaTypeId == qMetaTypeId<CUser>()) { return true; }
return this->CValueObject::isA(metaTypeId);
}
/*
* Compare
*/
int CUser::compareImpl(const CValueObject &otherBase) const
{
const auto &other = static_cast<const CUser &>(otherBase);
const auto lhs = std::tie(this->m_id, this->m_realname, this->m_email, this->m_password);
const auto rhs = std::tie(other.m_id, other.m_realname, other.m_email, other.m_password);
if (lhs < rhs) { return -1; }
if (lhs > rhs) { return 1; }
return 0;
}
/*
* Marshall to DBus
*/

15
src/blackmisc/nwuser.h
View File

@@ -185,6 +185,21 @@ namespace BlackMisc
*/
virtual QString convertToQString(bool i18n = false) const;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
/*!
* \brief Stream to DBus <<
* \param argument

27
src/blackmisc/pqbase.cpp
View File

@@ -74,6 +74,33 @@ namespace BlackMisc
return s;
}
/*
* metaTypeId
*/
int CMeasurementUnit::getMetaTypeId() const
{
return qMetaTypeId<CMeasurementUnit>();
}
/*
* is a
*/
bool CMeasurementUnit::isA(int metaTypeId) const
{
if (metaTypeId == qMetaTypeId<CMeasurementUnit>()) { return true; }
return this->CValueObject::isA(metaTypeId);
}
/*
* Compare
*/
int CMeasurementUnit::compareImpl(const CValueObject &/*otherBase*/) const
{
qFatal("not implemented");
return 0;
}
/*!
* \brief Register metadata of unit and quantity
*/

15
src/blackmisc/pqbase.h
View File

@@ -230,6 +230,21 @@ namespace BlackMisc
return this->getSymbol(i18n);
}
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
/*!
* \brief Stream to DBus
* \param argument

37
src/blackmisc/pqphysicalquantity.cpp
View File

@@ -20,6 +20,16 @@ namespace BlackMisc
// void
}
/*
* Copy constructor
* (The implicitly generated copy constructor would suffice, but for what seems to be a bug in MSVC2010 template instantiation)
*/
template <class MU, class PQ> CPhysicalQuantity<MU, PQ>::CPhysicalQuantity(const CPhysicalQuantity &other) :
m_value(other.m_value), m_unit(other.m_unit)
{
// void
}
/*
* Equal operator ==
*/
@@ -266,22 +276,33 @@ namespace BlackMisc
}
/*
* Compare
* metaTypeId
*/
template <class MU, class PQ> int CPhysicalQuantity<MU, PQ>::compare(const QVariant &qv) const
template <class MU, class PQ> int CPhysicalQuantity<MU, PQ>::getMetaTypeId() const
{
Q_ASSERT(qv.canConvert<PQ>());
Q_ASSERT(!qv.isNull() && qv.isValid());
return this->compare(qv.value<PQ>());
return qMetaTypeId<PQ>();
}
/*
* is a
*/
template <class MU, class PQ> bool CPhysicalQuantity<MU, PQ>::isA(int metaTypeId) const
{
if (metaTypeId == qMetaTypeId<PQ>()) { return true; }
return this->CValueObject::isA(metaTypeId);
}
/*
* Compare
*/
template <class MU, class PQ> int CPhysicalQuantity<MU, PQ>::compare(const PQ &other) const
template <class MU, class PQ> int CPhysicalQuantity<MU, PQ>::compareImpl(const CValueObject &otherBase) const
{
if (other == (*this)) return 0;
return ((*this) < other) ? -1 : 1;
const auto &other = static_cast<const CPhysicalQuantity &>(otherBase);
if (*this < other) { return -1; }
else if (*this > other) { return 1; }
else { return 0; }
}
// see here for the reason of thess forward instantiations

31
src/blackmisc/pqphysicalquantity.h
View File

@@ -61,6 +61,12 @@ namespace BlackMisc
*/
CPhysicalQuantity(double value, const MU &unit);
/*!
* \brief Copy constructor
* \param other
*/
CPhysicalQuantity(const CPhysicalQuantity &other);
/*!
* \brief Rounded value as string
* \param i18n
@@ -68,6 +74,21 @@ namespace BlackMisc
*/
virtual QString convertToQString(bool i18n = false) const;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
public:
/*!
* \brief Virtual destructor
@@ -357,16 +378,6 @@ namespace BlackMisc
* \brief Register metadata of unit and quantity
*/
static void registerMetadata();
/*!
* \copydoc BlackObject::compare
*/
virtual int compare(const QVariant &qv) const;
/*!
* \copydoc BlackObject::compare
*/
virtual int compare(const PQ &other) const;
};
} // namespace

27
src/blackmisc/setnetwork.cpp
View File

@@ -34,6 +34,33 @@ namespace BlackMisc
return s;
}
/*
* metaTypeId
*/
int CSettingsNetwork::getMetaTypeId() const
{
return qMetaTypeId<CSettingsNetwork>();
}
/*
* is a
*/
bool CSettingsNetwork::isA(int metaTypeId) const
{
if (metaTypeId == qMetaTypeId<CSettingsNetwork>()) { return true; }
return this->CValueObject::isA(metaTypeId);
}
/*
* Compare
*/
int CSettingsNetwork::compareImpl(const CValueObject &/*otherBase*/) const
{
qFatal("not implemented");
return 0;
}
/*
* Marshall to DBus
*/

15
src/blackmisc/setnetwork.h
View File

@@ -132,6 +132,21 @@ namespace BlackMisc
*/
virtual QString convertToQString(bool i18n = false) const;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
/*!
* \brief Stream to DBus <<
* \param argument

30
src/blackmisc/statusmessage.cpp
View File

@@ -33,6 +33,36 @@ namespace BlackMisc
return s;
}
/*
* metaTypeId
*/
int CStatusMessage::getMetaTypeId() const
{
return qMetaTypeId<CStatusMessage>();
}
/*
* is a
*/
bool CStatusMessage::isA(int metaTypeId) const
{
if (metaTypeId == qMetaTypeId<CStatusMessage>()) { return true; }
return this->CValueObject::isA(metaTypeId);
}
/*
* Compare
*/
int CStatusMessage::compareImpl(const CValueObject &otherBase) const
{
const auto &other = static_cast<const CStatusMessage &>(otherBase);
if (this->m_type < other.m_type) { return -1; }
if (this->m_type > other.m_type) { return 1; }
return this->m_message.compare(other.m_message);
}
/*
* Metadata
*/

15
src/blackmisc/statusmessage.h
View File

@@ -147,6 +147,21 @@ namespace BlackMisc
* \return
*/
virtual QString convertToQString(bool i18n = false) const;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
};
}

27
src/blackmisc/valuemap.cpp
View File

@@ -38,6 +38,33 @@ namespace BlackMisc
return s;
}
/*
* metaTypeId
*/
int CValueMap::getMetaTypeId() const
{
return qMetaTypeId<CValueMap>();
}
/*
* is a
*/
bool CValueMap::isA(int metaTypeId) const
{
if (metaTypeId == qMetaTypeId<CValueMap>()) { return true; }
return this->CValueObject::isA(metaTypeId);
}
/*
* Compare
*/
int CValueMap::compareImpl(const CValueObject &/*otherBase*/) const
{
qFatal("not implemented");
return 0;
}
/*
* Marshall to DBus
*/

15
src/blackmisc/valuemap.h
View File

@@ -131,6 +131,21 @@ namespace BlackMisc
*/
virtual QString convertToQString(bool i18n = false) const;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
/*!
* \brief Stream to DBus <<
* \param argument

18
src/blackmisc/valueobject.cpp
View File

@@ -87,11 +87,21 @@ namespace BlackMisc
/*
* Compare
*/
int CValueObject::compare(const QVariant & /** qv **/) const
int compare(const CValueObject &v1, const CValueObject &v2)
{
// not all classes have to implement this
qFatal("Property by index as string not implemented");
return -1; // avoid compiler warning
if (v1.isA(v2.getMetaTypeId()))
{
return v2.compareImpl(v1) * -1;
}
else if (v2.isA(v1.getMetaTypeId()))
{
return v1.compareImpl(v2);
}
else
{
Q_ASSERT_X(false, Q_FUNC_INFO, "Attempt to compare between instances of unrelated classes");
return 0;
}
}
/*!

42
src/blackmisc/valueobject.h
View File

@@ -141,6 +141,15 @@ namespace BlackMisc
*/
friend bool operator!=(const CValueObject &uc, const CValueMap &valueMap);
/*!
* Compares two instances of related classes
* and returns an integer less than, equal to, or greater than zero
* if v1 is less than, equal to, or greater than v2.
* \return
* \pre The runtime types of the two objects must be the same or related by inheritance.
*/
friend int compare(const CValueObject &v1, const CValueObject &v2);
public:
/*!
* \brief Virtual destructor
@@ -179,15 +188,6 @@ namespace BlackMisc
*/
virtual uint getValueHash() const = 0;
/*!
* Compares with QVariant with this object
* and returns an integer less than, equal to, or greater than zero
* if this is less than, equal to, or greater than QVariant.
* \remarks allows sorting among QVariants, not all classes implement this
* \return
*/
virtual int compare(const QVariant &qv) const;
/*!
* \brief Virtual method to return QVariant, used with DBUS QVariant lists
* \return
@@ -257,6 +257,30 @@ namespace BlackMisc
*/
virtual QString convertToQString(bool i18n = false) const = 0;
/*!
* \brief Returns the Qt meta type ID of this object.
* \return
*/
virtual int getMetaTypeId() const = 0;
/*!
* \brief Returns true if this object is an instance of the class with the given meta type ID,
* or one of its subclasses.
* \param metaTypeId
* \return
*/
virtual bool isA(int metaTypeId) const { Q_UNUSED(metaTypeId); return false; }
/*!
* \brief Compare this value with another value of the same type
* \param other
* \return Less than, equal to, or greater than zero if this is
* less than, equal to, or greather than other.
* \pre Other must have the same runtime type as the this object.
* \remark It is usually safer to use the friend function compare() instead.
*/
virtual int compareImpl(const CValueObject &other) const = 0;
/*!
* \brief Marshall to DBus
* \param argument

34
src/blackmisc/vaudiodevice.cpp
View File

@@ -10,6 +10,7 @@
#include "vaudiodevice.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include <QtNetwork/QHostInfo>
#include <tuple>
namespace BlackMisc
{
@@ -90,6 +91,39 @@ namespace BlackMisc
return s;
}
/*
* metaTypeId
*/
int CAudioDevice::getMetaTypeId() const
{
return qMetaTypeId<CAudioDevice>();
}
/*
* is a
*/
bool CAudioDevice::isA(int metaTypeId) const
{
if (metaTypeId == qMetaTypeId<CAudioDevice>()) { return true; }
return this->CValueObject::isA(metaTypeId);
}
/*
* Compare
*/
int CAudioDevice::compareImpl(const CValueObject &otherBase) const
{
const auto &other = static_cast<const CAudioDevice &>(otherBase);
const auto lhs = std::tie(this->m_type, this->m_deviceIndex, this->m_deviceName, this->m_hostName);
const auto rhs = std::tie(other.m_type, other.m_deviceIndex, other.m_deviceName, other.m_hostName);
if (lhs < rhs) { return -1; }
if (lhs > rhs) { return 1; }
return 0;
}
/*
* Marshall to DBus
*/

15
src/blackmisc/vaudiodevice.h
View File

@@ -126,6 +126,21 @@ namespace BlackMisc
*/
virtual QString convertToQString(bool i18n = false) const;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
/*!
* \brief Stream to DBus <<
* \param argument

35
src/blackmisc/vvoiceroom.cpp
View File

@@ -9,9 +9,9 @@
#include "vvoiceroom.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include <QChar>
#include <QStringList>
#include <tuple>
namespace BlackMisc
{
@@ -85,6 +85,39 @@ namespace BlackMisc
return s;
}
/*
* metaTypeId
*/
int CVoiceRoom::getMetaTypeId() const
{
return qMetaTypeId<CVoiceRoom>();
}
/*
* is a
*/
bool CVoiceRoom::isA(int metaTypeId) const
{
if (metaTypeId == qMetaTypeId<CVoiceRoom>()) { return true; }
return CValueObject::isA(metaTypeId);
}
/*
* Compare
*/
int CVoiceRoom::compareImpl(const CValueObject &otherBase) const
{
const auto &other = static_cast<const CVoiceRoom &>(otherBase);
const auto lhs = std::tie(m_hostname, m_channel, m_connected, m_audioPlaying);
const auto rhs = std::tie(other.m_hostname, other.m_channel, other.m_connected, other.m_audioPlaying);
if (lhs < rhs) { return -1; }
if (lhs > rhs) { return 1; }
return 0;
}
/*
* Marshall to DBus
*/

15
src/blackmisc/vvoiceroom.h
View File

@@ -166,6 +166,21 @@ namespace BlackMisc
*/
virtual QString convertToQString(bool i18n = false) const;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
/*!
* \brief Stream to DBus <<
* \param argument

4
tests/blackmisc/testvariantandmap.cpp
View File

@@ -46,6 +46,10 @@ namespace BlackMiscTest
QVERIFY2(station1 == station1qv, "Station should be equal (QVariant)");
QVERIFY2(station2 == station1qv, "Station should be equal (QVariant)");
QVERIFY2(station3 != station1qv, "Station should be equal (QVariant)");
QVERIFY2(compare(station1, station1) == 0, "Station should be equal");
QVERIFY2(compare(station1, station2) == 0, "Station should be equal");
QVERIFY2(compare(station1, station3) != 0, "Station should not be equal");
}
/*