Merge branch 'master' into release

Author: perdrix52

.github/ISSUE_TEMPLATE/⚠️-please-raise-any-issues--bugs-or-enhancement-requests-on-the-deepskystacker-mailing-list-at-groups-io---please-supply-the-information-listed-below-in-your-email-⚠️.md

@@ -11,6 +11,16 @@ assignees: ''
 **Check the Wiki**
 Before you report any issues it is worth checking the DeepSkyStacker Wiki: <https://groups.io/g/DeepSkyStacker/wiki>
 
+If you aren't a member the DeepSkyStacker mailing list, please join by sending an email to:
+
+[email protected]
+
+Once you have successfully joined the mailing list please report the problem on the mailing list by sending an email to:
+
+[email protected]
+
+Your email should contain the following information:
+
 **Describe the bug**
 A clear and concise description of what the bug is.  Please specify the version of DeepSkyStacker and if relevant whether the problem is with DeepSkyStacker Live or DeepSkyStacker Command Line
 

DeepSkyStacker/DeepSkyStacker.cpp

@@ -37,7 +37,11 @@
 //
 #include <stdafx.h>
 #include <htmlhelp.h>
-#include <boost/interprocess/sync/named_mutex.hpp>
+#include <boost/interprocess/sync/file_lock.hpp>
+#include <boost/interprocess/sync/scoped_lock.hpp>
+#include <boost/interprocess/exceptions.hpp>
+
+#include <fstream>
 
 namespace bip = boost::interprocess;
 
@@ -1108,23 +1112,12 @@ int main(int argc, char* argv[])
 
 	reportCpuType();
 
-	ZTRACE_RUNTIME("Creating Main Window");
-	DeepSkyStacker mainWindow;
-
-	ZTRACE_RUNTIME("Checking Mutex");
-	bip::named_mutex dssMutex{ bip::open_or_create, "DeepSkyStacker.Mutex.UniqueID.12354687" };
-	bip::scoped_lock<bip::named_mutex> lk(dssMutex, bip::defer_lock);
-	const bool firstInstance{ lk.try_lock() };
-	ZTRACE_RUNTIME("  firstInstance: %s", firstInstance ? "true" : "false");
-
 	//
 	// Set things up to capture terminal errors
 	//
 	setDssExceptionHandling();
 
 	askIfVersionCheckWanted();
-	if (firstInstance)
-		deleteRemainingTempFiles();
 
 	//
 	// Register PICTURETYPE and QMessageBox::Icon enums as meta types
@@ -1141,13 +1134,58 @@ int main(int argc, char* argv[])
 	ZTRACE_RUNTIME("Invoking QApplication::exec()");
 	try
 	{
+		ZTRACE_RUNTIME("Creating Main Window");
+		DeepSkyStacker mainWindow;
+
+		ZTRACE_RUNTIME("Checking Mutex");
+		//
+		// Get the name of the writable local application data directory
+		// and create the directories if necessary
+		//
+		QString mutexFileName{ QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) };
+		fs::path file{ mutexFileName.toStdU16String() };
+		create_directories(file);
+
+		//
+		// Append the file name to the directory name
+		//
+		mutexFileName += "/DeepSkyStacker.Interprocess.Mutex";
+
+		//
+		// Create the file if it doesn't exist.  It is intentionally never deleted.
+		//
+		auto newFile = std::ofstream(mutexFileName.toUtf8().constData());	
+
+		//
+		// Use a boost::interprocess::file_lock as unlike a named_mutex, the OS removes the lock in the case of abnormal termination
+		//
+		bip::file_lock dssMutex{ mutexFileName.toUtf8().constData() };
+		bip::scoped_lock<bip::file_lock> lock(dssMutex, bip::try_to_lock);
+		const bool firstInstance{ lock.owns() };
+		ZTRACE_RUNTIME("  firstInstance: %s", firstInstance ? "true" : "false");
+
+		if (firstInstance)
+			deleteRemainingTempFiles();
+
 		Exiv2::XmpParser::initialize();
 		::atexit(Exiv2::XmpParser::terminate);
 
 		mainWindow.show();
 		//result = app.run(&theApp);
 		result = app.exec();
 	}
+	catch (bip::interprocess_exception& e)
+	{
+		ZTRACE_RUNTIME("boost::interprocess_exception caught: %s", e.what());
+		traceControl.setDeleteOnExit(false);
+		QString errorMessage(e.what());
+#if defined(_CONSOLE)
+		std::cerr << errorMessage.toUtf8().constData();
+#else
+		QMessageBox::critical(nullptr, "DeepSkyStacker", errorMessage);
+#endif
+
+	}
 	catch (std::exception& e)
 	{
 		ZTRACE_RUNTIME("std::exception caught: %s", e.what());

DeepSkyStacker/ExplorerBar.cpp

@@ -357,7 +357,7 @@ void ExplorerBar::onLoadSettings()
 			create_directories(fileName);		// In case they don't exist
 
 			fileName /= "DSSLive.settings";		// Append the filename with a path separator
-			ZTRACE_RUNTIME("Loading DSSLive settings from: %s", fileName.generic_string().c_str());
+			ZTRACE_RUNTIME("Loading DSSLive settings from: %s", fileName.generic_u8string().c_str());
 			workspace.ReadFromFile(fileName);
 			workspace.saveSettings();
 		}
@@ -416,7 +416,7 @@ void ExplorerBar::onSaveSettings()
 			create_directories(fileName);		// In case they don't exist
 
 			fileName /= "DSSLive.settings";		// Append the filename with a path separator
-			ZTRACE_RUNTIME("Saving DSSLive settings to: %s", fileName.generic_string().c_str());
+			ZTRACE_RUNTIME("Saving DSSLive settings to: %s", fileName.generic_u8string().c_str());
 			workspace.SaveToFile(fileName);
 		}
 		else if (a == saveAnother)
@@ -575,7 +575,7 @@ void ExplorerBar::LoadSettingFile()
 			fs::path fileName(files.at(0).toStdU16String());		// as UTF-16
 			if (status(fileName).type() == fs::file_type::regular)
 			{
-				ZTRACE_RUNTIME("Loading settings file: %s", fileName.generic_string().c_str());
+				ZTRACE_RUNTIME("Loading settings file: %s", fileName.generic_u8string().c_str());
 				QGuiApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
 
 				workspace.ReadFromFile(fileName);
@@ -619,7 +619,7 @@ void ExplorerBar::SaveSettingFile()
 		if (!file.isEmpty())
 		{
 			fs::path fileName(file.toStdU16String());		// as UTF-16
-			ZTRACE_RUNTIME("Saving settings file: %s", fileName.generic_string().c_str());
+			ZTRACE_RUNTIME("Saving settings file: %s", fileName.generic_u8string().c_str());
 			QGuiApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
 
 			workspace.SaveToFile(fileName);

DeepSkyStacker/RawDDPSettings.cpp

@@ -384,13 +384,25 @@ void RawDDPSettings::onInitDialog()
 	string = workspace->value("RawDDP/Interpolation", "Bilinear").toString();
 
 	if (isRawBayer)
+	{
 		ui->rawBayer->setChecked(true);
+		ui->rawBayer_2->setChecked(true);
+	}
 	else if (isSuperPixels)
+	{
 		ui->superPixels->setChecked(true);
+		ui->superPixels_2->setChecked(true);
+	}
 	else if (string == "Bilinear")
+	{
 		ui->bilinear->setChecked(true);
+		ui->bilinear_2->setChecked(true);
+	}
 	else if (string == "AHD")
+	{
 		ui->AHD->setChecked(true);
+		ui->AHD_2->setChecked(true);
+	}
 
 	//
 	// Now populate the FITS Files tab controls
@@ -406,17 +418,6 @@ void RawDDPSettings::onInitDialog()
 	value = workspace->value("FitsDDP/BlueScale", "1.0").toDouble();
 	ui->blueScale_2->setText(QString("%L1").arg(value, 0, 'f', 4));
 
-	string = workspace->value("FitsDDP/Interpolation", "Bilinear").toString();
-
-	if (string == "Bilinear")
-		ui->bilinear_2->setChecked(true);
-	else if (string == "RawBayer")
-		ui->rawBayer_2->setChecked(true);
-	else if (string == "AHD")
-		ui->AHD_2->setChecked(true);
-	else
-		ui->superPixels_2->setChecked(true);
-
 	fillDSLRList(vector_DSLRs);
 
 	for (std::vector<CDSLR>::size_type i = 0; i < vector_DSLRs.size(); i++)
@@ -628,25 +629,29 @@ void RawDDPSettings::on_cameraWB_stateChanged()
 
 void RawDDPSettings::on_bilinear_clicked()
 {
+	ui->bilinear_2->setChecked(true);
 	workspace->setValue("RawDDP/Interpolation", "Bilinear");
 	workspace->setValue("RawDDP/RawBayer", false);
 	workspace->setValue("RawDDP/SuperPixels", false);
 }
 
 void RawDDPSettings::on_AHD_clicked()
 {
+	ui->AHD_2->setChecked(true);
 	workspace->setValue("RawDDP/Interpolation", "AHD");
 	workspace->setValue("RawDDP/RawBayer", false);
 	workspace->setValue("RawDDP/SuperPixels", false);
 }
 void RawDDPSettings::on_rawBayer_clicked()
 {
+	ui->rawBayer_2->setChecked(true);
 	workspace->setValue("RawDDP/Interpolation", "");
 	workspace->setValue("RawDDP/RawBayer", true);
 	workspace->setValue("RawDDP/SuperPixels", false);
 }
 void RawDDPSettings::on_superPixels_clicked()
 {
+	ui->superPixels_2->setChecked(true);
 	workspace->setValue("RawDDP/Interpolation", "");
 	workspace->setValue("RawDDP/RawBayer", false);
 	workspace->setValue("RawDDP/SuperPixels", true);
@@ -723,50 +728,28 @@ void RawDDPSettings::blueScale_2_editingFinished()
 	}
 }
 
-/**********************************************************************************/
-/*                           ***** NOTE WELL *****                                */
-/*                                                                                */
-/*   The following four slots that process the Bayer Matrix Transformation Radio  */  
-/* Buttons of the FITS Files tab all set the value of "RawDDP/SuperPixels" in the */
-/* workspace (which is what the original pre-Qt code did).                        */
-/*                                                                                */
-/*               AS FAR AS I CAN DETERMINE THIS IS NOT A BUG                      */
-/*                                                                                */
-/**********************************************************************************/
-void RawDDPSettings::on_bilinear_2_toggled(bool checked)
+void RawDDPSettings::on_bilinear_2_clicked()
 {
-	if (checked)
-	{
-		workspace->setValue("FitsDDP/Interpolation", "Bilinear");
-		workspace->setValue("RawDDP/SuperPixels", false);
-	}
+	ui->bilinear->setChecked(true);
+	on_bilinear_clicked();
 }
 
-void RawDDPSettings::on_AHD_2_toggled(bool checked)
+void RawDDPSettings::on_AHD_2_clicked()
 {
-	if (checked)
-	{
-		workspace->setValue("FitsDDP/Interpolation", "AHD");
-		workspace->setValue("RawDDP/SuperPixels", false);
-	}
+	ui->AHD->setChecked(true);
+	on_AHD_clicked();
 }
 
-void RawDDPSettings::on_rawBayer_2_toggled(bool checked)
+void RawDDPSettings::on_rawBayer_2_clicked()
 {
-	if (checked)
-	{
-		workspace->setValue("FitsDDP/Interpolation", "RawBayer");
-		workspace->setValue("RawDDP/SuperPixels", false);
-	}
+	ui->rawBayer->setChecked(true);
+	on_rawBayer_clicked();
 }
 
-void RawDDPSettings::on_superPixels_2_toggled(bool checked)
+void RawDDPSettings::on_superPixels_2_clicked()
 {
-	if (checked)
-	{
-		workspace->setValue("FitsDDP/Interpolation", "SuperPixels");
-		workspace->setValue("RawDDP/SuperPixels", true);
-	}
+	ui->superPixels->setChecked(true);
+	on_superPixels_clicked();
 }
 
 void RawDDPSettings::on_buttonBox_clicked(QAbstractButton *button)

DeepSkyStacker/RawDDPSettings.h

@@ -41,10 +41,11 @@ private slots:
 	void brightness_2_editingFinished();
 	void redScale_2_editingFinished();
 	void blueScale_2_editingFinished();
-	void on_bilinear_2_toggled(bool);
-	void on_AHD_2_toggled(bool);
-	void on_rawBayer_2_toggled(bool);
-	void on_superPixels_2_toggled(bool);
+	void on_bilinear_2_clicked();
+	void on_AHD_2_clicked();
+	void on_rawBayer_2_clicked();
+	void on_superPixels_2_clicked();
+
 private:
 	Ui::RawDDPSettings *ui;
 	std::unique_ptr<Workspace> workspace;

DeepSkyStacker/RecommendedSettings.cpp

@@ -251,7 +251,7 @@ void RecommendedSettings::insertHTML(const QString& html, const QColor& colour,
 /* ------------------------------------------------------------------- */
 /* ------------------------------------------------------------------- */
 
-static void AddRAWNarrowBandRecommendation(RECOMMENDATIONVECTOR & vRecommendations, bool bFITS)
+static void AddRAWNarrowBandRecommendation(RECOMMENDATIONVECTOR & vRecommendations)
 {
 	RecommendationItem			ri;
 	Recommendation				rec;
@@ -265,16 +265,11 @@ static void AddRAWNarrowBandRecommendation(RECOMMENDATIONVECTOR & vRecommendatio
 		"Use super-pixel mode",
 		"IDS_RECO_RAWNARROWBAND_TEXT"));
 
-	if (bFITS)
-	{
-		ri.addSetting("FitsDDP/Interpolation", "SuperPixels");
-	}
-	else
-	{
-		ri.addSetting("RawDDP/SuperPixels", true);
-		ri.addSetting("RawDDP/RawBayer", false);
-		ri.addSetting("RawDDP/AHD", false);
-	};
+
+	ri.addSetting("RawDDP/SuperPixels", true);
+	ri.addSetting("RawDDP/RawBayer", false);
+	ri.addSetting("RawDDP/AHD", false);
+
 	rec.isImportant = false;
 	rec.addItem(ri);
 
@@ -308,7 +303,7 @@ static void AddNarrowBandPerChannelBackgroundCalibration(RECOMMENDATIONVECTOR &
 
 /* ------------------------------------------------------------------- */
 
-static void AddRAWDebayering(RECOMMENDATIONVECTOR & vRecommendations, double fExposureTime, bool bFITS)
+static void AddRAWDebayering(RECOMMENDATIONVECTOR & vRecommendations, double fExposureTime)
 {
 	RecommendationItem			ri;
 	Recommendation				rec;
@@ -332,30 +327,20 @@ static void AddRAWDebayering(RECOMMENDATIONVECTOR & vRecommendations, double fEx
 			"IDS_RECO_RAWLOWSNR_TEXT"));
 	};
 
-	if (bFITS)
+	if (fExposureTime > 4*60.0)
 	{
-		if (fExposureTime > 4*60.0)
-			ri.addSetting("FitsDDP/Interpolation", "AHD");
-		else
-			ri.addSetting("FitsDDP/Interpolation", "Bilinear");
+		ri.addSetting("RawDDP/SuperPixels", false);
+		ri.addSetting("RawDDP/RawBayer", false);
+		ri.addSetting("RawDDP/Interpolation", "AHD");
+		ri.addSetting("RawDDP/AHD", true);
 	}
 	else
 	{
-		if (fExposureTime > 4*60.0)
-		{
-			ri.addSetting("RawDDP/SuperPixels", false);
-			ri.addSetting("RawDDP/RawBayer", false);
-			ri.addSetting("RawDDP/Interpolation", "AHD");
-			ri.addSetting("RawDDP/AHD", true);
-		}
-		else
-		{
-			ri.addSetting("RawDDP/SuperPixels", false);
-			ri.addSetting("RawDDP/RawBayer", false);
-			ri.addSetting("RawDDP/Interpolation", "Bilinear");
-			ri.addSetting("RawDDP/AHD", false);
-		};
-	};
+		ri.addSetting("RawDDP/SuperPixels", false);
+		ri.addSetting("RawDDP/RawBayer", false);
+		ri.addSetting("RawDDP/Interpolation", "Bilinear");
+		ri.addSetting("RawDDP/AHD", false);
+	}
 
 	rec.addItem(ri);
 	vRecommendations.push_back(rec);
@@ -737,9 +722,9 @@ void RecommendedSettings::fillWithRecommendedSettings()
 
 		if (pStackingTasks->AreBayerImageUsed())
 		{
-			AddRAWDebayering(vRecommendations, pStackingTasks->GetMaxExposureTime(), pStackingTasks->AreFITSImageUsed());
+			AddRAWDebayering(vRecommendations, pStackingTasks->GetMaxExposureTime());
 			AddModdedDSLR(vRecommendations, pStackingTasks->AreFITSImageUsed());
-			AddRAWNarrowBandRecommendation(vRecommendations, pStackingTasks->AreFITSImageUsed());
+			AddRAWNarrowBandRecommendation(vRecommendations);
 		//	if (!pStackingTasks->AreFITSImageUsed())
 		//		AddRAWBlackPoint(vRecommendations, pStackingTasks->AreFlatUsed(), pStackingTasks->AreBiasUsed());
 		};