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 b5ededf4ca..bf953ce735 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) diff --git a/src/gui/plugins/view_angle/ViewAngle.qml b/src/gui/plugins/view_angle/ViewAngle.qml index d0839a811a..9b21441e69 100644 --- a/src/gui/plugins/view_angle/ViewAngle.qml +++ b/src/gui/plugins/view_angle/ViewAngle.qml @@ -216,125 +216,23 @@ ColumnLayout { font.bold: true } - GridLayout { + GzPose { + y: 30 width: parent.width - columns: 6 - - Text { - text: "X (m)" - color: "dimgrey" - Layout.row: 0 - Layout.column: 0 - leftPadding: 5 - } - IgnSpinBox { - id: x - Layout.fillWidth: true - Layout.row: 0 - Layout.column: 1 - value: ViewAngle.camPose[0] - maximumValue: Number.MAX_VALUE - minimumValue: -Number.MAX_VALUE - 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: 1 - Layout.column: 0 - leftPadding: 5 - } - IgnSpinBox { - id: y - Layout.fillWidth: true - Layout.row: 1 - Layout.column: 1 - value: ViewAngle.camPose[1] - maximumValue: Number.MAX_VALUE - minimumValue: -Number.MAX_VALUE - 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: 2 - Layout.column: 0 - leftPadding: 5 - } - IgnSpinBox { - id: z - Layout.fillWidth: true - Layout.row: 2 - Layout.column: 1 - value: ViewAngle.camPose[2] - maximumValue: Number.MAX_VALUE - minimumValue: -Number.MAX_VALUE - decimals: 6 - stepSize: 0.01 - onEditingFinished: ViewAngle.SetCamPose(x.value, y.value, z.value, roll.value, pitch.value, yaw.value) - } - - Text { - text: "Roll (rad)" - color: "dimgrey" - Layout.row: 0 - Layout.column: 2 - leftPadding: 5 - } - IgnSpinBox { - id: roll - Layout.fillWidth: true - Layout.row: 0 - Layout.column: 3 - 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: 1 - Layout.column: 2 - leftPadding: 5 - } - IgnSpinBox { - id: pitch - Layout.fillWidth: true - Layout.row: 1 - Layout.column: 3 - 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: 2 - Layout.column: 2 - leftPadding: 5 - } - IgnSpinBox { - id: yaw - Layout.fillWidth: true - Layout.row: 2 - Layout.column: 3 - 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) + 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] + 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 } // Set camera's near/far clipping distance