Doni/ModelHandle
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add placeholder icons for measure tool.

Browse Source
This commit is contained in:
kovacsv 2022-02-26 08:55:05 +01:00
parent bb6b4daa0e
commit 42284ac419
9 changed files with 293 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
assets/icons/measure_angle.svg Normal file
View File

@ -0,0 +1,79 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
viewBox="0 0 18 18"
xml:space="preserve"
version="1.1"
id="svg6"
sodipodi:docname="measure.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
id="metadata12"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
id="defs10" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1017"
id="namedview8"
showgrid="true"
inkscape:zoom="37.083822"
inkscape:cx="7.8597919"
inkscape:cy="9.2417814"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="svg6"><inkscape:grid
type="xygrid"
id="grid822" /></sodipodi:namedview><rect
style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#263238;stroke-width:1.00157475;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
id="rect826"
width="15"
height="7"
x="1.5007874"
y="1.4992126" /><path
style="fill:none;stroke:#263238;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
d="M 4.50005,1.9857573 V 3.9999998"
id="path828"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#263238;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
d="M 7.5317797,1.9857573 V 5.9999998"
id="path828-4"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#263238;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
d="M 10.50005,1.9857573 V 3.9928785"
id="path828-9"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#263238;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
d="M 13.50005,1.9857574 V 5.9928785"
id="path828-7"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#263238;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="M 1.5071212,13.49495 H 16.507142"
id="path874"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#263238;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="m 3.5071212,11.49495 -2,2 2,2"
id="path882"
inkscape:connector-curvature="0" /><path
style="fill:none;stroke:#263238;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="m 14.507142,11.49495 2,2 -2,2"
id="path882-2"
inkscape:connector-curvature="0" /></svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

79
assets/icons/measure_distance.svg Normal file
View File

@ -0,0 +1,79 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
viewBox="0 0 18 18"
xml:space="preserve"
version="1.1"
id="svg6"
sodipodi:docname="measure.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
id="metadata12"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
id="defs10" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1017"
id="namedview8"
showgrid="true"
inkscape:zoom="37.083822"
inkscape:cx="7.8597919"
inkscape:cy="9.2417814"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="svg6"><inkscape:grid
type="xygrid"
id="grid822" /></sodipodi:namedview><rect
style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#263238;stroke-width:1.00157475;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
id="rect826"
width="15"
height="7"
x="1.5007874"
y="1.4992126" /><path
style="fill:none;stroke:#263238;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
d="M 4.50005,1.9857573 V 3.9999998"
id="path828"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#263238;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
d="M 7.5317797,1.9857573 V 5.9999998"
id="path828-4"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#263238;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
d="M 10.50005,1.9857573 V 3.9928785"
id="path828-9"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#263238;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
d="M 13.50005,1.9857574 V 5.9928785"
id="path828-7"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#263238;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="M 1.5071212,13.49495 H 16.507142"
id="path874"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#263238;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="m 3.5071212,11.49495 -2,2 2,2"
id="path882"
inkscape:connector-curvature="0" /><path
style="fill:none;stroke:#263238;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="m 14.507142,11.49495 2,2 -2,2"
id="path882-2"
inkscape:connector-curvature="0" /></svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

79
assets/icons/measure_distance_parallel.svg Normal file
View File

@ -0,0 +1,79 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
viewBox="0 0 18 18"
xml:space="preserve"
version="1.1"
id="svg6"
sodipodi:docname="measure.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
id="metadata12"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
id="defs10" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1017"
id="namedview8"
showgrid="true"
inkscape:zoom="37.083822"
inkscape:cx="7.8597919"
inkscape:cy="9.2417814"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="svg6"><inkscape:grid
type="xygrid"
id="grid822" /></sodipodi:namedview><rect
style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#263238;stroke-width:1.00157475;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
id="rect826"
width="15"
height="7"
x="1.5007874"
y="1.4992126" /><path
style="fill:none;stroke:#263238;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
d="M 4.50005,1.9857573 V 3.9999998"
id="path828"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#263238;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
d="M 7.5317797,1.9857573 V 5.9999998"
id="path828-4"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#263238;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
d="M 10.50005,1.9857573 V 3.9928785"
id="path828-9"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#263238;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
d="M 13.50005,1.9857574 V 5.9928785"
id="path828-7"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#263238;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="M 1.5071212,13.49495 H 16.507142"
id="path874"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#263238;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="m 3.5071212,11.49495 -2,2 2,2"
id="path882"
inkscape:connector-curvature="0" /><path
style="fill:none;stroke:#263238;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="m 14.507142,11.49495 2,2 -2,2"
id="path882-2"
inkscape:connector-curvature="0" /></svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

6
source/website/measuretool.js
View File

@ -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');
}
}
}

3
source/website/website.js
View File

@ -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 ();

BIN
website/css/O3DVIcons/O3DVIcons.woff
View File

Binary file not shown.

41
website/css/icons.css
View File

@ -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";
}

BIN
website/info/O3DVIcons.woff
View File

Binary file not shown.

41
website/info/icons.css
View File

@ -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";
}