bachir/ouatterrir-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

entite action picto #2249

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi 2023-11-06 17:06:37 +01:00
parent 6b4e8ae99c
commit 039f44072b
2 changed files with 56 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/ConcernementMapItem.vue
View File

@ -741,6 +741,7 @@ export default {
break;
}
console.log(`item_type: ${item_type}, symbol_name: ${symbol_name}`);
let instance = new paper.SymbolItem(this.paper_symbol_definitions[symbol_name]);
instance.name = 'entite';
@ -1591,10 +1592,10 @@ export default {
let group = this.map_mode === 'terraindevie' ? this.paper_main_object.children['entites'] : this.paper_main_object.children['agissantes'];
if(group){
group.children.forEach((item) => {
if (this.opened_entite_id && item.item_id === parseInt(this.opened_entite_id)) {
if (this.opened_entite_id && item.item_id === parseInt(this.opened_entite_id) && item.item_type !== 'entite_hidden') {
item.definition = item.item_type === 'entite' ? this.paper_symbol_definitions.entite_hover : this.paper_symbol_definitions.entite_action_hover;
} else {
if (!this.hover_elmt || item.item_id !== this.hover_elmt.id) {
if ((!this.hover_elmt || item.item_id !== this.hover_elmt.id) && item.item_type !== 'entite_hidden') {
item.definition = item.item_type === 'entite' ? this.paper_symbol_definitions.entite : this.paper_symbol_definitions.entite_action;
}
}

81
src/components/MapConcernements.vue
View File

@ -1014,29 +1014,42 @@ export default {
// svgIcon.fillColor = null;
// svgIcon.position = {x:0, y:0};
let children = [];
let ray = 0.7; //this.map_item_ray;
let pos = {x:0, y:0};
let strokewidth = 0.4;
let ray = 1; //this.map_item_ray;
// let pos = {x:0, y:0};
children.push(new paper.Path.Line({
from: [- ray, ray],
to: [ray, - ray],
strokeColor: '#000',
strokeWidth: strokewidth
}));
// children.push(new paper.Path.Line({
// from: [- ray, ray],
// to: [ray, - ray],
// strokeColor: '#000',
// strokeWidth: strokewidth
// }));
children.push(new paper.Path.Line({
from: [ray, ray],
to: [- ray, - ray],
strokeColor: '#000',
strokeWidth: strokewidth
}));
// children.push(new paper.Path.Line({
// from: [ray, ray],
// to: [- ray, - ray],
// strokeColor: '#000',
// strokeWidth: strokewidth
// }));
children.push(new paper.Path.Circle({
radius: ray/2,
fillColor: 'rgba(0,0,0,1)'
}))
children.push(new paper.Path.Circle({
radius: ray,
strokeColor: 'rgba(0,0,0,1)',
strokeWidth: 0.2,
fillColor: 'rgba(0,0,0,0)'
}))
children.push(new paper.Path.Circle({
radius: ray,
fillColor: 'rgba(255,255,255,0.01)'
}))
return new paper.Group({
children: children,
name: 'action_icon'
@ -1061,22 +1074,34 @@ export default {
// });
let children = [];
let ray = 0.7; //this.map_item_ray;
let pos = {x:0, y:0};
let strokewidth = 0.4;
// let pos = {x:0, y:0};
// let strokewidth = 0.4;
children.push(new paper.Path.Line({
from: [- ray, ray],
to: [ray, - ray],
strokeColor: '#01ffe2',
strokeWidth: strokewidth
}));
// children.push(new paper.Path.Line({
// from: [- ray, ray],
// to: [ray, - ray],
// strokeColor: '#01ffe2',
// strokeWidth: strokewidth
// }));
children.push(new paper.Path.Line({
from: [ray, ray],
to: [- ray, - ray],
// children.push(new paper.Path.Line({
// from: [ray, ray],
// to: [- ray, - ray],
// strokeColor: '#01ffe2',
// strokeWidth: strokewidth
// }));
children.push(new paper.Path.Circle({
radius: ray/2,
fillColor: '#01ffe2'
}))
children.push(new paper.Path.Circle({
radius: ray,
strokeColor: '#01ffe2',
strokeWidth: strokewidth
}));
strokeWidth: 0.2,
fillColor: 'rgba(0,0,0,0)'
}))
children.push(new paper.Path.Circle({
radius: ray,