THe GUI version can now handle 4 clouds

This commit is contained in:
Daniel Girardeau-Montaut
2019-03-29 13:40:57 +01:00
parent 568ed7e292
commit 4dfc90d967
3 changed files with 75 additions and 43 deletions
+4 -4
View File
@@ -129,9 +129,9 @@ void q3DMASCPlugin::doClassifyAction()
m_app->dispToConsole("Invalid classifier file (no cloud label defined)", ccMainAppInterface::ERR_CONSOLE_MESSAGE);
return;
}
else if (cloudLabels.size() > (cloudLabels.contains("TEST") ? 4 : 3))
else if (cloudLabels.size() > 4 + (cloudLabels.contains("TEST") ? 1 : 0))
{
m_app->dispToConsole("This classifier uses more than 3 clouds (the GUI version cannot handle it)", ccMainAppInterface::ERR_CONSOLE_MESSAGE);
m_app->dispToConsole("This classifier uses more than 4 clouds (the GUI version cannot handle it)", ccMainAppInterface::ERR_CONSOLE_MESSAGE);
return;
}
@@ -266,9 +266,9 @@ void q3DMASCPlugin::doTrainAction()
QString mainCloudLabel = corePointsLabel;
if (useCloudsFromDB)
{
if (cloudLabels.size() > (cloudLabels.contains("TEST") ? 4 : 3))
if (cloudLabels.size() > 4 + (cloudLabels.contains("TEST") ? 1 : 0))
{
m_app->dispToConsole("This classifier uses more than 3 different clouds (the GUI version cannot handle it)", ccMainAppInterface::WRN_CONSOLE_MESSAGE);
m_app->dispToConsole("This classifier uses more than 4 different clouds (the GUI version cannot handle it)", ccMainAppInterface::WRN_CONSOLE_MESSAGE);
return;
}