Changeset 2177 in ntrip

Timestamp:

Jan 4, 2010, 12:50:27 PM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncfigureppp.cpp (modified) (8 diffs)
• bncfigureppp.h (modified) (4 diffs)
• bnctime.h (modified) (2 diffs)
• bncwindow.cpp (modified) (1 diff)

trunk/BNC/bncfigureppp.cpp

@@ -50 +50 @@
 ////////////////////////////////////////////////////////////////////////////
 bncFigurePPP::bncFigurePPP(QWidget *parent) : QWidget(parent) {
+  reset();
+}
+
+
+// Destructor
+////////////////////////////////////////////////////////////////////////////
+bncFigurePPP::~bncFigurePPP() { 
+  for (int ii = 0; ii < _pos.size(); ++ii) {
+    delete _pos[ii];
+  }
+}
+
+// 
+////////////////////////////////////////////////////////////////////////////
+void bncFigurePPP::reset() {
+  QMutexLocker locker(&_mutex);
 
   bncSettings settings;
@@ -57 +73 @@
   _xyzRef[2] = settings.value("pppRefCrdZ").toDouble();
 
-}
-
-// Destructor
-////////////////////////////////////////////////////////////////////////////
-bncFigurePPP::~bncFigurePPP() { 
   for (int ii = 0; ii < _pos.size(); ++ii) {
     delete _pos[ii];
   }
+  _pos.clear();
+
+  update();
 }
 
@@ -82 +96 @@
   _pos.push_back(newPos);
 
+  if (_pos.size() == 1) {
+    _startTime = time;
+  }
+
   if (_pos.size() > MAXNUMPOS) {
     delete _pos[0];
@@ -114 +132 @@
   _height = painter.viewport().height();
 
-  QFont font;
-  font.setPointSize(int(font.QFont::pointSize()*0.8));
+  QFont font = this->font();
+  font.setPointSize(int(this->font().pointSize()*0.9));
   painter.setFont(font);
 
@@ -121 +139 @@
   // -----------------------------------------------------
   if (_pos.size() > 1) {
-//  _tRange = _pos[_pos.size()-1]->time - _pos[0]->time;
     _tRange = MAXNUMPOS;
     _tMin   = _pos[0]->time.gpssec();
@@ -168 +185 @@
       // neu-tics
       // --------
+
       double tic = floor(20.0 * (_neuMax - 0.05)) / 20.0;
       QString strP = QString("%1 m").arg( tic,0,'f',2);
@@ -180 +198 @@
 
       painter.setPen(QColor(Qt::red));
-      painter.drawText(0,int( ww * 1.0),int(pntP.x() + ww * 3.00),
-                                        int(pntP.x()),Qt::AlignRight,"N");
-      painter.setPen(QColor(0,210,0,127));
-      painter.drawText(0,int( ww * 1.0),int(pntP.x() + ww * 4.00),
-                                        int(pntP.x()),Qt::AlignRight,"E");
+      painter.drawText(0, ww, pntP.x() + 3*ww, pntP.x(), Qt::AlignRight, "N");
+      painter.setPen(QColor(Qt::green));
+      painter.drawText(0, ww, pntP.x() + 4*ww, pntP.x(), Qt::AlignRight, "E");
       painter.setPen(QColor(Qt::blue));
-      painter.drawText(0,int( ww * 1.0),int(pntP.x() + ww * 5.00),
-                                        int(pntP.x()),Qt::AlignRight,"U");
+      painter.drawText(0, ww, pntP.x() + 5*ww, pntP.x(), Qt::AlignRight, "U");
+
       painter.setPen(QColor(Qt::black));
-
-      painter.drawText(0,int(pntP.y() - ww * 0.5),int(pntP.x() - ww * 0.25),
-                                                  int(pntP.x()),Qt::AlignRight,strP);
-      painter.drawText(0,int(pntM.y() - ww * 0.5),int(pntM.x() - ww * 0.25),
-                                                  int(pntM.y()),Qt::AlignRight,strM);
-      painter.drawText(0,int(pntZ.y() - ww * 0.5),int(pntZ.x() - ww * 0.25),
-                                                  int(pntZ.y()),Qt::AlignRight,strZ);
+      painter.drawText(0, pntP.y()-ww/2, pntP.x()- ww/4, pntP.x(),
+                       Qt::AlignRight, strP);
+      painter.drawText(0, pntM.y()-ww/2, pntM.x()- ww/4, pntM.x(),
+                       Qt::AlignRight, strM);
+      painter.drawText(0, pntZ.y()-ww/2, pntZ.x()- ww/4, pntZ.x(),
+                       Qt::AlignRight, strZ);
 
       painter.drawLine(pntP.x(), pntP.y(), pntP.x()+ww, pntP.y());
       painter.drawLine(pntM.x(), pntM.y(), pntM.x()+ww, pntM.y());
+
+      // Start Time
+      // ----------
+      unsigned hour, minute;
+      double   second;
+      _startTime.civil_time(hour, minute, second);
+      QString startStr = QString("Start %1:%2:%3")
+                              .arg(hour,   2, 10, QChar('0'))
+                              .arg(minute, 2, 10, QChar('0'))
+                              .arg(int(second), 2, 10, QChar('0'));
+      painter.setPen(QColor(Qt::black));
+      painter.drawText(0, ww, pntP.x() + 14*ww, pntP.x(),
+                       Qt::AlignRight, startStr);
 
       // neu components
@@ -206 +234 @@
         double t2 = _tMin + (_pos[ii]->time   - _pos[0]->time);
   
-        // start time
-        // ----------
-        if (ii == 1) {
-          _daySec = int(fmod(t1,86400.));
-          _hours = int(_daySec / 3600);
-          _minutes = int((_daySec - _hours * 3600)/ 60.);
-          _seconds = int(fmod(t1,60.));
-          _strTic = QString("Start %1:%2:%3").arg(_hours,   2, 10, QChar('0'))
-                                                     .arg(_minutes, 2, 10, QChar('0'))
-                                                     .arg(_seconds, 2, 10, QChar('0'));
-          painter.setPen(QColor(Qt::black));
-          painter.drawText(0,int( ww * 1.0),int(pntP.x() + ww * 13.50),
-                                            int(pntP.x()),Qt::AlignRight,_strTic);
-        }
 
         // time-tics
         // ---------
-        if (fmod(t1,60.) == 0) {
+        if ( fmod(_pos[ii-1]->time.daysec(), 60.0) == 0 ) {
+          _pos[ii-1]->time.civil_time(hour, minute, second);
           QPoint pntTic = pltPoint(t1, 0.0);
-          _daySec = int(fmod(t1,86400.));
-          _hours = int(_daySec / 3600);
-          _minutes = int((_daySec - _hours * 3600)/ 60.);
-          _strTic = QString("%1:%2").arg(_hours,   2, 10, QChar('0'))
-                                    .arg(_minutes, 2, 10, QChar('0'));
+          QString strTic = QString("%1:%2").arg(hour,   2, 10, QChar('0'))
+                                           .arg(minute, 2, 10, QChar('0'));
           painter.setPen(QColor(Qt::black));
           double xFirstCharTic = pntTic.x() - ww * 1.2;
           if ( xFirstCharTic > pntZ.x()) {
-            painter.drawText(int(xFirstCharTic),int(pntTic.y() + ww * 1.7),_strTic);
-            painter.drawLine(int(pntTic.x()),int(pntTic.y()),
-                             int(pntTic.x()),int(pntTic.y() + ww * 0.5));
+            painter.drawText(int(xFirstCharTic), int(pntTic.y() + ww * 1.7), 
+                             strTic);
+            painter.drawLine(pntTic.x(), pntTic.y(), 
+                             pntTic.x(), pntTic.y()+ww/2);
           }
         }

trunk/BNC/bncfigureppp.h

@@ -34 +34 @@
   bncFigurePPP(QWidget *parent);
   ~bncFigurePPP();
+  void reset();
 
  public slots:
@@ -42 +43 @@
 
  private:
+  const static int MAXNUMPOS = 300;
+
   class pppPos {
    public:
@@ -52 +55 @@
   QMutex           _mutex;
   QVector<pppPos*> _pos;
+  bncTime          _startTime;
   double           _neuMax;
   double           _tRange;
@@ -58 +62 @@
   int              _height;
   double           _xyzRef[3];
-  int              _daySec;
-  int              _hours;
-  int              _minutes;
-  int              _seconds;
-  QString          _strTic;
-  const static int MAXNUMPOS = 300;
 };
 

trunk/BNC/bnctime.h

@@ -16 +16 @@
   unsigned int gpsw()   const;
   double       gpssec() const;
+  void         civil_time (unsigned int& hour, unsigned int& min,
+                           double& sec) const;
 
   bool   operator!=(const bncTime &time1) const;
@@ -27 +29 @@
   bncTime&     setmjd(double daysec, int mjd);
   void        reset() {_mjd = 0; _sec = 0;}
-  void        civil_time (unsigned int& hour, unsigned int& min,   double& sec) const;
   static void jdgp(double tjul, double & second, long & nweek);
 

trunk/BNC/bncwindow.cpp

@@ -1064 +1064 @@
   slotSaveOptions();
 
+  _bncFigurePPP->reset();
+
   _actDeleteMountPoints->setEnabled(false);
   _actGetData->setEnabled(false);