saberbud/q3DMASC
1
0
Fork 0
mirror of https://github.com/dgirardeau/q3DMASC.git synced 2026-08-29 08:34:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Various updates/fixes

Browse Source
This commit is contained in:
Daniel Girardeau-Montaut
2019-03-25 18:45:28 +01:00
parent 4907e68ae2
commit ba1b4ac58c
11 changed files with 188 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
q3DMASC.cpp
+35 -11
View File
@@ -117,7 +117,9 @@ void q3DMASCPlugin::doClassifyAction()
}
QSet<QString> cloudLabels;
if (!masc::Tools::LoadClassifierCloudLabels(inputFilename, cloudLabels))
QString corePointsLabel;
bool filenamesSpecified = false;
if (!masc::Tools::LoadClassifierCloudLabels(inputFilename, cloudLabels, corePointsLabel, filenamesSpecified))
{
m_app->dispToConsole("Failed to read classifier file (see Console)", ccMainAppInterface::ERR_CONSOLE_MESSAGE);
return;
@@ -135,7 +137,7 @@ void q3DMASCPlugin::doClassifyAction()
//now show a dialog where the user will be able to set the cloud roles
Classify3DMASCDialog classifDlg(m_app);
classifDlg.setCloudRoles(cloudLabels);
classifDlg.setCloudRoles(cloudLabels, corePointsLabel);
classifDlg.classifierFileLineEdit->setText(inputFilename);
static bool s_keepAttributes = false;
classifDlg.keepAttributesCheckBox->setChecked(s_keepAttributes);
@@ -233,7 +235,9 @@ void q3DMASCPlugin::doTrainAction()
//load the cloud labels (PC1, PC2, CTX, etc.)
QSet<QString> cloudLabels;
if (!masc::Tools::LoadClassifierCloudLabels(inputFilename, cloudLabels))
QString corePointsLabel;
bool filenamesSpecified = false;
if (!masc::Tools::LoadClassifierCloudLabels(inputFilename, cloudLabels, corePointsLabel, filenamesSpecified))
{
m_app->dispToConsole("Failed to read classifier file (see Console)", ccMainAppInterface::ERR_CONSOLE_MESSAGE);
return;
@@ -246,8 +250,11 @@ void q3DMASCPlugin::doTrainAction()
static bool s_keepAttributes = false;
masc::Tools::NamedClouds loadedClouds;
masc::CorePoints corePoints;
bool useCloudsFromDB = (QMessageBox::question(m_app->getMainWindow(), "Use clouds in DB", "Use clouds in db (yes) or clouds specified in the file(no)?", QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes);
//if no filename is specified in the training file, we are bound to ask the user to specify them
bool useCloudsFromDB = (!filenamesSpecified || QMessageBox::question(m_app->getMainWindow(), "Use clouds in DB", "Use clouds in db (yes) or clouds specified in the file(no)?", QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes);
QString mainCloudLabel;
if (useCloudsFromDB)
{
if (cloudLabels.size() > 3)
@@ -259,7 +266,7 @@ void q3DMASCPlugin::doTrainAction()
//now show a dialog where the user will be able to set the cloud roles
Classify3DMASCDialog classifDlg(m_app, true);
classifDlg.setWindowTitle("3DMASC Train");
classifDlg.setCloudRoles(cloudLabels);
classifDlg.setCloudRoles(cloudLabels, corePointsLabel);
classifDlg.classifierFileLineEdit->setText(inputFilename);
classifDlg.keepAttributesCheckBox->setChecked(s_keepAttributes);
if (!classifDlg.exec())
@@ -269,12 +276,12 @@ void q3DMASCPlugin::doTrainAction()
}
s_keepAttributes = classifDlg.keepAttributesCheckBox->isChecked();
QString mainCloudLabel;
classifDlg.getClouds(loadedClouds, mainCloudLabel);
m_app->dispToConsole("Training cloud: " + mainCloudLabel, ccMainAppInterface::STD_CONSOLE_MESSAGE);
corePoints.origin = loadedClouds[mainCloudLabel];
}
static masc::TrainParameters s_params;
masc::CorePoints corePoints;
masc::Feature::Set features;
if (!masc::Tools::LoadTrainingFile(inputFilename, features, loadedClouds, corePoints, s_params))
{
@@ -282,6 +289,18 @@ void q3DMASCPlugin::doTrainAction()
return;
}
if (!corePoints.origin)
{
m_app->dispToConsole("Core points not defined", ccMainAppInterface::ERR_CONSOLE_MESSAGE);
return;
}
if (!masc::Classifier::GetClassificationSF(corePoints.origin))
{
m_app->dispToConsole("Missing 'Classification' field on core points cloud", ccMainAppInterface::ERR_CONSOLE_MESSAGE);
return;
}
ccHObject* group = new ccHObject("3DMASC");
if (!useCloudsFromDB)
{
@@ -292,6 +311,11 @@ void q3DMASCPlugin::doTrainAction()
}
}
for (masc::Tools::NamedClouds::const_iterator it = loadedClouds.begin(); it != loadedClouds.end(); ++it)
{
m_app->dispToConsole(it.key() + " = " + it.value()->getName(), ccMainAppInterface::STD_CONSOLE_MESSAGE);
}
//show the training dialog for the first time
Train3DMASCDialog trainDlg(m_app->getMainWindow());
trainDlg.maxDepthSpinBox->setValue(s_params.rt.maxDepth);
@@ -452,25 +476,25 @@ void q3DMASCPlugin::doTrainAction()
testSubset2->addPointIndex(0, testCloud->size());
}
if (s_params.testDataRatio < 0.0f || s_params.testDataRatio > 0.99f)
if (testDataRatio < 0.0f || testDataRatio > 0.99f)
{
assert(false);
m_app->dispToConsole("Invalid test data ratio", ccMainAppInterface::ERR_CONSOLE_MESSAGE);
}
else
{
if (previousTestSubsetRatio != s_params.testDataRatio)
if (previousTestSubsetRatio != testDataRatio)
{
//randomly select the training points
testSubset->clear();
trainSubset->clear();
if (!masc::Tools::RandomSubset(corePoints.cloud, s_params.testDataRatio, testSubset.data(), trainSubset.data()))
if (!masc::Tools::RandomSubset(corePoints.cloud, testDataRatio, testSubset.data(), trainSubset.data()))
{
m_app->dispToConsole("Not enough memory", ccMainAppInterface::ERR_CONSOLE_MESSAGE);
generatedScalarFields.releaseAllSFs();
return;
}
previousTestSubsetRatio = s_params.testDataRatio;
previousTestSubsetRatio = testDataRatio;
}
//train the classifier