diff --git a/Classify3DMASCDialog.ui b/Classify3DMASCDialog.ui
index be9d5fd..846e316 100644
--- a/Classify3DMASCDialog.ui
+++ b/Classify3DMASCDialog.ui
@@ -7,7 +7,7 @@
0
0
700
- 300
+ 343
@@ -51,50 +51,83 @@
Data
-
- -
-
+
+
-
+
- PC2
+ Cloud
+
+
+ Qt::AlignCenter
-
- CTX
-
-
-
- -
-
-
- Role
-
-
-
- -
-
-
- Cloud
+
-
- PC1
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
-
- TEST (optional)
+ TEST on (optional)
- -
+
-
+
+
+ -
+
+
+ CLASSIFY
+
+
+
+ -
color:red;
@@ -107,17 +140,7 @@
- -
-
-
-
- 0
- 0
-
-
-
-
- -
+
-
@@ -127,17 +150,7 @@
- -
-
-
-
- 0
- 0
-
-
-
-
- -
+
-
@@ -147,16 +160,44 @@
- -
-
+
-
+
+
+ PC1
+
+
- -
-
+
-
+
+
+ PC2
+
+
+
+ -
+
+
+ CTX
+
+
+
+ -
+
PCX
+ -
+
+
+ <html><head/><body><p>Role as defined in the parameter file.</p></body></html>
+
+
+ Role
+
+
+
diff --git a/classifyDisclaimerDlg.ui b/classifyDisclaimerDlg.ui
index 9f4f538..0a419ab 100644
--- a/classifyDisclaimerDlg.ui
+++ b/classifyDisclaimerDlg.ui
@@ -49,15 +49,16 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+<html><head><meta name="qrichtext" content="1" /><meta charset="utf-8" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:9.75pt; font-weight:400; font-style:normal;">
-<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p>
-<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600; color:#1f497d;">3DMASC</span></p>
-<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt; font-weight:600; color:#1f497d;"><br /></p>
-<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600; color:#1f497d;">3D multi-cloud, multi-attribute, multi-scale, multi-class classification</span></p>
+hr { height: 1px; border-width: 0; }
+</style></head><body style=" font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;">
+<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:9.75pt;"><br /></p>
+<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600; color:#1f497d;">3DMASC</span></p>
+<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600; color:#1f497d;"><br /></p>
+<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600; color:#1f497d;">3D multi-cloud, multi-attribute, multi-scale, multi-class classification</span></p>
<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Calibri,sans-serif'; font-size:10pt; color:#1f497d; background-color:#ffffff;"><br /></p>
-<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'Slack-Lato','appleLogo','sans-serif'; font-size:10pt; font-weight:600; color:#1f497d;">development </span><span style=" font-family:'Slack-Lato','appleLogo','sans-serif'; font-size:10pt; color:#1f497d;">D. Lague, A. Le Guennec, S. Lefebre, Th. Corpetti</span></p>
+<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'Slack-Lato','appleLogo','sans-serif'; font-size:10pt; font-weight:600; color:#1f497d;">development </span><span style=" font-family:'Slack-Lato','appleLogo','sans-serif'; font-size:10pt; color:#1f497d;">D. Lague, A. Le Guennec, S. Lefèvre, Th. Corpetti</span></p>
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'Slack-Lato','appleLogo','sans-serif'; font-size:10pt; font-weight:600; color:#1f497d;">code </span><span style=" font-family:'Slack-Lato','appleLogo','sans-serif'; font-size:10pt; color:#1f497d;">D. Girardeau-Montaut</span></p>
<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Calibri,sans-serif'; font-size:10pt; color:#1f497d; background-color:#ffffff;"><br /></p>
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'Slack-Lato','appleLogo','sans-serif'; font-size:10pt; font-weight:600; color:#1f497d;">This software development has been funded by the European Union.</span></p>
diff --git a/q3DMASC.cpp b/q3DMASC.cpp
index 727923b..90dd820 100644
--- a/q3DMASC.cpp
+++ b/q3DMASC.cpp
@@ -272,6 +272,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.label_3->setText("TRAIN on");
classifDlg.setCloudRoles(cloudLabels, corePointsLabel);
classifDlg.classifierFileLineEdit->setText(inputFilename);
classifDlg.keepAttributesCheckBox->setChecked(s_keepAttributes);
diff --git a/qClassify3DMASCDialog.cpp b/qClassify3DMASCDialog.cpp
index fd6d340..5c93b84 100644
--- a/qClassify3DMASCDialog.cpp
+++ b/qClassify3DMASCDialog.cpp
@@ -124,22 +124,22 @@ void Classify3DMASCDialog::setCloudRoles(const QList& roles, QString co
switch (index)
{
case 0:
- cloud1RadioButton->setText(role);
+ cloud1Label->setText(role);
if (corePointsLabel.isEmpty() || corePointsLabel == role)
cloud1RadioButton->setChecked(true);
break;
case 1:
- cloud2RadioButton->setText(role);
+ cloud2Label->setText(role);
if (corePointsLabel == role)
cloud2RadioButton->setChecked(true);
break;
case 2:
- cloud3RadioButton->setText(role);
+ cloud3Label->setText(role);
if (corePointsLabel == role)
cloud3RadioButton->setChecked(true);
break;
case 3:
- cloud4RadioButton->setText(role);
+ cloud4Label->setText(role);
if (corePointsLabel == role)
cloud4RadioButton->setChecked(true);
break;
@@ -160,18 +160,21 @@ void Classify3DMASCDialog::setCloudRoles(const QList& roles, QString co
cloud2RadioButton->setEnabled(false);
cloud2RadioButton->setVisible(false);
cloud2ComboBox->setVisible(false);
+ cloud2Label->setVisible(false);
}
if (index < 3)
{
cloud3RadioButton->setEnabled(false);
cloud3RadioButton->setVisible(false);
cloud3ComboBox->setVisible(false);
+ cloud3Label->setVisible(false);
}
if (index < 4)
{
cloud4RadioButton->setEnabled(false);
cloud4RadioButton->setVisible(false);
cloud4ComboBox->setVisible(false);
+ cloud4Label->setVisible(false);
}
}
@@ -185,34 +188,34 @@ void Classify3DMASCDialog::getClouds(QMap& clouds, QStri
if (cloud1RadioButton->isEnabled())
{
- clouds.insert(cloud1RadioButton->text(), GetCloudFromCombo(cloud1ComboBox, m_app->dbRootObject()));
+ clouds.insert(cloud1Label->text(), GetCloudFromCombo(cloud1ComboBox, m_app->dbRootObject()));
if (cloud1RadioButton->isChecked())
{
- mainCloud = cloud1RadioButton->text();
+ mainCloud = cloud1Label->text();
}
}
if (cloud2RadioButton->isEnabled())
{
- clouds.insert(cloud2RadioButton->text(), GetCloudFromCombo(cloud2ComboBox, m_app->dbRootObject()));
+ clouds.insert(cloud2Label->text(), GetCloudFromCombo(cloud2ComboBox, m_app->dbRootObject()));
if (cloud2RadioButton->isChecked())
{
- mainCloud = cloud2RadioButton->text();
+ mainCloud = cloud2Label->text();
}
}
if (cloud3RadioButton->isEnabled())
{
- clouds.insert(cloud3RadioButton->text(), GetCloudFromCombo(cloud3ComboBox, m_app->dbRootObject()));
+ clouds.insert(cloud3Label->text(), GetCloudFromCombo(cloud3ComboBox, m_app->dbRootObject()));
if (cloud3RadioButton->isChecked())
{
- mainCloud = cloud3RadioButton->text();
+ mainCloud = cloud3Label->text();
}
}
if (cloud4RadioButton->isEnabled())
{
- clouds.insert(cloud4RadioButton->text(), GetCloudFromCombo(cloud4ComboBox, m_app->dbRootObject()));
+ clouds.insert(cloud4Label->text(), GetCloudFromCombo(cloud4ComboBox, m_app->dbRootObject()));
if (cloud4RadioButton->isChecked())
{
- mainCloud = cloud4RadioButton->text();
+ mainCloud = cloud4Label->text();
}
}
if (testCloudComboBox->currentIndex() >= 0)
diff --git a/trainDisclaimerDlg.ui b/trainDisclaimerDlg.ui
index b45b5fd..b0f664c 100644
--- a/trainDisclaimerDlg.ui
+++ b/trainDisclaimerDlg.ui
@@ -52,15 +52,16 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+<html><head><meta name="qrichtext" content="1" /><meta charset="utf-8" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:9.75pt; font-weight:400; font-style:normal;">
-<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><br /></p>
-<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600; color:#1f497d;">3DMASC</span></p>
-<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt; font-weight:600; color:#1f497d;"><br /></p>
-<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600; color:#1f497d;">3D multi-cloud, multi-attribute, multi-scale, multi-class classification</span></p>
+hr { height: 1px; border-width: 0; }
+</style></head><body style=" font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;">
+<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:9.75pt; background-color:#ffffff;"><br /></p>
+<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600; color:#1f497d;">3DMASC</span></p>
+<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600; color:#1f497d;"><br /></p>
+<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600; color:#1f497d;">3D multi-cloud, multi-attribute, multi-scale, multi-class classification</span></p>
<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Calibri,sans-serif'; font-size:10pt; color:#1f497d; background-color:#ffffff;"><br /></p>
-<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'Slack-Lato','appleLogo','sans-serif'; font-size:10pt; font-weight:600; color:#1f497d;">development </span><span style=" font-family:'Slack-Lato','appleLogo','sans-serif'; font-size:10pt; color:#1f497d;">D. Lague, A. Le Guennec, S. Lefebre, Th. Corpetti</span></p>
+<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'Slack-Lato','appleLogo','sans-serif'; font-size:10pt; font-weight:600; color:#1f497d;">development </span><span style=" font-family:'Slack-Lato','appleLogo','sans-serif'; font-size:10pt; color:#1f497d;">D. Lague, A. Le Guennec, S. Lefèvre, Th. Corpetti</span></p>
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'Slack-Lato','appleLogo','sans-serif'; font-size:10pt; font-weight:600; color:#1f497d;">code </span><span style=" font-family:'Slack-Lato','appleLogo','sans-serif'; font-size:10pt; color:#1f497d;">D. Girardeau-Montaut</span></p>
<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Calibri,sans-serif'; font-size:10pt; color:#1f497d; background-color:#ffffff;"><br /></p>
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'Slack-Lato','appleLogo','sans-serif'; font-size:10pt; font-weight:600; color:#1f497d;">This software development has been funded by the European Union.</span></p>