Skip to content
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

Plotting Components Plugin #270

Merged
merged 19 commits into from
Sep 23, 2020
Merged

Plotting Components Plugin #270

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
0526c4e
Drag & Drop Items in Component Inspector
AmrElsersy Jul 29, 2020
99f7633
Component Plotting Plugin
AmrElsersy Aug 2, 2020
925c66c
Merge branch 'master' of https://github.com/AmrElsersy/ign-gazebo
AmrElsersy Aug 5, 2020
e72f3c2
Integration with PlottingInterface
AmrElsersy Aug 13, 2020
d6dbd89
dataPtr Plot Component
AmrElsersy Aug 13, 2020
3201d8e
Plot over 60Hz in Update() function of _ecm
AmrElsersy Aug 22, 2020
6424f57
Merge branch 'master' into master
chapulina Sep 2, 2020
dcc6cd0
Fix Style
AmrElsersy Sep 2, 2020
e01c00c
using typeName instead of typeId
AmrElsersy Sep 2, 2020
a0833f6
Fix signals
AmrElsersy Sep 2, 2020
6057d30
Convert typeId to typeName for export
AmrElsersy Sep 3, 2020
431aaf4
Factory singleton
AmrElsersy Sep 4, 2020
3f00bbe
Merge branch 'master' into master
claireyywang Sep 10, 2020
580f0ce
fix deleting allocated data
AmrElsersy Sep 15, 2020
125b79b
fix style
AmrElsersy Sep 15, 2020
8b10c67
used shared_ptr for PlotComponent & PlotData
AmrElsersy Sep 17, 2020
095b1fe
Use smart pointers and set plugin name
chapulina Sep 17, 2020
f8beefd
Merge branch 'master' into master
chapulina Sep 19, 2020
2fbf595
Merge branch 'master' into master
chapulina Sep 22, 2020
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/gui/plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ add_subdirectory(align_tool)
add_subdirectory(component_inspector)
add_subdirectory(entity_tree)
add_subdirectory(grid_config)
add_subdirectory(plotting)
add_subdirectory(resource_spawner)
add_subdirectory(scene3d)
add_subdirectory(shapes)
Expand Down
6 changes: 5 additions & 1 deletion src/gui/plugins/component_inspector/ComponentInspector.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,8 @@ QHash<int, QByteArray> ComponentsModel::RoleNames()
std::pair(102, "shortName"),
std::pair(103, "dataType"),
std::pair(104, "unit"),
std::pair(105, "data")};
std::pair(105, "data"),
std::pair(106, "entity")};
}

/////////////////////////////////////////////////
Expand Down Expand Up @@ -383,6 +384,9 @@ void ComponentInspector::Update(const UpdateInfo &,
Q_ARG(ignition::gazebo::ComponentTypeId, typeId));
}

item->setData(QString::number(this->dataPtr->entity),
ComponentsModel::RoleNames().key("entity"));

if (nullptr == item)
{
ignerr << "Failed to get item for component type [" << typeId << "]"
Expand Down
1 change: 1 addition & 0 deletions src/gui/plugins/component_inspector/ComponentInspector.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@
<file>String.qml</file>
<file>TypeHeader.qml</file>
<file>Vector3d.qml</file>
<file>plottable_icon.svg</file>
</qresource>
</RCC>
189 changes: 158 additions & 31 deletions src/gui/plugins/component_inspector/Pose3d.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ Rectangle {
return !(isModel)
}

property int iconWidth: 20
property int iconHeight: 20

// Loaded item for X
property var xItem: {}

Expand Down Expand Up @@ -177,6 +180,7 @@ Rectangle {
}
}


GridLayout {
id: grid
width: parent.width
Expand All @@ -188,12 +192,58 @@ Rectangle {
width: margin + indentation
}

Text {
text: 'X (m)'
leftPadding: 5
color: Material.theme == Material.Light ? "#444444" : "#bbbbbb"
font.pointSize: 12

Component {
id: plotIcon
Image {
property string componentInfo: ""
source: "plottable_icon.svg"
anchors.top: parent.top
anchors.left: parent.left

Drag.mimeData: { "text/plain" : (model === null) ? "" :
"Component," + model.entity + "," + model.typeId + "," +
model.dataType + "," + componentInfo + "," + model.shortName
}
Drag.dragType: Drag.Automatic
Drag.supportedActions : Qt.CopyAction
Drag.active: dragMouse.drag.active
// a point to drag from
Drag.hotSpot.x: 0
Drag.hotSpot.y: y
MouseArea {
id: dragMouse
anchors.fill: parent
drag.target: (model === null) ? null : parent
onPressed: parent.grabToImage(function(result) {parent.Drag.imageSource = result.url })
onReleased: parent.Drag.drop();
cursorShape: Qt.DragCopyCursor
}
}
}

Rectangle {
color: "transparent"
height: 40
Layout.preferredWidth: xText.width + indentation*3
Loader {
id: loaderX
width: iconWidth
height: iconHeight
y:10
sourceComponent: plotIcon
}
Component.onCompleted: loaderX.item.componentInfo = "x"

Text {
id : xText
text: ' X (m)'
leftPadding: 5
color: Material.theme == Material.Light ? "#444444" : "#bbbbbb"
font.pointSize: 12
anchors.centerIn: parent
}
}

Item {
Layout.fillWidth: true
Expand All @@ -209,11 +259,27 @@ Rectangle {
}
}

Text {
text: 'Roll (rad)'
leftPadding: 5
color: Material.theme == Material.Light ? "#444444" : "#bbbbbb"
font.pointSize: 12
Rectangle {
color: "transparent"
height: 40
Layout.preferredWidth: rollText.width + indentation*3
Loader {
id: loaderRoll
width: iconWidth
height: iconHeight
y:10
sourceComponent: plotIcon
}
Component.onCompleted: loaderRoll.item.componentInfo = "roll"

Text {
id: rollText
text: ' Roll (rad)'
leftPadding: 5
color: Material.theme == Material.Light ? "#444444" : "#bbbbbb"
font.pointSize: 12
anchors.centerIn: parent
}
}

Item {
Expand All @@ -233,14 +299,30 @@ Rectangle {
// Right spacer
Item {
Layout.rowSpan: 3
width: margin
width: margin + indentation
}

Text {
text: 'Y (m)'
leftPadding: 5
color: Material.theme == Material.Light ? "#444444" : "#bbbbbb"
font.pointSize: 12

Rectangle {
color: "transparent"
height: 40
Layout.preferredWidth: yText.width + indentation*3
Loader {
id: loaderY
width: iconWidth
height: iconHeight
y:10
sourceComponent: plotIcon
}
Component.onCompleted: loaderY.item.componentInfo = "y"
Text {
id: yText
text: ' Y (m)'
leftPadding: 5
color: Material.theme == Material.Light ? "#444444" : "#bbbbbb"
font.pointSize: 12
anchors.centerIn: parent
}
}

Item {
Expand All @@ -257,11 +339,26 @@ Rectangle {
}
}

Text {
text: 'Pitch (rad)'
leftPadding: 5
color: Material.theme == Material.Light ? "#444444" : "#bbbbbb"
font.pointSize: 12
Rectangle {
color: "transparent"
height: 40
Layout.preferredWidth: pitchText.width + indentation*3
Loader {
id: loaderPitch
width: iconWidth
height: iconHeight
y:10
sourceComponent: plotIcon
}
Component.onCompleted: loaderPitch.item.componentInfo = "pitch";
Text {
id: pitchText
text: ' Pitch (rad)'
leftPadding: 5
color: Material.theme == Material.Light ? "#444444" : "#bbbbbb"
font.pointSize: 12
anchors.centerIn: parent
}
}

Item {
Expand All @@ -278,11 +375,26 @@ Rectangle {
}
}

Text {
text: 'Z (m)'
leftPadding: 5
color: Material.theme == Material.Light ? "#444444" : "#bbbbbb"
font.pointSize: 12
Rectangle {
color: "transparent"
height: 40
Layout.preferredWidth: zText.width + indentation*3
Loader {
id: loaderZ
width: iconWidth
height: iconHeight
y:10
sourceComponent: plotIcon
}
Component.onCompleted: loaderZ.item.componentInfo = "z";
Text {
id: zText
text: ' Z (m)'
leftPadding: 5
color: Material.theme == Material.Light ? "#444444" : "#bbbbbb"
font.pointSize: 12
anchors.centerIn: parent
}
}

Item {
Expand All @@ -299,11 +411,26 @@ Rectangle {
}
}

Text {
text: 'Yaw (rad)'
leftPadding: 5
color: Material.theme == Material.Light ? "#444444" : "#bbbbbb"
font.pointSize: 12
Rectangle {
color: "transparent"
height: 40
Layout.preferredWidth: yawText.width + indentation*3
Loader {
id: loaderYaw
width: iconWidth
height: iconHeight
y:10
sourceComponent: plotIcon
}
Component.onCompleted: loaderYaw.item.componentInfo = "yaw";
Text {
id: yawText
text: ' Yaw (rad)'
leftPadding: 5
color: Material.theme == Material.Light ? "#444444" : "#bbbbbb"
font.pointSize: 12
anchors.centerIn: parent
}
}

Item {
Expand Down
Loading