Skip to content

Fix lock-position crosshair jump when guiding starts #1452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Eyeke2 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix lock-position crosshair jump when guiding starts #1452

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions src/guider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,6 +980,12 @@ void Guider::SetState(GUIDER_STATE newState)
case STATE_SELECTED:
break;
case STATE_CALIBRATING_PRIMARY:
// Anchor the lock on the star at the start of the calibration cycle, so the
// calibration crosshair reflects the actual guiding target instead of a stale
// value from a previous session. Sticky lock is preserved as before.
if (!(m_lockPosition.IsValid() && m_lockPosIsSticky) && CurrentPosition().IsValid())
SetLockPosition(CurrentPosition());

if (!pMount->IsCalibrated())
{
pMount->ResetErrorCount();
Expand Down Expand Up @@ -1029,14 +1035,12 @@ void Guider::SetState(GUIDER_STATE newState)

pFrame->UpdateStatusBarCalibrationStatus();

if (m_lockPosition.IsValid() && m_lockPosIsSticky)
{
Debug.Write("keeping sticky lock position\n");
}
else
{
// The lock is already set (at CALIBRATING_PRIMARY entry, or earlier when the
// star was selected). Only fall back to CurrentPosition if the lock is somehow
// missing - avoids the visible jump from overwriting a valid lock with the
// post-calibration star position.
if (!m_lockPosition.IsValid())
SetLockPosition(CurrentPosition());
}
break;

case STATE_SELECTING:
Expand Down