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

add features to the traces of execution

Browse Source
This commit is contained in:
Paul Leroy
2023-03-28 17:19:41 +02:00
parent 3834043b95
commit ee6ffbd546
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -1
View File
@@ -8,7 +8,7 @@ if (INSTALL_Q3DMASC_PLUGIN)
project( Q3DMASC_PLUGIN ) project( Q3DMASC_PLUGIN )
AddPlugin( NAME ${PROJECT_NAME} ) AddPlugin( NAME ${PROJECT_NAME} )
set(Q3DMASC_PLUGIN_VERSION "0.3+") set(Q3DMASC_PLUGIN_VERSION "0.4")
include( CMakePolicies NO_POLICY_SCOPE ) include( CMakePolicies NO_POLICY_SCOPE )
q3DMASC.cpp
+7 -3
View File
@@ -697,16 +697,18 @@ void q3DMASCPlugin::doTrainAction()
QString tracePath = trainDlg.getTracePath(); QString tracePath = trainDlg.getTracePath();
if (!tracePath.isEmpty()) if (!tracePath.isEmpty())
{ {
QString outputFilename = tracePath + "/run_" + QString::number(trainDlg.getRun()) + ".txt"; QString outputFilePath = tracePath + "/run_" + QString::number(trainDlg.getRun()) + ".txt";
if (masc::Tools::SaveClassifier(outputFilename, features, mainCloudLabel, classifier, m_app->getMainWindow())) if (masc::Tools::SaveClassifier(outputFilePath, features, mainCloudLabel, classifier, m_app->getMainWindow()))
{ {
m_app->dispToConsole("Classifier succesfully saved to " + outputFilename, ccMainAppInterface::STD_CONSOLE_MESSAGE); m_app->dispToConsole("Classifier succesfully saved to " + outputFilePath, ccMainAppInterface::STD_CONSOLE_MESSAGE);
trainDlg.setClassifierSaved(); trainDlg.setClassifierSaved();
} }
else else
{ {
m_app->dispToConsole("Failed to save classifier file"); m_app->dispToConsole("Failed to save classifier file");
} }
QString exportFilePath = tracePath + "/run_" + QString::number(trainDlg.getRun()) + ".csv";
} }
} }
} }
@@ -719,6 +721,8 @@ void q3DMASCPlugin::doTrainAction()
{ {
saveTrainParameters(s_params); saveTrainParameters(s_params);
//the dialog can be closed //the dialog can be closed
if (trainDlg.keepAttributesCheckBox->isChecked())
s_keepAttributes = true;
generatedScalarFields.releaseSFs(s_keepAttributes); generatedScalarFields.releaseSFs(s_keepAttributes);
generatedScalarFieldsTest.releaseSFs(s_keepAttributes); generatedScalarFieldsTest.releaseSFs(s_keepAttributes);
return; return;
qTrain3DMASCDialog.cpp
+8 -2
View File
@@ -47,7 +47,8 @@ Train3DMASCDialog::Train3DMASCDialog(QWidget* parent/*=nullptr*/)
setupUi(this); setupUi(this);
QDateTime dateTime = QDateTime::currentDateTime(); QDateTime dateTime = QDateTime::currentDateTime();
m_baseName = "3dmasc_" + dateTime.toString("yyyyMMdd") + "_" + dateTime.toString("hh") + "h" + dateTime.toString("mm"); m_baseName = "3dmasc_" + dateTime.toString("yyyyMMdd_hh")
+ "h" + dateTime.toString("mm");
readSettings(); readSettings();
@@ -199,7 +200,7 @@ void Train3DMASCDialog::onSave()
accept(); accept();
} }
void Train3DMASCDialog::onExportResults() void Train3DMASCDialog::onExportResults(QString filePath/*=""*/)
{ {
QSettings settings; QSettings settings;
settings.beginGroup("3DMASC"); settings.beginGroup("3DMASC");
@@ -266,6 +267,11 @@ bool Train3DMASCDialog::openTraceFile()
m_tracePath = parameterDir.absolutePath() + "/" + m_baseName; m_tracePath = parameterDir.absolutePath() + "/" + m_baseName;
traceFileName = m_baseName + ".txt"; traceFileName = m_baseName + ".txt";
if (parameterDir.exists(m_baseName))
{
QDateTime dateTime = QDateTime::currentDateTime();
m_baseName += "min" + dateTime.toString("ss") + "s";
}
if (!parameterDir.mkdir(m_baseName)) // create a specific directory to store the traces if (!parameterDir.mkdir(m_baseName)) // create a specific directory to store the traces
{ {
ccLog::Error("impossible to save in the default directory: " + m_tracePath); ccLog::Error("impossible to save in the default directory: " + m_tracePath);
qTrain3DMASCDialog.h
+1 -1
View File
@@ -73,7 +73,7 @@ protected slots:
void onClose(); void onClose();
void onSave(); void onSave();
void onExportResults(); void onExportResults(QString filePath = "");
protected: //members protected: //members