Changeset 4090 in ntrip

Timestamp:

Apr 30, 2012, 8:19:23 AM (13 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/rinex/reqcedit.cpp (modified) (1 diff)

trunk/BNC/rinex/reqcedit.cpp

@@ -179 +179 @@
   QString oldMarkerName   = settings.value("reqcOldMarkerName").toString();
   QString newMarkerName   = settings.value("reqcNewMarkerName").toString();
-  if (oldMarkerName.isEmpty() || 
-      QRegExp(oldMarkerName).exactMatch(obsFile.markerName())) {
-    obsFile.setMarkerName(newMarkerName);
+  if (!newMarkerName.isEmpty()) {
+    if (oldMarkerName.isEmpty() || 
+        QRegExp(oldMarkerName).exactMatch(obsFile.markerName())) {
+      obsFile.setMarkerName(newMarkerName);
+    }
   }
 
   QString oldAntennaName  = settings.value("reqcOldAntennaName").toString();
   QString newAntennaName  = settings.value("reqcNewAntennaName").toString();
-  if (oldAntennaName.isEmpty() || 
-      QRegExp(oldAntennaName).exactMatch(obsFile.antennaName())) {
-    obsFile.setAntennaName(newAntennaName);
+  if (!newAntennaName.isEmpty()) {
+    if (oldAntennaName.isEmpty() || 
+        QRegExp(oldAntennaName).exactMatch(obsFile.antennaName())) {
+      obsFile.setAntennaName(newAntennaName);
+    }
   }
 
   QString oldReceiverType = settings.value("reqcOldReceiverName").toString();
   QString newReceiverType = settings.value("reqcNewReceiverName").toString();
-  if (oldReceiverType.isEmpty() || 
-      QRegExp(oldReceiverType).exactMatch(obsFile.receiverType())) {
-    obsFile.setReceiverType(newReceiverType);
+  if (!newReceiverType.isEmpty()) {
+    if (oldReceiverType.isEmpty() || 
+        QRegExp(oldReceiverType).exactMatch(obsFile.receiverType())) {
+      obsFile.setReceiverType(newReceiverType);
+    }
   }
 }