shen/Happy-Reconstruction
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Tang1705/Reconstruction

Browse Source
This commit is contained in:
Tang1705
2020-05-05 23:36:15 +08:00
parent 1ca0150893 25cd1378d6
commit 15b1fe641b
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Classes/Reconstruction.cpp
View File

@@ -118,7 +118,11 @@ void Reconstruction::on_pushButton_3_clicked()
{
ui.stackedWidget->setCurrentIndex(2);
updateQVTK(cloud, color);
<<<<<<< HEAD
if (loadingStatus)
=======
if(loadingStatus)
>>>>>>> 25cd1378d60d38a887eb0dbf1272b364c933624c
{
ui.label_9->setVisible(true);
}
@@ -137,7 +141,10 @@ void Reconstruction::setCloud()
cloud = t->getCloud();
updateQVTK(cloud, color);
}
<<<<<<< HEAD
=======
>>>>>>> 25cd1378d60d38a887eb0dbf1272b364c933624c
void Reconstruction::updateQVTK(PointCloud<PointXYZRGB> cloud, QColor color)
{
boost::shared_ptr<visualization::PCLVisualizer> viewer(new visualization::PCLVisualizer("3D Viewer"));
@@ -667,7 +674,11 @@ void Reconstruction::on_pushButton_15_clicked()
void Reconstruction::on_pushButton_16_clicked()
{
QColor colortmp = QColorDialog::getColor(Qt::black);
<<<<<<< HEAD
if (colortmp.isValid()) {
=======
if (colortmp.isValid()){
>>>>>>> 25cd1378d60d38a887eb0dbf1272b364c933624c
color = colortmp;
updateQVTK(cloud, color);
}