Skip to content

Commit

Permalink
Added nested subnamespaces and more options to hide or group topics. (#…
Browse files Browse the repository at this point in the history 
…13)

* Added nested subnamespaces.

The "Group Namespaces" checkbox has been replaced with a numeric spinner, where the user can specify the desired layers of depth.

* Moved the Hide section of the toolbar to a new line

* Grouped topics now display as 3d boxes.

* Added checkboxes to hide or group tf topics (/tf and /tf_static)

* Added checkbox to group image topics (/, /compressed, /theora, and /compressedDepth)


image_fix

* Added a checkbox to hide topics added by ros/dynamic_reconfigure.

Parameter topics include /parameter_descriptions and /parameter_updates.

* Changed dependency version, removed annoying margins in window

* Refactored lines to reduce redundancy, and minimize long lines of indent

* remove version dependency in order to work with Indigo
  • Loading branch information
@EliteMasterEric @dirk-thomas
EliteMasterEric authored and dirk-thomas committed May 22, 2018
1 parent 90117a0 commit e1945ec
Show file tree
Hide file tree
Showing 3 changed files with 604 additions and 193 deletions.
206 changes: 155 additions & 51 deletions resource/RosGraph.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
<x>0</x>
<y>0</y>
<width>1298</width>
<height>307</height>
<height>344</height>
</rect>
</property>
<property name="windowTitle">
<string>Node Graph</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0">
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0">
<item>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0,0,0,0,0,0,0">
<item>
Expand Down Expand Up @@ -132,21 +132,49 @@
<item>
<widget class="QWidget" name="widget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QWidget" name="widget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_4a">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel">
<widget class="QLabel" name="label">
<property name="text">
<string>Group:</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="namespace_cluster_check_box">
<widget class="QSpinBox" name="namespace_cluster_spin_box">
<property name="toolTip">
<string>Show namespace boxes</string>
<string>Show namespace boxes, nesting up to this amount</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Namespaces</string>
</property>
Expand All @@ -162,63 +190,23 @@
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="widget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_4b">
<item>
<widget class="QLabel">
<property name="text">
<string>Hide:</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="dead_sinks_check_box">
<widget class="QCheckBox" name="group_tf_check_box">
<property name="toolTip">
<string>Hide topics without subscribers</string>
<string>Summarize tf and tf2 topics into one virtual topic node (named /tf)</string>
</property>
<property name="text">
<string>Dead sinks</string>
<string>tf</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="leaf_topics_check_box">
<widget class="QCheckBox" name="group_image_check_box">
<property name="toolTip">
<string>Hide topics with one connection only (implicates dead sinks)</string>
<string>Summarize image topics into one virtual topic node (named &lt;image_server&gt;/image_topics)</string>
</property>
<property name="text">
<string>Leaf topics</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="quiet_check_box">
<property name="toolTip">
<string>Hide common debugging nodes</string>
</property>
<property name="text">
<string>Debug</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="unreachable_check_box">
<property name="toolTip">
<string>Hide unreachable nodes</string>
</property>
<property name="text">
<string>Unreachable</string>
<string>Images</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -287,6 +275,122 @@
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="widget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QWidget" name="widget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_5a" stretch="0,0,0,0,0,0,0,0">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Hide:</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="dead_sinks_check_box">
<property name="toolTip">
<string>Hide topics without subscribers</string>
</property>
<property name="text">
<string>Dead sinks</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="leaf_topics_check_box">
<property name="toolTip">
<string>Hide topics with one connection only (implicates dead sinks)</string>
</property>
<property name="text">
<string>Leaf topics</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="quiet_check_box">
<property name="toolTip">
<string>Hide common debugging nodes</string>
</property>
<property name="text">
<string>Debug</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="hide_tf_nodes_check_box">
<property name="toolTip">
<string>Hide tf nodes</string>
</property>
<property name="text">
<string>tf</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="unreachable_check_box">
<property name="toolTip">
<string>Hide unreachable nodes</string>
</property>
<property name="text">
<string>Unreachable</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="hide_dynamic_reconfigure_check_box">
<property name="toolTip">
<string>Hide dynamic reconfigure's parameter topics</string>
</property>
<property name="text">
<string>Params</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="InteractiveGraphicsView" name="graphics_view">
<property name="renderHints">
Expand Down
Loading

0 comments on commit e1945ec

Please sign in to comment.