Skip to content

Commit 9d754e7

Browse files
awawa-devawawa-dev
authored
LED strip designer context menu. Fix critical unicolor averaging bug. (#379)
1 parent d5f3d4b commit 9d754e7

File tree

14 files changed

+662
-222
lines changed

14 files changed

+662
-222
lines changed

‎assets/webconfig/content/light_source.html‎

Lines changed: 85 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ <h3 class="page-header"><i class="fa fa-lightbulb-o fa-fw"></i><span data-i18n="
3939
<div id="menu_gencfg" class="tab-pane fade" style="padding-top: 10px;" aria-labelledby="menugencfg">
4040
<div class="row">
4141
<div class="col-lg-12" id="layout_intro"></div>
42-
<div class="col-lg-6 col-md-12">
42+
<div class="col-lg-6 col-md-12" id="led_main_panel">
4343
<div class="accordion" id="accordion">
4444
<div class="accordion-item">
4545
<div class="accordion-header card card-default" id="headingOne">
@@ -567,31 +567,111 @@ <h4 class="card-title">
567567
</div>
568568
</div>
569569
<!-- accordion -->
570-
<div class="col-lg-6 col-md-12">
570+
<div class="col-lg-6 col-md-12" id="led_zoom_panel">
571571
<div class="card card-default">
572572
<div class="card-header" id="instTarget2">
573573
<h4 class="card-title"><i class="fa fa-search fa-fw"></i><span data-i18n="conf_leds_layout_peview">LED Layout preview</span></h4>
574574
</div>
575-
<div class="card-body">
576-
<p id="previewcreator" style="font-weight: bold;"></p>
575+
<div class="card-body" id="visualCreatorPanel">
577576
<p id="previewledcount" style="font-weight: bold;"></p>
578577
<p id="previewledpower" style="font-weight: bold;"></p>
579578
<div id="led_vis_help"></div>
579+
<p data-i18n="conf_leds_layout_context" style="font-weight: bold;"></p>
580580
<div class="col-lg-12 st_helper" style="padding-left: 0px; padding-right: 0px;">
581581
<div id="leds_preview"></div>
582582
</div>
583583
</div>
584584
<div class="card-footer">
585585
<button type="button" class="btn btn-danger" id="leds_prev_toggle_num"><i class="fa fa-info fa-fw"></i><span data-i18n="main_ledsim_btn_togglelednumber">toggle led numbers</span></button>
586586
<button type="button" class="btn btn-primary" id="leds_prev_checklist"><i class="fa fa-info-circle fa-fw"></i><span data-i18n="conf_leds_layout_btn_checklist">toggle led numbers</span></button>
587+
<button type="button" class="btn btn-warning" id="leds_prev_zoom"><i class="fa fa-arrows-alt fa-fw"></i><span data-i18n="conf_leds_layout_btn_zoom">zoom</span></button>
587588
</div>
588589
</div>
589590
</div>
590591
</div>
591592
</div>
592593
</div>
593594
</div>
594-
595+
<div class="dropdown-menu dropdown-menu-sm" style="display: none;" id="creator-context-menu">
596+
<a class="dropdown-item" href="#" id="CMD_MOVE"><i class="fa fa-arrows fa-fw"></i><span data-i18n="led_editor_context_move">Move</span></a>
597+
<a class="dropdown-item" href="#" id="CMD_PROPERTIES"><i class="fa fa-edit fa-fw"></i><span data-i18n="led_editor_context_properties">Properties</span></a>
598+
<a class="dropdown-item" href="#" id="CMD_ENABLE"><i class="fa fa-lightbulb-o fa-fw"></i><span id="cmd_dis_enable_text" data-i18n="led_editor_context_enable">Enable</span></a>
599+
<a class="dropdown-item" href="#" id="CMD_DELETE"><i class="fa fa-remove fa-fw"></i><span data-i18n="led_editor_context_delete">Delete</span></a>
600+
</div>
601+
<!-- Modal -->
602+
<div class="modal fade" id="ledPropertiesForm" tabindex="-1" aria-labelledby="ledPropertiesLabel" aria-hidden="true">
603+
<div class="modal-dialog">
604+
<div class="modal-content p-0">
605+
<div class="card card-default modal-body" style="margin: 0px !important; padding: 0px !important;">
606+
<div class="card-header">
607+
<h4 class="modal-title"><b><span id="ledPropertiesFormLabel"></span></b></h4>
608+
</div>
609+
<div class="card-body">
610+
<div class="container">
611+
<div class="form-group row">
612+
<div class="col-12 col-md-6">
613+
<div class="form-group row">
614+
<div class="col-form-label mb-3 col-3">
615+
<label class="required" data-i18n="conf_leds_layout_cl_left"></label>
616+
</div>
617+
<div class="mb-3 col-9">
618+
<div class="input-group">
619+
<input type="number" class="form-control" data-schemaformat="stepper" min="0" max="1" step="0.001" id="ledPropertiesDialogLeft" />
620+
<div class="input-group-append"><button type="button" class="btn btn-secondary stepper-down">-</button></div>
621+
<div class="input-group-append"><button type="button" class="btn btn-secondary stepper-up">+</button></div>
622+
</div>
623+
</div>
624+
</div>
625+
<div class="form-group row">
626+
<div class="col-form-label mb-3 col-3">
627+
<label class="required" data-i18n="conf_leds_layout_cl_right"></label>
628+
</div>
629+
<div class="mb-3 col-9">
630+
<div class="input-group">
631+
<input type="number" class="form-control" data-schemaformat="stepper" min="0" max="1" step="0.001" id="ledPropertiesDialogRight" />
632+
<div class="input-group-append"><button type="button" class="btn btn-secondary stepper-down">-</button></div>
633+
<div class="input-group-append"><button type="button" class="btn btn-secondary stepper-up">+</button></div>
634+
</div>
635+
</div>
636+
</div>
637+
</div>
638+
<div class="col-12 col-md-6">
639+
<div class="form-group row">
640+
<div class="col-form-label mb-3 col-3">
641+
<label class="required" data-i18n="conf_leds_layout_cl_top"></label>
642+
</div>
643+
<div class="mb-3 col-9">
644+
<div class="input-group">
645+
<input type="number" class="form-control" data-schemaformat="stepper" min="0" max="1" step="0.001" id="ledPropertiesDialogTop" />
646+
<div class="input-group-append"><button type="button" class="btn btn-secondary stepper-down">-</button></div>
647+
<div class="input-group-append"><button type="button" class="btn btn-secondary stepper-up">+</button></div>
648+
</div>
649+
</div>
650+
</div>
651+
<div class="form-group row">
652+
<div class="col-form-label mb-3 col-3">
653+
<label class="required" data-i18n="conf_leds_layout_cl_bottom"></label>
654+
</div>
655+
<div class="mb-3 col-9">
656+
<div class="input-group">
657+
<input type="number" class="form-control" data-schemaformat="stepper" min="0" max="1" step="0.001" id="ledPropertiesDialogBottom" />
658+
<div class="input-group-append"><button type="button" class="btn btn-secondary stepper-down">-</button></div>
659+
<div class="input-group-append"><button type="button" class="btn btn-secondary stepper-up">+</button></div>
660+
</div>
661+
</div>
662+
</div>
663+
</div>
664+
</div>
665+
</div>
666+
</div>
667+
<div class="card-footer">
668+
<button type="button" id="ready_to_set_single_abort" class="btn btn-danger float-end"><span data-i18n="general_btn_exit">Exit</span></button>
669+
<button type="button" id="ready_to_set_single_led" class="btn btn-primary float-end me-2"><span data-i18n="general_btn_save">Save</span></button>
670+
</div>
671+
</div>
672+
</div>
673+
</div>
674+
</div>
595675
<link href="css/jsonaceeditor.min.css" rel="stylesheet" type="text/css" />
596676
<script src='js/lib/jsonaceeditor.min.js'></script>
597677

‎assets/webconfig/css/hyperhdr.css‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -788,4 +788,36 @@ body:not(.dark-mode) .alert-yellow{
788788
color: #212529;
789789
background-color: #f39c12;
790790
border-color: #e08e0b;
791-
}
791+
}
792+
793+
.crosslineDark {
794+
background:
795+
linear-gradient(to top left,
796+
rgba(0,0,0,0) 0%,
797+
rgba(0,0,0,0) calc(50% - 1px),
798+
rgba(0,0,0,1) 50%,
799+
rgba(0,0,0,0) calc(50% + 1px),
800+
rgba(0,0,0,0) 100%),
801+
linear-gradient(to top right,
802+
rgba(0,0,0,0) 0%,
803+
rgba(0,0,0,0) calc(50% - 1px),
804+
rgba(0,0,0,1) 50%,
805+
rgba(0,0,0,0) calc(50% + 1px),
806+
rgba(0,0,0,0) 100%);
807+
}
808+
809+
.crosslineWhite {
810+
background:
811+
linear-gradient(to top left,
812+
rgba(0,0,0,0) 0%,
813+
rgba(0,0,0,0) calc(50% - 1.5px),
814+
rgba(255,255,255,1) 50%,
815+
rgba(0,0,0,0) calc(50% + 1.5px),
816+
rgba(0,0,0,0) 100%),
817+
linear-gradient(to top right,
818+
rgba(0,0,0,0) 0%,
819+
rgba(0,0,0,0) calc(50% - 1.5px),
820+
rgba(255,255,255,1) 50%,
821+
rgba(0,0,0,0) calc(50% + 1.5px),
822+
rgba(0,0,0,0) 100%);
823+
}

‎assets/webconfig/i18n/en.json‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1177,5 +1177,14 @@
11771177
"edt_conf_mqtt_ssl_ignore_errors_title" : "Ignore SSL errors",
11781178
"edt_conf_mqtt_ssl_ignore_errors_expl" : "Ignore all SSL errors such as self-signed certificates etc. Use with caution.",
11791179
"json_api_flatbuffers_user_lut" : "Flatbuffers LUT filename",
1180-
"json_api_hdr_expl" : "Turn on/off HDR tone mapping. You can also pass the name of the user LUT file in the user HyperHDR home folder to be used for Flatbuffers tone mapping."
1180+
"json_api_hdr_expl" : "Turn on/off HDR tone mapping. You can also pass the name of the user LUT file in the user HyperHDR home folder to be used for Flatbuffers tone mapping.",
1181+
"led_editor_context_move": "Move",
1182+
"led_editor_context_properties": "Properties",
1183+
"led_editor_context_delete": "Delete",
1184+
"led_editor_context_enable": "Enable",
1185+
"led_editor_context_disable": "Disable",
1186+
"led_editor_context_moving": "Left click the mouse to accept the position",
1187+
"conf_leds_disabled_notification" : "Some LEDs are disabled by the user!",
1188+
"conf_leds_layout_context" : "Right click on the LED to display the context menu. With the CTRL key selects the object below.",
1189+
"conf_leds_layout_btn_zoom" : "Zoom"
11811190
}

0 commit comments

Comments
 (0)