many display fixes

This commit is contained in:
2023-06-09 12:34:56 +02:00
parent e242d04df8
commit f47b2fd7e3
10 changed files with 510 additions and 265 deletions

View File

@@ -5,7 +5,7 @@
viewBox="0 0 35 35"
version="1.1"
id="svg5344"
sodipodi:docname="doleance.svg"
sodipodi:docname="doleancer.svg"
inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
@@ -20,17 +20,17 @@
borderopacity="1.0"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:pagecheckerboard="true"
inkscape:deskcolor="#d1d1d1"
showgrid="false"
inkscape:zoom="25.8"
inkscape:cx="14.903101"
inkscape:cy="17.53876"
inkscape:zoom="11.819053"
inkscape:cx="9.856966"
inkscape:cy="4.6111987"
inkscape:window-width="1920"
inkscape:window-height="1026"
inkscape:window-x="0"
inkscape:window-y="30"
inkscape:window-maximized="1"
inkscape:window-height="1170"
inkscape:window-x="1920"
inkscape:window-y="16"
inkscape:window-maximized="0"
inkscape:current-layer="svg5344" />
<circle
class="thick"
@@ -39,39 +39,71 @@
cy="17.5"
r="17"
id="circle5315"
style="stroke:#000000;stroke-width:0.75;stroke-dasharray:none;stroke-opacity:1" />
style="stroke:#000000;stroke-width:0.75;stroke-dasharray:none;stroke-opacity:1;fill:none" />
<line
class="thin"
x1="17.5"
y1="0"
x2="17.5"
y2="35"
y2="9.5"
id="line5317"
style="stroke:#000000;stroke-width:0.75;stroke-dasharray:none;stroke-opacity:1" />
style="stroke:#000000;stroke-width:0.749999;stroke-dasharray:none;stroke-opacity:1" />
<line
class="thin"
x1="29.874369"
y1="5.1256313"
x2="5.1256313"
y2="29.874369"
id="line5319"
style="stroke:#000000;stroke-width:0.75;stroke-dasharray:none;stroke-opacity:1" />
x1="17.5"
y1="25.658915"
x2="17.5"
y2="35.158916"
id="line5317-7"
style="stroke:#000000;stroke-width:0.749999;stroke-dasharray:none;stroke-opacity:1" />
<line
class="thin"
x1="35"
x1="9.5"
y1="17.5"
x2="0"
y2="17.5"
id="line5321"
style="stroke:#000000;stroke-width:0.75;stroke-dasharray:none;stroke-opacity:1" />
style="stroke:#000000;stroke-width:0.749999;stroke-dasharray:none;stroke-opacity:1" />
<line
class="thin"
x1="29.874369"
y1="29.874369"
x2="5.1256313"
y2="5.1256313"
id="line5323"
style="stroke:#000000;stroke-width:0.75;stroke-dasharray:none;stroke-opacity:1" />
x1="11.866509"
y1="11.866509"
x2="5.1489959"
y2="5.1489949"
id="line5321-3"
style="stroke:#000000;stroke-width:0.749999;stroke-dasharray:none;stroke-opacity:1" />
<line
class="thin"
x1="29.870384"
y1="29.870384"
x2="23.15287"
y2="23.15287"
id="line5321-3-5"
style="stroke:#000000;stroke-width:0.749999;stroke-dasharray:none;stroke-opacity:1" />
<line
class="thin"
x1="29.870384"
y1="5.1296153"
x2="23.15287"
y2="11.84713"
id="line5321-3-5-6"
style="stroke:#000000;stroke-width:0.749999;stroke-dasharray:none;stroke-opacity:1" />
<line
class="thin"
x1="11.866508"
y1="23.133492"
x2="5.1489949"
y2="29.851006"
id="line5321-3-5-6-2"
style="stroke:#000000;stroke-width:0.749999;stroke-dasharray:none;stroke-opacity:1" />
<line
class="thin"
x1="34.810078"
y1="17.5"
x2="25.310078"
y2="17.5"
id="line5321-5"
style="stroke:#000000;stroke-width:0.749999;stroke-dasharray:none;stroke-opacity:1" />
<circle
class="thin"
fill="#ffffff"
@@ -79,61 +111,33 @@
cy="17.5"
r="8"
id="circle5325"
style="stroke:#000000;stroke-width:0.75;stroke-dasharray:none;stroke-opacity:1" />
style="stroke:#000000;stroke-width:0.75;stroke-dasharray:none;stroke-opacity:1;fill:none" />
<path
class="thin"
fill="none"
d="m 3.5,22.5 2,-3 2,3"
d="m 3.5,21.737498 2,-3 2,3"
transform-origin="center"
id="path5327"
style="stroke:#000000;stroke-width:0.75;stroke-dasharray:none;stroke-opacity:1" />
<path
class="thin"
fill="none"
d="m -13.435029,18.384776 3.5355343,-0.707106 -0.7071063,3.535534"
transform-origin="center"
id="path5329"
style="stroke:#000000;stroke-width:0.75;stroke-dasharray:none;stroke-opacity:1" />
<path
class="thin"
fill="none"
d="m -22.5,3.5 3,2 -3,2"
transform-origin="center"
id="path5331"
style="stroke:#000000;stroke-width:0.75;stroke-dasharray:none;stroke-opacity:1" />
<path
class="thin"
fill="none"
d="m -18.384776,-13.435029 0.707106,3.535534 -3.535534,-0.707107"
transform-origin="center"
id="path5333"
style="stroke:#000000;stroke-width:0.75;stroke-dasharray:none;stroke-opacity:1" />
<path
class="thin"
fill="none"
d="m -3.5,-22.5 -2,3 -2,-3"
transform-origin="center"
id="path5335"
style="stroke:#000000;stroke-width:0.75;stroke-dasharray:none;stroke-opacity:1" />
<path
class="thin"
fill="none"
d="m 13.435029,-18.384776 -3.535534,0.707107 0.707107,-3.535534"
transform-origin="center"
id="path5337"
style="stroke:#000000;stroke-width:0.75;stroke-dasharray:none;stroke-opacity:1" />
<path
class="thin"
fill="none"
d="m 22.5,-3.5 -3,-2 3,-2"
transform-origin="center"
id="path5339"
style="stroke:#000000;stroke-width:0.75;stroke-dasharray:none;stroke-opacity:1" />
<path
class="thin"
fill="none"
d="M 31.841686,13.177822 29.81831,16.162106 27.841808,13.146572"
d="M 31.841686,13.344229 29.81831,16.328513 27.841808,13.312979"
transform-origin="center"
id="path5341"
style="stroke:#000000;stroke-width:0.75;stroke-dasharray:none;stroke-opacity:1" />
<path
class="thin"
fill="none"
d="m 13.294665,3.4773346 2.999999,2 -2.999999,2"
transform-origin="center"
id="path5327-9"
style="stroke:#000000;stroke-width:0.75;stroke-dasharray:none;stroke-opacity:1" />
<path
class="thin"
fill="none"
d="m 21.687933,31.819021 -2.984284,-2.023376 3.015534,-1.976502"
transform-origin="center"
id="path5341-1"
style="stroke:#000000;stroke-width:0.75;stroke-dasharray:none;stroke-opacity:1" />
</svg>

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

@@ -20,27 +20,27 @@
borderopacity="1.0"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:pagecheckerboard="true"
inkscape:deskcolor="#d1d1d1"
showgrid="false"
inkscape:zoom="25.8"
inkscape:cx="14.903101"
inkscape:cy="17.53876"
inkscape:cx="12.344961"
inkscape:cy="17.577519"
inkscape:window-width="1920"
inkscape:window-height="1026"
inkscape:window-x="0"
inkscape:window-y="30"
inkscape:window-maximized="1"
inkscape:window-height="1170"
inkscape:window-x="1920"
inkscape:window-y="16"
inkscape:window-maximized="0"
inkscape:current-layer="svg4457" />
<g
id="picto"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none">
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none;fill:none">
<path
class="thick"
fill="white"
d="M 4, 4 L 13, 1 L 19, 5 L 28, 3 L 34, 12 L 29, 22 L 27, 29 L 21, 34 L 14, 31 L 12, 23 L 4, 17 L 1, 12 Z"
id="path4446"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none" />
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none;fill:none" />
<circle
class="circle-fill"
fill="black"
@@ -48,24 +48,24 @@
cy="17.5"
r="2.5"
id="circle4448"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none" />
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none;fill:none" />
<path
class="thin"
fill="none"
d="M 7, 7 L 11, 5 L 15, 7 L 12, 12 L 12, 15 L 9, 16 L 5, 12 Z"
id="path4450"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none" />
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none;fill:none" />
<path
class="thin"
fill="none"
d="M 20, 11 L 22, 9 L 24, 9 L 27, 7 L 29, 11 L 26, 15 L 24, 16 L 21, 14 Z"
id="path4452"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none" />
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none;fill:none" />
<path
class="thin"
fill="none"
d="M 18, 23 L 22, 22 L 24, 25 L 22, 28 L 20, 29 L 17, 27 Z"
id="path4454"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none" />
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none;fill:none" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

@@ -5,7 +5,7 @@
viewBox="0 0 35 35"
version="1.1"
id="svg3586"
sodipodi:docname="puissance-d-agir.svg"
sodipodi:docname="puissancedagir.svg"
inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
@@ -20,21 +20,21 @@
borderopacity="1.0"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:pagecheckerboard="true"
inkscape:deskcolor="#d1d1d1"
showgrid="false"
inkscape:zoom="25.8"
inkscape:cx="14.903101"
inkscape:cy="17.53876"
inkscape:cx="12.344961"
inkscape:cy="17.577519"
inkscape:window-width="1920"
inkscape:window-height="1026"
inkscape:window-x="0"
inkscape:window-y="30"
inkscape:window-maximized="1"
inkscape:window-height="1170"
inkscape:window-x="1920"
inkscape:window-y="16"
inkscape:window-maximized="0"
inkscape:current-layer="svg3586" />
<g
id="picto"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none">
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none;fill:none">
<circle
class="thick"
fill="white"
@@ -42,7 +42,7 @@
cy="17.5"
r="17"
id="circle3571"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none" />
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none;fill:none" />
<circle
class="thin"
fill="none"
@@ -50,7 +50,7 @@
cy="17.5"
r="9.3"
id="circle3573"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none" />
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none;fill:none" />
<circle
class="circle-fill"
fill="black"
@@ -58,7 +58,7 @@
cy="17.5"
r="2.5"
id="circle3575"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none" />
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none;fill:none" />
<line
class="thin"
x1="17.5"
@@ -66,7 +66,7 @@
x2="17.5"
y2="35"
id="line3577"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none" />
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none;fill:none" />
<line
class="thin"
x1="17.5"
@@ -75,7 +75,7 @@
y2="35"
transform="rotate(45, 17.5, 17.5)"
id="line3579"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none" />
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none;fill:none" />
<line
class="thin"
x1="17.5"
@@ -84,7 +84,7 @@
y2="35"
transform="rotate(90, 17.5, 17.5)"
id="line3581"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none" />
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none;fill:none" />
<line
class="thin"
x1="17.5"
@@ -93,6 +93,6 @@
y2="35"
transform="rotate(135, 17.5, 17.5)"
id="line3583"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none" />
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none;fill:none" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

@@ -20,18 +20,22 @@
borderopacity="1.0"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:pagecheckerboard="true"
inkscape:deskcolor="#d1d1d1"
showgrid="false"
inkscape:zoom="25.8"
inkscape:cx="14.903101"
inkscape:cy="17.53876"
inkscape:zoom="28.934453"
inkscape:cx="18.9912"
inkscape:cy="14.498287"
inkscape:window-width="1920"
inkscape:window-height="1026"
inkscape:window-x="0"
inkscape:window-height="1146"
inkscape:window-x="1920"
inkscape:window-y="30"
inkscape:window-maximized="1"
inkscape:current-layer="svg1973" />
inkscape:current-layer="picto">
<inkscape:grid
type="xygrid"
id="grid1365" />
</sodipodi:namedview>
<g
id="picto"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none">
@@ -39,32 +43,17 @@
class="thick"
d="M 12, 13 L 21, 13 L 31, 22 L 22, 32 L 8, 26 Z"
id="path1952"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none" />
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none;fill:none" />
<path
class="thick"
d="M 1, 11 L 9, 2 L 25, 9 L 21, 23 L 3, 20 Z"
id="path1954"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none" />
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none;fill:none" />
<path
class="thick"
d="M 21, 2 L 30, 6 L 33, 13 L 25, 24 L 18, 27 L 7, 12 Z"
id="path1956"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none" />
<path
fill="white"
d="M 12, 13 L 21, 13 L 31, 22 L 22, 32 L 8, 26 Z"
id="path1958"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none" />
<path
fill="white"
d="M 1, 11 L 9, 2 L 25, 9 L 21, 23 L 3, 20 Z"
id="path1960"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none" />
<path
fill="white"
d="M 21, 2 L 30, 6 L 33, 13 L 25, 24 L 18, 27 L 7, 12 Z"
id="path1962"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none" />
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none;fill:none" />
<circle
class="circle-fill"
fill="black"

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@@ -5,7 +5,7 @@
viewBox="0 0 35 35"
version="1.1"
id="svg13"
sodipodi:docname="terrain-de-vie.svg"
sodipodi:docname="terraindevie.svg"
inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
@@ -20,18 +20,18 @@
borderopacity="1.0"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:pagecheckerboard="true"
inkscape:deskcolor="#d1d1d1"
showgrid="false"
inkscape:zoom="1.7479522"
inkscape:cx="-20.881578"
inkscape:cy="62.644733"
inkscape:zoom="32.684168"
inkscape:cx="17.347848"
inkscape:cy="23.910659"
inkscape:window-width="1920"
inkscape:window-height="1026"
inkscape:window-x="0"
inkscape:window-y="30"
inkscape:window-maximized="1"
inkscape:current-layer="svg13" />
inkscape:window-height="1170"
inkscape:window-x="1920"
inkscape:window-y="16"
inkscape:window-maximized="0"
inkscape:current-layer="picto" />
<g
id="picto"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none">
@@ -42,31 +42,46 @@
cy="17.5"
r="17"
id="circle2"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none" />
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none;fill:none" />
<line
class="thin"
x1="17.5"
y1="0"
x2="17.5"
y2="35"
y2="9.666667"
id="line4"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none" />
style="stroke:#000000;stroke-width:0.750001;stroke-dasharray:none;stroke-opacity:1" />
<line
class="thin"
x1="17.5"
y1="0"
y1="26.714285"
x2="17.5"
y2="35"
transform="rotate(90, 17.5, 17.5)"
y2="35.061226"
id="line4-6"
style="stroke:#000000;stroke-width:0.750001;stroke-dasharray:none;stroke-opacity:1" />
<line
class="thin"
x1="7.3333335"
y1="17.5"
x2="-5.0000001e-08"
y2="17.5"
id="line6"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none" />
style="stroke:#000000;stroke-width:0.749999;stroke-dasharray:none;stroke-opacity:1" />
<line
class="thin"
x1="35.022579"
y1="17.5"
x2="27.000002"
y2="17.5"
id="line6-3"
style="stroke:#000000;stroke-width:0.749999;stroke-dasharray:none;stroke-opacity:1" />
<path
class="thick"
fill="white"
d="M 9, 12 L 21, 8 L 27, 14 L 27, 21 L 19, 26 L 12, 27 L 6, 21 Z"
transform="translate(0 0.5)"
id="path8"
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none" />
style="stroke:#000000;stroke-opacity:1;stroke-width:0.75;stroke-dasharray:none;fill:none" />
<path
class="thin"
fill="none"

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

View File

@@ -32,6 +32,13 @@ import { mapState, mapActions } from 'pinia'
import { ConcernementsStore } from '@/stores/concernements'
import { CommonStore } from '@/stores/common'
import iconAction from "@/assets/icons/action.svg"
import iconDoleancer from "@/assets/icons/doleancer.svg"
import iconProximite from "@/assets/icons/proximite.svg"
import iconPuissanceagir from "@/assets/icons/puissancedagir.svg"
import iconSuperposition from "@/assets/icons/superposition.svg"
import iconTerraindevie from "@/assets/icons/terraindevie.svg"
export default {
inject: ['canvasMap', 'matterEngine'],
data() {
@@ -44,7 +51,7 @@ export default {
x: 0,
y: 0
},
ray: 60,
ray: 100,
time: 0,
salientPoints: [],
scale: 1,
@@ -79,7 +86,7 @@ export default {
// // console.log("we have an entity");
// this.opened_entite_id = parseInt(this.$route.params.eid);
// }
this.parsePoints()
this.getSalientPoints()
@@ -493,8 +500,8 @@ export default {
return new paper.Path({
name: 'contours',
segments: segments,
strokeColor: '#000',
strokeWidth: 1,
// strokeColor: '#000',
// strokeWidth: 1,
fillColor: 'rgba(255,255,255,0.8)',
pivot: new paper.Point(this.pos),
cid: this.id
@@ -577,49 +584,9 @@ export default {
setPaperPuissanceagirICON(){
let children = [];
var r = 20 * this.scale; // ray
var dr = r/2; // demi ray
var d = r*2; // diameter
children.push(new paper.Path.Circle({
center: [this.pos.x, this.pos.y],
radius: r
}));
children.push(new paper.Path.Circle({
center: [this.pos.x, this.pos.y],
radius: dr
}));
children.push(new paper.Path.Circle({
center: [this.pos.x, this.pos.y],
radius: 2*this.scale
}));
// axes
// vertical
children.push(new paper.Path.Line({
from: [this.pos.x, this.pos.y - r],
to: [this.pos.x , this.pos.y + r],
}))
// horizontal
children.push(new paper.Path.Line({
from: [this.pos.x - r, this.pos.y],
to: [this.pos.x + r, this.pos.y],
}))
// diagonale
// https://fr.wikipedia.org/wiki/Trigonom%C3%A9trie#/media/Fichier:Unit_circle_angles_color.svg
// https://fr.wikipedia.org/wiki/Identit%C3%A9_trigonom%C3%A9trique_pythagoricienne#Preuve_utilisant_le_cercle_unit%C3%A9
// radians = degrees * (pi/180)
// degrees = radians * (180/pi)
var m = Math.sin(45*(Math.PI/180)) * r;
children.push(new paper.Path.Line({
from: [this.pos.x + m, this.pos.y + m],
to: [this.pos.x - m, this.pos.y - m],
}))
children.push(new paper.Path.Line({
from: [this.pos.x - m, this.pos.y + m],
to: [this.pos.x + m, this.pos.y - m],
}))
let svgIcon = paper.project.importSVG(iconPuissanceagir);
children.push(svgIcon);
svgIcon.position = this.pos;
return new paper.Group({
children: children,
@@ -628,7 +595,8 @@ export default {
locked: true,
style: {
strokeColor: '#000',
strokeWidth: 1
strokeWidth: 1,
fillColor: null
}
});
},
@@ -1109,71 +1077,10 @@ export default {
setPaperDoleanceICON(){
let children = [];
var r = 20 * this.scale; // ray
var dr = r/2; // demi ray
var d = r*2; // diameter
let svgIcon = paper.project.importSVG(iconDoleancer);
children.push(svgIcon);
svgIcon.position = this.pos;
children.push(new paper.Path.Circle({
center: [this.pos.x, this.pos.y],
radius: r
}));
children.push(new paper.Path.Circle({
center: [this.pos.x, this.pos.y],
radius: dr
}));
// axes
// vertical
children.push(new paper.Path.Line({
from: [this.pos.x, this.pos.y - r],
to: [this.pos.x , this.pos.y - dr],
}));
children.push(new paper.Path.Line({
from: [this.pos.x, this.pos.y + r],
to: [this.pos.x , this.pos.y + dr],
}));
// horizontal
children.push(new paper.Path.Line({
from: [this.pos.x - r, this.pos.y],
to: [this.pos.x - dr, this.pos.y],
}));
children.push(new paper.Path.Line({
from: [this.pos.x + r, this.pos.y],
to: [this.pos.x + dr, this.pos.y],
}));
// diagonale
// https://fr.wikipedia.org/wiki/Trigonom%C3%A9trie#/media/Fichier:Unit_circle_angles_color.svg
// https://fr.wikipedia.org/wiki/Identit%C3%A9_trigonom%C3%A9trique_pythagoricienne#Preuve_utilisant_le_cercle_unit%C3%A9
// radians = degrees * (pi/180)
// degrees = radians * (180/pi)
let m,n;
m = Math.sin(45*(Math.PI/180)) * r;
n = Math.sin(45*(Math.PI/180)) * r/2;
// console.log('m', m);
children.push(new paper.Path.Line({
from: [this.pos.x + m, this.pos.y + m],
to: [this.pos.x + n, this.pos.y + n],
}));
//
children.push(new paper.Path.Line({
from: [this.pos.x - m, this.pos.y + m],
to: [this.pos.x - n, this.pos.y + n],
}));
//
children.push(new paper.Path.Line({
from: [this.pos.x + m, this.pos.y - m],
to: [this.pos.x + n, this.pos.y - n],
}));
//
children.push(new paper.Path.Line({
from: [this.pos.x - m, this.pos.y - m],
to: [this.pos.x - n, this.pos.y - n],
}));
return new paper.Group({
children: children,
pivot: new paper.Point(this.pos),
@@ -1181,9 +1088,12 @@ export default {
locked: true,
style: {
strokeColor: '#000',
strokeWidth: 1
strokeWidth: 1,
fillColor: null
}
});
},
setPaperDoleanceSteps(){
let g = new paper.Group({
@@ -1568,7 +1478,7 @@ export default {
// opening tweening
this.tween = new Tween.Tween({s: this.scale, x: this.pos.x, y: this.pos.y, o: 0})
.to({
s: 6,
s: 3,
x: (this.canvas.width - 450) / 2,
y: this.canvas.height / 2,
o: 0.8
@@ -1731,8 +1641,10 @@ export default {
this.paper_objects.children['contours'].fillColor = "rgba(255,255,255,0.8)";
if (this.is_hover) {
this.paper_objects.children['contours'].strokeColor = "#01ffe2";
this.paper_objects.children['contours'].strokeWidth = 2;
}else{
this.paper_objects.children['contours'].strokeColor = "#000";
this.paper_objects.children['contours'].strokeColor = null;
this.paper_objects.children['contours'].strokeWidth = 0;
}
}

View File

@@ -169,12 +169,12 @@ export default {
<li>
<a href="#terraindevie" @click="setMapMode('terraindevie')"><span class="icon terraindevie"></span> terrain de vie</a>
</li>
<!-- <li>
<li>
<a href="#proximite" @click="setMapMode('proximite')"><span class="icon proximite"></span> proximité</a>
</li>
<li>
<a href="#superposition" @click="setMapMode('superposition')"><span class="icon superposition"></span> superposition</a>
</li> -->
</li>
<li>
<a href="#puissancedagir" @click="setMapMode('puissancedagir')"><span class="icon puissancedagir"></span> puissance d'agir</a>
</li>