Skip to content

Commit e48dffb

Browse files
authored
Merge pull request #1074 from camicroscope/fix-port-xml
Default color/style
2 parents 3dc7b36 + 2afcd52 commit e48dffb

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

common/DrawHelper.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,12 @@ caDrawHelper.prototype.draw = function(ctx, image_data){
192192
for (let i = 0; i < image_data.length; i++) {
193193
const polygon = image_data[i];
194194
if (polygon.properties == undefined || polygon.properties == null){
195-
polygon.properties = {}
195+
polygon.properties = {};
196+
}
197+
let style = polygon.properties.style;
198+
if (style == undefined || style == null){
199+
style = {"color":"#FF6926"};
196200
}
197-
const style = polygon.properties.style;
198201

199202
// if there is path using path to draw
200203
// if(polygon.geometry.path){

core/extension/openseadragon-overlays-manage.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,10 @@
265265
if($.isArray(layer.data)){
266266
for(let j = 0;j < layer.data.length;j++){
267267
const path = layer.data[j].geometry.path;
268-
const style = layer.data[j].properties.style;
268+
let style = layer.data[j].properties.style;
269+
if (style == undefined || style == null){
270+
style = {"color": "#FF6296"};
271+
}
269272
const pathData = layer.data[j];
270273
if(layer.hoverable&&path.contains(img_point.x,img_point.y)){
271274
this.resize();
@@ -907,4 +910,4 @@
907910

908911

909912

910-
})(OpenSeadragon)
913+
})(OpenSeadragon)

0 commit comments

Comments
 (0)