обновление ШПС вебки: исправление полей для ввода частоты

front-generator/render-params.json

@@ -370,8 +370,8 @@
                     "values": [{"label": "Ethernet", "value": "false"}, {"label": "Тест", "value": "true"}]
                   },
                   {"widget": "h3", "label": "Параметры передачи"},
-                  {"widget": "number", "label": "Центральная частота, КГц", "name": "txCentralFreq", "min": 70000, "max": 6000000, "step": 100},
+                  {"widget": "number-int", "label": "Центральная частота, КГц", "name": "txCentralFreq", "min": 70000, "max": 6000000, "step": 100},
-                  {"widget": "number", "label": "Символьная скорость, Бод", "name": "txBaudrate", "min": 128000, "max": 30000000},
+                  {"widget": "number-int", "label": "Символьная скорость, Бод", "name": "txBaudrate", "min": 128000, "max": 30000000},
                   {
                     "widget": "select", "label": "Roll-off", "name": "txRolloff",
                     "values": [{"label": "0.02", "value": "20"}, {"label": "0.05", "value": "50"}, {"label": "0.10", "value": "100"}, {"label": "0.15", "value": "150"}, {"label": "0.20", "value": "200"}, {"label": "0.25", "value": "250"}, {"label": "0.30", "value": "300"}, {"label": "0.35", "value": "350"}]
@@ -401,8 +401,8 @@
                   {"widget": "number", "label": "Усиление, дБ", "name": "rxManualGain", "min": -40, "step": 0.01, "max": 40, "v_show": "paramRxtx.rxAgcEn === false"},
                   {"widget": "watch-expr", "label": "Текущее усиление", "expr": "paramRxtx.rxManualGain", "v_show": "paramRxtx.rxAgcEn === true"},
                   {"widget": "checkbox", "label": "Инверсия спектра", "name": "rxSpectrumInversion"},
-                  {"widget": "number", "label": "Центральная частота, КГц", "name": "rxCentralFreq", "min": 70000, "max": 6000000, "step": 100},
+                  {"widget": "number-int", "label": "Центральная частота, КГц", "name": "rxCentralFreq", "min": 70000, "max": 6000000, "step": 100},
-                  {"widget": "number", "label": "Символьная скорость, Бод", "name": "rxBaudrate", "min": 128000, "max": 30000000},
+                  {"widget": "number-int", "label": "Символьная скорость, Бод", "name": "rxBaudrate", "min": 128000, "max": 30000000},
                   {
                     "widget": "select", "label": "Roll-off", "name": "rxRolloff",
                     "values": [{"label": "0.02", "value": "20"}, {"label": "0.05", "value": "50"}, {"label": "0.10", "value": "100"}, {"label": "0.15", "value": "150"}, {"label": "0.20", "value": "200"}, {"label": "0.25", "value": "250"}, {"label": "0.30", "value": "300"}, {"label": "0.35", "value": "350"}]

static/main-shps.html

@@ -126,8 +126,14 @@
                         </select>
                     </label>
                     <h3>Параметры передачи</h3>
-                    <label><span>Центральная частота, КГц</span><input type="number" v-model="paramRxtx.txCentralFreq" min="70000" max="6000000" step="100"/></label>
+                    <label>
-                    <label><span>Символьная скорость, Бод</span><input type="number" v-model="paramRxtx.txBaudrate" min="128000" max="30000000"/></label>
+                        <span>Центральная частота, КГц</span>
+                        <input type="text" v-model.lazy="paramRxtx.txCentralFreq" @change="e => paramRxtx.txCentralFreq = inputFormatNumber(inputFormatNumber(e.target.value, {min:70000,max:6000000,step:100}), {min:70000,max:6000000,step:100})"/>
+                    </label>
+                    <label>
+                        <span>Символьная скорость, Бод</span>
+                        <input type="text" v-model.lazy="paramRxtx.txBaudrate" @change="e => paramRxtx.txBaudrate = inputFormatNumber(inputFormatNumber(e.target.value, {min:128000,max:30000000,}), {min:128000,max:30000000,})"/>
+                    </label>
                     <label>
                         <span>Roll-off</span>
                         <select v-model="paramRxtx.txRolloff">
@@ -171,8 +177,14 @@
                         <span>Инверсия спектра</span>
                         <span class="toggle-input"><input type="checkbox" v-model="paramRxtx.rxSpectrumInversion" /><span class="slider"></span></span>
                     </label>
-                    <label><span>Центральная частота, КГц</span><input type="number" v-model="paramRxtx.rxCentralFreq" min="70000" max="6000000" step="100"/></label>
+                    <label>
-                    <label><span>Символьная скорость, Бод</span><input type="number" v-model="paramRxtx.rxBaudrate" min="128000" max="30000000"/></label>
+                        <span>Центральная частота, КГц</span>
+                        <input type="text" v-model.lazy="paramRxtx.rxCentralFreq" @change="e => paramRxtx.rxCentralFreq = inputFormatNumber(inputFormatNumber(e.target.value, {min:70000,max:6000000,step:100}), {min:70000,max:6000000,step:100})"/>
+                    </label>
+                    <label>
+                        <span>Символьная скорость, Бод</span>
+                        <input type="text" v-model.lazy="paramRxtx.rxBaudrate" @change="e => paramRxtx.rxBaudrate = inputFormatNumber(inputFormatNumber(e.target.value, {min:128000,max:30000000,}), {min:128000,max:30000000,})"/>
+                    </label>
                     <label>
                         <span>Roll-off</span>
                         <select v-model="paramRxtx.rxRolloff">
@@ -350,8 +362,8 @@
                     txModulatorIsTest: false,
                     txAttenuation: -40,
                     txIsTestInput: false,
-                    txCentralFreq: 70000,
+                    txCentralFreq: 0,
-                    txBaudrate: 128000,
+                    txBaudrate: 0,
                     txRolloff: 20,
                     txSpreadCoef: 8,
                     txFieldsDataPreamble: 1,
@@ -362,8 +374,8 @@
                     rxAgcEn: false,
                     rxManualGain: -40,
                     rxSpectrumInversion: false,
-                    rxCentralFreq: 70000,
+                    rxCentralFreq: 0,
-                    rxBaudrate: 128000,
+                    rxBaudrate: 0,
                     rxRolloff: 20,
                     rxSpreadCoef: 8,
                     rxFftShift: 256,
@@ -503,8 +515,8 @@
                     "txModulatorIsTest": this.paramRxtx.txModulatorIsTest,
                     "txAttenuation": this.paramRxtx.txAttenuation,
                     "txIsTestInput": this.paramRxtx.txIsTestInput,
-                    "txCentralFreq": this.paramRxtx.txCentralFreq,
+                    "txCentralFreq": parseFloat(this.paramRxtx.txCentralFreq.replace(/[^0-9,.]/g, '').replace(',', '.')),
-                    "txBaudrate": this.paramRxtx.txBaudrate,
+                    "txBaudrate": parseFloat(this.paramRxtx.txBaudrate.replace(/[^0-9,.]/g, '').replace(',', '.')),
                     "txRolloff": this.paramRxtx.txRolloff,
                     "txSpreadCoef": this.paramRxtx.txSpreadCoef,
                     "txFieldsDataPreamble": this.paramRxtx.txFieldsDataPreamble,
@@ -515,8 +527,8 @@
                     "rxAgcEn": this.paramRxtx.rxAgcEn,
                     "rxManualGain": this.paramRxtx.rxManualGain,
                     "rxSpectrumInversion": this.paramRxtx.rxSpectrumInversion,
-                    "rxCentralFreq": this.paramRxtx.rxCentralFreq,
+                    "rxCentralFreq": parseFloat(this.paramRxtx.rxCentralFreq.replace(/[^0-9,.]/g, '').replace(',', '.')),
-                    "rxBaudrate": this.paramRxtx.rxBaudrate,
+                    "rxBaudrate": parseFloat(this.paramRxtx.rxBaudrate.replace(/[^0-9,.]/g, '').replace(',', '.')),
                     "rxRolloff": this.paramRxtx.rxRolloff,
                     "rxSpreadCoef": this.paramRxtx.rxSpreadCoef,
                     "rxFftShift": this.paramRxtx.rxFftShift,
@@ -574,8 +586,8 @@
                 this.paramRxtx.txModulatorIsTest = vals["settings"]["rxtx"]["txModulatorIsTest"]
                 this.paramRxtx.txAttenuation = vals["settings"]["rxtx"]["txAttenuation"]
                 this.paramRxtx.txIsTestInput = vals["settings"]["rxtx"]["txIsTestInput"]
-                this.paramRxtx.txCentralFreq = vals["settings"]["rxtx"]["txCentralFreq"]
+                this.paramRxtx.txCentralFreq = this.inputFormatNumber(vals["settings"]["rxtx"]["txCentralFreq"], {min:70000,max:6000000,step:100})
-                this.paramRxtx.txBaudrate = vals["settings"]["rxtx"]["txBaudrate"]
+                this.paramRxtx.txBaudrate = this.inputFormatNumber(vals["settings"]["rxtx"]["txBaudrate"], {min:128000,max:30000000,})
                 this.paramRxtx.txRolloff = vals["settings"]["rxtx"]["txRolloff"]
                 this.paramRxtx.txSpreadCoef = vals["settings"]["rxtx"]["txSpreadCoef"]
                 this.paramRxtx.txFieldsDataPreamble = vals["settings"]["rxtx"]["txFieldsDataPreamble"]
@@ -586,8 +598,8 @@
                 this.paramRxtx.rxAgcEn = vals["settings"]["rxtx"]["rxAgcEn"]
                 this.paramRxtx.rxManualGain = vals["settings"]["rxtx"]["rxManualGain"]
                 this.paramRxtx.rxSpectrumInversion = vals["settings"]["rxtx"]["rxSpectrumInversion"]
-                this.paramRxtx.rxCentralFreq = vals["settings"]["rxtx"]["rxCentralFreq"]
+                this.paramRxtx.rxCentralFreq = this.inputFormatNumber(vals["settings"]["rxtx"]["rxCentralFreq"], {min:70000,max:6000000,step:100})
-                this.paramRxtx.rxBaudrate = vals["settings"]["rxtx"]["rxBaudrate"]
+                this.paramRxtx.rxBaudrate = this.inputFormatNumber(vals["settings"]["rxtx"]["rxBaudrate"], {min:128000,max:30000000,})
                 this.paramRxtx.rxRolloff = vals["settings"]["rxtx"]["rxRolloff"]
                 this.paramRxtx.rxSpreadCoef = vals["settings"]["rxtx"]["rxSpreadCoef"]
                 this.paramRxtx.rxFftShift = vals["settings"]["rxtx"]["rxFftShift"]