diff --git a/front-generator/render-params.json b/front-generator/render-params.json
index cd70e2f..cafeb55 100644
--- a/front-generator/render-params.json
+++ b/front-generator/render-params.json
@@ -103,17 +103,17 @@
"widget": "settings-container",
"childs": [
{
- "widget": "select", "label": "Метод расчета задержки", "name": "dpdiIsPositional",
+ "widget": "select", "label": "Метод расчета задержки", "name": "isPositional",
"values": [
{"label": "Позиционированием", "value": "true"},
{"label": "Окном задержки", "value": "false"}
]
},
- {"widget": "h2", "label": "Настройки позиционирования", "v_show": "paramDpdi.dpdiIsPositional === true"},
- {"widget": "number", "label": "Широта станции", "name": "dpdiPositionStationLatitude", "v_show": "paramDpdi.dpdiIsPositional === true", "min": -180, "step": 0.000001, "max": 180},
- {"widget": "number", "label": "Долгота станции", "name": "dpdiPositionStationLongitude", "v_show": "paramDpdi.dpdiIsPositional === true", "min": -180, "step": 0.000001, "max": 180},
- {"widget": "number", "label": "Подспутниковая точка", "name": "dpdiPositionSatelliteLongitude", "v_show": "paramDpdi.dpdiIsPositional === true", "min": -180, "step": 0.000001, "max": 180},
- {"widget": "number", "label": "Задержка до спутника, мс", "name": "dpdiDelay", "v_show": "paramDpdi.dpdiIsPositional === false", "min": 0, "step": 0.1, "max": 400}]
+ {"widget": "h2", "label": "Настройки позиционирования", "v_show": "paramDpdi.isPositional === true"},
+ {"widget": "number", "label": "Широта станции", "name": "positionStationLatitude", "v_show": "paramDpdi.isPositional === true", "min": -180, "step": 0.000001, "max": 180},
+ {"widget": "number", "label": "Долгота станции", "name": "positionStationLongitude", "v_show": "paramDpdi.isPositional === true", "min": -180, "step": 0.000001, "max": 180},
+ {"widget": "number", "label": "Подспутниковая точка", "name": "positionSatelliteLongitude", "v_show": "paramDpdi.isPositional === true", "min": -180, "step": 0.000001, "max": 180},
+ {"widget": "number", "label": "Задержка до спутника, мс", "name": "delay", "v_show": "paramDpdi.isPositional === false", "min": 0, "step": 0.1, "max": 400}]
},
{"widget": "submit"}
],
@@ -254,20 +254,20 @@
"widget": "settings-container", "v_show": "paramRxtx.isCinC",
"childs": [
{
- "widget": "select", "label": "Метод расчета задержки", "name": "dpdiIsPositional",
+ "widget": "select", "label": "Метод расчета задержки", "name": "isPositional",
"values": [
{"label": "Позиционированием", "value": "true"},
{"label": "Окном задержки", "value": "false"}
]
},
- {"widget": "number", "label": "Полоса поиска, КГц ±", "name": "dpdiSearchBandwidth", "min": 0, "step": 1, "max": 100},
- {"widget": "h2", "label": "Настройки позиционирования", "v_show": "paramDpdi.dpdiIsPositional === true"},
- {"widget": "number", "label": "Широта станции", "name": "dpdiPositionStationLatitude", "v_show": "paramDpdi.dpdiIsPositional === true", "min": -180, "step": 0.000001, "max": 180},
- {"widget": "number", "label": "Долгота станции", "name": "dpdiPositionStationLongitude", "v_show": "paramDpdi.dpdiIsPositional === true", "min": -180, "step": 0.000001, "max": 180},
- {"widget": "number", "label": "Подспутниковая точка", "name": "dpdiPositionSatelliteLongitude", "v_show": "paramDpdi.dpdiIsPositional === true", "min": -180, "step": 0.000001, "max": 180},
- {"widget": "h2", "label": "Задержка до спутника", "v_show": "paramDpdi.dpdiIsPositional === false"},
- {"widget": "number", "label": "от, мс", "name": "dpdiDelayMin", "v_show": "paramDpdi.dpdiIsPositional === false", "min": 0, "step": 0.1, "max": 400},
- {"widget": "number", "label": "до, мс", "name": "dpdiDelayMax", "v_show": "paramDpdi.dpdiIsPositional === false", "min": 0, "step": 0.1, "max": 400}]
+ {"widget": "number", "label": "Полоса поиска, КГц ±", "name": "searchBandwidth", "min": 0, "step": 1, "max": 100},
+ {"widget": "h2", "label": "Настройки позиционирования", "v_show": "paramDpdi.isPositional === true"},
+ {"widget": "number", "label": "Широта станции", "name": "positionStationLatitude", "v_show": "paramDpdi.isPositional === true", "min": -180, "step": 0.000001, "max": 180},
+ {"widget": "number", "label": "Долгота станции", "name": "positionStationLongitude", "v_show": "paramDpdi.isPositional === true", "min": -180, "step": 0.000001, "max": 180},
+ {"widget": "number", "label": "Подспутниковая точка", "name": "positionSatelliteLongitude", "v_show": "paramDpdi.isPositional === true", "min": -180, "step": 0.000001, "max": 180},
+ {"widget": "h2", "label": "Задержка до спутника", "v_show": "paramDpdi.isPositional === false"},
+ {"widget": "number", "label": "от, мс", "name": "delayMin", "v_show": "paramDpdi.isPositional === false", "min": 0, "step": 0.1, "max": 400},
+ {"widget": "number", "label": "до, мс", "name": "delayMax", "v_show": "paramDpdi.isPositional === false", "min": 0, "step": 0.1, "max": 400}]
},
{"widget": "submit", "v_show": "paramRxtx.isCinC"}
],
diff --git a/static/main-scpc.html b/static/main-scpc.html
index fd06506..b43f079 100644
--- a/static/main-scpc.html
+++ b/static/main-scpc.html
@@ -326,19 +326,19 @@
-
-
Настройки позиционирования
-
-
-
- Задержка до спутника
-
-
+
+ Настройки позиционирования
+
+
+
+ Задержка до спутника
+
+
Настройки питания и опорного генератора
@@ -631,13 +631,13 @@
rxGoldan: 0,
},
paramDpdi: {
- dpdiIsPositional: true,
- dpdiSearchBandwidth: 0,
- dpdiPositionStationLatitude: -180,
- dpdiPositionStationLongitude: -180,
- dpdiPositionSatelliteLongitude: -180,
- dpdiDelayMin: 0,
- dpdiDelayMax: 0,
+ isPositional: true,
+ searchBandwidth: 0,
+ positionStationLatitude: -180,
+ positionStationLongitude: -180,
+ positionSatelliteLongitude: -180,
+ delayMin: 0,
+ delayMax: 0,
},
paramBuclnb: {
bucRefClk10M: false,
@@ -829,13 +829,13 @@
if (this.submitStatus.dpdi) { return }
let query = {
- "dpdiIsPositional": this.paramDpdi.dpdiIsPositional,
- "dpdiSearchBandwidth": this.paramDpdi.dpdiSearchBandwidth,
- "dpdiPositionStationLatitude": this.paramDpdi.dpdiPositionStationLatitude,
- "dpdiPositionStationLongitude": this.paramDpdi.dpdiPositionStationLongitude,
- "dpdiPositionSatelliteLongitude": this.paramDpdi.dpdiPositionSatelliteLongitude,
- "dpdiDelayMin": this.paramDpdi.dpdiDelayMin,
- "dpdiDelayMax": this.paramDpdi.dpdiDelayMax,
+ "isPositional": this.paramDpdi.isPositional,
+ "searchBandwidth": this.paramDpdi.searchBandwidth,
+ "positionStationLatitude": this.paramDpdi.positionStationLatitude,
+ "positionStationLongitude": this.paramDpdi.positionStationLongitude,
+ "positionSatelliteLongitude": this.paramDpdi.positionSatelliteLongitude,
+ "delayMin": this.paramDpdi.delayMin,
+ "delayMax": this.paramDpdi.delayMax,
}
this.submitStatus.dpdi = true
@@ -919,13 +919,13 @@
},
updateDpdiSettings(vals) {
this.submitStatus.dpdi = false
- this.paramDpdi.dpdiIsPositional = vals["settings"]["dpdi"]["dpdiIsPositional"]
- this.paramDpdi.dpdiSearchBandwidth = vals["settings"]["dpdi"]["dpdiSearchBandwidth"]
- this.paramDpdi.dpdiPositionStationLatitude = vals["settings"]["dpdi"]["dpdiPositionStationLatitude"]
- this.paramDpdi.dpdiPositionStationLongitude = vals["settings"]["dpdi"]["dpdiPositionStationLongitude"]
- this.paramDpdi.dpdiPositionSatelliteLongitude = vals["settings"]["dpdi"]["dpdiPositionSatelliteLongitude"]
- this.paramDpdi.dpdiDelayMin = vals["settings"]["dpdi"]["dpdiDelayMin"]
- this.paramDpdi.dpdiDelayMax = vals["settings"]["dpdi"]["dpdiDelayMax"]
+ this.paramDpdi.isPositional = vals["settings"]["dpdi"]["isPositional"]
+ this.paramDpdi.searchBandwidth = vals["settings"]["dpdi"]["searchBandwidth"]
+ this.paramDpdi.positionStationLatitude = vals["settings"]["dpdi"]["positionStationLatitude"]
+ this.paramDpdi.positionStationLongitude = vals["settings"]["dpdi"]["positionStationLongitude"]
+ this.paramDpdi.positionSatelliteLongitude = vals["settings"]["dpdi"]["positionSatelliteLongitude"]
+ this.paramDpdi.delayMin = vals["settings"]["dpdi"]["delayMin"]
+ this.paramDpdi.delayMax = vals["settings"]["dpdi"]["delayMax"]
},
updateBuclnbSettings(vals) {
this.submitStatus.buclnb = false
diff --git a/static/main-tdma.html b/static/main-tdma.html
index d4945e1..cbdfbac 100644
--- a/static/main-tdma.html
+++ b/static/main-tdma.html
@@ -173,16 +173,16 @@
-
Настройки позиционирования
-
-
-
-
+ Настройки позиционирования
+
+
+
+
Настройки питания и опорного генератора
@@ -363,11 +363,11 @@
bucLnbAutoStart: false,
},
paramDpdi: {
- dpdiIsPositional: true,
- dpdiPositionStationLatitude: -180,
- dpdiPositionStationLongitude: -180,
- dpdiPositionSatelliteLongitude: -180,
- dpdiDelay: 0,
+ isPositional: true,
+ positionStationLatitude: -180,
+ positionStationLongitude: -180,
+ positionSatelliteLongitude: -180,
+ delay: 0,
},
paramNetwork: {
cesPassword: null,
@@ -533,11 +533,11 @@
if (this.submitStatus.dpdi) { return }
let query = {
- "dpdiIsPositional": this.paramDpdi.dpdiIsPositional,
- "dpdiPositionStationLatitude": this.paramDpdi.dpdiPositionStationLatitude,
- "dpdiPositionStationLongitude": this.paramDpdi.dpdiPositionStationLongitude,
- "dpdiPositionSatelliteLongitude": this.paramDpdi.dpdiPositionSatelliteLongitude,
- "dpdiDelay": this.paramDpdi.dpdiDelay,
+ "isPositional": this.paramDpdi.isPositional,
+ "positionStationLatitude": this.paramDpdi.positionStationLatitude,
+ "positionStationLongitude": this.paramDpdi.positionStationLongitude,
+ "positionSatelliteLongitude": this.paramDpdi.positionSatelliteLongitude,
+ "delay": this.paramDpdi.delay,
}
this.submitStatus.dpdi = true
@@ -589,11 +589,11 @@
},
updateDpdiSettings(vals) {
this.submitStatus.dpdi = false
- this.paramDpdi.dpdiIsPositional = vals["settings"]["dpdi"]["dpdiIsPositional"]
- this.paramDpdi.dpdiPositionStationLatitude = vals["settings"]["dpdi"]["dpdiPositionStationLatitude"]
- this.paramDpdi.dpdiPositionStationLongitude = vals["settings"]["dpdi"]["dpdiPositionStationLongitude"]
- this.paramDpdi.dpdiPositionSatelliteLongitude = vals["settings"]["dpdi"]["dpdiPositionSatelliteLongitude"]
- this.paramDpdi.dpdiDelay = vals["settings"]["dpdi"]["dpdiDelay"]
+ this.paramDpdi.isPositional = vals["settings"]["dpdi"]["isPositional"]
+ this.paramDpdi.positionStationLatitude = vals["settings"]["dpdi"]["positionStationLatitude"]
+ this.paramDpdi.positionStationLongitude = vals["settings"]["dpdi"]["positionStationLongitude"]
+ this.paramDpdi.positionSatelliteLongitude = vals["settings"]["dpdi"]["positionSatelliteLongitude"]
+ this.paramDpdi.delay = vals["settings"]["dpdi"]["delay"]
},
updateNetworkSettings(vals) {
this.submitStatus.network = false