Skip to content

Commit cac36ac

Browse files
committed
New DXWaterfall Option "Eye Friendly"
1 parent 21c8e94 commit cac36ac

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

application/views/components/dxwaterfall.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!-- DX Waterfall Component - START -->
2-
<?php if ($this->session->userdata('user_dxwaterfall_enable') == 'Y' && isset($manual_mode) && $manual_mode == 0) { ?>
2+
<?php if ((($this->session->userdata('user_dxwaterfall_enable') == 'E') || $this->session->userdata('user_dxwaterfall_enable') == 'Y') && isset($manual_mode) && $manual_mode == 0) { ?>
33
<!-- DX Waterfall Component - JS loaded in footer after radiohelpers.js -->
44
<script language="javascript">
55
/*

application/views/interface_assets/footer.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,10 @@ function stopImpersonate_modal() {
373373
<?php if ($this->uri->segment(1) == "qso" ) { ?>
374374
<!-- Javascript used for QSO Notes Area -->
375375
<script src="<?php echo base_url() ;?>assets/plugins/easymde/easymde.min.js"></script>
376-
<?php if($this->session->userdata('user_dxwaterfall_enable') == 'Y' && isset($manual_mode) && $manual_mode == 0) { ?>
376+
<?php if(($this->session->userdata('user_dxwaterfall_enable') == 'E' || $this->session->userdata('user_dxwaterfall_enable') == 'Y') && isset($manual_mode) && $manual_mode == 0) { ?>
377+
<script>
378+
var dxwaterfall_enable='<?php echo $this->session->userdata('user_dxwaterfall_enable'); ?>';
379+
</script>
377380
<script type="text/javascript" src="<?php echo base_url() ;?>assets/js/dxwaterfall.js?v=<?php echo floor(time() / 3600); ?>"></script>
378381
<?php } ?>
379382
<?php } ?>
@@ -1435,7 +1438,7 @@ function toggleGridsquares(bool) {
14351438

14361439
<!--- CAT Functionality --->
14371440
<!--- DX Waterfall Functionality --->
1438-
<?php if ($this->session->userdata('user_dxwaterfall_enable') == 'Y') { ?>
1441+
<?php if (($this->session->userdata('user_dxwaterfall_enable') == 'Y') || ($this->session->userdata('user_dxwaterfall_enable') == 'E')) { ?>
14391442
<script>
14401443
// Global variable definition for dxwaterfall.js
14411444
var dxwaterfall_cat_state = "none";

application/views/user/edit.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,7 @@
447447
<?php if(!isset($user_dxwaterfall_enable)) { $user_dxwaterfall_enable='N'; }?>
448448
<select class="form-select" id="user_dxwaterfall_enable" name="user_dxwaterfall_enable" aria-describedby="user_dxwaterfall_enable_Help" required>
449449
<option value='Y' <?php if($user_dxwaterfall_enable == "Y") { echo "selected=\"selected\""; } ?>><?= __("Enabled"); ?></option>
450+
<option value='E' <?php if($user_dxwaterfall_enable == "E") { echo "selected=\"selected\""; } ?>><?= __("Enabled").' '.__("Eye friendly"); ?></option>
450451
<option value='N' <?php if($user_dxwaterfall_enable == "N") { echo "selected=\"selected\""; } ?>><?= __("Disabled"); ?></option>
451452
</select>
452453
<small id="user_dxwaterfall_enable_Help" class="form-text text-muted"><?= __("Show an interactive DX Cluster 'Waterfall' on the QSO logging page."); ?></small>

assets/js/dxwaterfall.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3583,6 +3583,7 @@ var dxWaterfall = {
35833583

35843584
// Generate and cache static noise patterns for animation
35853585
generateCachedNoise: function() {
3586+
if ((dxwaterfall_enable ?? 'Y') === 'E') { return; }
35863587
var width = this.canvas.width;
35873588
var height = this.canvas.height;
35883589

@@ -3637,6 +3638,7 @@ var dxWaterfall = {
36373638

36383639
// Draw static noise background (cached and animated)
36393640
drawStaticNoise: function() {
3641+
if ((dxwaterfall_enable ?? 'Y') === 'E') { return; }
36403642
try {
36413643
// Generate cached noise only if needed (dimensions changed or first time)
36423644
this.generateCachedNoise();

0 commit comments

Comments
 (0)