-
Notifications
You must be signed in to change notification settings - Fork 3
Sam drone icon #215
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.
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
base: main
Are you sure you want to change the base?
Sam drone icon #215
Changes from 5 commits
50c8679
6a190b5
a4033bc
4ceedc8
ae6619e
5c47478
a26b043
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -150,7 +150,7 @@ Rectangle { | |
| } | ||
|
|
||
|
|
||
| // Drone list view | ||
| // Drone list view----------------- | ||
| ListView { | ||
| id: droneListView | ||
| Layout.fillWidth: true | ||
|
|
@@ -256,12 +256,15 @@ Rectangle { | |
|
|
||
| Image { | ||
| id: statusIcon | ||
| source: { | ||
| modelData.altitude > 0.05 ? "qrc:/resources/droneStatusSVG.svg" : "qrc:/resources/grounded.png" | ||
| } | ||
| source: mainPanel.isIndexSelected(index) ? "qrc:/resources/droneMapIconSelected.svg" | ||
| : (modelData.altitude > 0.05 ? "qrc:/resources/droneStatusSVG.svg" : "qrc:/resources/grounded.png") | ||
| sourceSize.width: GcsStyle.PanelStyle.statusIconSize | ||
| sourceSize.height: GcsStyle.PanelStyle.statusIconSize | ||
| Layout.alignment: Qt.AlignVCenter | ||
| opacity: mainPanel.isIndexSelected(index) ? 1.0 : 0.6 | ||
|
||
| Behavior on opacity { | ||
| NumberAnimation { duration: 150 } | ||
| } | ||
| } | ||
|
|
||
| ColumnLayout { | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,7 +25,7 @@ Window { | |
| id: mapComponent | ||
| anchors.fill: parent | ||
| activeDrone: mainWindow.activeDrone | ||
| selectedDrones: mainWindow.selectedDrones // Not yet implemented. But will be like this | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. revert :) |
||
| selectedDrones: mainWindow.selectedDrones | ||
| onZoomScaleChanged: function(coord1, coord2, pixelLength) { | ||
| mapScaleBar.updateScaleBar(coord1, coord2, pixelLength) | ||
| } | ||
|
|
@@ -62,9 +62,12 @@ Window { | |
| z: 100 | ||
| } | ||
|
|
||
| //active drone, initial anchor drone, clicked selected first, | ||
|
||
| //more than one selected, pass in list of selected drones to qml map, -> use list to determine what is selected | ||
| //to select each drone, to change our icon. | ||
| TelemetryPanel { | ||
| id: telemetryPanel | ||
| activeDrone: mainWindow.activeDrone | ||
| activeDrone: mainWindow.activeDrone // Pass the active drone reference to the telemetry panel | ||
|
||
| anchors { | ||
| bottom: parent.bottom | ||
| margins: GcsStyle.PanelStyle.applicationBorderMargin | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
revert* :)