diff --git a/CMakeLists.txt b/CMakeLists.txt index 7549021..9393d49 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ if (INSTALL_Q3DMASC_PLUGIN) project( Q3DMASC_PLUGIN ) AddPlugin( NAME ${PROJECT_NAME} ) - set(Q3DMASC_PLUGIN_VERSION "0.1+") + set(Q3DMASC_PLUGIN_VERSION "0.2") include( CMakePolicies NO_POLICY_SCOPE ) diff --git a/q3DMASC.cpp b/q3DMASC.cpp index 851c795..8b3016b 100644 --- a/q3DMASC.cpp +++ b/q3DMASC.cpp @@ -182,6 +182,7 @@ void q3DMASCPlugin::doClassifyAction() //prepare the main cloud ccProgressDialog progressDlg(true, m_app->getMainWindow()); + progressDlg.show(); progressDlg.setAutoClose(false); //we don't want the progress dialog to 'pop' for each feature QString error; SFCollector generatedScalarFields; diff --git a/q3DMASCClassifier.cpp b/q3DMASCClassifier.cpp index cc74db6..553bc13 100644 --- a/q3DMASCClassifier.cpp +++ b/q3DMASCClassifier.cpp @@ -275,7 +275,7 @@ bool Classifier::classify( const Feature::Source::Set& featureSources, QCoreApplication::processEvents(); } - ConfusionMatrix *confusionMatrix = new ConfusionMatrix(*classifSFBackup, *classificationSF, parentWidget); + ConfusionMatrix *confusionMatrix = new ConfusionMatrix(*classifSFBackup, *classificationSF); return success; } @@ -562,14 +562,11 @@ bool Classifier::train( const ccPointCloud* cloud, cv::TermCriteria terminationCriteria(cv::TermCriteria::MAX_ITER, params.maxTreeCount, std::numeric_limits::epsilon()); m_rtrees->setTermCriteria(terminationCriteria); - ccLog::Warning("[Classifier::train] cv::getNumThreads " + QString::number(cv::getNumThreads())); - QFuture future = QtConcurrent::run([&]() { // Code in this block will run in another thread try { - ccLog::Warning("[QFuture] cv::getNumThreads " + QString::number(cv::getNumThreads())); cv::Mat sampleIndexes = cv::Mat::zeros(1, training_data.rows, CV_8U); // cv::Mat trainSamples = sampleIndexes.colRange(0, sampleCount); // trainSamples.setTo(cv::Scalar::all(1));