Changeset 6537 in ntrip for trunk/BNC

Timestamp:

Jan 2, 2015, 3:40:09 PM (9 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bncmap_svg.cpp (modified) (1 diff)
• bncutils.cpp (modified) (1 diff)
• ephemeris.cpp (modified) (2 diffs)
• pppRun.cpp (modified) (1 diff)
• rinex/availplot.cpp (modified) (1 diff)
• rinex/dopplot.cpp (modified) (2 diffs)
• rinex/eleplot.cpp (modified) (1 diff)
• rinex/reqcedit.cpp (modified) (1 diff)

trunk/BNC/src/bncmap_svg.cpp

@@ -141 +141 @@
   QwtText text(name.left(4));
   QFont   font = text.font();
-  font.setPointSize(font.pointSize()*0.8);
+  font.setPointSize(int(font.pointSize()*0.8));
   text.setFont(font);
   marker->setLabel(text);

trunk/BNC/src/bncutils.cpp

@@ -589 +589 @@
 ////////////////////////////////////////////////////////////////////////////
 QString fortranFormat(double value, int width, int prec) {
-  int    expo = value == 0.0 ? 0 : log10(fabs(value));
+  int    expo = value == 0.0 ? 0 : int(log10(fabs(value)));
   double mant = value == 0.0 ? 0 : value / pow(10, expo);
   if (fabs(mant) >= 1.0) {

trunk/BNC/src/ephemeris.cpp

@@ -1453 +1453 @@
 
   TOEw += 1356;  // BDT -> GPS week number
-  _TOE_bdt.set(TOEw, TOEs);
+  _TOE_bdt.set(int(TOEw), TOEs);
 
   // GPS->BDT
@@ -1648 +1648 @@
   out << QString(fmt)
     .arg(_TOE_bdt.gpssec(), 19, 'e', 12)
-    .arg(double(_AODC),     19, QChar(' '));
+    .arg(double(_AODC),     19, 'e', 12);
 
   return rnxStr;

trunk/BNC/src/pppRun.cpp

@@ -375 +375 @@
     if (_speed < 100) {
       double sleepTime = 2.0 / _speed;
-      t_pppThread::msleep(sleepTime*1.e3);
+      t_pppThread::msleep(int(sleepTime*1.e3));
     }
 

trunk/BNC/src/rinex/availplot.cpp

@@ -63 +63 @@
  public:
   t_scaleDrawPrn() {}
-  virtual QwtText label(double iPrn) const {
+  virtual QwtText label(int iPrn) const {
     return _yLabels[iPrn];
   }

trunk/BNC/src/rinex/dopplot.cpp

@@ -77 +77 @@
   QwtText textPDOP("PDOP");
   QFont   fontPDOP = textPDOP.font();
-  fontPDOP.setPointSize(fontPDOP.pointSize()*0.8);
+  fontPDOP.setPointSize(int(fontPDOP.pointSize()*0.8));
   textPDOP.setFont(fontPDOP);
   textPDOP.setColor(Qt::red);
@@ -85 +85 @@
   QwtText textNumSat("# Sat");
   QFont   fontNumSat = textNumSat.font();
-  fontNumSat.setPointSize(fontNumSat.pointSize()*0.8);
+  fontNumSat.setPointSize(int(fontNumSat.pointSize()*0.8));
   textNumSat.setFont(fontNumSat);
   textNumSat.setColor(Qt::blue);

trunk/BNC/src/rinex/eleplot.cpp

@@ -96 +96 @@
         const QVector<double>& xData = plotData._mjdX24;
         const QVector<double>& yData = plotData._eleDeg;
-        QColor color = QColor::fromHsv((iC-1)*(359.0/numCurves), 255, 255);
+        QColor color = QColor::fromHsv(int((iC-1)*(359.0/numCurves)), 255, 255);
         QwtSymbol symbol(QwtSymbol::Rect, QBrush(color), QPen(color), QSize(1,1));
         addCurve(prn, symbol, xData, yData);

trunk/BNC/src/rinex/reqcedit.cpp

@@ -254 +254 @@
     }
     if (ii == 0) {
-      outObsFile.setHeader(obsFile->header(), _rnxVersion, &useObsTypes);
+      outObsFile.setHeader(obsFile->header(), int(_rnxVersion), &useObsTypes);
       if (_begTime.valid() && _begTime > outObsFile.startTime()) {
         outObsFile.setStartTime(_begTime);