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.

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

correct "simplify widget handling" #452

Merged
merged 2 commits into from Mar 7, 2017

Conversation

Projects
None yet
3 participants
@Jntzko
Copy link

commented Feb 27, 2017

The changes from the pull request #442 leads to an error.

Hiding the docking area when the motion planning panel is part of it disabled the whole display including the motion planning scene that is displayed in the main window.

So instead of relying on the setAssociatedWidget mechanism, we have to implement the wanted behavior ourselves.

@Jntzko Jntzko force-pushed the Jntzko:fixMotionPlanningDisplay branch from cf8fc0f to 04c5ca0 Feb 27, 2017

@v4hn
Copy link
Member

left a comment

Except for a nitpick, this looks good to me.
We discovered the problem only after the previous patch was merged, so now we have to revert it.

The new patch seems to address all the problems mentioned in the previous pull request.

@@ -55,6 +56,7 @@
#endif

#include <moveit_msgs/DisplayTrajectory.h>
#include <QDockWidget>

This comment has been minimized.

Copy link
@v4hn

v4hn Feb 27, 2017

Member

I believe this is not needed, because now you use rviz::PanelDockWidget instead, right?
Could you please remove it from the request?

This comment has been minimized.

Copy link
@Jntzko

Jntzko Feb 28, 2017

Author

You're right, I removed it.

Yannick Jonetzko
correct "simplify widget handling"
This improves on commit: e677d8cc790d91f427606c23717954015f207ef7

With the previous solution, hiding the docking area when the motion planning
panel is part of it disabled the whole display including the motion planning
*scene* that is displayed in the main window.

So instead of relying on the setAssociatedWidget mechanism, we have to
implement the wanted behavior ourselves.

@Jntzko Jntzko force-pushed the Jntzko:fixMotionPlanningDisplay branch from 04c5ca0 to f16c1ea Feb 28, 2017

@v4hn

v4hn approved these changes Feb 28, 2017

@v4hn

This comment has been minimized.

Copy link
Member

commented Feb 28, 2017

Thank you.
I believe this should be merged and ported to j/k.

@v4hn v4hn referenced this pull request Mar 4, 2017

Closed

Release (Kinetic 0.9.5 and IJ altogether) #457

6 of 6 tasks complete

@130s 130s merged commit ed43752 into ros-planning:indigo-devel Mar 7, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

130s added a commit that referenced this pull request Mar 7, 2017

@Jntzko Jntzko deleted the Jntzko:fixMotionPlanningDisplay branch Mar 27, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.