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

fix a small bug

Browse Source
This commit is contained in:
Tang1705
2020-05-05 23:46:54 +08:00
parent 3893003b8e
commit 14141acc45
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Classes/Reconstruction.cpp
View File

@@ -118,11 +118,7 @@ void Reconstruction::on_pushButton_3_clicked()
{
ui.stackedWidget->setCurrentIndex(2);
updateQVTK(cloud, color);
<<<<<<< HEAD
if (loadingStatus)
=======
if(loadingStatus)
>>>>>>> 25cd1378d60d38a887eb0dbf1272b364c933624c
{
ui.label_9->setVisible(true);
}
@@ -141,10 +137,7 @@ 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"));
@@ -674,17 +667,12 @@ 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);
}
}
// 帮助
void Reconstruction::on_pushButton_18_clicked()
{