Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into new/ThermoCamManager

Browse Source
This commit is contained in:
Samuele E. Locatelli
2021-02-20 17:38:43 +01:00
parent 274cfdfc6b 4a2d40308c
commit f194225bdc
15 changed files with 181 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Thermo.Active/wwwroot/assets/icons/svg/slide-controstampo.svg
+13 -5
View File
@@ -1,7 +1,15 @@
<svg xmlns="http://www.w3.org/2000/svg" width="575" height="468" viewBox="0 0 575 468">
<g fill="#99CFFF" fill-rule="evenodd" stroke="#002680" stroke-linejoin="round" stroke-width="4">
<path d="M314.344 266.967L314.04 462.242 498.344 366.966 522.344 162.967z" transform="translate(0 3)"/>
<path d="M314.344 266.967L314.04 462.242 122.344 362.967 82.344 150.967z" transform="translate(0 3)"/>
<path d="M318.041 287.159L574.319 159.021 256.278 0 0 128.139zM0 136.139L318.319 295.298 318.319 287.298 0 128.139zM574.319 167.298L318.319 295.298 318.319 287.298 574.319 159.298z" transform="translate(0 3)"/>
<svg xmlns="http://www.w3.org/2000/svg" width="170" height="139" viewBox="0 0 170 139">
<g fill="none" fill-rule="evenodd" stroke-linejoin="round">
<g fill="#99CFFF" stroke="#002680" stroke-width=".5">
<g>
<g>
<g>
<path d="M92.936 78.721L92.847 136.302 147.336 108.208 154.432 48.054z" transform="translate(-1655 -718) translate(612 708) translate(1043 10.731) translate(0 .885)"/>
<path d="M92.936 78.721L92.847 136.302 36.171 107.029 24.345 44.516z" transform="translate(-1655 -718) translate(612 708) translate(1043 10.731) translate(0 .885)"/>
<path d="M94.03 84.675L169.799 46.891 75.769 0 0 37.785zM0 40.144L94.112 87.075 94.112 84.716 0 37.785zM169.799 49.331L94.112 87.075 94.112 84.716 169.799 46.972z" transform="translate(-1655 -718) translate(612 708) translate(1043 10.731) translate(0 .885)"/>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 647 B

After

Width:  |  Height:  |  Size: 1.0 KiB

Thermo.Active/wwwroot/assets/icons/svg/slide-cornice.svg
+21 -13
View File
@@ -1,15 +1,23 @@
<svg xmlns="http://www.w3.org/2000/svg" width="575" height="468" viewBox="0 0 575 468">
<g fill="#99CFFF" fill-rule="evenodd" stroke="#002680" stroke-linejoin="round" stroke-width="4">
<path d="M24.331 220L.331 208 .331 184 24.331 196zM24.331 196L0 183.834 368.331 0 392.331 12z" transform="translate(11 70)"/>
<path d="M24.331 196L0 183.834 368.331 0 392.331 12z" transform="translate(11 70)"/>
<path d="M24.331 220L24 195.834 392.331 12 392.331 36z" transform="translate(11 70)"/>
<path d="M236 233.834L117.55 173.059 117.55 165.059 236 225.834zM246.45 228.609L128 167.834 128 159.834 246.45 220.609z" transform="translate(11 70)"/>
<path d="M246.45 220.609L128 159.834 117.55 165.059 236 225.834z" transform="translate(11 70)"/>
<path d="M236 233.834L246.45 228.609 246.45 220.609 236 225.834zM424 139.834L305.55 79.059 305.55 71.059 424 131.834zM434.45 134.609L316 73.834 316 65.834 434.45 126.609z" transform="translate(11 70)"/>
<path d="M434.45 126.609L316 65.834 305.55 71.059 424 131.834z" transform="translate(11 70)"/>
<path d="M424 139.834L434.45 134.609 434.45 126.609 424 131.834zM184.662 300.165L160.662 288.165 160.662 264.165 184.662 276.165z" transform="translate(11 70)"/>
<path d="M184.662 276.165L160.331 264 528.662 80.165 552.662 92.165z" transform="translate(11 70)"/>
<path d="M184.662 276.165L160.331 264 528.662 80.165 552.662 92.165z" transform="translate(11 70)"/>
<path d="M184.662 300.165L184.331 276 552.662 92.165 552.662 116.165z" transform="translate(11 70)"/>
<svg xmlns="http://www.w3.org/2000/svg" width="170" height="139" viewBox="0 0 170 139">
<g fill="none" fill-rule="evenodd" stroke-linejoin="round">
<g fill="#99CFFF" stroke="#002680" stroke-width=".5">
<g>
<g>
<g>
<path d="M7.193 64.872L.098 61.333.098 54.256 7.193 57.795zM7.193 57.795L0 54.207 108.898 0 115.994 3.538z" transform="translate(-1401 -718) translate(612 708) translate(789 10.731) matrix(-1 0 0 1 166.748 20.641)"/>
<path d="M7.193 57.795L0 54.207 108.898 0 115.994 3.538z" transform="translate(-1401 -718) translate(612 708) translate(789 10.731) matrix(-1 0 0 1 166.748 20.641)"/>
<path d="M7.193 64.872L7.096 57.746 115.994 3.538 115.994 10.615z" transform="translate(-1401 -718) translate(612 708) translate(789 10.731) matrix(-1 0 0 1 166.748 20.641)"/>
<path d="M69.774 68.951L34.754 51.03 34.754 48.671 69.774 66.592zM72.863 67.41L37.843 49.49 37.843 47.131 72.863 65.051z" transform="translate(-1401 -718) translate(612 708) translate(789 10.731) matrix(-1 0 0 1 166.748 20.641)"/>
<path d="M72.863 65.051L37.843 47.131 34.754 48.671 69.774 66.592z" transform="translate(-1401 -718) translate(612 708) translate(789 10.731) matrix(-1 0 0 1 166.748 20.641)"/>
<path d="M69.774 68.951L72.863 67.41 72.863 65.051 69.774 66.592zM125.357 41.233L90.337 23.312 90.337 20.953 125.357 38.874zM128.446 39.692L93.426 21.772 93.426 19.413 128.446 37.333z" transform="translate(-1401 -718) translate(612 708) translate(789 10.731) matrix(-1 0 0 1 166.748 20.641)"/>
<path d="M128.446 37.333L93.426 19.413 90.337 20.953 125.357 38.874z" transform="translate(-1401 -718) translate(612 708) translate(789 10.731) matrix(-1 0 0 1 166.748 20.641)"/>
<path d="M125.357 41.233L128.446 39.692 128.446 37.333 125.357 38.874zM54.596 88.51L47.5 84.972 47.5 77.895 54.596 81.433z" transform="translate(-1401 -718) translate(612 708) translate(789 10.731) matrix(-1 0 0 1 166.748 20.641)"/>
<path d="M54.596 81.433L47.402 77.846 156.3 23.638 163.396 27.177z" transform="translate(-1401 -718) translate(612 708) translate(789 10.731) matrix(-1 0 0 1 166.748 20.641)"/>
<path d="M54.596 81.433L47.402 77.846 156.3 23.638 163.396 27.177z" transform="translate(-1401 -718) translate(612 708) translate(789 10.731) matrix(-1 0 0 1 166.748 20.641)"/>
<path d="M54.596 88.51L54.498 81.384 163.396 27.177 163.396 34.254z" transform="translate(-1401 -718) translate(612 708) translate(789 10.731) matrix(-1 0 0 1 166.748 20.641)"/>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Thermo.Active/wwwroot/assets/icons/svg/slide-lastra.svg
+9 -3
View File
@@ -1,5 +1,11 @@
<svg xmlns="http://www.w3.org/2000/svg" width="575" height="468" viewBox="0 0 575 468">
<g fill="#99CFFF" fill-rule="evenodd" stroke="#002680" stroke-linejoin="round" stroke-width="4">
<path d="M318.041 373.861L516.006 274.878 574.319 245.722 256.278 86.702 0 214.841zM0 222.841L318.319 382 318.319 374 0 214.841zM574.319 254L318.319 382 318.319 374 574.319 246z"/>
<svg xmlns="http://www.w3.org/2000/svg" width="170" height="139" viewBox="0 0 170 139">
<g fill="none" fill-rule="evenodd" stroke-linejoin="round">
<g fill="#99CFFF" stroke="#002680" stroke-width=".5">
<g>
<g>
<path d="M94.03 110.241L152.558 81.054 169.799 72.456 75.769 25.566 0 63.351zM0 65.71L94.112 112.641 94.112 110.282 0 63.351zM169.799 74.897L94.112 112.641 94.112 110.282 169.799 72.538z" transform="translate(-894 -718) translate(612 708) translate(282 10.731)"/>
</g>
</g>
</g>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 394 B

After

Width:  |  Height:  |  Size: 601 B

Thermo.Active/wwwroot/assets/icons/svg/slide-piastra-riduzione.svg
+17 -9
View File
@@ -1,11 +1,19 @@
<svg xmlns="http://www.w3.org/2000/svg" width="575" height="468" viewBox="0 0 575 468">
<g fill="#99CFFF" fill-rule="evenodd" stroke="#002680" stroke-linejoin="round" stroke-width="4">
<path d="M259.773 284.957L189.834 249.988 429.624 130.093 499.563 165.062zM139.464 164.855L69.526 129.886 309.316 9.991 379.255 44.961z" transform="translate(3.249 90.5)"/>
<path d="M159.86 264.975L0 185.044 89.921 140.084 249.782 220.014zM479.581 155.071L319.721 75.141 409.642 30.18 569.502 110.11z" transform="translate(3.249 90.5)"/>
<path d="M429.624 130.093L319.721 75.141 319.721 65.149 429.624 120.101zM499.563 165.062L259.773 284.957 259.773 274.966 499.563 155.071zM569.502 110.11L479.581 155.071 479.581 145.079 569.502 100.119zM139.878 165.062L69.939 130.093 69.939 120.101 139.878 155.071z" transform="translate(3.249 90.5)"/>
<path d="M259.773 274.966L189.834 239.996 429.624 120.101 499.563 155.071zM139.464 154.865L69.526 119.895 309.316 0 379.255 34.969z" transform="translate(3.249 90.5)"/>
<path d="M159.86 254.983L0 175.053 89.921 130.093 249.782 210.023z" transform="translate(3.249 90.5)"/>
<path d="M159.86 254.983L0 175.053 89.921 130.093 249.782 210.023z" transform="translate(3.249 90.5)"/>
<path d="M259.773 284.957L189.834 249.988 189.834 239.996 259.773 274.966zM159.86 264.975L0 185.044 0 175.053 159.86 254.983zM479.581 145.079L319.721 65.149 409.642 20.189 569.502 100.119z" transform="translate(3.249 90.5)"/>
<svg xmlns="http://www.w3.org/2000/svg" width="170" height="139" viewBox="0 0 170 139">
<g fill="none" fill-rule="evenodd" stroke-linejoin="round">
<g fill="#99CFFF" stroke="#002680" stroke-width=".5">
<g>
<g>
<g>
<path d="M76.802 84.026L56.125 73.714 127.019 38.361 147.697 48.672zM41.233 48.611L20.555 38.3 91.45 2.946 112.127 13.258z" transform="translate(-1148 -718) translate(612 708) translate(534 10.731) matrix(-1 0 0 1 171.482 26.686)"/>
<path d="M47.263 78.134L0 54.564 26.585 41.307 73.848 64.876zM141.789 45.726L94.526 22.157 121.112 8.899 168.375 32.468z" transform="translate(-1148 -718) translate(612 708) translate(534 10.731) matrix(-1 0 0 1 171.482 26.686)"/>
<path d="M127.019 38.361L94.526 22.157 94.526 19.211 127.019 35.414zM147.697 48.672L76.802 84.026 76.802 81.08 147.697 45.726zM168.375 32.468L141.789 45.726 141.789 42.78 168.375 29.522zM41.355 48.672L20.678 38.361 20.678 35.414 41.355 45.726z" transform="translate(-1148 -718) translate(612 708) translate(534 10.731) matrix(-1 0 0 1 171.482 26.686)"/>
<path d="M76.802 81.08L56.125 70.768 127.019 35.414 147.697 45.726zM41.233 45.665L20.555 35.354 91.45 0 112.127 10.311z" transform="translate(-1148 -718) translate(612 708) translate(534 10.731) matrix(-1 0 0 1 171.482 26.686)"/>
<path d="M47.263 75.187L0 51.618 26.585 38.361 73.848 61.93z" transform="translate(-1148 -718) translate(612 708) translate(534 10.731) matrix(-1 0 0 1 171.482 26.686)"/>
<path d="M47.263 75.187L0 51.618 26.585 38.361 73.848 61.93zM76.802 84.026L56.125 73.714 56.125 70.768 76.802 81.08z" transform="translate(-1148 -718) translate(612 708) translate(534 10.731) matrix(-1 0 0 1 171.482 26.686)"/>
<path d="M47.263 78.134L0 54.564 0 51.618 47.263 75.187zM141.789 42.78L94.526 19.211 121.112 5.953 168.375 29.522z" transform="translate(-1148 -718) translate(612 708) translate(534 10.731) matrix(-1 0 0 1 171.482 26.686)"/>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Thermo.Active/wwwroot/assets/styles/base/riscaldi.less
+23
View File
@@ -19,6 +19,23 @@
pointer-events: none;
}
.subresselected{
width: calc(100% - 4px);
height: calc(100% - 4px);
margin: 2px;
border-radius: 4px;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: black;
}
div{
width: 100%;
height: 100%
}
.resistance {
width: calc(100% - 4px);
height: calc(100% - 4px);
@@ -32,6 +49,12 @@
font-size: 32px;
font-weight: bold;
color: #fff;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
&.disabled {
cursor: not-allowed;
}
Thermo.Active/wwwroot/assets/styles/style.css
+21
View File
@@ -4802,6 +4802,22 @@ article .box .body {
.warmers svg .thermoImage {
pointer-events: none;
}
.warmers svg .subresselected {
width: calc(100% - 4px);
height: calc(100% - 4px);
margin: 2px;
border-radius: 4px;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: black;
}
.warmers svg div {
width: 100%;
height: 100%;
}
.warmers svg .resistance {
width: calc(100% - 4px);
height: calc(100% - 4px);
@@ -4815,6 +4831,11 @@ article .box .body {
font-size: 32px;
font-weight: bold;
color: #fff;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
}
.warmers svg .resistance.disabled {
cursor: not-allowed;
Thermo.Active/wwwroot/assets/svg/disegno-piastra-riduzione.svg
+20 -196
View File
@@ -1,197 +1,21 @@
<?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"
width="760"
height="400"
viewBox="0 0 760 400"
version="1.1"
id="svg2151"
sodipodi:docname="disegno-piastra-riduzione.svg"
inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
<metadata
id="metadata2157">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs2155" />
<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="1001"
id="namedview2153"
showgrid="false"
inkscape:zoom="0.61040842"
inkscape:cx="483.14087"
inkscape:cy="92.689213"
inkscape:window-x="-9"
inkscape:window-y="-9"
inkscape:window-maximized="1"
inkscape:current-layer="svg2151" />
<g
id="g2149"
style="fill:#99cfff;fill-rule:evenodd;stroke:#002680;stroke-width:4;stroke-linejoin:round"
transform="translate(71.399971,-68.000001)">
<path
d="m 259.773,284.957 -69.939,-34.969 239.79,-119.895 69.939,34.969 z M 139.464,164.855 69.526,129.886 309.316,9.991 l 69.939,34.97 z"
transform="translate(3.249,90.5)"
id="path2135"
inkscape:connector-curvature="0" />
<path
d="M 159.86,264.975 0,185.044 l 89.921,-44.96 159.861,79.93 z m 319.721,-109.904 -159.86,-79.93 89.921,-44.961 159.86,79.93 z"
transform="translate(3.249,90.5)"
id="path2137"
inkscape:connector-curvature="0" />
<path
d="M 429.624,130.093 319.721,75.141 v -9.992 l 109.903,54.952 z m 69.939,34.969 -239.79,119.895 v -9.991 l 239.79,-119.895 z m 69.939,-54.952 -89.921,44.961 v -9.992 l 89.921,-44.96 z M 139.878,165.062 69.939,130.093 v -9.992 l 69.939,34.97 z"
transform="translate(3.249,90.5)"
id="path2139"
inkscape:connector-curvature="0" />
<path
d="m 259.773,274.966 -69.939,-34.97 239.79,-119.895 69.939,34.97 z M 139.464,154.865 69.526,119.895 309.316,0 379.255,34.969 Z"
transform="translate(3.249,90.5)"
id="path2141"
inkscape:connector-curvature="0" />
<path
d="M 159.86,254.983 0,175.053 l 89.921,-44.96 159.861,79.93 z"
transform="translate(3.249,90.5)"
id="path2143"
inkscape:connector-curvature="0" />
<path
d="M 159.86,254.983 0,175.053 l 89.921,-44.96 159.861,79.93 z"
transform="translate(3.249,90.5)"
id="path2145"
inkscape:connector-curvature="0" />
<path
d="m 259.773,284.957 -69.939,-34.969 v -9.992 l 69.939,34.97 z M 159.86,264.975 0,185.044 v -9.991 l 159.86,79.93 z m 319.721,-119.896 -159.86,-79.93 89.921,-44.96 159.86,79.93 z"
transform="translate(3.249,90.5)"
id="path2147"
inkscape:connector-curvature="0" />
</g>
<g
id="g2197"
transform="translate(4.635,-19.933997)">
<path
inkscape:connector-curvature="0"
id="path150"
d="M 318.8129,252.23077 571.924,373.37584"
style="fill:none;stroke:#b3b3b3;stroke-width:2.40387583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
id="path152"
d="M 319.40509,252.24353 107.46073,357.84397"
style="fill:none;stroke:#b3b3b3;stroke-width:1.63572109px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
id="path154"
d="M 212.43303,195.88113 1.4261138,301.81785"
style="fill:none;stroke:#b3b3b3;stroke-width:2.22034693px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
id="path156"
d="M 497.54429,162.08482 750.46604,283.3136"
style="fill:none;stroke:#b3b3b3;stroke-width:2.50929308px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
transform="matrix(0.41166896,-0.86857177,0.86999321,0.41099635,232.92499,797.48697)"
inkscape:transform-center-y="0.97901651"
inkscape:transform-center-x="0.010241558"
d="m 711.04477,246.9809 -3.551,-0.27201 -3.55099,-0.27201 2.01106,-2.93925 2.01107,-2.93924 1.53993,3.21125 z"
inkscape:randomized="0"
inkscape:rounded="0"
inkscape:flatsided="false"
sodipodi:arg2="1.6472478"
sodipodi:arg1="0.60005021"
sodipodi:r2="2.0561731"
sodipodi:r1="4.1123462"
sodipodi:cy="244.65872"
sodipodi:cx="707.65082"
sodipodi:sides="3"
id="path158"
style="fill:#b3b3b3;fill-opacity:0.97397766;stroke:#b3b3b3;stroke-width:1.33899999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:type="star" />
<path
transform="matrix(0.94299544,-0.07032979,0.07093357,0.93496879,-28.773309,44.438169)"
inkscape:transform-center-y="-0.96165537"
inkscape:transform-center-x="0.0026663609"
d="m 119.90086,340.35431 -3.55099,-0.27201 -3.551,-0.27201 2.01107,-2.93924 2.01106,-2.93925 1.53993,3.21126 z"
inkscape:randomized="0"
inkscape:rounded="0"
inkscape:flatsided="false"
sodipodi:arg2="1.6472478"
sodipodi:arg1="0.60005021"
sodipodi:r2="2.0561731"
sodipodi:r1="4.1123462"
sodipodi:cy="338.03214"
sodipodi:cx="116.50691"
sodipodi:sides="3"
id="path158-6"
style="fill:#b3b3b3;fill-opacity:0.97397766;stroke:#b3b3b3;stroke-width:1.33899999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:type="star" />
<path
transform="matrix(0.95969918,-0.07293537,0.07305473,0.95813117,34.268197,86.269724)"
inkscape:transform-center-y="-0.98707767"
inkscape:transform-center-x="0.00094255263"
d="m 538.48654,334.9762 -3.55099,-0.27201 -3.551,-0.27201 2.01107,-2.93925 2.01106,-2.93924 1.53993,3.21125 z"
inkscape:randomized="0"
inkscape:rounded="0"
inkscape:flatsided="false"
sodipodi:arg2="1.6472478"
sodipodi:arg1="0.60005021"
sodipodi:r2="2.0561731"
sodipodi:r1="4.1123462"
sodipodi:cy="332.65402"
sodipodi:cx="535.09259"
sodipodi:sides="3"
id="path158-5"
style="fill:#b3b3b3;fill-opacity:0.97397766;stroke:#b3b3b3;stroke-width:1.33899999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:type="star" />
<path
transform="matrix(0.41299761,-0.84346738,0.85070849,0.40948224,-239.15287,199.42316)"
inkscape:transform-center-y="0.95589683"
inkscape:transform-center-x="-0.0093608417"
d="m 19.170891,289.32773 -3.550993,-0.27201 -3.550994,-0.27201 2.011064,-2.93924 2.011063,-2.93925 1.53993,3.21126 z"
inkscape:randomized="0"
inkscape:rounded="0"
inkscape:flatsided="false"
sodipodi:arg2="1.6472478"
sodipodi:arg1="0.60005021"
sodipodi:r2="2.0561731"
sodipodi:r1="4.1123462"
sodipodi:cy="287.00555"
sodipodi:cx="15.776942"
sodipodi:sides="3"
id="path158-8"
style="fill:#b3b3b3;fill-opacity:0.97397766;stroke:#b3b3b3;stroke-width:1.33899999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:type="star" />
<path
inkscape:connector-curvature="0"
id="path187"
d="M 568.66937,367.9429 740.51175,281.4018"
style="fill:none;stroke:#b3b3b3;stroke-width:0.96168911px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
id="path189"
d="M 8.1625556,301.69556 108.4352,354.22622"
style="fill:none;stroke:#b3b3b3;stroke-width:0.94162625px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
</g>
<svg xmlns="http://www.w3.org/2000/svg" width="575" height="468" viewBox="0 0 575 468">
<g fill="none" fill-rule="evenodd" stroke-linejoin="round">
<g fill="#99CFFF" stroke="#002680" stroke-width="4">
<g>
<g>
<g>
<g>
<path d="M259.773 284.957L189.834 249.988 429.624 130.093 499.563 165.062zM139.464 164.855L69.526 129.886 309.316 9.991 379.255 44.961z" transform="translate(-946 -173) translate(719 167) translate(156 6) translate(71) matrix(-1 0 0 1 573.249 90.5)"/>
<path d="M159.86 264.975L0 185.044 89.921 140.084 249.782 220.014zM479.581 155.071L319.721 75.141 409.642 30.18 569.502 110.11z" transform="translate(-946 -173) translate(719 167) translate(156 6) translate(71) matrix(-1 0 0 1 573.249 90.5)"/>
<path d="M429.624 130.093L319.721 75.141 319.721 65.149 429.624 120.101zM499.563 165.062L259.773 284.957 259.773 274.966 499.563 155.071zM569.502 110.11L479.581 155.071 479.581 145.079 569.502 100.119zM139.878 165.062L69.939 130.093 69.939 120.101 139.878 155.071z" transform="translate(-946 -173) translate(719 167) translate(156 6) translate(71) matrix(-1 0 0 1 573.249 90.5)"/>
<path d="M259.773 274.966L189.834 239.996 429.624 120.101 499.563 155.071zM139.464 154.865L69.526 119.895 309.316 0 379.255 34.969z" transform="translate(-946 -173) translate(719 167) translate(156 6) translate(71) matrix(-1 0 0 1 573.249 90.5)"/>
<path d="M159.86 254.983L0 175.053 89.921 130.093 249.782 210.023z" transform="translate(-946 -173) translate(719 167) translate(156 6) translate(71) matrix(-1 0 0 1 573.249 90.5)"/>
<path d="M159.86 254.983L0 175.053 89.921 130.093 249.782 210.023z" transform="translate(-946 -173) translate(719 167) translate(156 6) translate(71) matrix(-1 0 0 1 573.249 90.5)"/>
<path d="M259.773 284.957L189.834 249.988 189.834 239.996 259.773 274.966zM159.86 264.975L0 185.044 0 175.053 159.86 254.983zM479.581 145.079L319.721 65.149 409.642 20.189 569.502 100.119z" transform="translate(-946 -173) translate(719 167) translate(156 6) translate(71) matrix(-1 0 0 1 573.249 90.5)"/>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Thermo.Active/wwwroot/src/app_modules_thermo/components/index.ts
+5 -2
View File
@@ -15,14 +15,17 @@ export default {
loadMore
}
declare let $: any;
Vue.directive('focusOn', {
bind: function (el: HTMLElement, binding) {
el.addEventListener('click', (ev) => {
let element = document.getElementById(binding.arg) as HTMLElement;
if (element) {
element.scrollIntoView({ behavior: "smooth", block: "center", inline: "nearest" });
element.focus();
var topPos = element.offsetTop;
$("aside#formato").animate({ scrollTop: topPos }, 200, 'swing', function() {
element.focus();
});
}
})
}
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.ts
+13 -1
View File
@@ -21,6 +21,7 @@ import { Deferred } from "@/services";
import { recipeService } from "@/services/recipeService";
import { debounce } from "@/_base/debounce";
declare let $: any;
@Component({
components: {
modal: Modal,
@@ -110,7 +111,18 @@ export default class ShowFormatoInfo extends Vue {
takeScreenshot() {
messageService.publishToChannel("take-screenshot");
}
}
clickSection(key){
this.show = key;
var myElement = document.getElementById("view-" + key);
if(myElement)
{
var topPos = myElement.offsetTop;
$("aside#formato").scrollTop(topPos);
}
}
async conferma() {
// recipeActions.setCurrent(store, this.recipe);
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.vue
+11 -11
View File
@@ -10,12 +10,12 @@
</button>
</div>
<section>
<aside class="scrollable">
<stampo :recipe="recipe"></stampo>
<lastra :recipe="recipe"></lastra>
<piastra :recipe="recipe"></piastra>
<cornice :recipe="recipe"></cornice>
<controstampo :recipe="recipe"></controstampo>
<aside class="scrollable" id="formato">
<stampo :recipe="recipe" id="view-stampo"></stampo>
<lastra :recipe="recipe" id="view-lastra"></lastra>
<piastra :recipe="recipe" id="view-piastra"></piastra>
<cornice :recipe="recipe" id="view-cornice"></cornice>
<controstampo :recipe="recipe" id="view-controstampo"></controstampo>
<template v-if="recipe.general_area_working_dxsx.status.visible">
<div class="radio-buttons">
<label>{{'general_area_working_dxsx' | localize("Zona lavoro DX/SX")}}</label>
@@ -45,27 +45,27 @@
<controstampoSVG v-if="show=='controstampo'" :recipe="recipe"></controstampoSVG>
<div class="slides">
<img
@click="show='stampo'"
@click="clickSection('stampo')"
:class="{'imgborder':show=='stampo'}"
src="assets/icons/svg/slide-stampo.svg"
/>
<img
@click="show='lastra'"
@click="clickSection('lastra')"
:class="{'imgborder':show=='lastra'}"
src="assets/icons/svg/slide-lastra.svg"
/>
<img
@click="show='piastra'"
@click="clickSection('piastra')"
:class="{'imgborder':show=='piastra'}"
src="assets/icons/svg/slide-piastra-riduzione.svg"
/>
<img
@click="show='cornice'"
@click="clickSection('cornice')"
:class="{'imgborder':show=='cornice'}"
src="assets/icons/svg/slide-cornice.svg"
/>
<img
@click="show='controstampo'"
@click="clickSection('controstampo')"
:class="{'imgborder':show=='controstampo'}"
src="assets/icons/svg/slide-controstampo.svg"
/>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/controstampo.vue
+1 -1
View File
@@ -1,6 +1,6 @@
<template>
<section>
<aside class="scrollable">
<aside class="scrollable" id="formato">
<div class="box">
<div class="header">
<label>{{'position_upperplate' | localize("Discesa Stampo")}}</label>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue
+1 -1
View File
@@ -1,6 +1,6 @@
<template>
<section class="cornice">
<aside class="scrollable">
<aside class="scrollable" id="formato">
<div class="box">
<div class="header">
<label>{{'position_frame' | localize("Discesa Cornice")}}</label>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue
+1 -1
View File
@@ -1,6 +1,6 @@
<template>
<section>
<aside class="scrollable">
<aside class="scrollable" id="formato">
<div class="box">
<div class="header">
<label>{{'position_mould' | localize("Salita Stampo")}}</label>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/resistance.ts
+19 -33
View File
@@ -43,65 +43,72 @@ export default class Resistance extends Vue {
isThermoProphet: boolean;
click() {
console.log('click')
if (this.editable)
this.$emit('click');
}
get currentStandardTempColor() {
// if selected use transparency
let transp = 1.0
if(this.selected)
transp = 0.5
//Not linear, but quadratic
if (!this.channel.tCamActive || this.channel.setpointHMI == 0)
return "179, 179, 179";
return "179, 179, 179, " + transp;
if (this.channel.tCamTempAct == 0 || this.channel.tCamTempSet == 0)
return "144,191,61";
return "144,191,61," + transp;
var delta = this.channel.tCamTempSet - this.channel.tCamTempAct;
if (delta >= - 5 && delta <= 5) {
return "144,191,61";
return "144,191,61," + transp;
}
else if (delta > 5 && delta <= 20) {
delta = delta - 5;
return [this.ColorColdFrom[0] - (this.ColorColdFrom[0] - this.colorColdTo[0]) * delta / 20,
this.ColorColdFrom[1] - (this.ColorColdFrom[1] - this.colorColdTo[1]) * delta / 20,
this.ColorColdFrom[2] - (this.ColorColdFrom[2] - this.colorColdTo[2]) * delta / 20];
this.ColorColdFrom[2] - (this.ColorColdFrom[2] - this.colorColdTo[2]) * delta / 20,transp];
}
else if (delta > 20) {
return "23, 86, 173";
return "23, 86, 173," + transp;
}
else if (delta < -5 && delta >= -20) {
delta = delta * (-1);
delta = delta - 5;
return [this.colorFrom[0] - (this.colorFrom[0] - this.colorTo[0]) * delta / 20,
this.colorFrom[1] - (this.colorFrom[1] - this.colorTo[1]) * delta / 20,
this.colorFrom[2] - (this.colorFrom[2] - this.colorTo[2]) * delta / 20];
this.colorFrom[2] - (this.colorFrom[2] - this.colorTo[2]) * delta / 20,transp];
}
else if (delta < -20) {
return "244, 0, 0";
return "244, 0, 0," + transp;
}
return "179, 179, 179";
return "179, 179, 179," + transp;
}
get currentStandardColor() {
// if selected use transparency
let transp = 1.0
if(this.selected)
transp = 0.5
//Not linear, but quadratic
var x = 1 / 100 * this.channel.setpointHMI * this.channel.setpointHMI;
return [this.colorFrom[0] - (this.colorFrom[0] - this.colorTo[0]) * x / 100,
this.colorFrom[1] - (this.colorFrom[1] - this.colorTo[1]) * x / 100,
this.colorFrom[2] - (this.colorFrom[2] - this.colorTo[2]) * x / 100];
this.colorFrom[2] - (this.colorFrom[2] - this.colorTo[2]) * x / 100,transp];
}
get currentColor() {
if(!this.isThermoProphet)
{
if (this.selected) return this.currentSelectedColor;
return this.currentStandardColor;
}
else
{
if (this.selected) return this.currentSelectedTempColor;
return this.currentStandardTempColor;
}
}
@@ -114,26 +121,5 @@ export default class Resistance extends Vue {
return Math.floor((id - 1) % 16) + 1;
}
get currentSelectedColor() {
return "0,38,128"
/*
var x = 1/100 * this.channel.setpointHMI * this.channel.setpointHMI;
return [this.selectedColorFrom[0] - (this.selectedColorFrom[0] - this.selectedColorTo[0]) * x / 100,
this.selectedColorFrom[1] - (this.selectedColorFrom[1] - this.selectedColorTo[1]) * x / 100,
this.selectedColorFrom[2] - (this.selectedColorFrom[2] - this.selectedColorTo[2]) * x / 100];
*/
}
get currentSelectedTempColor() {
//Not linear, but quadratic
return "0,38,128"
/*
var x = 1/100 * this.channel.setpointHMI * this.channel.setpointHMI;
return [this.selectedColorFrom[0] - (this.selectedColorFrom[0] - this.selectedColorTo[0]) * x / 100,
this.selectedColorFrom[1] - (this.selectedColorFrom[1] - this.selectedColorTo[1]) * x / 100,
this.selectedColorFrom[2] - (this.selectedColorFrom[2] - this.selectedColorTo[2]) * x / 100];*/
}
}
Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/resistance.vue
+6 -3
View File
@@ -1,11 +1,13 @@
<template>
<div>
<div class="subresselected" v-if="selected"></div>
<div
class="resistance"
:key="selected"
v-if="mode == 1"
@click="click"
v-on:touchend="click"
:style="{backgroundColor:`rgb(${currentColor})`}"
:style="{backgroundColor:`rgba(${currentColor})`}"
>{{channel.setpointHMI}} %</div>
<div
class="resistance"
@@ -13,7 +15,7 @@
v-else-if="mode == 0"
@click="click"
v-on:touchend="click"
:style="{backgroundColor:`rgb(${currentColor})`}"
:style="{backgroundColor:`rgba(${currentColor})`}"
>{{channel.tCamTempSet}}&nbsp;°C</div>
<div
class="resistance"
@@ -21,7 +23,7 @@
v-else-if="mode == 4"
@click="click"
v-on:touchend="click"
:style="{backgroundColor:`rgb(${currentColor})`}"
:style="{backgroundColor:`rgba(${currentColor})`}"
>{{channel.actualCurrent}}&nbsp;W</div>
<div
class="resistance id"
@@ -36,5 +38,6 @@
<small>Bo: {{getBoard(channel.idChannel)}}</small>
<small>Ch: {{channel.idChannel}}</small>
</div>
</div>
</template>
<script src="./resistance.ts" lang="ts"></script>