From 42284ac419c53a62662cd8fbcc07e7a91eabadb1 Mon Sep 17 00:00:00 2001 From: kovacsv Date: Sat, 26 Feb 2022 08:55:05 +0100 Subject: [PATCH] Add placeholder icons for measure tool. --- assets/icons/measure_angle.svg | 79 +++++++++++++++++++++ assets/icons/measure_distance.svg | 79 +++++++++++++++++++++ assets/icons/measure_distance_parallel.svg | 79 +++++++++++++++++++++ source/website/measuretool.js | 6 +- source/website/website.js | 3 + website/css/O3DVIcons/O3DVIcons.woff | Bin 6804 -> 6828 bytes website/css/icons.css | 41 ++++++----- website/info/O3DVIcons.woff | Bin 6804 -> 6828 bytes website/info/icons.css | 41 ++++++----- 9 files changed, 293 insertions(+), 35 deletions(-) create mode 100644 assets/icons/measure_angle.svg create mode 100644 assets/icons/measure_distance.svg create mode 100644 assets/icons/measure_distance_parallel.svg 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 577a9234ce38a000abc6af24fcc7586cfbc93673..38407758c6bd57346aee2782f5c4f400d6bad4f2 100644 GIT binary patch delta 847 zcmV-V1F-y*HLNuhcTYw}00961000`S01E&B001wpcWB>pFG5`PoHdvUTRA^{rVE_OZ zm;e9(9RL6TBm!IkPiSp)cmMzwxBvhEAOHXWpe?xn^K5TpVE_OZ*Z=?kQUCw|QmO=> zQf*;)Z~y={7%Tt)0384T03ZQ80N`$6ZDjxe7)$^F0W<&r0wM=s&*X4#b94Xz8Grx) z0Vx0g0lW|m#OIR;0cd|}G3o%h(v0p5AeD?LikJW;hY7-XobA%taf2`bgyA29F}Cr2 z-?vGal$V0?l>Vr|(P~{rU_PzTEDVDH+CUn71sNp2B>BaSo@7T$--qf#G z7!!@*I*Vf~bhGfpoDK!ua9^L20YgTNnJ{I>oCQl(tl7NJEjxeq95`~~%!MmA?mT!> zg@@++AEky?@xH3{-7W4!%TT7K9c?nx-ZX8~Za2B1>=??zP<9Pv&-52GeM4EA-mV!K z%Auhg8OpJtoEXZfp`01YxuIMb%B7)P8OpVx+!)HO#re+Sd~b1nFw{L7>YfaB&xX1e zL*1*P?#)p5Zm1ahFw}h->Q;ujABMW0hPt&;{Q<0YW(xqbasuZRDP4tItK<1?zA|t# z>HtL;YE(Bg!07*f{{Lk(V$=h2IT)Bgq5wCz3$e3;7w!Rn$8y6k3`DiDsuQR8-pf~M zXcLq$p-Bx%TS>k?llh{f$2+z#LW&GI3Y4fY#x`~^!7lc&j{_Xy z2*)_VDb8??3tZv~*SNtg?r@I>JmLw@c)=^)@Q#mUES$4_Ep2Z$s7ZzGH9BtEP_B8= zWixF(l{2eiVC{2hO>A@e>V%O)u`ZN~NKVD=tO2xyqW*<_exyu_4?P8j@EG3zgjk3kYyqd@4SZF_)lkf{iwJ?pQ zd``ZlIArhHH1*0an_Ee`v>lmx;dDAc=_!P`;WOVV3P)9NMD-wE(~_w#LeC+(r17`! ZA^j9f_B_>8^un1aPLf|Q#C>Z3007~oZZiM? delta 823 zcmV-71IYZWHIy|JcTYw}00961000`401E&B001wPkrY3FO=E3gZ~y=Sga7~l?f?J- zg!BM#j%RFnW&i*JbN~Pp+yDS2RNHFGKWJrPWB>pcPyhe`G5`PoHdvUTRA^{rVE_OZ zga7~l9RL6TBm!IkPiSp)cmMzwqyPW_AOHXWpe?xn^K5TpVE_OZ!~g&QQUCw|QmO=> zQf*;)Z~y={7#IKm0384T03ZQ80N`$6ZDjxe7&rg`0W<&r0wM=s&*X4#b94Xz8EgOm z0VV(d0k*<^(nymC0cd}!GwJ}j(v0p5AeD?LikJW;FbThSobA!qZNo4aMd2fhmYdvr z@8(Np%RqU`a9My8IJ~+UBLY4ih>!?DKhOrs>>~?Md{dz7EAJM~eo4RC4}3Py1nsBz ze&@B&n(sriw(_$fpIFhMOE14Spk~O3F%zcDn6qHXiZvUy?AU*E;K+$H7p~m6^We#g zn2)RYziKVT&);3tAGc-(Eki9$vrNG>mDD!PIaP+*G1RW1_6)UentvJ?YHj+uG&Iza zp^go8VyII?of+!fP#1=}G}M)$t_^i#s9Qtb8S36p4~BX))RUo}4fSHES3|uS>fKNu zhWa$rm!U=@{sIK)3SXA9h63jlDYlyz-^TOXd}ZKf)B%bx)TnM~fYJZ|{Qt{n#Ha`4 zaxgG~L;+gG41BYe7w!RnS#!cL41}|g6H4#ew0E5ZYhg1n67!u=+G3 z?J62X+Zsmy*AxQ`5hFp03^@vnFvcDx*vA15afD->;1p*##|18Ng=^g47I(PE10L~& zXT0DQZ+OQCrud9T!a3WP(za%Ynp7BX(ea`R`IeVWGS}8qKDSzbi^fwSiM`b#P$nq| z);^WibYn{EMi|*Q>q4%GsjVcP+lEZJbUN-K z_Y^|6;S*m8M@4WZL}h=xr4>_~g_c9-A9r7U_wtji*z-(N)(U63<0$$CD|mYU000=; BUtItI 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 577a9234ce38a000abc6af24fcc7586cfbc93673..38407758c6bd57346aee2782f5c4f400d6bad4f2 100644 GIT binary patch delta 847 zcmV-V1F-y*HLNuhcTYw}00961000`S01E&B001wpcWB>pFG5`PoHdvUTRA^{rVE_OZ zm;e9(9RL6TBm!IkPiSp)cmMzwxBvhEAOHXWpe?xn^K5TpVE_OZ*Z=?kQUCw|QmO=> zQf*;)Z~y={7%Tt)0384T03ZQ80N`$6ZDjxe7)$^F0W<&r0wM=s&*X4#b94Xz8Grx) z0Vx0g0lW|m#OIR;0cd|}G3o%h(v0p5AeD?LikJW;hY7-XobA%taf2`bgyA29F}Cr2 z-?vGal$V0?l>Vr|(P~{rU_PzTEDVDH+CUn71sNp2B>BaSo@7T$--qf#G z7!!@*I*Vf~bhGfpoDK!ua9^L20YgTNnJ{I>oCQl(tl7NJEjxeq95`~~%!MmA?mT!> zg@@++AEky?@xH3{-7W4!%TT7K9c?nx-ZX8~Za2B1>=??zP<9Pv&-52GeM4EA-mV!K z%Auhg8OpJtoEXZfp`01YxuIMb%B7)P8OpVx+!)HO#re+Sd~b1nFw{L7>YfaB&xX1e zL*1*P?#)p5Zm1ahFw}h->Q;ujABMW0hPt&;{Q<0YW(xqbasuZRDP4tItK<1?zA|t# z>HtL;YE(Bg!07*f{{Lk(V$=h2IT)Bgq5wCz3$e3;7w!Rn$8y6k3`DiDsuQR8-pf~M zXcLq$p-Bx%TS>k?llh{f$2+z#LW&GI3Y4fY#x`~^!7lc&j{_Xy z2*)_VDb8??3tZv~*SNtg?r@I>JmLw@c)=^)@Q#mUES$4_Ep2Z$s7ZzGH9BtEP_B8= zWixF(l{2eiVC{2hO>A@e>V%O)u`ZN~NKVD=tO2xyqW*<_exyu_4?P8j@EG3zgjk3kYyqd@4SZF_)lkf{iwJ?pQ zd``ZlIArhHH1*0an_Ee`v>lmx;dDAc=_!P`;WOVV3P)9NMD-wE(~_w#LeC+(r17`! ZA^j9f_B_>8^un1aPLf|Q#C>Z3007~oZZiM? delta 823 zcmV-71IYZWHIy|JcTYw}00961000`401E&B001wPkrY3FO=E3gZ~y=Sga7~l?f?J- zg!BM#j%RFnW&i*JbN~Pp+yDS2RNHFGKWJrPWB>pcPyhe`G5`PoHdvUTRA^{rVE_OZ zga7~l9RL6TBm!IkPiSp)cmMzwqyPW_AOHXWpe?xn^K5TpVE_OZ!~g&QQUCw|QmO=> zQf*;)Z~y={7#IKm0384T03ZQ80N`$6ZDjxe7&rg`0W<&r0wM=s&*X4#b94Xz8EgOm z0VV(d0k*<^(nymC0cd}!GwJ}j(v0p5AeD?LikJW;FbThSobA!qZNo4aMd2fhmYdvr z@8(Np%RqU`a9My8IJ~+UBLY4ih>!?DKhOrs>>~?Md{dz7EAJM~eo4RC4}3Py1nsBz ze&@B&n(sriw(_$fpIFhMOE14Spk~O3F%zcDn6qHXiZvUy?AU*E;K+$H7p~m6^We#g zn2)RYziKVT&);3tAGc-(Eki9$vrNG>mDD!PIaP+*G1RW1_6)UentvJ?YHj+uG&Iza zp^go8VyII?of+!fP#1=}G}M)$t_^i#s9Qtb8S36p4~BX))RUo}4fSHES3|uS>fKNu zhWa$rm!U=@{sIK)3SXA9h63jlDYlyz-^TOXd}ZKf)B%bx)TnM~fYJZ|{Qt{n#Ha`4 zaxgG~L;+gG41BYe7w!RnS#!cL41}|g6H4#ew0E5ZYhg1n67!u=+G3 z?J62X+Zsmy*AxQ`5hFp03^@vnFvcDx*vA15afD->;1p*##|18Ng=^g47I(PE10L~& zXT0DQZ+OQCrud9T!a3WP(za%Ynp7BX(ea`R`IeVWGS}8qKDSzbi^fwSiM`b#P$nq| z);^WibYn{EMi|*Q>q4%GsjVcP+lEZJbUN-K z_Y^|6;S*m8M@4WZL}h=xr4>_~g_c9-A9r7U_wtji*z-(N)(U63<0$$CD|mYU000=; BUtItI 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"; +}