Changeset 276 in ntrip for trunk/BNC

Timestamp:

Nov 8, 2006, 11:08:37 AM (18 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncrinex.cpp (modified) (4 diffs)
• bncrinex.h (modified) (1 diff)
• bncwindow.cpp (modified) (1 diff)

trunk/BNC/bncrinex.cpp

@@ -39 +39 @@
   _mountPoint = mountPoint;
   _headerWritten = false;
-  readSkeleton();
 
   QSettings settings;
@@ -61 +60 @@
 void bncRinex::readSkeleton() {
 
-  // Resolve Skeleton File Name
-  // --------------------------
-  QSettings settings;
-  QString sklName = settings.value("rnxPath").toString();
-  expandEnvVar(sklName);
-  if ( sklName[sklName.length()-1] != QDir::separator() ) {
-    sklName += QDir::separator();
-  }
-  sklName += _statID.left(4) + "." + settings.value("rnxSkel").toString();
+  _headerLines.clear();
 
   // Read the File
   // -------------
-  QFile skl(sklName);
+  QFile skl(_sklName);
   if ( skl.exists() && skl.open(QIODevice::ReadOnly) ) {
     QTextStream in(&skl);
@@ -167 +158 @@
   }
 
+  QString sklExt = settings.value("rnxSkel").toString();
+  if (!sklExt.isEmpty()) {
+    _sklName = path + ID4 + distStr + "." + sklExt;
+  }
+
   path += ID4 +
           QString("%1").arg(datTim.date().dayOfYear(), 3, 10, QChar('0')) +
-          hlpStr + distStr +
-          datTim.toString(".yyO");
+          hlpStr + distStr + datTim.toString(".yyO");
 
   _fName = path.toAscii();
@@ -201 +196 @@
   // Copy Skeleton Header
   // --------------------
+  readSkeleton();
   if (_headerLines.size() > 0) {
     QStringListIterator it(_headerLines);

trunk/BNC/bncrinex.h

@@ -37 +37 @@
    QString             _pgmName;
    QString             _userName;
+   QString             _sklName;
 };
 

trunk/BNC/bncwindow.cpp

@@ -178 +178 @@
 
     bncTableItem* bncIt = new bncTableItem();
+    bncIt->setFlags(bncIt->flags() & ~Qt::ItemIsEditable);
     _mountPointsTable->setItem(iRow, 3, bncIt);