фикс некорректного ограничения центральной частоты

This commit is contained in:
2025-01-27 14:04:03 +03:00
parent 4d1b29b015
commit f9b919facf
6 changed files with 46 additions and 38 deletions

View File

@@ -124,7 +124,7 @@
</select>
</label>
<label v-show="paramRxtx.txModulatorIsTest"><span>Центральная частота, КГц</span><input type="number" v-model="paramRxtx.txCentralFreq" min="900000" step="0.01"/></label>
<label><span>Ослабление, дБ</span><input type="number" v-model="paramRxtx.txAttenuation" step="1"/></label>
<label><span>Ослабление, дБ</span><input type="number" v-model="paramRxtx.txAttenuation" min="-40" step="1"/></label>
</div>
<div class="settings-set-container">
<h3>Настройки приемника</h3>
@@ -289,7 +289,7 @@
txEn: false,
txModulatorIsTest: false,
txCentralFreq: 900000,
txAttenuation: 0,
txAttenuation: -40,
rxAgcEn: true,
rxManualGain: -40,
rxSpectrumInversion: false,
@@ -409,10 +409,12 @@
return []
}
},
inputFormatInt(src, validation) {
inputFormatNumber(src, validation) {
if (validation === null || validation === undefined) { validation = {} }
const rawVal = src.toString().replace(/[^0-9]/g, '')
let result = rawVal === '' ? 0 : parseInt(rawVal)
const rawVal = src.toString().replace(/[^0-9.,]/g, '').replace(',', '.')
let result = rawVal === '' ? 0 : parseFloat(rawVal)
const step = 'step' in validation ? validation['step']: 1.0
result = Math.round(result / step) * step
if ('min' in validation) { if (result <= validation['min']) { result = validation['min'] } }
if ('max' in validation) { if (result >= validation['max']) { result = validation['max'] } }
return result.toLocaleString()