Changeset 563 in ntrip for trunk/BNC

Timestamp:

Nov 3, 2007, 11:11:37 AM (17 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncapp.cpp (modified) (2 diffs)
• bncwindow.cpp (modified) (1 diff)

trunk/BNC/bncapp.cpp

@@ -238 +238 @@
   if (!_ephPath.isEmpty()) {
 
-    QDate date = QDate::currentDate();
+    QDateTime datTim = QDateTime::currentDateTime();
 
     QString hlp = (_rinexVers == 3) ? "MIX_" : "GPS_";
-    QString ephFileNameGPS = _ephPath + hlp +
-          QString("%1").arg(date.dayOfYear(), 3, 10, QChar('0')) +
-                            date.toString("0.yyN");
+    QString ephFileNameGPS = _ephPath + hlp + 
+               QString("%1").arg(datTim.date().dayOfYear(), 3, 10, QChar('0'));
+
+    QString hlpStr;
+    QString intStr = settings.value("ephIntr").toString();
+    if      (intStr == "1 day") {
+      hlpStr = "0";
+    }
+    else if (intStr == "1 hour") {
+      char ch = 'A' + datTim.time().hour();
+      hlpStr = ch;
+    }
+    else {
+      char ch = 'A' + datTim.time().hour();
+      hlpStr = ch;
+      if      (datTim.time().minute() < 15) {
+        hlpStr += "00";
+      }
+      else if (datTim.time().minute() < 30) {
+        hlpStr += "15";
+      }
+      else if (datTim.time().minute() < 45) {
+        hlpStr += "30";
+      }
+      else {
+        hlpStr += "45";
+      }
+    }
+    ephFileNameGPS += hlpStr + datTim.toString(".yyN");
 
     if (_ephFileNameGPS == ephFileNameGPS) {
@@ -274 +300 @@
     else if (_rinexVers == 2) {
       QString ephFileNameGlonass = _ephPath + "GLO_" +
-          QString("%1").arg(date.dayOfYear(), 3, 10, QChar('0')) +
-                            date.toString("0.yyN");
+          QString("%1").arg(datTim.date().dayOfYear(), 3, 10, QChar('0')) +
+          hlpStr + datTim.toString(".yyN");
 
       delete _ephStreamGlonass;

trunk/BNC/bncwindow.cpp

@@ -179 +179 @@
   _ephIntrComboBox->setMaximumWidth(9*ww);
   _ephIntrComboBox->setEditable(false);
-  _ephIntrComboBox->addItems(QString("15 min,30 min,1 hour,1 day").split(","));
+  _ephIntrComboBox->addItems(QString("15 min,1 hour,1 day").split(","));
   int jj = _ephIntrComboBox->findText(settings.value("ephIntr").toString());
   if (jj != -1) {