From 8e8aab6d6101bd40ba1918a9823a905ca38f6a9a Mon Sep 17 00:00:00 2001 From: AzulRadio <50132891+AzulRadio@users.noreply.github.com> Date: Thu, 11 Aug 2022 16:47:27 -0500 Subject: [PATCH 1/2] Replace pose in ViewAngle with GzPose (#1641) * Replace pose in ViewAngle with GzPose Signed-off-by: youhy --- src/gui/plugins/view_angle/ViewAngle.qml | 150 ++++------------------- 1 file changed, 23 insertions(+), 127 deletions(-) diff --git a/src/gui/plugins/view_angle/ViewAngle.qml b/src/gui/plugins/view_angle/ViewAngle.qml index 311ca12b3e..04859fe73f 100644 --- a/src/gui/plugins/view_angle/ViewAngle.qml +++ b/src/gui/plugins/view_angle/ViewAngle.qml @@ -194,136 +194,32 @@ ToolBar { width: parent.width color: "transparent" - ColumnLayout { - width: parent.width - Text { - text: "Camera Pose" - color: Material.Grey - Layout.row: 4 - Layout.column: 1 - leftPadding: 5 - } - - GridLayout { - width: parent.width - columns: 6 + Text { + text: "Camera Pose" + Layout.fillWidth: true + color: Material.Grey + leftPadding: 5 + font.bold: true + } - Text { - text: "X (m)" - color: "dimgrey" - Layout.row: 4 - Layout.column: 1 - leftPadding: 5 - } - IgnSpinBox { - id: x - Layout.fillWidth: true - Layout.row: 4 - Layout.column: 2 - value: ViewAngle.camPose[0] - maximumValue: 1000000 - minimumValue: -1000000 - decimals: 6 - stepSize: 0.01 - onEditingFinished: ViewAngle.SetCamPose(x.value, y.value, z.value, roll.value, pitch.value, yaw.value) - } - Text { - text: "Y (m)" - color: "dimgrey" - Layout.row: 5 - Layout.column: 1 - leftPadding: 5 - } - IgnSpinBox { - id: y - Layout.fillWidth: true - Layout.row: 5 - Layout.column: 2 - value: ViewAngle.camPose[1] - maximumValue: 1000000 - minimumValue: -1000000 - decimals: 6 - stepSize: 0.01 - onEditingFinished: ViewAngle.SetCamPose(x.value, y.value, z.value, roll.value, pitch.value, yaw.value) - } - Text { - text: "Z (m)" - color: "dimgrey" - Layout.row: 6 - Layout.column: 1 - leftPadding: 5 - } - IgnSpinBox { - id: z - Layout.fillWidth: true - Layout.row: 6 - Layout.column: 2 - value: ViewAngle.camPose[2] - maximumValue: 1000000 - minimumValue: -1000000 - decimals: 6 - stepSize: 0.01 - onEditingFinished: ViewAngle.SetCamPose(x.value, y.value, z.value, roll.value, pitch.value, yaw.value) - } + GzPose { + y: 30 + width: parent.width + Layout.fillWidth: true + readOnly: false + xValue: ViewAngle.camPose[0] + yValue: ViewAngle.camPose[1] + zValue: ViewAngle.camPose[2] + rollValue: ViewAngle.camPose[3] + pitchValue: ViewAngle.camPose[4] + yawValue: ViewAngle.camPose[5] - Text { - text: "Roll (rad)" - color: "dimgrey" - Layout.row: 4 - Layout.column: 3 - leftPadding: 5 - } - IgnSpinBox { - id: roll - Layout.fillWidth: true - Layout.row: 4 - Layout.column: 4 - value: ViewAngle.camPose[3] - maximumValue: 6.28 - minimumValue: -6.28 - decimals: 6 - stepSize: 0.01 - onEditingFinished: ViewAngle.SetCamPose(x.value, y.value, z.value, roll.value, pitch.value, yaw.value) - } - Text { - text: "Pitch (rad)" - color: "dimgrey" - Layout.row: 5 - Layout.column: 3 - leftPadding: 5 - } - IgnSpinBox { - id: pitch - Layout.fillWidth: true - Layout.row: 5 - Layout.column: 4 - value: ViewAngle.camPose[4] - maximumValue: 6.28 - minimumValue: -6.28 - decimals: 6 - stepSize: 0.01 - onEditingFinished: ViewAngle.SetCamPose(x.value, y.value, z.value, roll.value, pitch.value, yaw.value) - } - Text { - text: "Yaw (rad)" - color: "dimgrey" - Layout.row: 6 - Layout.column: 3 - leftPadding: 5 - } - IgnSpinBox { - id: yaw - Layout.fillWidth: true - Layout.row: 6 - Layout.column: 4 - value: ViewAngle.camPose[5] - maximumValue: 6.28 - minimumValue: -6.28 - decimals: 6 - stepSize: 0.01 - onEditingFinished: ViewAngle.SetCamPose(x.value, y.value, z.value, roll.value, pitch.value, yaw.value) - } + onGzPoseSet: { + // _x, _y, _z, _roll, _pitch, _yaw are parameters of signal gzPoseSet + // from gz-gui GzPose.qml + ViewAngle.SetCamPose(_x, _y, _z, _roll, _pitch, _yaw) } + expand: true } } } From 87cabc8797ba09eee0d2e2ff19bc6c68438c36d8 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Fri, 12 Aug 2022 10:55:26 -0500 Subject: [PATCH 2/2] Change CODEOWNERS and maintainer to Michael (#1644) Signed-off-by: Michael Carroll --- .github/CODEOWNERS | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 400878bf31..5862fc253e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,7 +1,7 @@ # More info: # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners -* @chapulina +* @mjcarroll */rendering/* @iche033 src/systems/physics/* @azeey src/systems/sensors/* @iche033 diff --git a/README.md b/README.md index 25e5b3b24b..a985f29053 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Gazebo Sim : A Robotic Simulator -**Maintainer:** louise AT openrobotics DOT org +**Maintainer:** michael AT openrobotics DOT org [![GitHub open issues](https://img.shields.io/github/issues-raw/gazebosim/gz-sim.svg)](https://github.com/gazebosim/gz-sim/issues) [![GitHub open pull requests](https://img.shields.io/github/issues-pr-raw/gazebosim/gz-sim.svg)](https://github.com/gazebosim/gz-sim/pulls)