Moved ExportCloudsDialog::mergeTextures() method in util3d_surface module

This commit is contained in:
matlabbe
2017-06-13 19:20:09 -04:00
parent 29a48aba66
commit 811afa1171
9 changed files with 1308 additions and 1058 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -121,17 +121,10 @@ private:
void saveClouds(const QString & workingDirectory, const std::map<int, Transform> & poses, const std::map<int, pcl::PointCloud<pcl::PointXYZRGBNormal>::Ptr> & clouds, bool binaryMode = true);
void saveMeshes(const QString & workingDirectory, const std::map<int, Transform> & poses, const std::map<int, pcl::PolygonMesh::Ptr> & meshes, bool binaryMode = true);
void saveTextureMeshes(const QString & workingDirectory, const std::map<int, Transform> & poses, std::map<int, pcl::TextureMesh::Ptr> & textureMeshes, const QMap<int, Signature> & cachedSignatures, const std::vector<std::map<int, pcl::PointXY> > & textureVertexToPixels);
std::vector<cv::Mat> mergeTextures(pcl::TextureMesh & mesh, const QMap<int, Signature> & cachedSignatures, const std::vector<std::map<int, pcl::PointXY> > & textureVertexToPixels, int maxTextures) const;
void setSaveButton();
void setOkButton();
void denseMeshPostProcessing(
int id,
pcl::PolygonMeshPtr & mesh,
bool lostColors,
pcl::PointCloud<pcl::PointXYZRGBNormal>::Ptr & cloud);
private:
Ui_ExportCloudsDialog * _ui;
ProgressDialog * _progressDialog;

View File

@@ -40,8 +40,9 @@ class TexturingState : public QObject, public ProgressState
Q_OBJECT
public:
TexturingState(ProgressDialog * dialog): dialog_(dialog)
TexturingState(ProgressDialog * dialog, bool incrementOnMsgReceived): dialog_(dialog)
{
_increment = incrementOnMsgReceived;
connect(dialog_, SIGNAL(canceled()), this, SLOT(cancel()));
}
virtual ~TexturingState() {}
@@ -50,10 +51,17 @@ public:
if(!msg.empty())
{
dialog_->appendText(msg.c_str());
dialog_->incrementStep();
if(_increment)
{
dialog_->incrementStep();
}
}
QApplication::processEvents();
return !isCanceled();
if(!isCanceled())
{
return ProgressState::callback(msg);
}
return false;
}
public slots:
@@ -64,6 +72,7 @@ public slots:
private:
ProgressDialog * dialog_;
bool _increment;
};
}