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

Jump to bottom

Modify access specifier to protected or public for the scope of processMessage() member function #984

Merged
merged 2 commits into from
May 17, 2023
Merged

Modify access specifier to protected or public for the scope of processMessage() member function #984

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a1ff73
Modify access specifier to protected or public for the scope of proce…
hyunseok-yang May 11, 2023
366aa44
Update rviz_default_plugins/include/rviz_default_plugins/displays/flu…
hyunseok-yang May 17, 2023
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
5 changes: 3 additions & 2 deletions ...t_plugins/include/rviz_default_plugins/displays/fluid_pressure/fluid_pressure_display.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ namespace displays
* \class FluidPressureDisplay
*/

class RVIZ_DEFAULT_PLUGINS_PUBLIC FluidPressureDisplay
class RVIZ_DEFAULT_PLUGINS_PUBLIC z
hyunseok-yang marked this conversation as resolved.
Show resolved Hide resolved
: public PointCloudScalarDisplay<sensor_msgs::msg::FluidPressure>
{
Q_OBJECT
Expand All @@ -56,9 +56,10 @@ class RVIZ_DEFAULT_PLUGINS_PUBLIC FluidPressureDisplay
FluidPressureDisplay();
~FluidPressureDisplay() override;

private:
protected:
void processMessage(const sensor_msgs::msg::FluidPressure::ConstSharedPtr message) override;

private:
void setInitialValues() override;
void hideUnneededProperties() override;
};
Expand Down
3 changes: 2 additions & 1 deletion ...default_plugins/include/rviz_default_plugins/displays/illuminance/illuminance_display.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,10 @@ class RVIZ_DEFAULT_PLUGINS_PUBLIC IlluminanceDisplay
IlluminanceDisplay();
~IlluminanceDisplay() override;

private:
protected:
void processMessage(const sensor_msgs::msg::Illuminance::ConstSharedPtr message) override;

private:
void setInitialValues() override;
void hideUnneededProperties() override;
};
Expand Down
3 changes: 1 addition & 2 deletions rviz_default_plugins/include/rviz_default_plugins/displays/marker/marker_display.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,9 @@ class RVIZ_DEFAULT_PLUGINS_PUBLIC MarkerDisplay
protected:
void subscribe() override;
void unsubscribe() override;

private:
void processMessage(visualization_msgs::msg::Marker::ConstSharedPtr msg) override;

private:
void createMarkerArraySubscription();

rclcpp::Subscription<visualization_msgs::msg::MarkerArray>::SharedPtr array_sub_;
Expand Down
3 changes: 2 additions & 1 deletion ...fault_plugins/include/rviz_default_plugins/displays/marker_array/marker_array_display.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,10 @@ class RVIZ_DEFAULT_PLUGINS_PUBLIC MarkerArrayDisplay

void reset() override;

private:
protected:
void processMessage(visualization_msgs::msg::MarkerArray::ConstSharedPtr array) override;

private:
std::unique_ptr<MarkerCommon> marker_common_;
};

Expand Down
4 changes: 3 additions & 1 deletion rviz_default_plugins/include/rviz_default_plugins/displays/pointcloud/point_cloud_common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,11 @@ private Q_SLOTS:
void setXyzTransformerOptions(rviz_common::properties::EnumProperty * prop);
void setColorTransformerOptions(rviz_common::properties::EnumProperty * prop);

protected:
void processMessage(sensor_msgs::msg::PointCloud2::ConstSharedPtr cloud);

private:
bool transformCloud(const CloudInfoPtr & cloud, bool fully_update_transformers);
void processMessage(sensor_msgs::msg::PointCloud2::ConstSharedPtr cloud);
bool transformPoints(
const CloudInfoPtr & cloud_info, V_PointCloudPoint & cloud_points, bool update_transformers);
void setProblematicPointsToInfinity(V_PointCloudPoint & cloud_points);
Expand Down
2 changes: 1 addition & 1 deletion rviz_default_plugins/include/rviz_default_plugins/displays/pose/pose_display.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ class RVIZ_DEFAULT_PLUGINS_PUBLIC PoseDisplay : public
/** @brief Overridden from MessageFilterDisplay to get arrow/axes visibility correct. */
void onEnable() override;
void onDisable() override;
void processMessage(geometry_msgs::msg::PoseStamped::ConstSharedPtr message) override;

private Q_SLOTS:
void updateShapeVisibility();
Expand All @@ -98,7 +99,6 @@ private Q_SLOTS:
void updateArrowGeometry();

private:
void processMessage(geometry_msgs::msg::PoseStamped::ConstSharedPtr message) override;
void setupSelectionHandler();

std::unique_ptr<rviz_rendering::Arrow> arrow_;
Expand Down
4 changes: 2 additions & 2 deletions ...ns/include/rviz_default_plugins/displays/pose_covariance/pose_with_covariance_display.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ class PoseWithCovarianceDisplay
protected:
/** @brief Overridden from MessageFilterDisplay to get Arrow/Axes visibility correct. */
void onEnable() override;
void
processMessage(geometry_msgs::msg::PoseWithCovarianceStamped::ConstSharedPtr message) override;

private Q_SLOTS:
void updateShapeVisibility();
Expand All @@ -99,8 +101,6 @@ private Q_SLOTS:
void updateCovariance();

private:
void
processMessage(geometry_msgs::msg::PoseWithCovarianceStamped::ConstSharedPtr message) override;
void setupSelectionHandler();

std::shared_ptr<rviz_rendering::Arrow> arrow_;
Expand Down
3 changes: 2 additions & 1 deletion ...ins/include/rviz_default_plugins/displays/relative_humidity/relative_humidity_display.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,10 @@ class RVIZ_DEFAULT_PLUGINS_PUBLIC RelativeHumidityDisplay
RelativeHumidityDisplay();
~RelativeHumidityDisplay() override;

private:
protected:
clalancette marked this conversation as resolved.
Show resolved Hide resolved
void processMessage(const sensor_msgs::msg::RelativeHumidity::ConstSharedPtr message) override;

private:
void setInitialValues() override;
void hideUnneededProperties() override;
};
Expand Down
1 change: 1 addition & 0 deletions ...default_plugins/include/rviz_default_plugins/displays/temperature/temperature_display.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ class RVIZ_DEFAULT_PLUGINS_PUBLIC TemperatureDisplay
TemperatureDisplay();
~TemperatureDisplay() override;

protected:
void processMessage(const sensor_msgs::msg::Temperature::ConstSharedPtr message) override;

private:
Expand Down