diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbfa161..3e3e149 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,7 @@ if (INSTALL_Q3DMASC_PLUGIN)
)
target_link_libraries( ${PROJECT_NAME} ${OpenCV_LIBS} )
- set( OPENCV_DEP_DLL_FILES ${OpenCV_DIR}/x64/vc15/bin/opencv_world460.dll )
+ set( OPENCV_DEP_DLL_FILES ${OpenCV_DIR}/x64/vc15/bin/opencv_world340.dll )
copy_files("${OPENCV_DEP_DLL_FILES}" "${CLOUDCOMPARE_DEST_FOLDER}") #mind the quotes!
diff --git a/confusionmatrix.ui b/confusionmatrix.ui
index 412c70f..ff62d0b 100644
--- a/confusionmatrix.ui
+++ b/confusionmatrix.ui
@@ -6,15 +6,15 @@
0
0
- 575
- 260
+ 620
+ 327
Form
-
- -
+
+
-
Qt::ScrollBarAlwaysOff
@@ -55,6 +55,69 @@
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 394
+ 20
+
+
+
+
+ -
+
+
+ false
+
+
+
+ true
+
+
+
+ Session
+
+
+
+ -
+
+
+ false
+
+
+ -
+
+
+
+ -
+
+
+ false
+
+
+
+ true
+
+
+
+ Run
+
+
+
+ -
+
+
+ false
+
+
+ -
+
+
+
diff --git a/q3DMASC.cpp b/q3DMASC.cpp
index 4e20f03..a877ecb 100644
--- a/q3DMASC.cpp
+++ b/q3DMASC.cpp
@@ -310,8 +310,6 @@ void q3DMASCPlugin::doTrainAction()
mainCloudLabel = corePoints.role;
}
-
-
if (!masc::Tools::GetClassificationSF(corePoints.origin))
{
m_app->dispToConsole("Missing 'Classification' field on core points cloud", ccMainAppInterface::ERR_CONSOLE_MESSAGE);
diff --git a/q3DMASCClassifier.cpp b/q3DMASCClassifier.cpp
index 546032f..cc74db6 100644
--- a/q3DMASCClassifier.cpp
+++ b/q3DMASCClassifier.cpp
@@ -442,7 +442,7 @@ bool Classifier::evaluate(const Feature::Source::Set& featureSources,
}
std::unique_ptr confusionMatrix(new ConfusionMatrix(actualClass, predictectedClass));
- train3DMASCDialog.deleteLaterConfusionMatrix(confusionMatrix);
+ train3DMASCDialog.addConfusionMatrix(confusionMatrix);
return true;
}
diff --git a/qTrain3DMASCDialog.cpp b/qTrain3DMASCDialog.cpp
index 5ba595e..f18c10a 100644
--- a/qTrain3DMASCDialog.cpp
+++ b/qTrain3DMASCDialog.cpp
@@ -187,7 +187,7 @@ void Train3DMASCDialog::onExportResults()
}
}
-void Train3DMASCDialog::deleteLaterConfusionMatrix(std::unique_ptr& ptr)
+void Train3DMASCDialog::addConfusionMatrix(std::unique_ptr& ptr)
{
- m_confusionMatrixToDeleteLater.push_back(std::move(ptr));
+ m_confusionMatrices.push_back(std::move(ptr));
}
diff --git a/qTrain3DMASCDialog.h b/qTrain3DMASCDialog.h
index 2ee68cb..c069031 100644
--- a/qTrain3DMASCDialog.h
+++ b/qTrain3DMASCDialog.h
@@ -53,7 +53,7 @@ public:
inline bool shouldSaveClassifier() const { return saveRequested; }
- void deleteLaterConfusionMatrix(std::unique_ptr& ptr);
+ void addConfusionMatrix(std::unique_ptr& ptr);
protected slots:
@@ -65,5 +65,5 @@ protected: //members
bool classifierSaved;
bool saveRequested;
- std::vector> m_confusionMatrixToDeleteLater;
+ std::vector> m_confusionMatrices;
};