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

Transition to standard smart pointers, part 1 #2804

Merged
merged 6 commits into from
Jan 24, 2019
Merged

Transition to standard smart pointers, part 1 #2804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
218869e
Use PCLVisualizer::Ptr typedef instead of explicit boost::shared_ptr
taketwo Jan 23, 2019
6fb8f29
Use Ptr typedefs where appropriate in examples/ and tools/
taketwo Jan 23, 2019
bb4d548
Use ImageViewer::Ptr typedef instead of explicit boost::shared_ptr
taketwo Jan 23, 2019
59c77ee
Use PCLPlotter::Ptr typedef instead of explicit boost::shared_ptr
taketwo Jan 23, 2019
baa01c3
Use PCLHistogramVisualizer::Ptr typedef instead of explicit boost::sh…
taketwo Jan 23, 2019
391eba7
Use CloudViewer::Ptr typedef instead of explicit boost::shared_ptr
taketwo Jan 23, 2019
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
4 changes: 2 additions & 2 deletions apps/cloud_composer/include/pcl/apps/cloud_composer/cloud_view.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ namespace pcl
QVTKWidget*
getQVTK() const {return qvtk_; }

boost::shared_ptr<pcl::visualization::PCLVisualizer>
pcl::visualization::PCLVisualizer::Ptr
getPCLVisualizer () const { return vis_; }

void
Expand Down Expand Up @@ -140,7 +140,7 @@ namespace pcl
void
removeOrientationMarkerWidgetAxes ();

boost::shared_ptr<pcl::visualization::PCLVisualizer> vis_;
pcl::visualization::PCLVisualizer::Ptr vis_;
ProjectModel* model_;
QVTKWidget* qvtk_;
vtkSmartPointer<InteractorStyleSwitch> style_switch_;
Expand Down
2 changes: 1 addition & 1 deletion apps/cloud_composer/include/pcl/apps/cloud_composer/cloud_viewer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ namespace pcl

private:

boost::shared_ptr<pcl::visualization::PCLVisualizer> vis_;
pcl::visualization::PCLVisualizer::Ptr vis_;
QMap <ProjectModel*, CloudView*> model_view_map_;
};
}
Expand Down
4 changes: 2 additions & 2 deletions apps/cloud_composer/include/pcl/apps/cloud_composer/items/cloud_composer_item.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@ namespace pcl

/** \brief Paint View function - reimpliment in item subclass if it can be displayed in PCLVisualizer*/
virtual void
paintView (boost::shared_ptr<pcl::visualization::PCLVisualizer> vis) const;
paintView (pcl::visualization::PCLVisualizer::Ptr vis) const;

/** \brief Remove from View function - reimpliment in item subclass if it can be displayed in PCLVisualizer*/
virtual void
removeFromView (boost::shared_ptr<pcl::visualization::PCLVisualizer> vis) const;
removeFromView (pcl::visualization::PCLVisualizer::Ptr vis) const;

/** \brief Inspector additional tabs paint function - reimpliment in item subclass if item has additional tabs to show in Inspector*/
virtual QMap <QString, QWidget*>
Expand Down
4 changes: 2 additions & 2 deletions apps/cloud_composer/include/pcl/apps/cloud_composer/items/cloud_item.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,11 @@ namespace pcl

/** \brief Paint View function - puts this cloud item into a PCLVisualizer object*/
void
paintView (boost::shared_ptr<pcl::visualization::PCLVisualizer> vis) const override;
paintView (pcl::visualization::PCLVisualizer::Ptr vis) const override;

/** \brief Remove from View function - removes this cloud from a PCLVisualizer object*/
void
removeFromView (boost::shared_ptr<pcl::visualization::PCLVisualizer> vis) const override;
removeFromView (pcl::visualization::PCLVisualizer::Ptr vis) const override;

/** \brief Initializes and stores a templated PointCloud object with point type matching the blob */
void
Expand Down
2 changes: 1 addition & 1 deletion apps/cloud_composer/include/pcl/apps/cloud_composer/items/fpfh_item.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ namespace pcl
private:
pcl::PointCloud<pcl::FPFHSignature33>::Ptr fpfh_ptr_;
double radius_;
boost::shared_ptr<pcl::visualization::PCLPlotter> plot_;
pcl::visualization::PCLPlotter::Ptr plot_;
QVTKWidget *qvtk_;
QWidget *hist_page_;
};
Expand Down
4 changes: 2 additions & 2 deletions apps/cloud_composer/include/pcl/apps/cloud_composer/items/normals_item.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ namespace pcl
clone () const override;

void
paintView (boost::shared_ptr<pcl::visualization::PCLVisualizer> vis) const override;
paintView (pcl::visualization::PCLVisualizer::Ptr vis) const override;

/** \brief Remove from View function - removes the normal cloud from a PCLVisualizer object*/
void
removeFromView (boost::shared_ptr<pcl::visualization::PCLVisualizer> vis) const override;
removeFromView (pcl::visualization::PCLVisualizer::Ptr vis) const override;

private:
pcl::PointCloud<pcl::Normal>::Ptr normals_ptr_;
Expand Down
4 changes: 2 additions & 2 deletions .../cloud_composer/include/pcl/apps/cloud_composer/point_selectors/interactor_style_switch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ namespace pcl
vtkGetObjectMacro(current_style_, vtkInteractorStyle);

void
initializeInteractorStyles (boost::shared_ptr<pcl::visualization::PCLVisualizer> vis, ProjectModel* model);
initializeInteractorStyles (pcl::visualization::PCLVisualizer::Ptr vis, ProjectModel* model);

inline void
setQVTKWidget (QVTKWidget* qvtk) { qvtk_ = qvtk; }
Expand Down Expand Up @@ -136,7 +136,7 @@ namespace pcl
/** \brief Internal pointer to QVTKWidget that this Switch works with */
QVTKWidget* qvtk_;
/** \brief Internal pointer to PCLVisualizer that this Switch works with */
boost::shared_ptr<pcl::visualization::PCLVisualizer> vis_;
pcl::visualization::PCLVisualizer::Ptr vis_;
private:
InteractorStyleSwitch(const InteractorStyleSwitch&); // Not implemented.
void operator=(const InteractorStyleSwitch&); // Not implemented.
Expand Down
4 changes: 2 additions & 2 deletions apps/cloud_composer/src/items/cloud_composer_item.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ pcl::cloud_composer::CloudComposerItem::addChild (CloudComposerItem *item_arg)
}

void
pcl::cloud_composer::CloudComposerItem::paintView (boost::shared_ptr<pcl::visualization::PCLVisualizer>) const
pcl::cloud_composer::CloudComposerItem::paintView (pcl::visualization::PCLVisualizer::Ptr) const
{
qDebug () << "Paint View in Cloud Composer Item - doing nothing";
}

void
pcl::cloud_composer::CloudComposerItem::removeFromView (boost::shared_ptr<pcl::visualization::PCLVisualizer>) const
pcl::cloud_composer::CloudComposerItem::removeFromView (pcl::visualization::PCLVisualizer::Ptr) const
{
qDebug () << "Remove from View in Cloud Composer Item - doing nothing";
}
Expand Down
4 changes: 2 additions & 2 deletions apps/cloud_composer/src/items/cloud_item.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ pcl::cloud_composer::CloudItem::~CloudItem ()


void
pcl::cloud_composer::CloudItem::paintView (boost::shared_ptr<pcl::visualization::PCLVisualizer> vis) const
pcl::cloud_composer::CloudItem::paintView (pcl::visualization::PCLVisualizer::Ptr vis) const
{
vis->addPointCloud (cloud_blob_ptr_, geometry_handler_, color_handler_, origin_, orientation_, getId ().toStdString ());
vis->setPointCloudRenderingProperties (pcl::visualization::PCL_VISUALIZER_POINT_SIZE, properties_->getProperty ("Point Size").toDouble (), getId ().toStdString ());
Expand All @@ -82,7 +82,7 @@ pcl::cloud_composer::CloudItem::paintView (boost::shared_ptr<pcl::visualization:
}

void
pcl::cloud_composer::CloudItem::removeFromView (boost::shared_ptr<pcl::visualization::PCLVisualizer> vis) const
pcl::cloud_composer::CloudItem::removeFromView (pcl::visualization::PCLVisualizer::Ptr vis) const
{
vis->removePointCloud (getId ().toStdString ());
}
Expand Down
2 changes: 1 addition & 1 deletion apps/cloud_composer/src/items/fpfh_item.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ pcl::cloud_composer::FPFHItem::getInspectorTabs ()
//Create the plotter and QVTKWidget if it doesn't exist
if (!plot_)
{
plot_ = boost::shared_ptr<pcl::visualization::PCLPlotter> (new pcl::visualization::PCLPlotter);
plot_.reset (new pcl::visualization::PCLPlotter);
qvtk_ = new QVTKWidget ();
hist_page_ = new QWidget ();
QGridLayout *mainLayout = new QGridLayout (hist_page_);
Expand Down
4 changes: 2 additions & 2 deletions apps/cloud_composer/src/items/normals_item.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ pcl::cloud_composer::NormalsItem::~NormalsItem ()
}

void
pcl::cloud_composer::NormalsItem::paintView (boost::shared_ptr<pcl::visualization::PCLVisualizer> vis) const
pcl::cloud_composer::NormalsItem::paintView (pcl::visualization::PCLVisualizer::Ptr vis) const
{
//Get the parent cloud, convert to XYZ
if (parent ()->type () == CLOUD_ITEM)
Expand All @@ -60,7 +60,7 @@ pcl::cloud_composer::NormalsItem::paintView (boost::shared_ptr<pcl::visualizatio
}

void
pcl::cloud_composer::NormalsItem::removeFromView (boost::shared_ptr<pcl::visualization::PCLVisualizer> vis) const
pcl::cloud_composer::NormalsItem::removeFromView (pcl::visualization::PCLVisualizer::Ptr vis) const
{
//qDebug () << "Removing Normals "<<item_id_;
vis->removePointCloud (getId ().toStdString ());
Expand Down
2 changes: 1 addition & 1 deletion apps/cloud_composer/src/point_selectors/interactor_style_switch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ pcl::cloud_composer::InteractorStyleSwitch::~InteractorStyleSwitch ()
}

void
pcl::cloud_composer::InteractorStyleSwitch::initializeInteractorStyles (boost::shared_ptr<pcl::visualization::PCLVisualizer> vis, ProjectModel* model)
pcl::cloud_composer::InteractorStyleSwitch::initializeInteractorStyles (pcl::visualization::PCLVisualizer::Ptr vis, ProjectModel* model)
{
qDebug () << "Initializing Interactor Styles";
vis_ = vis;
Expand Down
4 changes: 2 additions & 2 deletions apps/include/pcl/apps/manual_registration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ class ManualRegistration : public QMainWindow
DstPointPickCallback (const pcl::visualization::PointPickingEvent& event, void*);

protected:
boost::shared_ptr<pcl::visualization::PCLVisualizer> vis_src_;
boost::shared_ptr<pcl::visualization::PCLVisualizer> vis_dst_;
pcl::visualization::PCLVisualizer::Ptr vis_src_;
pcl::visualization::PCLVisualizer::Ptr vis_dst_;

pcl::PointCloud<pcl::PointXYZRGBA>::Ptr cloud_src_;
pcl::PointCloud<pcl::PointXYZRGBA>::Ptr cloud_dst_;
Expand Down
2 changes: 1 addition & 1 deletion apps/include/pcl/apps/openni_passthrough.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class OpenNIPassthrough : public QMainWindow
cloud_cb (const CloudConstPtr& cloud);

protected:
boost::shared_ptr<pcl::visualization::PCLVisualizer> vis_;
pcl::visualization::PCLVisualizer::Ptr vis_;
pcl::OpenNIGrabber& grabber_;
std::string device_id_;
CloudPtr cloud_pass_;
Expand Down
2 changes: 1 addition & 1 deletion apps/include/pcl/apps/organized_segmentation_demo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class OrganizedSegmentationDemo : public QMainWindow
void cloud_cb (const CloudConstPtr& cloud);

protected:
boost::shared_ptr<pcl::visualization::PCLVisualizer> vis_;
pcl::visualization::PCLVisualizer::Ptr vis_;
pcl::Grabber& grabber_;

QMutex mtx_;
Expand Down
2 changes: 1 addition & 1 deletion apps/include/pcl/apps/pcd_video_player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class PCDVideoPlayer : public QMainWindow
~PCDVideoPlayer () {}

protected:
boost::shared_ptr<pcl::visualization::PCLVisualizer> vis_;
pcl::visualization::PCLVisualizer::Ptr vis_;
pcl::PointCloud<pcl::PointXYZRGBA>::Ptr cloud_;

QMutex mtx_;
Expand Down
2 changes: 1 addition & 1 deletion apps/src/convolve.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ main (int argc, char ** argv)
#endif
convolved_label << "threads: " << nb_threads;
// Display
boost::shared_ptr<pcl::visualization::PCLVisualizer> viewer (new pcl::visualization::PCLVisualizer ("Convolution"));
pcl::visualization::PCLVisualizer::Ptr viewer (new pcl::visualization::PCLVisualizer ("Convolution"));
// viewport stuff
viewer->createViewPort (0, 0, 0.5, 1, viewport_source);
viewer->createViewPort (0.5, 0, 1, 1, viewport_convolved);
Expand Down
2 changes: 1 addition & 1 deletion apps/src/openni_fast_mesh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ class OpenNIFastMesh
boost::shared_ptr<std::vector<pcl::Vertices> > vertices_;
pcl::PolygonMesh::Ptr mesh_;

boost::shared_ptr<pcl::visualization::PCLVisualizer> view;
pcl::visualization::PCLVisualizer::Ptr view;
};

void
Expand Down
2 changes: 1 addition & 1 deletion apps/src/openni_grab_frame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ class OpenNIGrabFrame
visualizer_enable_ = visualizer;
}

boost::shared_ptr<pcl::visualization::PCLVisualizer> visualizer_;
pcl::visualization::PCLVisualizer::Ptr visualizer_;
pcl::PCDWriter writer_;
bool quit_;
bool continuous_;
Expand Down
4 changes: 2 additions & 2 deletions apps/src/openni_klt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ class OpenNIViewer
delete[] rgb_data_;
}

boost::shared_ptr<pcl::visualization::ImageViewer> image_viewer_;
pcl::visualization::ImageViewer::Ptr image_viewer_;

pcl::Grabber& grabber_;
boost::mutex cloud_mutex_;
Expand All @@ -311,7 +311,7 @@ class OpenNIViewer
};

// Create the PCLVisualizer object
boost::shared_ptr<pcl::visualization::ImageViewer> img;
pcl::visualization::ImageViewer::Ptr img;

/* ---[ */
int
Expand Down
4 changes: 2 additions & 2 deletions apps/src/openni_organized_edge_detection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ typedef pcl::PointXYZRGBA PointT;
class OpenNIOrganizedEdgeDetection
{
private:
boost::shared_ptr<pcl::visualization::PCLVisualizer> viewer;
pcl::visualization::PCLVisualizer::Ptr viewer;
pcl::PointCloud<PointT> cloud_;
boost::mutex cloud_mutex;

Expand All @@ -60,7 +60,7 @@ class OpenNIOrganizedEdgeDetection
{
}

boost::shared_ptr<pcl::visualization::PCLVisualizer>
pcl::visualization::PCLVisualizer::Ptr
initCloudViewer (pcl::PointCloud<PointT>::ConstPtr cloud)
{
viewer->setSize (640, 480);
Expand Down
4 changes: 2 additions & 2 deletions apps/src/openni_organized_multi_plane_segmentation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ typedef pcl::PointXYZRGBA PointT;
class OpenNIOrganizedMultiPlaneSegmentation
{
private:
boost::shared_ptr<pcl::visualization::PCLVisualizer> viewer;
pcl::visualization::PCLVisualizer::Ptr viewer;
pcl::PointCloud<PointT>::ConstPtr prev_cloud;
boost::mutex cloud_mutex;

Expand All @@ -64,7 +64,7 @@ class OpenNIOrganizedMultiPlaneSegmentation
{
}

boost::shared_ptr<pcl::visualization::PCLVisualizer>
pcl::visualization::PCLVisualizer::Ptr
cloudViewer (pcl::PointCloud<PointT>::ConstPtr cloud)
{
boost::shared_ptr < pcl::visualization::PCLVisualizer> viewer (new pcl::visualization::PCLVisualizer ("Viewer"));
Expand Down
10 changes: 5 additions & 5 deletions apps/src/organized_segmentation_demo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

void
displayPlanarRegions (std::vector<pcl::PlanarRegion<PointT>, Eigen::aligned_allocator<pcl::PlanarRegion<PointT> > > &regions,
boost::shared_ptr<pcl::visualization::PCLVisualizer> viewer)
pcl::visualization::PCLVisualizer::Ptr viewer)
{
char name[1024];
unsigned char red [6] = {255, 0, 0, 255, 255, 0};
Expand Down Expand Up @@ -44,7 +44,7 @@ displayPlanarRegions (std::vector<pcl::PlanarRegion<PointT>, Eigen::aligned_allo

void
displayEuclideanClusters (const pcl::PointCloud<PointT>::CloudVectorType &clusters,
boost::shared_ptr<pcl::visualization::PCLVisualizer> viewer)
pcl::visualization::PCLVisualizer::Ptr viewer)
{
char name[1024];
unsigned char red [6] = {255, 0, 0, 255, 255, 0};
Expand All @@ -63,7 +63,7 @@ displayEuclideanClusters (const pcl::PointCloud<PointT>::CloudVectorType &cluste
}

void
displayCurvature (pcl::PointCloud<PointT>& cloud, pcl::PointCloud<pcl::Normal>& normals, boost::shared_ptr<pcl::visualization::PCLVisualizer> viewer)
displayCurvature (pcl::PointCloud<PointT>& cloud, pcl::PointCloud<pcl::Normal>& normals, pcl::visualization::PCLVisualizer::Ptr viewer)
{
pcl::PointCloud<pcl::PointXYZRGBA> curvature_cloud = cloud;
for (size_t i = 0; i < cloud.points.size (); i++)
Expand All @@ -88,7 +88,7 @@ displayCurvature (pcl::PointCloud<PointT>& cloud, pcl::PointCloud<pcl::Normal>&
}

void
displayDistanceMap (pcl::PointCloud<PointT>& cloud, float* distance_map, boost::shared_ptr<pcl::visualization::PCLVisualizer> viewer)
displayDistanceMap (pcl::PointCloud<PointT>& cloud, float* distance_map, pcl::visualization::PCLVisualizer::Ptr viewer)
{
pcl::PointCloud<pcl::PointXYZRGBA> distance_map_cloud = cloud;
for (size_t i = 0; i < cloud.points.size (); i++)
Expand All @@ -112,7 +112,7 @@ displayDistanceMap (pcl::PointCloud<PointT>& cloud, float* distance_map, boost::
}

void
removePreviousDataFromScreen (size_t prev_models_size, size_t prev_clusters_size, boost::shared_ptr<pcl::visualization::PCLVisualizer> viewer)
removePreviousDataFromScreen (size_t prev_models_size, size_t prev_clusters_size, pcl::visualization::PCLVisualizer::Ptr viewer)
{
char name[1024];
for (size_t i = 0; i < prev_models_size; i++)
Expand Down
4 changes: 2 additions & 2 deletions apps/src/stereo_ground_segmentation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ typedef Cloud::ConstPtr CloudConstPtr;
class HRCSSegmentation
{
private:
boost::shared_ptr<pcl::visualization::PCLVisualizer> viewer;
boost::shared_ptr<pcl::visualization::ImageViewer> image_viewer;
pcl::visualization::PCLVisualizer::Ptr viewer;
pcl::visualization::ImageViewer::Ptr image_viewer;
pcl::PointCloud<PointT>::ConstPtr prev_cloud;
pcl::PointCloud<pcl::Normal>::ConstPtr prev_normal_cloud;
pcl::PointCloud<pcl::PointXYZ>::ConstPtr prev_ground_cloud;
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorials/content/hdl_grabber.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ So let's look at the code. The following represents a simplified version of *vis
cloud_connection.disconnect ();
}

boost::shared_ptr<pcl::visualization::PCLVisualizer> cloud_viewer_;
pcl::visualization::PCLVisualizer::Ptr cloud_viewer_;

pcl::Grabber& grabber_;
boost::mutex cloud_mutex_;
Expand Down
Loading