Gitlab CSE Unil

Commit e83e6dc7 authored by M. Chardon's avatar M. Chardon
Browse files

correction bug mantis 232

parent 57ae707b
......@@ -43,7 +43,8 @@ define(["paper", "tools/Shape.class","adim/category"], function (paper, Shape, C
var defaultProperties = {
comment: "",
category: "cat_geo_1",
fill: true
fill: true,
opacity:1
};
var hitOptions = {
......@@ -66,6 +67,7 @@ define(["paper", "tools/Shape.class","adim/category"], function (paper, Shape, C
// Sanitize data
var item = itemDef[1];
var itemData = item.data;
itemData.prop.opacity=parseFloat(item.opacity) || 1;
var curLayer = paper.project.activeLayer;
layer.activate();
......@@ -134,6 +136,7 @@ define(["paper", "tools/Shape.class","adim/category"], function (paper, Shape, C
strokeColor: _getColor(properties.category),
strokeWidth: 7
};
newEllGeo.opacity = parseFloat(properties.opacity) || 1;
if (properties.fill)
newEllGeo.style = {
fillColor: _getColorBg(properties.category),
......
......@@ -43,7 +43,8 @@ define(["paper", "tools/Shape.class","adim/category"], function (paper, Shape, C
var defaultProperties = {
comment: "",
category: "cat_geo_1",
fill:true
fill:true,
opacity:1
};
var hitOptions = {
......@@ -67,6 +68,7 @@ define(["paper", "tools/Shape.class","adim/category"], function (paper, Shape, C
// Sanitize data
var item = itemDef[1];
var itemData = item.data;
itemData.prop.opacity=parseFloat(item.opacity) || 1;
var curLayer = paper.project.activeLayer;
layer.activate();
......@@ -126,6 +128,7 @@ define(["paper", "tools/Shape.class","adim/category"], function (paper, Shape, C
strokeColor: _getColor(properties.category),
strokeWidth: 7
};
newRecGeo.opacity = parseFloat(properties.opacity) || 1;
if (properties.fill)
newRecGeo.style = {
fillColor: _getColorBg(properties.category),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment