fix: suppress resampling and background file loading errors on startup

Author: spectralcode

octproz_project/octproz/src/octalgorithmparametersmanager.cpp

@@ -45,27 +45,31 @@ bool OctAlgorithmParametersManager::saveCurveToFile(QString fileName, int nSampl
 }
 
 
-void OctAlgorithmParametersManager::loadPostProcessBackgroundFromFile(QString fileName) {
+void OctAlgorithmParametersManager::loadPostProcessBackgroundFromFile(QString fileName, bool suppressErrors) {
 	QVector<float> curve = this->loadCurveFromFile(fileName);
 	if(curve.size() > 0){
 		this->octParams->loadPostProcessingBackground(curve.data(), curve.size());
 		//this->sidebar->updateBackgroundPlot();
 		emit backgroundDataUpdated();
 		emit info(tr("Background data for post processing loaded. File used: ") + fileName);
 	}else{
-		emit error(tr("Background data has a size of 0. Check if the .csv file with background data is not empty and has the right format."));
+		if(!suppressErrors){
+			emit error(tr("Background data has a size of 0. Check if the .csv file with background data is not empty and has the right format."));
+		}
 	}
 }
 
-void OctAlgorithmParametersManager::loadCustomResamplingCurveFromFile(QString fileName) {
+void OctAlgorithmParametersManager::loadCustomResamplingCurveFromFile(QString fileName, bool suppressErrors) {
 	QVector<float> curve = this->loadCurveFromFile(fileName);
 	if(curve.size() > 0){
 		this->octParams->loadCustomResampleCurve(curve.data(), curve.size());
 		this->octParams->customResampleCurveFilePath = fileName;
 		emit resamplingCurveUpdated();
 		emit info(tr("Resampling  curve loaded. File used: ") + fileName);
 	}else{
-		emit error(tr("Resampling  curve has a size of 0. Check if the .csv file with resampling curve data is not empty and has the right format."));
+		if(!suppressErrors){
+			emit error(tr("Resampling  curve has a size of 0. Check if the .csv file with resampling curve data is not empty and has the right format."));
+		}
 	}
 }
 

octproz_project/octproz/src/octalgorithmparametersmanager.h

@@ -21,8 +21,8 @@ class OctAlgorithmParametersManager : public QObject
 
 
 public slots:
-	void loadPostProcessBackgroundFromFile(QString fileName);
-	void loadCustomResamplingCurveFromFile(QString fileName);
+	void loadPostProcessBackgroundFromFile(QString fileName, bool suppressErrors = false);
+	void loadCustomResamplingCurveFromFile(QString fileName, bool suppressErrors = false);
 	void savePostProcessBackgroundToFile(QString fileName);
 	void saveCustomResamplingCurveToFile(QString fileName);
 

octproz_project/octproz/src/sidebar.cpp

@@ -202,9 +202,9 @@ void Sidebar::loadSettings() {
 	OctAlgorithmParameters::getInstance()->useCustomResampleCurve = this->processingSettings.value(PROC_CUSTOM_RESAMPLING).toBool(); //todo: move all actions for klin from octproz to sidebar
 	QString customResamplingFilePath = this->processingSettings.value(PROC_CUSTOM_RESAMPLING_FILEPATH).toString();
 	if (customResamplingFilePath.isEmpty() || !QFile::exists(customResamplingFilePath)) {
-		emit loadResamplingCurveRequested(SETTINGS_PATH_RESAMPLING_FILE);
+		emit loadResamplingCurveRequested(SETTINGS_PATH_RESAMPLING_FILE, true);
 	} else {
-		emit loadResamplingCurveRequested(customResamplingFilePath);
+		emit loadResamplingCurveRequested(customResamplingFilePath, true);
 	}
 	this->ui.groupBox_dispersionCompensation->setChecked(this->processingSettings.value(PROC_DISPERSION_COMPENSATION).toBool());
 	this->ui.doubleSpinBox_d0->setValue(this->processingSettings.value(PROC_DISPERSION_COMPENSATION_D0).toDouble());
@@ -222,7 +222,7 @@ void Sidebar::loadSettings() {
 	this->ui.groupBox_postProcessBackgroundRemoval->setChecked(this->processingSettings.value(PROC_POST_BACKGROUND_REMOVAL).toBool());
 	this->ui.doubleSpinBox_postProcessBackgroundWeight->setValue(this->processingSettings.value(PROC_POST_BACKGROUND_WEIGHT).toDouble());
 	this->ui.doubleSpinBox_postProcessBackgroundOffset->setValue(this->processingSettings.value(PROC_POST_BACKGROUND_OFFSET).toDouble());
-	emit loadPostProcessBackgroundRequested(SETTINGS_PATH_BACKGROUND_FILE);
+	emit loadPostProcessBackgroundRequested(SETTINGS_PATH_BACKGROUND_FILE, true);
 
 	//GPU to RAM Streaming
 	this->ui.groupBox_streaming->setChecked(this->streamingSettings.value(STREAM_STREAMING).toBool());
@@ -498,7 +498,7 @@ void Sidebar::slot_loadPostProcessingBackground() {
 	QString savedPath = this->recordSettings.value(REC_PATH).toString();
 	QString standardLocation = savedPath.size() == 0 ? QStandardPaths::writableLocation(QStandardPaths::DesktopLocation) : savedPath;
 	fileName = QFileDialog::getOpenFileName(this, tr("Load background data"), QDir::currentPath(), filters, &defaultFilter);
-	emit loadPostProcessBackgroundRequested(fileName);
+	emit loadPostProcessBackgroundRequested(fileName, false);
 	emit dialogClosed();
 }
 

octproz_project/octproz/src/sidebar.h

@@ -179,9 +179,9 @@ public slots:
 	void klinCoeffs(double k0, double k1, double k2, double k3);
 	void dispCompCoeffs(double d0, double d1, double d2, double d3);
 	void savePostProcessBackgroundRequested(QString fileName);
-	void loadPostProcessBackgroundRequested(QString fileName);
+	void loadPostProcessBackgroundRequested(QString fileName, bool suppressErrors);
 	void saveResamplingCurveRequested(QString fileName);
-	void loadResamplingCurveRequested(QString fileName);
+	void loadResamplingCurveRequested(QString fileName, bool suppressErrors);
 	void error(QString);
 	void info(QString);
 };