WriterIdentification: added evaluation file to settings

TUWien · Jun 15, 2016 · 7bba46b · 7bba46b
1 parent ec96ecb
commit 7bba46b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Modules/WriterIdentification/src/WriterIdentificationPlugin.cpp b/Modules/WriterIdentification/src/WriterIdentificationPlugin.cpp
@@ -352,7 +352,7 @@ void WriterIdentificationPlugin::postLoadPlugin(const QVector<QSharedPointer<nmc
 		}
 		//wiDatabase.evaluateDatabase(classLabels, featurePaths/*, QString("c:\\tmp\\eval-2.txt")*/);
 		//wiDatabase.evaluateDatabase(hists, classLabels, featurePaths/*, QString("c:\\tmp\\eval-2.txt")*/);
-		wiDatabase.evaluateDatabase(hists, classLabels, featurePaths, QString("c:\\tmp\\onlyAreaEval.txt"));
+		wiDatabase.evaluateDatabase(hists, classLabels, featurePaths, mEvalFile);
 	}
 }
 
@@ -376,6 +376,7 @@ void WriterIdentificationPlugin::loadSettings(QSettings & settings) {
 	mVocPowerNormalization = settings.value("powerNormalization", 1).toDouble();
 	mFeatureDir = settings.value("featureDir", QString()).toString();
 
+	mEvalFile = settings.value("evalFile", QString()).toString();
 
 	qDebug() << "settings read: path: " << mSettingsVocPath << " type:" << mVocType << " numberOfClusters:" << mVocNumberOfClusters << " numberOfPCA: " << mVocNumberOfPCA;
 	settings.endGroup();

diff --git a/Modules/WriterIdentification/src/WriterIdentificationPlugin.h b/Modules/WriterIdentification/src/WriterIdentificationPlugin.h
@@ -99,6 +99,7 @@ class WriterIdentificationPlugin : public QObject, nmc::DkBatchPluginInterface {
 	double mVocPowerNormalization;
 	WIVocabulary mVocabulary = WIVocabulary();
 	QString mFeatureDir = QString();
+	QString mEvalFile = QString();
 };
 
 };