unset the parent of the ConfusionMatrix in the classifier

This commit is contained in:
Paul Leroy
2023-01-26 14:46:52 +01:00
parent 22d2839fd3
commit 9e49a9e72e
3 changed files with 3 additions and 5 deletions
+1 -1
View File
@@ -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 )
+1
View File
@@ -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;
+1 -4
View File
@@ -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<double>::epsilon());
m_rtrees->setTermCriteria(terminationCriteria);
ccLog::Warning("[Classifier::train] cv::getNumThreads " + QString::number(cv::getNumThreads()));
QFuture<bool> 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));