Changeset 6607 in ntrip for trunk

Timestamp:

Feb 20, 2015, 2:58:01 PM (10 years ago)

Author:

stuerze

Message:

some gui preparation for sinex_tro file output

Location:

trunk/BNC/src

Files:

• bncoutf.cpp (modified) (1 diff)
• bncwindow.cpp (modified) (1 diff)
• pppWidgets.cpp (modified) (2 diffs)
• pppWidgets.h (modified) (1 diff)

trunk/BNC/src/bncoutf.cpp

@@ -108 +108 @@
     dayOfWeek = 0;
   }
+  int dayOfYear = datTim.date().dayOfYear();
+
+  QString yyyy     = QString::number(datTim.date().year());
+  QString doy      = QString("%1%2").arg(dayOfYear,3,10, QLatin1Char('0')).arg(0);
   QString gpswd    = QString("%1%2").arg(GPSweek).arg(dayOfWeek);
   QString epoStr   = epochStr(datTim, _intr);
   QString baseName = _sklBaseName; 
   baseName.replace("${GPSWD}", gpswd);
-  baseName.replace("${DATE}",  datTim.date().toString(Qt::ISODate));
-
+  baseName.replace("${DATE}" , datTim.date().toString(Qt::ISODate));
+  baseName.replace("${DOY}"  , doy);
+  _extension.replace("${YY}" , yyyy.right(2));
   return _path + baseName + epoStr + _extension;
 }

trunk/BNC/src/bncwindow.cpp

@@ -851 +851 @@
   pppLayout1->addWidget(new QLabel("ANTEX"),              ir, 0, Qt::AlignLeft);
   pppLayout1->addWidget(_pppWidgets._antexFile,           ir, 1, 1, 2);
+
   pppLayout1->addWidget(new QLabel("NMEA File"),          ir, 4, Qt::AlignLeft);
   pppLayout1->addWidget(_pppWidgets._nmeaFile,            ir, 5);
   pppLayout1->addWidget(new QLabel("Port"),               ir, 6, Qt::AlignLeft);
   pppLayout1->addWidget(_pppWidgets._nmeaPort,            ir, 7); _pppWidgets._nmeaPort->setMaximumWidth(8*ww);
+  ++ir;
+  pppLayout1->addWidget(new QLabel("SNX TRO File"),       ir, 4, Qt::AlignLeft);
+  pppLayout1->addWidget(_pppWidgets._snxtroFile,          ir, 5);
+  pppLayout1->addWidget(new QLabel("Sampling"),           ir, 6, Qt::AlignLeft);
+  pppLayout1->addWidget(_pppWidgets._snxtroSampl,         ir, 7);
 
   pppLayout1->addItem(new QSpacerItem(4*ww, 0),           ir, 8);

trunk/BNC/src/pppWidgets.cpp

@@ -61 +61 @@
   _logFile      = new QLineEdit();     _logFile     ->setObjectName("PPP/logFile");      _widgets << _logFile;     
   _nmeaFile     = new QLineEdit();     _nmeaFile    ->setObjectName("PPP/nmeaFile");     _widgets << _nmeaFile;    
-  _nmeaPort     = new QLineEdit();     _nmeaPort    ->setObjectName("PPP/nmeaPort");     _widgets << _nmeaPort;    
+  _nmeaPort     = new QLineEdit();     _nmeaPort    ->setObjectName("PPP/nmeaPort");     _widgets << _nmeaPort;
+  _snxtroFile   = new QLineEdit();     _snxtroFile  ->setObjectName("PPP/snxtroFile");   _widgets << _snxtroFile;
+  _snxtroSampl  = new QSpinBox();      _snxtroSampl ->setObjectName("PPP/snxtroSampl");  _widgets << _snxtroSampl;
   _staTable     = new QTableWidget();  _staTable    ->setObjectName("PPP/staTable");     _widgets << _staTable;    
   _lcGPS        = new QComboBox();     _lcGPS       ->setObjectName("PPP/lcGPS");        _widgets << _lcGPS;       
@@ -100 +102 @@
   _lcGalileo->setEditable(false);
   _lcGalileo->addItems(QString("no,P3,L3,P3&L3").split(","));
+
+  _snxtroSampl->setMinimum(0);
+  _snxtroSampl->setMaximum(300);
+  _snxtroSampl->setSingleStep(30);
+  _snxtroSampl->setSuffix(" sec");
 
   _minObs->setMinimum(4);

trunk/BNC/src/pppWidgets.h

@@ -47 +47 @@
   QLineEdit*     _nmeaFile;
   QLineEdit*     _nmeaPort;
+  QLineEdit*     _snxtroFile;
+  QSpinBox*      _snxtroSampl;
   QTableWidget*  _staTable;
   QComboBox*     _lcGPS;