|
@@ -155,8 +155,11 @@
|
|
|
txtadd(layer[get(tooltipname)].parent, 'hotspot[', get(name), ']');
|
|
|
set(layer[get(tooltipname)].autowidth, true);
|
|
|
set(layer[get(tooltipname)].width,'prop');
|
|
|
- <!-- set(layer[get(tooltipname)].height,30); -->
|
|
|
- set(layer[get(tooltipname)].height,30);
|
|
|
+
|
|
|
+ <!-- if(hotspottitle == '', trace('title-empty'); set(layer[get(tooltipname)].autoheight,true); );
|
|
|
+ ifnot(hotspottitle == '', trace('title-no-empty');set(layer[get(tooltipname)].autoheight,true);); -->
|
|
|
+
|
|
|
+ set(layer[get(tooltipname)].autoheight,true);
|
|
|
set(layer[get(tooltipname)].edge,center);
|
|
|
set(layer[get(tooltipname)].background,false);
|
|
|
set(layer[get(tooltipname)].pos,pos);
|
|
@@ -198,6 +201,8 @@
|
|
|
<action name='add_tooltip_dot'>
|
|
|
txtadd(tooldot, 'tooldot_', get(name));
|
|
|
<!-- trace('hey::',get(borderColor)); -->
|
|
|
+
|
|
|
+ <!-- trace('add-dot-type::',get(name),'::',get(hotspottype)); -->
|
|
|
addlayer(get(tooldot));
|
|
|
txtadd(layer[get(tooldot)].parent, 'hotspot[', get(name), ']');
|
|
|
set(layer[get(tooldot)].width,10);
|
|
@@ -237,26 +242,28 @@
|
|
|
get(dir)==1,
|
|
|
<!-- trace('set_label_dir::1::',get(dirItem),'::2::',get(lineDirection),'::3::',get(dir)); -->
|
|
|
copy(labelWidth,layer[get(dirItem)].width);
|
|
|
- <!-- trace('dirItem::',get(layer[get(dirItem)].width)); -->
|
|
|
+ copy(labelHeight,layer[get(dirItem)].height);
|
|
|
+
|
|
|
+
|
|
|
);
|
|
|
|
|
|
if(
|
|
|
get(lineDirection) == 'right-top',
|
|
|
if(get(dir)==0,set(hotspot[get(dirItem)].rotate,35));
|
|
|
- if(get(dir)==1,set(layer[get(dirItem)].rotate,-35);set(layer[get(dirItem)].x,0);set(layer[get(dirItem)].y,-60););
|
|
|
+ if(get(dir)==1,add(allHeight,labelHeight,80);div(allHeight,2);mul(allHeight,-1);set(layer[get(dirItem)].rotate,0);set(layer[get(dirItem)].x,0);set(layer[get(dirItem)].y,get(allHeight));set(layer[get(dirItem)].rotate,-35););
|
|
|
if(get(dir)==2,set(layer[get(dirItem)].x,0);set(layer[get(dirItem)].y,40););
|
|
|
);
|
|
|
if(
|
|
|
get(lineDirection) == 'right-center',
|
|
|
if(get(dir)==0,set(hotspot[get(dirItem)].rotate,90););
|
|
|
- <!-- if(get(dir)==1,set(layer[get(dirItem)].rotate,-90);set(layer[get(dirItem)].x,0);set(layer[get(dirItem)].y,-80)); -->
|
|
|
if(get(dir)==1,
|
|
|
- trace('labelWidth::',labelWidth);
|
|
|
set(layer[get(dirItem)].rotate,-90);
|
|
|
+ add(allWidth,labelWidth,80);
|
|
|
+ div(allWidth,2);
|
|
|
+ mul(allWidth,-1);
|
|
|
+ trace('allWidth::',get(allWidth));
|
|
|
set(layer[get(dirItem)].x,0);
|
|
|
- sub(labelWidth,25);
|
|
|
- mul(labelWidth,-1);
|
|
|
- set(layer[get(dirItem)].y,get(labelWidth));
|
|
|
+ set(layer[get(dirItem)].y,get(allWidth));
|
|
|
);
|
|
|
|
|
|
if(get(dir)==2,set(layer[get(dirItem)].x,0);set(layer[get(dirItem)].y,40););
|
|
@@ -264,23 +271,29 @@
|
|
|
if(
|
|
|
get(lineDirection) == 'right-bottom',
|
|
|
if(get(dir)==0,set(hotspot[get(dirItem)].rotate,-35));
|
|
|
- if(get(dir)==1,set(layer[get(dirItem)].rotate,35);set(layer[get(dirItem)].x,0);set(layer[get(dirItem)].y,60));
|
|
|
- if(get(dir)==2,set(layer[get(dirItem)].x,0);set(layer[get(dirItem)].y,-40););
|
|
|
+ if(get(dir)==1,add(allHeight,labelHeight,80);div(allHeight,2);mul(allHeight,1);set(layer[get(dirItem)].rotate,0);set(layer[get(dirItem)].x,0);set(layer[get(dirItem)].y,get(allHeight));set(layer[get(dirItem)].rotate,35););
|
|
|
+ if(get(dir)==2,set(layer[get(dirItem)].x,0);set(layer[get(dirItem)].y,-40););
|
|
|
);
|
|
|
if(
|
|
|
get(lineDirection) == 'center-top',
|
|
|
- if(get(dir)==0,set(hotspot[get(dirItem)].rotate,0));
|
|
|
- if(get(dir)==1,set(layer[get(dirItem)].rotate,0);set(layer[get(dirItem)].x,0);set(layer[get(dirItem)].y,-60));
|
|
|
+ if(get(dir)==0,
|
|
|
+ set(hotspot[get(dirItem)].rotate,0);
|
|
|
+ );
|
|
|
+ if(get(dir)==1,add(allHeight,labelHeight,80);div(allHeight,2);mul(allHeight,-1);set(layer[get(dirItem)].rotate,0);set(layer[get(dirItem)].x,0);set(layer[get(dirItem)].y,get(allHeight)););
|
|
|
if(get(dir)==2,set(layer[get(dirItem)].x,0);set(layer[get(dirItem)].y,40););
|
|
|
);
|
|
|
if(get(lineDirection) == 'center-bottom',
|
|
|
if(get(dir)==0,set(hotspot[get(dirItem)].rotate,0));
|
|
|
- if(get(dir)==1,set(layer[get(dirItem)].rotate,0);set(layer[get(dirItem)].x,0);set(layer[get(dirItem)].y,55));
|
|
|
+ if(get(dir)==1,add(allHeight,labelHeight,80);div(allHeight,2);mul(allHeight,1);
|
|
|
+ set(layer[get(dirItem)].rotate,0);
|
|
|
+ set(layer[get(dirItem)].x,0);
|
|
|
+ set(layer[get(dirItem)].y,get(allHeight));
|
|
|
+ );
|
|
|
if(get(dir)==2,set(layer[get(dirItem)].x,0);set(layer[get(dirItem)].y,-40););
|
|
|
);
|
|
|
if( get(lineDirection) == 'left-top',
|
|
|
if(get(dir)==0,set(hotspot[get(dirItem)].rotate,-35));
|
|
|
- ; if(get(dir)==1,set(layer[get(dirItem)].rotate,35);set(layer[get(dirItem)].x,0);set(layer[get(dirItem)].y,-60));
|
|
|
+ if(get(dir)==1,add(allHeight,labelHeight,80);div(allHeight,2);mul(allHeight,-1);set(layer[get(dirItem)].rotate,0);set(layer[get(dirItem)].x,0);set(layer[get(dirItem)].y,get(allHeight));set(layer[get(dirItem)].rotate,35););
|
|
|
if(get(dir)==2,set(layer[get(dirItem)].x,0);set(layer[get(dirItem)].y,40););
|
|
|
);
|
|
|
if(
|
|
@@ -289,16 +302,18 @@
|
|
|
|
|
|
if(get(dir)==1,
|
|
|
set(layer[get(dirItem)].rotate,-90);
|
|
|
+ add(allWidth,labelWidth,80);
|
|
|
+ div(allWidth,2);
|
|
|
+ trace('allWidth::',get(allWidth));
|
|
|
set(layer[get(dirItem)].x,0);
|
|
|
- sub(labelWidth,25);
|
|
|
- set(layer[get(dirItem)].y,get(labelWidth));
|
|
|
+ set(layer[get(dirItem)].y,get(allWidth));
|
|
|
);
|
|
|
if(get(dir)==2,set(layer[get(dirItem)].x,0);set(layer[get(dirItem)].y,-40););
|
|
|
);
|
|
|
if(
|
|
|
get(lineDirection) == 'left-bottom',
|
|
|
if(get(dir)==0,set(hotspot[get(dirItem)].rotate,35));
|
|
|
- if(get(dir)==1,set(layer[get(dirItem)].rotate,-35);set(layer[get(dirItem)].x,0);set(layer[get(dirItem)].y,60));
|
|
|
+ if(get(dir)==1,add(allHeight,labelHeight,80);div(allHeight,2);mul(allHeight,1);set(layer[get(dirItem)].rotate,0);set(layer[get(dirItem)].x,0);set(layer[get(dirItem)].y,get(allHeight));set(layer[get(dirItem)].rotate,-35););
|
|
|
if(get(dir)==2,set(layer[get(dirItem)].x,0);set(layer[get(dirItem)].y,-40););
|
|
|
|
|
|
);
|
|
@@ -383,49 +398,41 @@
|
|
|
set(dImage,'static/panoassets/images/hotspot/image_place_holder.png');
|
|
|
txtadd(hsLabel, 'tooltip_', %1);
|
|
|
txtadd(hsDot, 'tooldot_', %1);
|
|
|
+ set(hotspot[get(hsp_name)].hotspottype,%2);
|
|
|
set(hotspot[get(hsp_name)].hotspottitle,%3);
|
|
|
+ set(hotspot[get(hsp_name)].hotlink,%7);
|
|
|
set(hotspot[get(hsp_name)].hotspotStyle,%10);
|
|
|
copy(hotspot[get(hsp_name)].borderWidth,false);
|
|
|
copy(layer[get(hsLabel)].borderWidth,false);
|
|
|
copy(layer[get(hsDot)].borderWidth,false);
|
|
|
set(hotspot[get(hsp_name)].background,false);
|
|
|
txtsplit(%10,'|',fontSize,pos,isHover,borderColor,fillColor,textColor,isShowLine,isTextWrap,lineDirection,textDirection,textNumPerLine,duration,frameNumber,framewidth);
|
|
|
- txtadd(labelCode, '<div style="min-height:30px; display: flex; align-items: center; justify-content: center; position: relative; border: 1px solid ',get(borderColor) ,'; padding: 6px 10px; white-space: pre; border-radius: 5px; background: ',get(fillColor),'">',' <div style="text-align: left; font-size:',get(fontSize),'px; color: ',get(textColor),'; line-height: 1.4;">',%3,'</div>
|
|
|
+ txtadd(labelCode, '<div style=" display: flex; align-items: center; justify-content: center; position: relative; border: 1px solid ',get(borderColor) ,'; padding: 6px 10px; white-space: pre; border-radius: 5px; background: ',get(fillColor),'">',' <div style="text-align: left; font-size:',get(fontSize),'px; color: ',get(textColor),'; line-height: 1.4;">',%3,'</div>
|
|
|
</div>');
|
|
|
copy(layer[get(hsLabel)].html, labelCode);
|
|
|
copy(layer[get(hsLabel)].pos, pos);
|
|
|
trace('editJQHotspot',%1,'::type::',%3);
|
|
|
-
|
|
|
- if(%3 == '',
|
|
|
- trace('title-empty');
|
|
|
- set(layer[get(hsLabel)].height,12));
|
|
|
-
|
|
|
- <!-- if(%3 == '',
|
|
|
- trace('title-empty');
|
|
|
- set(layer[get(hsLabel)].height,12)
|
|
|
- );
|
|
|
- ifnot(%3 == '',trace('has-title'); set(layer[get(hsLabel)].height,30);); -->
|
|
|
-
|
|
|
if(get(hsp_type) == 3,
|
|
|
-
|
|
|
- set(hotspot[get(hsp_name)].rotate,0);
|
|
|
- set(layer[get(hsLabel)].rotate,0)
|
|
|
- set(hotspot[get(hsp_name)].type,'text');
|
|
|
+ trace('edit3::',get(hsp_name));
|
|
|
+
|
|
|
+ copy(hotspot[get(hsp_name)].rotate,0);
|
|
|
+ copy(layer[get(hsLabel)].rotate,0);
|
|
|
+
|
|
|
+ set(hotspot[get(hsp_name)].type,"text");
|
|
|
+ set(hotspot[get(hsp_name)].width,1);
|
|
|
set(hotspot[get(hsp_name)].width,1);
|
|
|
set(hotspot[get(hsp_name)].height,80);
|
|
|
set(hotspot[get(hsp_name)].padding,0);
|
|
|
-
|
|
|
+ trace('edit3-1::');
|
|
|
|
|
|
txtadd(line,'<div style="background-color: ',get(borderColor),';width:1px;height:80px;"></div>');
|
|
|
- txtadd(dot,'<div style="background-color: ',get(borderColor),';width:10px;height:10px;"></div>');
|
|
|
+ <!-- txtadd(dot,'<div style="background-color: ',get(borderColor),';width:10px;height:10px;"></div>'); -->
|
|
|
copy(hotspot[get(hsp_name)].html,line);
|
|
|
- copy(layer[get(hsDot)].html,dot);
|
|
|
- set(layer[get(hsDot)].visible,true);
|
|
|
|
|
|
set_label_dir(get(hsp_name),get(lineDirection),0);
|
|
|
set_label_dir(get(hsLabel),get(lineDirection),1);
|
|
|
set_label_dir(get(hsDot),get(lineDirection),2);
|
|
|
-
|
|
|
+
|
|
|
);
|
|
|
if(get(hsp_type) LE 2,
|
|
|
trace('edit2::',get(hsp_name));
|
|
@@ -472,7 +479,7 @@
|
|
|
set(hotspot[get(hsp_name)].url,get(iconUrl));
|
|
|
set(hotspot[get(hsp_name)].rotate,0);
|
|
|
set(layer[get(hsLabel)].rotate,0);
|
|
|
- set(layer[get(hsDot)].visible,false);
|
|
|
+ <!-- set(layer[get(hsDot)].visible,false); -->
|
|
|
|
|
|
);
|
|
|
|