Skip to content

Commit 2111737

Browse files
committed
Merge branch 'release'
2 parents e45b9b0 + ee1c32f commit 2111737

File tree

4 files changed

+33
-45
lines changed

4 files changed

+33
-45
lines changed

DeepSkyStacker/FrameList.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,9 @@ namespace DSS
196196
{
197197
for (auto it = group.pictures->cbegin(); it != group.pictures->cend(); ++it)
198198
{
199-
if (it->IsLightFrame() && it->m_bChecked == Qt::Checked && it->m_bUseAsStarting)
199+
if (it->IsLightFrame() &&
200+
it->m_bUseAsStarting
201+
)
200202
{
201203
return QString::fromStdU16String(it->filePath.generic_u16string());
202204
}

DeepSkyStacker/RegisterSettings.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ void RegisterSettings::onInitDialog()
118118
ui->luminanceThreshold->
119119
setSliderPosition(value);
120120
ui->luminancePercent->setText(QString("%1%").arg(value));
121+
detectionThreshold = value;
121122

122123
ui->medianFilter->
123124
setChecked(workspace->value("Register/ApplyMedianFilter", false).toBool());

DeepSkyStacker/StackingEngine.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,11 @@ bool CStackingEngine::AddLightFramesToList(CAllStackingTasks& tasks)
455455
lfi = bitmap;
456456
lfi.RefreshSuperPixel();
457457

458-
if (!m_strReferenceFrame.CompareNoCase(lfi.filePath.c_str()))
458+
//
459+
// m_strReferenceFrame is a CString but contains the reference frame path
460+
// with / separators rather than \\
461+
//
462+
if (!m_strReferenceFrame.CompareNoCase(lfi.filePath.generic_wstring().c_str()))
459463
{
460464
lfi.m_bStartingFrame = true;
461465
bReferenceFrameFound = true;
@@ -819,7 +823,7 @@ void CStackingEngine::ComputeOffsets()
819823

820824
const int lLast = static_cast<int>(m_vBitmaps.size() * m_fKeptPercentage / 100.0);
821825
if (m_pProgress)
822-
m_pProgress->Start1(strText, lLast, false);
826+
m_pProgress->Start1(strText, lLast, true);
823827

824828
// The first bitmap is the best one
825829
if (m_vBitmaps.size() > 1)

Installers/README.txt

Lines changed: 23 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,70 +3,51 @@ Welcome to DeepSkyStacker 5.1.4
33

44
Only 64 bit versions of Windows 10 and later are supported in this release.
55

6-
Changes since the last release:
6+
This is a bug fix release for problems reported against 5.1.0, 5.1.1, 5.1.2
77

8-
1. Upgrade CFISTIO library to 4.2.0
9-
10-
2. Always create a tracefile in DeepSkyStacker sub-folder of the user's Documents folder. The file will be called e.g.
11-
12-
DSSTrace_yyyy-mm-ddThh-hh-ssZ.log where the timestamp is GMT time.
13-
14-
The trace file will be deleted on normal application exit, but an option is provided to keep the file.
15-
16-
Welcome to DeepSkyStacker 5.1.3
17-
===============================
18-
19-
Changes since the last release:
20-
21-
1. Bug fix - correct problems with drag drop of a directory.
22-
23-
2. Enhancement - if Custom Rectangle mode is read from a filelist or settings file, switch to Intersection mode.
24-
25-
3. Bug fix - correct handling of reference frame in filelist.
8+
1. Possible bug fix - DeepSkyStacker terminated at startup when running on ARM version of Windows 11 in x64 emulation mode. Unable to test.
269

27-
4. Bug Fix - FITS/DDP choice of Camera was not being handled correctly.
10+
2. Bug fix - A corrupt info.txt file caused an infinite loop.
2811

29-
Welcome to DeepSkyStacker 5.1.2
30-
===============================
12+
3. Diagnostic added - Report processor architecture and processor type in trace file and to stderr at startup.
3113

32-
This is a bug fix release for problems reported against 5.1.0 and 5.1.1
14+
4. Bug fix - Stacked FITS images in SuperPixel mode were displayed only in the top left corner.
3315

34-
1. Bug fix - correct handling of file types (TIFF/FITS) in DeepSkyStackerCL for intermediate and final files
16+
5. Bug fix - Resolve occasional odd problems when using edit stars mode.
3517

36-
2. Bug fix - correct handling of Stacking Mode (Standard/Mosaic/Intersection/Custom)
18+
6. Bug fix - DeepSkyStackerCL was only displaying the help text regardless of command line input.
3719

38-
3. Bug fix - unable to select a custom rectangle immediately after opening image file
20+
7. Enhancement - Reinstate Image Properties as a Qt based dialogue to allow changing e.g. exposure for multiple images at once
3921

40-
4. Bug fix - fileids in filelist files were being incorrectly written as ANSI not UTF8
22+
8. Bug fix - Fields in the image list and the group tabs were not updated when switching to another language.
4123

42-
5. Bug fix - the selection for a custom rectangle was not always visible
24+
9. Bug fix - remove all "Set Black Point to Zero" recommendations from "Recommended Settings"
4325

44-
6. Enhancement - reduce the minium size for the image list to be two rows
26+
10. Bug fix - Invalid input in RAW/DDP settings for scale factors caused an assertion failure
4527

46-
Welcome to DeepSkyStacker 5.1.1
47-
===============================
28+
11. Bug fix - correct handling of file types (TIFF/FITS) in DeepSkyStackerCL for intermediate and final files
4829

49-
This is a bug fix release for problems reported against 5.1.0
30+
12. Bug fix - correct handling of Stacking Mode (Standard/Mosaic/Intersection/Custom)
5031

51-
1. Possible bug fix - DeepSkyStacker terminated at startup when running on ARM version of Windows 11 in x64 emulation mode. Unable to test.
32+
13. Bug fix - unable to select a custom rectangle immediately after opening image file
5233

53-
2. Bug fix - A corrupt info.txt file caused an infinite loop.
34+
14. Bug fix - fileids in filelist files were being incorrectly written as ANSI not UTF8
5435

55-
3. Diagnostic added - Report processor architecture and processor type in trace file and to stderr at startup.
36+
15. Bug fix - the selection for a custom rectangle was not always visible
5637

57-
4. Bug fix - Stacked FITS images in SuperPixel mode were displayed only in the top left corner.
38+
16. Enhancement - reduce the minimum size for the image list to be two rows
5839

59-
5. Bug fix - Resolve occasional odd problems when using edit stars mode.
40+
17. Bug fix - correct problems with drag drop of a directory.
6041

61-
6. Bug fix - DeepSkyStackerCL was only displaying the help text regardless of command line input.
42+
18. Enhancement - if Custom Rectangle mode is read from a filelist or settings file, switch to Intersection mode.
6243

63-
7. Enhancement - Reinstate Image Properties as a Qt based dialogue to allow changing e.g. exposure for multiple images at once
44+
19. Bug fix - correct handling of reference frame in filelist.
6445

65-
8. Bug fix - Fields in the image list and the group tabs were not updated when switching to another language.
46+
20. Bug Fix - FITS/DDP choice of Camera was not being handled correctly.
6647

67-
9. Bug fix - remove all "Set Black Point to Zero" recommendations from "Recommended Settings"
48+
21. Bug fix - ensure that reference frame is used a) when checked, and b) when not checked
6849

69-
10. Bug fix - Invalid input in RAW/DDP settings for scale factors caused an assertion failure
50+
22. Bug fix - Register settings set a value of 0 for the luminance threshold when it was initially set to 20.
7051

7152
Welcome to DeepSkyStacker 5.1.0
7253
===============================

0 commit comments

Comments
 (0)