Skip to content
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

Ca button label #1075

Merged
merged 2 commits into from
May 29, 2023
Merged

Ca button label #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46b0056
CA change 'Recal' label to 'Recalc'
bwdev01 May 24, 2023
d83b3e2
Push help file change missing from previous commit
bwdev01 May 29, 2023
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
8 changes: 4 additions & 4 deletions calibration_assistant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,11 +319,11 @@ void CalibrationAssistant::PerformSanityChecks(void)
if (sidRate <= 0.2)
msg = _("Your mount guide speed is too slow for effective calibration and guiding."
" Use the hand-controller or mount driver to increase the guide speed to at least 0.5x sidereal."
" Then click the 'Recal' button so PHD2 can compute a correct calibration step-size.");
" Then click the 'Recalc' button so PHD2 can compute a correct calibration step-size.");
else
msg = _("Your mount guide speed is below the minimum recommended value of 0.5x sidereal."
" Use the hand-controller or mount driver to increase the guide speed to at least 0.5x sidereal."
" Then click the 'Recal' button so PHD2 can compute a correct calibration step-size.");
" Then click the 'Recalc' button so PHD2 can compute a correct calibration step-size.");
}
else
{
Expand All @@ -335,7 +335,7 @@ void CalibrationAssistant::PerformSanityChecks(void)
if (fabs(1.0 - (double)currStepSize / (double)recStepSize) > 0.3) // Within 30% is good enough
{
msg = _("Your current calibration parameters can be adjusted for more accurate results."
" Click the 'Recal' button to restore them to the default values.");
" Click the 'Recalc' button to restore them to the default values.");
}
}
if (!msg.empty())
Expand Down Expand Up @@ -1127,7 +1127,7 @@ CalAssistSanityDialog::CalAssistSanityDialog(CalibrationAssistant* Parent, const
MakeBold(pMessage);

wxBoxSizer* btnSizer = new wxBoxSizer(wxHORIZONTAL);
wxButton* pRecalBtn = new wxButton(this, wxID_ANY, _("Recal"));
wxButton* pRecalBtn = new wxButton(this, wxID_ANY, _("Recalc"));
pRecalBtn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CalAssistSanityDialog::OnRecal, this);
wxButton* cancelBtn = new wxButton(this, wxID_ANY, _("Cancel"));
cancelBtn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CalAssistSanityDialog::OnCancel, this);
Expand Down
Binary file modified help/Calibration_Assistant_Sanity_1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified help/Calibration_Assistant_Sanity_2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions help/Tools.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,12 +193,12 @@ <h3><a name="Auto-Select_Star"></a>Auto-Select Stars</h3>Automatic guide
settings such as mount guide speed and the calibration step-size value.
&nbsp;If these values don't look right, you will see another dialog
warning you of the specific problem. &nbsp;If the calibration step-size
is wrong, the CA will offer to recalculate ('Recal') it for you.
is wrong, the CA will offer to recalculate ('Recalc') it for you.
&nbsp;If the mount
guide speed is too low, it will advise you to increase it to at least
0.5x sidereal. &nbsp;This isn't done through PHD2;&nbsp;you will need to
adjust it in the mount driver or via the mount hand-controller. The CA
sanity-checking dialogs look this this:<br><br><img style="width: 620px; height: 155px;" alt="" src="Calibration_Assistant_Sanity_1.png"><br><br><img style="width: 619px; height: 135px;" alt="" src="Calibration_Assistant_Sanity_2.png"><br><br>As with the other CA messages, you are strongly encouraged to follow the recommendations.<br><br>After this sanity-checking is complete, the CA will
sanity-checking dialogs look this this:<br><br><img style="width: 619px; height: 153px;" alt="" src="Calibration_Assistant_Sanity_1.png"><br><br><img style="width: 619px; height: 135px;" alt="" src="Calibration_Assistant_Sanity_2.png"><br><br>As with the other CA messages, you are strongly encouraged to follow the recommendations.<br><br>After this sanity-checking is complete, the CA will
trigger the normal calibration process. &nbsp;You can move the CA
window out of the way if you want to watch how the calibration
proceeds. &nbsp;When the calibration completes, the CA will use various
Expand Down