Changeset 9783 in ntrip for trunk/BNC/src/bncoutf.cpp
- Timestamp:
- Jun 27, 2022, 5:09:40 PM (21 months ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/bncoutf.cpp
r9655 r9783 48 48 49 49 _append = Qt::CheckState(settings.value("rnxAppend").toInt()) == Qt::Checked; 50 _v2filenames = settings.value("PPP/v2filenames").toBool();51 50 } 52 51 … … 84 83 if ( indHlp != -1) { 85 84 int step = intStr.left(indHlp-1).toInt(); 86 if (!_v2filenames) { 87 epoStr += QString("%1").arg(datTim.time().hour(), 2, 10, QChar('0')); // H 88 } else { 89 epoStr += 'A' + datTim.time().hour(); 90 } 85 epoStr += QString("%1").arg(datTim.time().hour(), 2, 10, QChar('0')); // H 91 86 92 87 if (datTim.time().minute() >= 60-step) { … … 101 96 } 102 97 } 103 104 if (!_v2filenames) { 105 epoStr += QString("_%1M").arg(step, 2, 10, QChar('0')); // period 106 } 98 epoStr += QString("_%1M").arg(step, 2, 10, QChar('0')); // period 107 99 108 100 _numSec = 60 * step; … … 110 102 else if (intStr == "1 hour") { 111 103 int step = intStr.left(indHlp-1).toInt(); 112 if (!_v2filenames) { 113 epoStr += QString("%1").arg(datTim.time().hour(), 2, 10, QChar('0')); // H 114 epoStr += QString("%1").arg(0, 2, 10, QChar('0')); // M 115 epoStr += QString("_%1H").arg(step+1, 2, 10, QChar('0')); // period 116 } else { 117 epoStr += 'A' + datTim.time().hour(); 118 } 104 epoStr += QString("%1").arg(datTim.time().hour(), 2, 10, QChar('0')); // H 105 epoStr += QString("%1").arg(0, 2, 10, QChar('0')); // M 106 epoStr += QString("_%1H").arg(step+1, 2, 10, QChar('0')); // period 119 107 _numSec = 3600; 120 108 } 121 109 else { 122 110 int step = intStr.left(indHlp-1).toInt(); 123 if (!_v2filenames) { 124 epoStr += QString("%1").arg(0, 2, 10, QChar('0')); // H 125 epoStr += QString("%1").arg(0, 2, 10, QChar('0')); // M 126 epoStr += QString("_%1D").arg(step+1, 2, 10, QChar('0')); // period 127 } 111 epoStr += QString("%1").arg(0, 2, 10, QChar('0')); // H 112 epoStr += QString("%1").arg(0, 2, 10, QChar('0')); // M 113 epoStr += QString("_%1D").arg(step+1, 2, 10, QChar('0')); // period 128 114 _numSec = 86400; 129 115 } 130 116 131 if (!_v2filenames) { 132 if (sampl < 60) { 133 epoStr += QString("_%1S").arg(sampl, 2, 10, QChar('0')); 134 } 135 else { 136 sampl /= 60; 137 epoStr += QString("_%1M").arg(sampl, 2, 10, QChar('0')); 138 } 117 118 if (sampl < 60) { 119 epoStr += QString("_%1S").arg(sampl, 2, 10, QChar('0')); 120 } 121 else { 122 sampl /= 60; 123 epoStr += QString("_%1M").arg(sampl, 2, 10, QChar('0')); 139 124 } 140 125
Note:
See TracChangeset
for help on using the changeset viewer.