Changeset 1932 in ntrip

Timestamp:

Nov 12, 2009, 7:42:21 AM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bnc.pro (modified) (2 diffs)
• bncfigure.cpp (added)
• bncfigure.h (added)
• bncwindow.cpp (modified) (4 diffs)
• bncwindow.h (modified) (4 diffs)

trunk/BNC/bnc.pro

@@ -37 +37 @@
           bncipport.h bncnetqueryv0.h bncnetqueryudp.h                \ 
           bncnetqueryudp0.h bncudpport.h                              \ 
-          bncserialport.h bncnetquerys.h                              \ 
+          bncserialport.h bncnetquerys.h bncfigure.h                  \ 
           RTCM/GPSDecoder.h RTCM/RTCM2.h RTCM/RTCM2Decoder.h          \
           RTCM/RTCM2_2021.h RTCM/rtcm_utils.h                         \
@@ -59 +59 @@
           bncipport.cpp bncnetqueryv0.cpp bncnetqueryudp.cpp          \
           bncnetqueryudp0.cpp bncudpport.cpp                          \
-          bncserialport.cpp bncnetquerys.cpp                          \
+          bncserialport.cpp bncnetquerys.cpp bncfigure.cpp            \
           RTCM/RTCM2.cpp RTCM/RTCM2Decoder.cpp                        \
           RTCM/RTCM2_2021.cpp RTCM/rtcm_utils.cpp                     \

trunk/BNC/bncwindow.cpp

@@ -53 +53 @@
 #include "bnctableitem.h"
 #include "bncsettings.h"
+#include "bncfigure.h"
 
 using namespace std;
@@ -58 +59 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-FWidget::FWidget(QWidget *parent) : QWidget(parent) {
-  bncSettings settings;
-  QListIterator<QString> it(settings.value("mountPoints").toStringList());
-  while (it.hasNext()) {
-    QStringList hlp   = it.next().split(" ");
-    QUrl        url(hlp[0]);
-    QByteArray  staID = url.path().mid(1).toAscii();
-    _bytes[staID] = new sumAndMean();
-  }
-  _counter = 0;
-  slotNextAnimationFrame();
-}
-
-// Destructor
-////////////////////////////////////////////////////////////////////////////
-FWidget::~FWidget() { 
-}
-
-// 
-////////////////////////////////////////////////////////////////////////////
-void FWidget::slotNewData(const QByteArray staID, double nbyte) {
-  QMutexLocker locker(&_mutex);
-  QMap<QByteArray, sumAndMean*>::const_iterator it = _bytes.find(staID);
-  if (it != _bytes.end()) {
-    it.value()->_sum += nbyte;
-  }
-}
-
-// 
-////////////////////////////////////////////////////////////////////////////
-void FWidget::slotNextAnimationFrame() {
-  QMutexLocker locker(&_mutex);
-  if (++_counter == 10) {
-    QMapIterator<QByteArray, sumAndMean*> it(_bytes);
-    while (it.hasNext()) {
-      it.next();
-      it.value()->_mean = it.value()->_sum / _counter;
-      it.value()->_sum  = 0.0;
-    }
-    _counter = 0;
-  }
-  update();
-  QTimer::singleShot(1000, this, SLOT(slotNextAnimationFrame()));
-}
-
-// 
-////////////////////////////////////////////////////////////////////////////
-void FWidget::paintEvent(QPaintEvent *) {
-  QRectF rectangle(0, 0, 640, 180);
-  QBrush rBrush(Qt::white,Qt::SolidPattern);
-  QPainter painter(this);
-  painter.fillRect(rectangle,rBrush);
-  painter.drawRect(rectangle);
-  QLine line(50, 140, 630, 140);
-  painter.drawLine(line);
-  line.setLine(50, 140, 50, 10);
-  painter.drawLine(line);
-  QPoint textP(40, 140);
-  painter.drawText(textP, tr("0"));
-  textP.setX(20);
-  textP.setY(25);
-  painter.drawText(textP, tr("3000"));
-  int anker=0;
-  textP.setY(160);
-  painter.drawText(textP, tr(QTime::currentTime().toString().toAscii()));
-  textP.setX(300);
-
-  QMapIterator<QByteArray, sumAndMean*> it(_bytes);
-  while (it.hasNext()) {
-    it.next();
-    QByteArray staID = it.key();
-    double     vv    = it.value()->_mean;
-    QRectF vrect((100+anker*40), (140-vv), (30), (vv));
-    QBrush xBrush(Qt::green,Qt::SolidPattern);
-    textP.setX(100+anker*40);
-    painter.fillRect(vrect,xBrush);
-    painter.drawRect(vrect);
-    painter.drawText(textP, staID);
-    anker++;
-  }
-}
-
-// Constructor
-////////////////////////////////////////////////////////////////////////////
 bncWindow::bncWindow() {
 
   _caster = 0;
 
-  _Figure1 = new FWidget(this);
+  _bncFigure = new bncFigure(this);
 
   int ww = QFontMetrics(this->font()).width('w');
@@ -491 +408 @@
   // ----------
   QGridLayout* log2Layout = new QGridLayout;
-  log2Layout->addWidget(_Figure1,            0,0);
+  log2Layout->addWidget(_bncFigure,            0,0);
   log2group->setLayout(log2Layout);
 
@@ -1323 +1240 @@
         ((bncTableItem*) _mountPointsTable->item(iRow, 7))->setGetThread(thread);
         connect(thread, SIGNAL(newBytes(QByteArray, double)),
-                _Figure1, SLOT(slotNewData(QByteArray, double)));
+                _bncFigure, SLOT(slotNewData(QByteArray, double)));
 
         break;

trunk/BNC/bncwindow.h

@@ -32 +32 @@
 #include "bnccaster.h"
 
-class FWidget : public QWidget {
-  Q_OBJECT
- public:
-  FWidget(QWidget *parent);
-  ~FWidget();
- public slots:
-  void slotNewData(const QByteArray staID, double nbyte);
- protected:
-  void paintEvent(QPaintEvent *event);
- private slots:
-  void slotNextAnimationFrame();
- private:
-  class sumAndMean {
-   public:
-    sumAndMean() {_mean = 0.0; _sum = 0.0;}
-    ~sumAndMean() {}
-    double _mean;
-    double _sum;
-  };
-  QMap<QByteArray, sumAndMean*> _bytes;
-  QMutex                        _mutex;
-  int                           _counter;
-};
-
 class bncAboutDlg : public QDialog {
   Q_OBJECT
@@ -63 +39 @@
 };
 
-  class bncFlowchartDlg : public QDialog {
+class bncFlowchartDlg : public QDialog {
   Q_OBJECT
 
@@ -71 +47 @@
 };
 
-  class bncWindow : public QMainWindow {
+class bncFigure;
+
+class bncWindow : public QMainWindow {
   Q_OBJECT
 
@@ -177 +155 @@
 
     QTabWidget* _loggroup;
-    FWidget*    _Figure1;
+    bncFigure*  _bncFigure;
 
     bncCaster* _caster;