Skip to content

Fix startrails moonmode settings, fixes #2832 #2880

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
tswfi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix startrails moonmode settings, fixes #2832 #2880

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion indi_allsky/flask/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4470,7 +4470,7 @@ class IndiAllskyConfigForm(FlaskForm):
REALTIME_KEOGRAM__SAVE_INTERVAL = IntegerField('Save Interval', validators=[REALTIME_KEOGRAM__SAVE_INTERVAL_validator])
REALTIME_KEOGRAM__LABEL = BooleanField('Label Realtime Keogram')
STARTRAILS_SUN_ALT_THOLD = FloatField('Star Trails Max Sun Altitude', validators=[DataRequired(), STARTRAILS_SUN_ALT_THOLD_validator])
STARTRAILS_MOONMODE_THOLD = BooleanField('Star Trails Custom Moon Mode')
STARTRAILS_MOONMODE_THOLD = BooleanField('Star Trails: Use Camera Moon Mode Thresholds')
STARTRAILS_MOON_ALT_THOLD = FloatField('Custom Max Moon Altitude', validators=[DataRequired(), STARTRAILS_MOON_ALT_THOLD_validator])
STARTRAILS_MOON_PHASE_THOLD = FloatField('Custom Max Moon Phase', validators=[DataRequired(), STARTRAILS_MOON_PHASE_THOLD_validator])
STARTRAILS_MAX_ADU = IntegerField('Star Trails Max ADU', validators=[DataRequired(), STARTRAILS_MAX_ADU_validator])
Expand Down
27 changes: 16 additions & 11 deletions indi_allsky/flask/templates/config.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4404,7 +4404,7 @@ <h2 class="accordion-header">
<div id="STARTRAILS_MOONMODE_THOLD-error" class="invalid-feedback text-danger" style="display: none;"></div>
</div>
</div>
<div class="col-sm-8">Exclude images during moonmode</div>
<div class="col-sm-8">When enabled, use the camera moon mode thresholds to exclude images. When disabled, use the custom thresholds below.</div>
</div>

<div class="form-group row">
Expand All @@ -4415,7 +4415,7 @@ <h2 class="accordion-header">
{{ form_config.STARTRAILS_MOON_ALT_THOLD(class='form-control bg-secondary') }}
<div id="STARTRAILS_MOON_ALT_THOLD-error" class="invalid-feedback text-danger" style="display: none;"></div>
</div>
<div class="col-sm-8">Custom moon altitude threshold (91 is disabled)</div>
<div class="col-sm-8">Exclude images when moon altitude exceeds this value in degrees. Both altitude and phase must be exceeded to exclude (AND logic). 91 disables the check (moon can never reach 91°). A reasonable starting point is 30°.</div>
</div>

<div class="form-group row">
Expand All @@ -4426,7 +4426,7 @@ <h2 class="accordion-header">
{{ form_config.STARTRAILS_MOON_PHASE_THOLD(class='form-control bg-secondary') }}
<div id="STARTRAILS_MOON_PHASE_THOLD-error" class="invalid-feedback text-danger" style="display: none;"></div>
</div>
<div class="col-sm-8">Custom moon phase threshold (101 is disabled)</div>
<div class="col-sm-8">Exclude images when moon phase exceeds this percentage. Both altitude and phase must be exceeded to exclude (AND logic). 101 disables the check (moon phase can never exceed 100%). A reasonable starting point is 50%.</div>
</div>

<div class="form-group row">
Expand Down Expand Up @@ -10683,10 +10683,12 @@ <h2 class="accordion-header">
);
}

function group_on_change(trigger_checkbox_field, group_fields, group_checkbox_fields) {
function group_on_change(trigger_checkbox_field, group_fields, group_checkbox_fields, inverted=false) {
$('#' + trigger_checkbox_field).on('change', function() {
// logic is reversed
if (!$('#' + trigger_checkbox_field).prop('checked')) {
var checked = $('#' + trigger_checkbox_field).prop('checked');
var enable = inverted ? !checked : checked;

if (!enable) {
group_fields.forEach(item => {
$('#' + item).attr({'readonly': true, 'disabled': true});
$('#' + item).addClass('bg-dark text-secondary');
Expand All @@ -10709,8 +10711,11 @@ <h2 class="accordion-header">
}


function group_on_ready(trigger_checkbox_field, group_fields, group_checkbox_fields) {
if (!$('#' + trigger_checkbox_field).prop('checked')) {
function group_on_ready(trigger_checkbox_field, group_fields, group_checkbox_fields, inverted=false) {
var checked = $('#' + trigger_checkbox_field).prop('checked');
var enable = inverted ? !checked : checked;

if (!enable) {
group_fields.forEach(item => {
$('#' + item).attr({'readonly': true, 'disabled': true});
$('#' + item).addClass('bg-dark text-secondary');
Expand Down Expand Up @@ -10818,8 +10823,8 @@ <h2 class="accordion-header">
'STARTRAILS_MOON_PHASE_THOLD',
];

// startrails moonmode
group_on_change('STARTRAILS_MOONMODE_THOLD', group_fields_st_moonmode, []);
// startrails moonmode - custom thresholds are used when moon mode exclusion is OFF
group_on_change('STARTRAILS_MOONMODE_THOLD', group_fields_st_moonmode, [], true);


// nonlocal assets
Expand Down Expand Up @@ -11279,7 +11284,7 @@ <h2 class="accordion-header">


// startrails moonmode
group_on_ready('STARTRAILS_MOONMODE_THOLD', group_fields_st_moonmode, []);
group_on_ready('STARTRAILS_MOONMODE_THOLD', group_fields_st_moonmode, [], true);


// nonlocal assets
Expand Down