diff --git a/assets/icons/measure_angle.svg b/assets/icons/measure_angle.svg new file mode 100644 index 0000000..88bf987 --- /dev/null +++ b/assets/icons/measure_angle.svg @@ -0,0 +1,79 @@ + +image/svg+xml \ No newline at end of file diff --git a/assets/icons/measure_distance.svg b/assets/icons/measure_distance.svg new file mode 100644 index 0000000..88bf987 --- /dev/null +++ b/assets/icons/measure_distance.svg @@ -0,0 +1,79 @@ + +image/svg+xml \ No newline at end of file diff --git a/assets/icons/measure_distance_parallel.svg b/assets/icons/measure_distance_parallel.svg new file mode 100644 index 0000000..88bf987 --- /dev/null +++ b/assets/icons/measure_distance_parallel.svg @@ -0,0 +1,79 @@ + +image/svg+xml \ No newline at end of file diff --git a/source/website/measuretool.js b/source/website/measuretool.js index e74116c..02a5390 100644 --- a/source/website/measuretool.js +++ b/source/website/measuretool.js @@ -212,14 +212,14 @@ export class MeasureTool let calcResult = CalculateMarkerValues (this.markers[0], this.markers[1]); if (calcResult.pointsDistance !== null) { - AddValue (this.panel, 'measure', 'Distance of points', calcResult.pointsDistance.toFixed (3)); + AddValue (this.panel, 'measure_distance', 'Distance of points', calcResult.pointsDistance.toFixed (3)); } if (calcResult.parallelFacesDistance !== null) { - AddValue (this.panel, 'measure', 'Distance of parallel faces', calcResult.parallelFacesDistance.toFixed (3)); + AddValue (this.panel, 'measure_distance_parallel', 'Distance of parallel faces', calcResult.parallelFacesDistance.toFixed (3)); } if (calcResult.facesAngle !== null) { let degreeValue = calcResult.facesAngle * RadDeg; - AddValue (this.panel, 'measure', 'Angle of faces', degreeValue.toFixed (1) + '\xB0'); + AddValue (this.panel, 'measure_angle', 'Angle of faces', degreeValue.toFixed (1) + '\xB0'); } } } diff --git a/source/website/website.js b/source/website/website.js index 19128f2..4fbc3b9 100644 --- a/source/website/website.js +++ b/source/website/website.js @@ -634,6 +634,9 @@ export class Website onBackgroundColorChange : () => { this.settings.SaveToCookies (); this.viewer.SetBackgroundColor (this.settings.backgroundColor); + if (this.measureTool.IsActive ()) { + this.measureTool.UpdatePanel (); + } }, onDefaultColorChange : () => { this.settings.SaveToCookies (); diff --git a/website/css/O3DVIcons/O3DVIcons.woff b/website/css/O3DVIcons/O3DVIcons.woff index 577a923..3840775 100644 Binary files a/website/css/O3DVIcons/O3DVIcons.woff and b/website/css/O3DVIcons/O3DVIcons.woff differ diff --git a/website/css/icons.css b/website/css/icons.css index 9ad4639..51a7a0b 100644 --- a/website/css/icons.css +++ b/website/css/icons.css @@ -1,6 +1,6 @@ @font-face { font-family: "O3DVIcons"; - src: url("O3DVIcons/O3DVIcons.woff?01bd85707830dedc06defe6d5374c240") format("woff"); + src: url("O3DVIcons/O3DVIcons.woff?43ee2533396d2125f154730cabd87b6e") format("woff"); } i[class^="icon-"]:before, i[class*=" icon-"]:before { @@ -86,48 +86,57 @@ i[class^="icon-"]:before, i[class*=" icon-"]:before { .icon-materials:before { content: "\f118"; } -.icon-measure:before { +.icon-measure_angle:before { content: "\f119"; } -.icon-meshes:before { +.icon-measure_distance_parallel:before { content: "\f11a"; } -.icon-missing_files:before { +.icon-measure_distance:before { content: "\f11b"; } -.icon-model:before { +.icon-measure:before { content: "\f11c"; } -.icon-open_url:before { +.icon-meshes:before { content: "\f11d"; } -.icon-open:before { +.icon-missing_files:before { content: "\f11e"; } -.icon-settings:before { +.icon-model:before { content: "\f11f"; } -.icon-share:before { +.icon-open_url:before { content: "\f120"; } -.icon-tree_mesh:before { +.icon-open:before { content: "\f121"; } -.icon-tree_view:before { +.icon-settings:before { content: "\f122"; } -.icon-twitter:before { +.icon-share:before { content: "\f123"; } -.icon-up_y:before { +.icon-tree_mesh:before { content: "\f124"; } -.icon-up_z:before { +.icon-tree_view:before { content: "\f125"; } -.icon-visible:before { +.icon-twitter:before { content: "\f126"; } -.icon-warning:before { +.icon-up_y:before { content: "\f127"; } +.icon-up_z:before { + content: "\f128"; +} +.icon-visible:before { + content: "\f129"; +} +.icon-warning:before { + content: "\f12a"; +} diff --git a/website/info/O3DVIcons.woff b/website/info/O3DVIcons.woff index 577a923..3840775 100644 Binary files a/website/info/O3DVIcons.woff and b/website/info/O3DVIcons.woff differ diff --git a/website/info/icons.css b/website/info/icons.css index d43600a..d4491ec 100644 --- a/website/info/icons.css +++ b/website/info/icons.css @@ -1,6 +1,6 @@ @font-face { font-family: "O3DVIcons"; - src: url("./O3DVIcons.woff?01bd85707830dedc06defe6d5374c240") format("woff"); + src: url("./O3DVIcons.woff?43ee2533396d2125f154730cabd87b6e") format("woff"); } i[class^="icon-"]:before, i[class*=" icon-"]:before { @@ -86,48 +86,57 @@ i[class^="icon-"]:before, i[class*=" icon-"]:before { .icon-materials:before { content: "\f118"; } -.icon-measure:before { +.icon-measure_angle:before { content: "\f119"; } -.icon-meshes:before { +.icon-measure_distance_parallel:before { content: "\f11a"; } -.icon-missing_files:before { +.icon-measure_distance:before { content: "\f11b"; } -.icon-model:before { +.icon-measure:before { content: "\f11c"; } -.icon-open_url:before { +.icon-meshes:before { content: "\f11d"; } -.icon-open:before { +.icon-missing_files:before { content: "\f11e"; } -.icon-settings:before { +.icon-model:before { content: "\f11f"; } -.icon-share:before { +.icon-open_url:before { content: "\f120"; } -.icon-tree_mesh:before { +.icon-open:before { content: "\f121"; } -.icon-tree_view:before { +.icon-settings:before { content: "\f122"; } -.icon-twitter:before { +.icon-share:before { content: "\f123"; } -.icon-up_y:before { +.icon-tree_mesh:before { content: "\f124"; } -.icon-up_z:before { +.icon-tree_view:before { content: "\f125"; } -.icon-visible:before { +.icon-twitter:before { content: "\f126"; } -.icon-warning:before { +.icon-up_y:before { content: "\f127"; } +.icon-up_z:before { + content: "\f128"; +} +.icon-visible:before { + content: "\f129"; +} +.icon-warning:before { + content: "\f12a"; +}