From 173d9ac53281fc5a0a35ca44aac8ad205e5e0f3b Mon Sep 17 00:00:00 2001 From: Martin Toeltsch Date: Thu, 9 Mar 2023 19:30:02 +0100 Subject: [PATCH 1/4] Fix bug: Stacking FITS files in Superpixel mode resulted in picture of half the size (rest was black). --- DeepSkyStacker/FITSUtil.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DeepSkyStacker/FITSUtil.cpp b/DeepSkyStacker/FITSUtil.cpp index 2b42c78ca..6bcc1df72 100644 --- a/DeepSkyStacker/FITSUtil.cpp +++ b/DeepSkyStacker/FITSUtil.cpp @@ -100,7 +100,7 @@ bool IsFITSSuperPixels() Workspace workspace; QString interpolation; - workspace.value("FitsDDP/Interpolation").toString(); + interpolation = workspace.value("FitsDDP/Interpolation").toString(); return (0 == interpolation.compare("SuperPixels", Qt::CaseInsensitive)); }; From aaee37c2618293b00d19e22201f0334ed1f032cf Mon Sep 17 00:00:00 2001 From: Martin Toeltsch Date: Thu, 9 Mar 2023 19:38:36 +0100 Subject: [PATCH 2/4] Fix further helper functions in FITSutil. --- DeepSkyStacker/FITSUtil.cpp | 99 +++++++++++-------------------------- 1 file changed, 28 insertions(+), 71 deletions(-) diff --git a/DeepSkyStacker/FITSUtil.cpp b/DeepSkyStacker/FITSUtil.cpp index 6bcc1df72..c1cfb8bda 100644 --- a/DeepSkyStacker/FITSUtil.cpp +++ b/DeepSkyStacker/FITSUtil.cpp @@ -61,103 +61,60 @@ inline double AdjustColor(const double fColor) /* ------------------------------------------------------------------- */ -bool IsFITSRaw() +bool IsFITSRaw() { - Workspace workspace; - - return workspace.value("FitsDDP/FITSisRAW", false).toBool(); -}; - -/* ------------------------------------------------------------------- */ + return Workspace{}.value("FitsDDP/FITSisRAW", false).toBool(); +} CFATYPE GetFITSCFATYPE() { - Workspace workspace; - - bool isFitsRaw = workspace.value("FitsDDP/FITSisRAW", false).toBool(); - CFATYPE pattern = (CFATYPE)workspace.value("FitsDDP/BayerPattern", (uint)CFATYPE_NONE).toUInt(); - + Workspace workspace{}; + const bool isFitsRaw = workspace.value("FitsDDP/FITSisRAW", false).toBool(); + const CFATYPE pattern = static_cast(workspace.value("FitsDDP/BayerPattern", (uint)CFATYPE_NONE).toUInt()); return isFitsRaw ? pattern : CFATYPE_NONE; -}; - -/* ------------------------------------------------------------------- */ +} -bool IsFITSRawBayer() +bool IsFITSRawBayer() { - Workspace workspace; - QString interpolation; - - interpolation = workspace.value("FitsDDP/Interpolation").toString(); - + const QString interpolation = Workspace{}.value("FitsDDP/Interpolation").toString(); return (0 == interpolation.compare("RawBayer", Qt::CaseInsensitive)); -}; - -/* ------------------------------------------------------------------- */ +} -bool IsFITSSuperPixels() +bool IsFITSSuperPixels() { - Workspace workspace; - QString interpolation; - - interpolation = workspace.value("FitsDDP/Interpolation").toString(); - + const QString interpolation = Workspace{}.value("FitsDDP/Interpolation").toString(); return (0 == interpolation.compare("SuperPixels", Qt::CaseInsensitive)); -}; - -/* ------------------------------------------------------------------- */ +} -bool IsFITSBilinear() +bool IsFITSBilinear() { - Workspace workspace; - QString interpolation; - - workspace.value("FitsDDP/Interpolation").toString(); - + const QString interpolation = Workspace{}.value("FitsDDP/Interpolation").toString(); return (0 == interpolation.compare("Bilinear", Qt::CaseInsensitive)); -}; - -/* ------------------------------------------------------------------- */ +} -bool IsFITSAHD() +bool IsFITSAHD() { - Workspace workspace; - QString interpolation; - - workspace.value("FitsDDP/Interpolation").toString(); - + const QString interpolation = Workspace{}.value("FitsDDP/Interpolation").toString(); return (0 == interpolation.compare("AHD", Qt::CaseInsensitive)); -}; - -/* ------------------------------------------------------------------- */ +} -double GetFITSBrightnessRatio() +double GetFITSBrightnessRatio() { - Workspace workspace; - - return workspace.value("FitsDDP/Brightness", 1.0).toDouble(); -}; - -/* ------------------------------------------------------------------- */ + return Workspace{}.value("FitsDDP/Brightness", 1.0).toDouble(); +} -void GetFITSRatio(double & fRed, double & fGreen, double & fBlue) +void GetFITSRatio(double& fRed, double& fGreen, double& fBlue) { - Workspace workspace; + Workspace workspace{}; fGreen = workspace.value("FitsDDP/Brightness", 1.0).toDouble(); + fRed = fGreen * workspace.value("FitsDDP/RedScale", 1.0).toDouble(); + fBlue = fGreen * workspace.value("FitsDDP/BlueScale", 1.0).toDouble(); +} - fRed = workspace.value("FitsDDP/RedScale", 1.0).toDouble(); - fRed *= fGreen; - - fBlue = workspace.value("FitsDDP/BlueScale", 1.0).toDouble(); - fBlue *= fGreen; -}; - -/* ------------------------------------------------------------------- */ - -/* ------------------------------------------------------------------- */ -bool CFITSReader::ReadKey(LPCSTR szKey, double & fValue, CString & strComment) +bool CFITSReader::ReadKey(LPCSTR szKey, double& fValue, CString& strComment) { bool bResult = false; int nStatus = 0; From 6863d0612a03bbb2665746b2b595f8f9add3a42d Mon Sep 17 00:00:00 2001 From: "David C. Partridge" Date: Thu, 9 Mar 2023 20:43:03 +0000 Subject: [PATCH 3/4] Update readme for fixes since 5.1.0 --- Installers/README.txt | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Installers/README.txt b/Installers/README.txt index 0b4361ce6..9c791b9ec 100644 --- a/Installers/README.txt +++ b/Installers/README.txt @@ -1,7 +1,19 @@ -Welcome to DeepSkyStacker 5.1.0 +Welcome to DeepSkyStacker 5.1.1 Beta 1 +====================================== Only 64 bit versions of Windows 10 and later are supported in this release. +Changes since 5.1.0 + +1. Bug fix - active tab jumped back to Main Group after drop of files when another group was active. + +2. Possible bug fix for DeepSkyStacker failing at startup when rinning on ARM version of WIndows 11 in x64 emulation mode. + +3. Stacked FITS images in SuperPixel mode were displayed only in the top left corner. + +Welcome to DeepSkyStacker 5.1.0 +=============================== + This release is the start of the process of converting the code to Qt so that it can be ported to platforms other than Windows. Here are the main changes that were made for DeepSkyStacker 5.1.0: From acb3761cbd9c16868071d62d55ee42024147eee7 Mon Sep 17 00:00:00 2001 From: "David C. Partridge" Date: Thu, 9 Mar 2023 20:52:12 +0000 Subject: [PATCH 4/4] More changes to readme --- Installers/README.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Installers/README.txt b/Installers/README.txt index 9c791b9ec..975e703f0 100644 --- a/Installers/README.txt +++ b/Installers/README.txt @@ -7,9 +7,13 @@ Changes since 5.1.0 1. Bug fix - active tab jumped back to Main Group after drop of files when another group was active. -2. Possible bug fix for DeepSkyStacker failing at startup when rinning on ARM version of WIndows 11 in x64 emulation mode. +2. Possible bug fix - DeepSkyStacker terminated at startup when running on ARM version of Windows 11 in x64 emulation mode. Unable to test. -3. Stacked FITS images in SuperPixel mode were displayed only in the top left corner. +3. Bug fix - A corrupt info.txt file caused an infinite loop. + +4. Diagnostic added - Report processor architecture in trace file and to stderr at startup. + +4. Bug fix - Stacked FITS images in SuperPixel mode were displayed only in the top left corner. Welcome to DeepSkyStacker 5.1.0 ===============================