Bugfix for #397650 flat creation failed
ClosedPublic

Authored by wreissenberger on Aug 21 2018, 5:25 PM.

Details

Summary

After rework of the capture module creation flats creation works again.

BUGS: 397650

Test Plan

Create a sequence with flats and set the calibration to a certain ADU value
to force calibration. Flats should be created with the defined ADU value
within the given range.
A new test for testing flats creation has been aded to Tests/scheduler. Run
this test and check whether three new flats have been created.

Diff Detail

Repository
R321 KStars
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
wreissenberger created this revision.Aug 21 2018, 5:25 PM
Restricted Application added a project: KDE Edu. · View Herald TranscriptAug 21 2018, 5:25 PM
Restricted Application added a subscriber: kde-edu. · View Herald Transcript
wreissenberger requested review of this revision.Aug 21 2018, 5:25 PM

As a hotfix, ok. On the long term, we should avoid isPreview when dealing with calibration. I'll test tonight.

Bugfix for #397650 flat creation failed (Update)
Separation of pure preview job from flat calibration preview now by calibration stage

Oops, that was not the intention! I did a rebase in advance, so this small change includes a bunch of other changes. The only relevant change is that to capture.cpp.

Please advise: what should I do to carve it out?

From what I see the other changes are from master right? If you have a local master, make sure its upstream is origin/master, set the upstream of bugfix_397650_creating_flats_failed to master, pull changes to your local master (from origin/master) then pull changes to your development branch (from master). Then arc diff the result.

Even in this state, I suppose it would merge anyway. Unless you have other changes scattered in that I did not see?

The only changes I made were in capture.cpp - in addition to the new test case. The diff of my changes is attached.

Yes, another way to do it:
$ git checkout master
$ git branch -set-upstream-to=origin/master
$ git pull
$ git cherry-pick 941bcd65a0ca
$ arc diff --update D14977

Bugfix for #397650 flat creation failed (Update)
Retry to submit the correct files.

If you want your neat phabricator commit message to be visible in the git log, I suggest you squash your two commits. If Jasem fuses the diff now, only the last commit message will appear.

Bugfix for #397650 flat creation failed
 
 Summary:
 After rework of the capture module creation flats creation works again.
 
 BUGS: 397650
 
 Test Plan:
 Create a sequence with flats and set the calibration to a certain ADU value
 to force calibration. Flats should be created with the defined ADU value
 within the given range.
 A new test for testing flats creation has been aded to Tests/scheduler. Run
 this test and check whether three new flats have been created.
 
 Reviewers: TallFurryMan
 
 Subscribers: kde-edu
 
 Tags: #kde_edu
 
 Differential Revision: https://phabricator.kde.org/D14977

OK, I squashed the two commits.

TallFurryMan accepted this revision.Aug 28 2018, 6:53 AM

Fix is tested OK for me. Sorry for taking such a long time, the parking states fix was a headache :)

This revision is now accepted and ready to land.Aug 28 2018, 6:53 AM
mutlaqja accepted this revision.Aug 28 2018, 7:37 AM
This revision was automatically updated to reflect the committed changes.