Add scale and color properties to Marker selection #1436
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rhaschke
approved these changes
Oct 11, 2019
| @@ -85,53 +85,49 @@ QColor MarkerSelectionHandler::getColor() | |||
| (int)(marker_->getMessage()->color.a * 255) ); | |||
| } | |||
|
|
|||
| QString MarkerSelectionHandler::getMarkerTypeName() | |||
There was a problem hiding this comment.
I moved getMarkerTypeName to marker_utils.cpp.
| } | ||
|
|
||
| void MarkerSelectionHandler::createProperties( const Picked& obj, Property* parent_property ) | ||
| { | ||
| Property* group = new Property( "Marker " + marker_id_ + " (" + getMarkerTypeName() + ")", QVariant(), "", parent_property ); |
There was a problem hiding this comment.
Here, my intention was to use the type name in the value field. Minor change.
| @@ -140,7 +136,7 @@ void MarkerSelectionHandler::createProperties( const Picked& obj, Property* pare | |||
| orientation_property_ = new QuaternionProperty( "Orientation", getOrientation(), "", group ); | |||
| orientation_property_->setReadOnly( true ); | |||
|
|
|||
| scale_property_ = new MarkerScaleProperty( "Scale", getScale(), marker_->getMessage()->type, "", group ); | |||
There was a problem hiding this comment.
There is no need to duplicate code for a new MarkerScaleProperty, which actually behaves like a VectorProperty.
It's possible to rename (and hide) the fields.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR addresses issue #1380 and adds some extra functionality to the marker selection pane.
This PR started from #1435 and was intended to target
melodic-devel, but it wasn't possible to make the necessary changes and not break the ABI. Therefore, this PR targetsnoetic-develinstead. Here is an updated screenshot with some changes made since the initial PR was opened:Before modifications:
After modifications:
