Index: unk/GnssCenter/monitor/map_stations.cpp =================================================================== --- /trunk/GnssCenter/monitor/map_stations.cpp (revision 5442) +++ (revision ) @@ -1,158 +1,0 @@ - -/* ------------------------------------------------------------------------- - * RTNet GUI - * ------------------------------------------------------------------------- - * - * Class: t_map_stations - * - * Purpose: Plot map of stations/satellites - * - * Author: L. Mervart - * - * Created: 05-Jan-2013 - * - * Changes: - * - * -----------------------------------------------------------------------*/ - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "map_stations.h" -#include "utils.h" -#include "worldplot.h" -#include "thriftclient.h" - -using namespace std; -using namespace GnssCenter; - -Q_EXPORT_PLUGIN2(gnsscenter_map_stations, GnssCenter::t_map_stationsFactory) - -// Constructor -///////////////////////////////////////////////////////////////////////////// -t_map_stations::t_map_stations() : QMainWindow() { - - // World Plot - // ---------- - _plot = new t_worldPlot(); - setCentralWidget(_plot); - - // Tool Bar - // -------- - QToolBar* toolBar = new QToolBar("t_map_stations_ToolBar"); - addToolBar(Qt::BottomToolBarArea, toolBar); - - QAction* actStartThrift = new QAction("Start Thrift", 0); - toolBar->addAction(actStartThrift); - connect(actStartThrift, SIGNAL(triggered()), this, SLOT(slotStartThrift())); - - QAction* actStopThrift = new QAction("Stop Thrift", 0); - toolBar->addAction(actStopThrift); - connect(actStopThrift, SIGNAL(triggered()), this, SLOT(slotStopThrift())); - - // Thrift Client; - // -------------- - _thriftClient = 0; - _results = 0; -} - -// Destructor -///////////////////////////////////////////////////////////////////////////// -t_map_stations::~t_map_stations() { - slotStopThrift(); - if (_results) { - while (!_results->empty()) { - delete _results->back(); - _results->pop_back(); - } - delete _results; - } -} - -// -///////////////////////////////////////////////////////////////////////////// -void t_map_stations::slotStartThrift() { - if (!_thriftClient) { - _thriftClient = new t_thriftClient(this); - connect(_thriftClient, SIGNAL(finished()), this, SLOT(slotThriftFinished())); - _thriftClient->start(); - slotPlotResults(); - } -} - -// -///////////////////////////////////////////////////////////////////////////// -void t_map_stations::slotStopThrift() { - if (_thriftClient) { - _thriftClient->stop(); - _thriftClient = 0; - } -} - -// -///////////////////////////////////////////////////////////////////////////// -void t_map_stations::slotThriftFinished() { - sender()->deleteLater(); - _thriftClient = 0; -} - -// -///////////////////////////////////////////////////////////////////////////// -void t_map_stations::putThriftResults(std::vector* results) { - QMutexLocker locker(&_mutex); - if (_results) { - while (!_results->empty()) { - delete _results->back(); - _results->pop_back(); - } - delete _results; - } - _results = results; -} - -// -///////////////////////////////////////////////////////////////////////////// -void t_map_stations::slotPlotResults() { - QMutexLocker locker(&_mutex); - - if (_results) { - QList points; - for (unsigned ii = 0; ii < _results->size(); ii++) { - const t_thriftResult* result = _results->at(ii); - - double xyz[3]; - xyz[0] = result->_x; - xyz[1] = result->_y; - xyz[2] = result->_z; - - double ell[3]; - - if (xyz2ell(xyz, ell) == success) { - double latDeg = ell[0] * 180.0 / M_PI; - double lonDeg = ell[1] * 180.0 / M_PI; - QString str = QString().sprintf("%d/%d", result->_nGPS, result->_nGLO); - t_worldPlot::t_point* point = new t_worldPlot::t_point(str, latDeg, lonDeg); - points.append(point); - } - } - _plot->slotNewPoints(points); - - QListIterator it(points); - while (it.hasNext()) { - delete it.next(); - } - } - - if (_thriftClient) { - QTimer::singleShot(1000, this, SLOT(slotPlotResults())); - } -} Index: unk/GnssCenter/monitor/map_stations.h =================================================================== --- /trunk/GnssCenter/monitor/map_stations.h (revision 5442) +++ (revision ) @@ -1,48 +1,0 @@ -#ifndef GnssCenter_MAP_STATIONS_H -#define GnssCenter_MAP_STATIONS_H - -#include -#include -#include "plugininterface.h" - -namespace GnssCenter { -class t_worldPlot; -} - -class t_thriftClient; -class t_thriftResult; - -namespace GnssCenter { - -class t_map_stations : public QMainWindow { - Q_OBJECT - public: - t_map_stations(); - ~t_map_stations(); - - void putThriftResults(std::vector* results); - - private slots: - void slotStartThrift(); - void slotStopThrift(); - void slotThriftFinished(); - void slotPlotResults(); - - private: - QMutex _mutex; - t_worldPlot* _plot; - t_thriftClient* _thriftClient; - std::vector* _results; -}; - -class t_map_stationsFactory : public QObject, public t_pluginFactoryInterface { - Q_OBJECT - Q_INTERFACES(GnssCenter::t_pluginFactoryInterface) - public: - virtual QWidget* create() {return new t_map_stations();} - virtual QString getName() const {return QString("Map of Stations");} -}; - -} // namespace GnssCenter - -#endif Index: unk/GnssCenter/monitor/map_stations.pro =================================================================== --- /trunk/GnssCenter/monitor/map_stations.pro (revision 5442) +++ (revision ) @@ -1,42 +1,0 @@ - -TEMPLATE = lib -CONFIG += plugin debug -TARGET = $$qtLibraryTarget(gnsscenter_map_stations) -QT += svg -INCLUDEPATH += ../qwt ../main -DESTDIR = ../plugins -LIBS = -L../qwt -lqwt - -INCLUDEPATH += /usr/local/include/thrift -DEFINES += HAVE_INTTYPES_H HAVE_NETINET_IN_H - -debug:OBJECTS_DIR = .obj/debug -debug:MOC_DIR = .moc/debug -release:OBJECTS_DIR = .obj/release -release:MOC_DIR = .moc/release - -thrift.target = gen-cpp -thrift.commands = "thrift -r -gen cpp rtnet.thrift" -thrift.depends = rtnet.thrift rtnet_data.thrift - -QMAKE_EXTRA_TARGETS += thrift -PRE_TARGETDEPS += gen-cpp -LIBS += -lthrift - -HEADERS = map_stations.h \ - utils.h \ - const.h \ - worldplot.h \ - thriftclient.h - -SOURCES = map_stations.cpp \ - utils.cpp \ - const.cpp \ - worldplot.cpp \ - thriftclient.cpp \ - gen-cpp/RtnetData.cpp \ - gen-cpp/rtnet_constants.cpp gen-cpp/rtnet_types.cpp \ - gen-cpp/rtnet_data_constants.cpp gen-cpp/rtnet_data_types.cpp - - -RESOURCES = map_stations.qrc Index: unk/GnssCenter/monitor/map_stations.qrc =================================================================== --- /trunk/GnssCenter/monitor/map_stations.qrc (revision 5442) +++ (revision ) @@ -1,5 +1,0 @@ - - - world.svg - - Index: /trunk/GnssCenter/monitor/monitor.cpp =================================================================== --- /trunk/GnssCenter/monitor/monitor.cpp (revision 5443) +++ /trunk/GnssCenter/monitor/monitor.cpp (revision 5443) @@ -0,0 +1,158 @@ + +/* ------------------------------------------------------------------------- + * RTNet GUI + * ------------------------------------------------------------------------- + * + * Class: t_map_stations + * + * Purpose: Plot map of stations/satellites + * + * Author: L. Mervart + * + * Created: 05-Jan-2013 + * + * Changes: + * + * -----------------------------------------------------------------------*/ + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "map_stations.h" +#include "utils.h" +#include "worldplot.h" +#include "thriftclient.h" + +using namespace std; +using namespace GnssCenter; + +Q_EXPORT_PLUGIN2(gnsscenter_map_stations, GnssCenter::t_map_stationsFactory) + +// Constructor +///////////////////////////////////////////////////////////////////////////// +t_map_stations::t_map_stations() : QMainWindow() { + + // World Plot + // ---------- + _plot = new t_worldPlot(); + setCentralWidget(_plot); + + // Tool Bar + // -------- + QToolBar* toolBar = new QToolBar("t_map_stations_ToolBar"); + addToolBar(Qt::BottomToolBarArea, toolBar); + + QAction* actStartThrift = new QAction("Start Thrift", 0); + toolBar->addAction(actStartThrift); + connect(actStartThrift, SIGNAL(triggered()), this, SLOT(slotStartThrift())); + + QAction* actStopThrift = new QAction("Stop Thrift", 0); + toolBar->addAction(actStopThrift); + connect(actStopThrift, SIGNAL(triggered()), this, SLOT(slotStopThrift())); + + // Thrift Client; + // -------------- + _thriftClient = 0; + _results = 0; +} + +// Destructor +///////////////////////////////////////////////////////////////////////////// +t_map_stations::~t_map_stations() { + slotStopThrift(); + if (_results) { + while (!_results->empty()) { + delete _results->back(); + _results->pop_back(); + } + delete _results; + } +} + +// +///////////////////////////////////////////////////////////////////////////// +void t_map_stations::slotStartThrift() { + if (!_thriftClient) { + _thriftClient = new t_thriftClient(this); + connect(_thriftClient, SIGNAL(finished()), this, SLOT(slotThriftFinished())); + _thriftClient->start(); + slotPlotResults(); + } +} + +// +///////////////////////////////////////////////////////////////////////////// +void t_map_stations::slotStopThrift() { + if (_thriftClient) { + _thriftClient->stop(); + _thriftClient = 0; + } +} + +// +///////////////////////////////////////////////////////////////////////////// +void t_map_stations::slotThriftFinished() { + sender()->deleteLater(); + _thriftClient = 0; +} + +// +///////////////////////////////////////////////////////////////////////////// +void t_map_stations::putThriftResults(std::vector* results) { + QMutexLocker locker(&_mutex); + if (_results) { + while (!_results->empty()) { + delete _results->back(); + _results->pop_back(); + } + delete _results; + } + _results = results; +} + +// +///////////////////////////////////////////////////////////////////////////// +void t_map_stations::slotPlotResults() { + QMutexLocker locker(&_mutex); + + if (_results) { + QList points; + for (unsigned ii = 0; ii < _results->size(); ii++) { + const t_thriftResult* result = _results->at(ii); + + double xyz[3]; + xyz[0] = result->_x; + xyz[1] = result->_y; + xyz[2] = result->_z; + + double ell[3]; + + if (xyz2ell(xyz, ell) == success) { + double latDeg = ell[0] * 180.0 / M_PI; + double lonDeg = ell[1] * 180.0 / M_PI; + QString str = QString().sprintf("%d/%d", result->_nGPS, result->_nGLO); + t_worldPlot::t_point* point = new t_worldPlot::t_point(str, latDeg, lonDeg); + points.append(point); + } + } + _plot->slotNewPoints(points); + + QListIterator it(points); + while (it.hasNext()) { + delete it.next(); + } + } + + if (_thriftClient) { + QTimer::singleShot(1000, this, SLOT(slotPlotResults())); + } +} Index: /trunk/GnssCenter/monitor/monitor.h =================================================================== --- /trunk/GnssCenter/monitor/monitor.h (revision 5443) +++ /trunk/GnssCenter/monitor/monitor.h (revision 5443) @@ -0,0 +1,48 @@ +#ifndef GnssCenter_MAP_STATIONS_H +#define GnssCenter_MAP_STATIONS_H + +#include +#include +#include "plugininterface.h" + +namespace GnssCenter { +class t_worldPlot; +} + +class t_thriftClient; +class t_thriftResult; + +namespace GnssCenter { + +class t_map_stations : public QMainWindow { + Q_OBJECT + public: + t_map_stations(); + ~t_map_stations(); + + void putThriftResults(std::vector* results); + + private slots: + void slotStartThrift(); + void slotStopThrift(); + void slotThriftFinished(); + void slotPlotResults(); + + private: + QMutex _mutex; + t_worldPlot* _plot; + t_thriftClient* _thriftClient; + std::vector* _results; +}; + +class t_map_stationsFactory : public QObject, public t_pluginFactoryInterface { + Q_OBJECT + Q_INTERFACES(GnssCenter::t_pluginFactoryInterface) + public: + virtual QWidget* create() {return new t_map_stations();} + virtual QString getName() const {return QString("Map of Stations");} +}; + +} // namespace GnssCenter + +#endif Index: /trunk/GnssCenter/monitor/monitor.pro =================================================================== --- /trunk/GnssCenter/monitor/monitor.pro (revision 5443) +++ /trunk/GnssCenter/monitor/monitor.pro (revision 5443) @@ -0,0 +1,42 @@ + +TEMPLATE = lib +CONFIG += plugin debug +TARGET = $$qtLibraryTarget(gnsscenter_map_stations) +QT += svg +INCLUDEPATH += ../qwt ../main +DESTDIR = ../plugins +LIBS = -L../qwt -lqwt + +INCLUDEPATH += /usr/local/include/thrift +DEFINES += HAVE_INTTYPES_H HAVE_NETINET_IN_H + +debug:OBJECTS_DIR = .obj/debug +debug:MOC_DIR = .moc/debug +release:OBJECTS_DIR = .obj/release +release:MOC_DIR = .moc/release + +thrift.target = gen-cpp +thrift.commands = "thrift -r -gen cpp rtnet.thrift" +thrift.depends = rtnet.thrift rtnet_data.thrift + +QMAKE_EXTRA_TARGETS += thrift +PRE_TARGETDEPS += gen-cpp +LIBS += -lthrift + +HEADERS = map_stations.h \ + utils.h \ + const.h \ + worldplot.h \ + thriftclient.h + +SOURCES = map_stations.cpp \ + utils.cpp \ + const.cpp \ + worldplot.cpp \ + thriftclient.cpp \ + gen-cpp/RtnetData.cpp \ + gen-cpp/rtnet_constants.cpp gen-cpp/rtnet_types.cpp \ + gen-cpp/rtnet_data_constants.cpp gen-cpp/rtnet_data_types.cpp + + +RESOURCES = map_stations.qrc Index: /trunk/GnssCenter/monitor/monitor.qrc =================================================================== --- /trunk/GnssCenter/monitor/monitor.qrc (revision 5443) +++ /trunk/GnssCenter/monitor/monitor.qrc (revision 5443) @@ -0,0 +1,5 @@ + + + world.svg + +