Skip to content

Rework Remote ID settings to new style #11993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 14, 2024
Merged

Rework Remote ID settings to new style #11993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/FactSystem/FactControls/LabelledFactTextField.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ RowLayout {
property alias textFieldUnitsLabel: _factTextField.unitsLabel
property alias textFieldShowUnits: _factTextField.showUnits
property alias textFieldShowHelp: _factTextField.showHelp
property alias textField: _factTextField

spacing: ScreenTools.defaultFontPixelWidth * 2

Expand Down
12 changes: 6 additions & 6 deletions src/QmlControls/ParameterEditorDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ QGCPopupDialog {
}

Component.onCompleted: {
console.log("ParameterEditor")
if (validate) {
valueField.text = validateValue
validationError.text = fact.validate(validateValue, false /* convertOnly */)
Expand Down Expand Up @@ -116,11 +115,12 @@ QGCPopupDialog {
}

QGCComboBox {
id: factCombo
width: _editFieldWidth
model: fact.enumStrings
visible: _showCombo
focus: setFocus && visible
id: factCombo
width: _editFieldWidth
model: fact.enumStrings
sizeToContents: true
visible: _showCombo
focus: setFocus && visible

Component.onCompleted: {
// We can't bind directly to fact.enumIndex since that would add an unknown value
Expand Down
8 changes: 4 additions & 4 deletions src/QmlControls/SettingsGroupLayout.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import QGroundControl.ScreenTools
import QGroundControl.Palette

ColumnLayout {
id: control
spacing: _margins / 2
implicitWidth: _contentLayout.implicitWidth + (_margins * 2)
implicitHeight: _contentLayout.implicitHeight + (_margins * 2)
id: control
spacing: _margins / 2
implicitWidth: _contentLayout.implicitWidth + (_margins * 2)
implicitHeight: _contentLayout.implicitHeight + (_margins * 2)

default property alias contentItem: _contentLayout.data

Expand Down
58 changes: 31 additions & 27 deletions src/Settings/RemoteID.SettingsGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,21 @@
},
{
"name": "selfIDFree",
"shortDesc": "Self ID",
"shortDesc": "Flight Purpose",
"longDesc": "Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.",
"type": "string",
"default": ""
},
{
"name": "selfIDEmergency",
"shortDesc": "Self ID",
"shortDesc": "Emergency Text",
"longDesc": "Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.",
"type": "string",
"default": "Pilot Emergency Status"
},
{
"name": "selfIDExtended",
"shortDesc": "Self ID",
"shortDesc": "Extended Status",
"longDesc": "Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.",
"type": "string",
"default": ""
Expand All @@ -57,7 +57,7 @@
"name": "selfIDType",
"shortDesc": "Self ID type",
"type": "uint8",
"enumStrings": "Free Text,Emergency,Extended Status",
"enumStrings": "Flight Purpose,Emergency,Extended Status",
"enumValues": "0,1,2",
"default": 0
},
Expand All @@ -78,7 +78,7 @@
"name": "basicIDType",
"shortDesc": "Basic ID Type",
"type": "uint8",
"enumStrings": "None,SerialNumber(ANSI/CTA-2063),CAA,UTM(RFC4122),Specific",
"enumStrings": "None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific",
"enumValues": "0,1,2,3,4",
"default": 2
},
Expand Down Expand Up @@ -116,41 +116,45 @@
"default": 1
},
{
"name": "latitudeFixed",
"shortDesc": "Latitude Fixed",
"longDesc": "Fixed latitude to send on SYSTEM message",
"type": "double",
"decimalPlaces":7,
"default": 0
"name": "latitudeFixed",
"shortDesc": "Latitude Fixed",
"longDesc": "Fixed latitude to send on SYSTEM message",
"type": "double",
"minValue": "-90",
"maxValue": "90",
"decimalPlaces": 7,
"default": 0
},
{
"name": "longitudeFixed",
"shortDesc": "Longitude Fixed",
"longDesc": "Fixed Longitude to send on SYSTEM message",
"type": "double",
"decimalPlaces":7,
"default": 0
"name": "longitudeFixed",
"shortDesc": "Longitude Fixed",
"longDesc": "Fixed Longitude to send on SYSTEM message",
"type": "double",
"minValue": "-180",
"maxValue": "180",
"decimalPlaces": 7,
"default": 0
},
{
"name": "altitudeFixed",
"shortDesc": "Altitude Fixed",
"longDesc": "Fixed Altitude to send on SYSTEM message",
"type": "double",
"decimalPlaces":7,
"default": 0
"name": "altitudeFixed",
"shortDesc": "Altitude Fixed",
"longDesc": "Fixed Altitude to send on SYSTEM message",
"type": "double",
"decimalPlaces": 7,
"default": 0
},
{
"name": "classificationType",
"shortDesc": "Classification Type",
"longDesc": "Classification Type of UA",
"longDesc": "Classification Type of UAS",
"type": "uint8",
"enumStrings": "Undefined,EU",
"enumStrings": "Undeclared,EU",
"enumValues": "0,1",
"default": 0
},
{
"name": "categoryEU",
"shortDesc": "Category EU",
"shortDesc": "Category",
"longDesc": "Category of the UAS in the EU region",
"type": "uint8",
"enumStrings": "Undeclared,Open,Specific,Certified",
Expand All @@ -159,7 +163,7 @@
},
{
"name": "classEU",
"shortDesc": "Class EU",
"shortDesc": "Class",
"longDesc": "Class of the UAS in the EU region",
"type": "uint8",
"enumStrings": "Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6",
Expand Down
Loading
Loading