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

LED strip designer context menu. Fix critical unicolor averaging bug. #379

Merged
merged 13 commits into from
Nov 6, 2022
Merged

LED strip designer context menu. Fix critical unicolor averaging bug. #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5521205
SPI devices discovery
awawa-dev Sep 12, 2022
84b5ceb
Only system files for SPI devices filter
awawa-dev Sep 12, 2022
89de4bc
Code clean-up
awawa-dev Sep 13, 2022
82bd26c
Merge branch 'master' into SPI_discovery
awawa-dev Oct 9, 2022
a66b058
Devices specialized option
awawa-dev Oct 9, 2022
4acdd22
LED context editor
awawa-dev Oct 9, 2022
cf068d9
Critical bug for unicolor color averaging. Zoom button for designer.
awawa-dev Oct 12, 2022
8e0eff0
Better scaling Zoom for LED Layout Preview creator. Live updates when…
awawa-dev Oct 13, 2022
471e0c4
CTRL allows now to select the object below
awawa-dev Oct 13, 2022
f68448c
Update
awawa-dev Nov 6, 2022
35a40ca
Merge branch 'master' into LED_context_menu
awawa-dev Nov 6, 2022
50bbaed
Update
awawa-dev Nov 6, 2022
8e5de48
Merge branch 'master' into LED_context_menu
awawa-dev Nov 6, 2022
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
90 changes: 85 additions & 5 deletions assets/webconfig/content/light_source.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h3 class="page-header"><i class="fa fa-lightbulb-o fa-fw"></i><span data-i18n="
<div id="menu_gencfg" class="tab-pane fade" style="padding-top: 10px;" aria-labelledby="menugencfg">
<div class="row">
<div class="col-lg-12" id="layout_intro"></div>
<div class="col-lg-6 col-md-12">
<div class="col-lg-6 col-md-12" id="led_main_panel">
<div class="accordion" id="accordion">
<div class="accordion-item">
<div class="accordion-header card card-default" id="headingOne">
Expand Down Expand Up @@ -567,31 +567,111 @@ <h4 class="card-title">
</div>
</div>
<!-- accordion -->
<div class="col-lg-6 col-md-12">
<div class="col-lg-6 col-md-12" id="led_zoom_panel">
<div class="card card-default">
<div class="card-header" id="instTarget2">
<h4 class="card-title"><i class="fa fa-search fa-fw"></i><span data-i18n="conf_leds_layout_peview">LED Layout preview</span></h4>
</div>
<div class="card-body">
<p id="previewcreator" style="font-weight: bold;"></p>
<div class="card-body" id="visualCreatorPanel">
<p id="previewledcount" style="font-weight: bold;"></p>
<p id="previewledpower" style="font-weight: bold;"></p>
<div id="led_vis_help"></div>
<p data-i18n="conf_leds_layout_context" style="font-weight: bold;"></p>
<div class="col-lg-12 st_helper" style="padding-left: 0px; padding-right: 0px;">
<div id="leds_preview"></div>
</div>
</div>
<div class="card-footer">
<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>
<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>
<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>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

<div class="dropdown-menu dropdown-menu-sm" style="display: none;" id="creator-context-menu">
<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>
<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>
<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>
<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>
</div>
<!-- Modal -->
<div class="modal fade" id="ledPropertiesForm" tabindex="-1" aria-labelledby="ledPropertiesLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content p-0">
<div class="card card-default modal-body" style="margin: 0px !important; padding: 0px !important;">
<div class="card-header">
<h4 class="modal-title"><b><span id="ledPropertiesFormLabel"></span></b></h4>
</div>
<div class="card-body">
<div class="container">
<div class="form-group row">
<div class="col-12 col-md-6">
<div class="form-group row">
<div class="col-form-label mb-3 col-3">
<label class="required" data-i18n="conf_leds_layout_cl_left"></label>
</div>
<div class="mb-3 col-9">
<div class="input-group">
<input type="number" class="form-control" data-schemaformat="stepper" min="0" max="1" step="0.001" id="ledPropertiesDialogLeft" />
<div class="input-group-append"><button type="button" class="btn btn-secondary stepper-down">-</button></div>
<div class="input-group-append"><button type="button" class="btn btn-secondary stepper-up">+</button></div>
</div>
</div>
</div>
<div class="form-group row">
<div class="col-form-label mb-3 col-3">
<label class="required" data-i18n="conf_leds_layout_cl_right"></label>
</div>
<div class="mb-3 col-9">
<div class="input-group">
<input type="number" class="form-control" data-schemaformat="stepper" min="0" max="1" step="0.001" id="ledPropertiesDialogRight" />
<div class="input-group-append"><button type="button" class="btn btn-secondary stepper-down">-</button></div>
<div class="input-group-append"><button type="button" class="btn btn-secondary stepper-up">+</button></div>
</div>
</div>
</div>
</div>
<div class="col-12 col-md-6">
<div class="form-group row">
<div class="col-form-label mb-3 col-3">
<label class="required" data-i18n="conf_leds_layout_cl_top"></label>
</div>
<div class="mb-3 col-9">
<div class="input-group">
<input type="number" class="form-control" data-schemaformat="stepper" min="0" max="1" step="0.001" id="ledPropertiesDialogTop" />
<div class="input-group-append"><button type="button" class="btn btn-secondary stepper-down">-</button></div>
<div class="input-group-append"><button type="button" class="btn btn-secondary stepper-up">+</button></div>
</div>
</div>
</div>
<div class="form-group row">
<div class="col-form-label mb-3 col-3">
<label class="required" data-i18n="conf_leds_layout_cl_bottom"></label>
</div>
<div class="mb-3 col-9">
<div class="input-group">
<input type="number" class="form-control" data-schemaformat="stepper" min="0" max="1" step="0.001" id="ledPropertiesDialogBottom" />
<div class="input-group-append"><button type="button" class="btn btn-secondary stepper-down">-</button></div>
<div class="input-group-append"><button type="button" class="btn btn-secondary stepper-up">+</button></div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="card-footer">
<button type="button" id="ready_to_set_single_abort" class="btn btn-danger float-end"><span data-i18n="general_btn_exit">Exit</span></button>
<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>
</div>
</div>
</div>
</div>
</div>
<link href="css/jsonaceeditor.min.css" rel="stylesheet" type="text/css" />
<script src='js/lib/jsonaceeditor.min.js'></script>

Expand Down
34 changes: 33 additions & 1 deletion assets/webconfig/css/hyperhdr.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,4 +788,36 @@ body:not(.dark-mode) .alert-yellow{
color: #212529;
background-color: #f39c12;
border-color: #e08e0b;
}
}

.crosslineDark {
background:
linear-gradient(to top left,
rgba(0,0,0,0) 0%,
rgba(0,0,0,0) calc(50% - 1px),
rgba(0,0,0,1) 50%,
rgba(0,0,0,0) calc(50% + 1px),
rgba(0,0,0,0) 100%),
linear-gradient(to top right,
rgba(0,0,0,0) 0%,
rgba(0,0,0,0) calc(50% - 1px),
rgba(0,0,0,1) 50%,
rgba(0,0,0,0) calc(50% + 1px),
rgba(0,0,0,0) 100%);
}

.crosslineWhite {
background:
linear-gradient(to top left,
rgba(0,0,0,0) 0%,
rgba(0,0,0,0) calc(50% - 1.5px),
rgba(255,255,255,1) 50%,
rgba(0,0,0,0) calc(50% + 1.5px),
rgba(0,0,0,0) 100%),
linear-gradient(to top right,
rgba(0,0,0,0) 0%,
rgba(0,0,0,0) calc(50% - 1.5px),
rgba(255,255,255,1) 50%,
rgba(0,0,0,0) calc(50% + 1.5px),
rgba(0,0,0,0) 100%);
}
11 changes: 10 additions & 1 deletion assets/webconfig/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1177,5 +1177,14 @@
"edt_conf_mqtt_ssl_ignore_errors_title" : "Ignore SSL errors",
"edt_conf_mqtt_ssl_ignore_errors_expl" : "Ignore all SSL errors such as self-signed certificates etc. Use with caution.",
"json_api_flatbuffers_user_lut" : "Flatbuffers LUT filename",
"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."
"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.",
"led_editor_context_move": "Move",
"led_editor_context_properties": "Properties",
"led_editor_context_delete": "Delete",
"led_editor_context_enable": "Enable",
"led_editor_context_disable": "Disable",
"led_editor_context_moving": "Left click the mouse to accept the position",
"conf_leds_disabled_notification" : "Some LEDs are disabled by the user!",
"conf_leds_layout_context" : "Right click on the LED to display the context menu. With the CTRL key selects the object below.",
"conf_leds_layout_btn_zoom" : "Zoom"
}
Loading