hqchart 1.1.14243 → 1.1.14254
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/umychart.vue.js
CHANGED
|
@@ -4335,7 +4335,7 @@ this.BuildKey=function(item){if(IFrameSplitOperator.IsNumber(item.Time))return i
|
|
|
4335
4335
|
{if(isHScreen==true){var left=this.ChartBorder.GetLeft();var right=this.ChartBorder.GetRight();var top=this.ChartBorder.GetTop();var bottom=this.ChartBorder.GetBottom();}else{var left=this.ChartBorder.GetLeft();var right=this.ChartBorder.GetRight();var top=this.ChartBorder.GetTop();var bottom=this.ChartBorder.GetBottom();}this.Canvas.beginPath();this.Canvas.rect(left,top,right-left,bottom-top);//this.Canvas.stroke(); //调试用
|
|
4336
4336
|
this.Canvas.clip();};this.Draw=function(){this.IconRect=[];if(!this.IsShow||this.ChartFrame.IsMinSize||!this.IsVisible)return;if(this.IsShowIndexTitleOnly())return;if(this.IsHideScriptIndex())return;if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return;//k线数据
|
|
4337
4337
|
if(!this.Family)return;if(!this.MapCache||this.MapCache.size<=0)return;this.IsHScreen=this.ChartFrame.IsHScreen===true;var xPointCount=this.ChartFrame.XPointCount;var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;var isMinute=this.IsMinuteFrame();var border=this.GetBorder();if(this.IsHScreen){var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;var chartright=border.BottomEx;var chartLeft=border.TopEx;}else{var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;var chartright=border.RightEx;var chartLeft=border.LeftEx;}this.Canvas.save();this.ClipClient(this.ChartFrame.IsHScreen);var fontSize=this.GetDynamicIconSize(dataWidth,distanceWidth,this.IconSize.Max,this.IconSize.Min,this.IconSize.Zoom);this.Canvas.font=fontSize+'px '+this.Family;var drawInfo={Left:chartLeft,Right:chartright,FontSize:fontSize,DataWidth:dataWidth,DistanceWidth:distanceWidth};for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth){var kItem=this.Data.Data[i];var key=this.BuildKey(kItem);if(!this.MapCache.has(key))continue;var mapItem=this.MapCache.get(key);if(isMinute){var x=this.ChartFrame.GetXFromIndex(j);}else{var left=xOffset;var right=xOffset+dataWidth;if(right>chartright)break;var x=left+(right-left)/2;}this.DrawItem(mapItem,kItem,x,drawInfo);}this.Canvas.restore();};this.GetKValue=function(kItem,valueName){switch(valueName){case"HIGH":case"H":return kItem.High;case"L":case"LOW":return kItem.Low;case"C":case"CLOSE":return kItem.Close;case"O":case"OPEN":return KItem.Open;default:return null;}};this.DrawItem=function(groupItem,kItem,x,drawInfo){if(!IFrameSplitOperator.IsNonEmptyArray(groupItem.Data))return;var fontSize=drawInfo.FontSize;var left=drawInfo.Left,right=drawInfo.Right;var dataWidth=drawInfo.DataWidth;//var distanceWidth=drawInfo.DistanceWidth;
|
|
4338
|
-
for(var i=0;i<groupItem.Data.length;++i){var item=groupItem.Data[i];var value=item.Value;if(IFrameSplitOperator.IsString(item.Value))value=this.GetKValue(kItem,item.Value);if(!IFrameSplitOperator.IsNumber(value))continue;var y=this.ChartFrame.GetYFromData(item.Value,false);if(item.Image){var imageHeight=item.Image.Height;var imageWidth=item.Image.Width;var rtIcon=new Rect(x-imageWidth/2,y-imageHeight/2,imageWidth,imageHeight);if(item.Baseline==1)
|
|
4338
|
+
for(var i=0;i<groupItem.Data.length;++i){var item=groupItem.Data[i];var value=item.Value;if(IFrameSplitOperator.IsString(item.Value))value=this.GetKValue(kItem,item.Value);if(!IFrameSplitOperator.IsNumber(value))continue;var y=this.ChartFrame.GetYFromData(item.Value,false);if(item.Image){var imageHeight=item.Image.Height;var imageWidth=item.Image.Width;if(this.IsHScreen){var xImage=x-imageWidth/2,yImage=y;if(item.Baseline==1)yImage=y-imageHeight;else if(item.Baseline==2)yImage=y;else yImage=y-imageHeight/2;if(IFrameSplitOperator.IsNumber(item.YMove)){yImage-=item.YMove;y-=item.YMove;}this.Canvas.save();this.Canvas.translate(yImage+imageWidth/2,xImage+imageHeight/2);this.Canvas.rotate(90*Math.PI/180);this.Canvas.drawImage(item.Image.Data,-imageWidth/2,-imageHeight/2,item.Image.Width,item.Image.Height);this.Canvas.restore();}else{var rtIcon=new Rect(x-imageWidth/2,y-imageHeight/2,imageWidth,imageHeight);if(item.Baseline==1)rtIcon.Y=y;else if(item.Baseline==2)rtIcon.Y=y-imageHeight;else rtIcon.Y=y-imageHeight/2;if(IFrameSplitOperator.IsNumber(item.YMove)){y+=item.YMove;rtIcon.Y+=item.YMove;}this.Canvas.drawImage(item.Image.Data,rtIcon.X,rtIcon.Y,item.Image.Width,item.Image.Height);if(item.Text)this.IconRect.push({Rect:rtIcon,Item:item,KItem:kItem});else if(IFrameSplitOperator.IsNonEmptyArray(item.AryText))this.IconRect.push({Rect:rtIcon,Item:item,KItem:kItem});}}else{if(item.Color)this.Canvas.fillStyle=item.Color;else this.Canvas.fillStyle=this.Color;//var textWidth=this.Canvas.measureText(item.Symbol).width;
|
|
4339
4339
|
this.Canvas.textAlign='center';var rtIcon=new Rect(x-fontSize/2,y-fontSize/2,fontSize,fontSize);if(item.Baseline==1){this.Canvas.textBaseline='top';rtIcon.Y=y;}else if(item.Baseline==2){this.Canvas.textBaseline='bottom';rtIcon.Y=y-fontSize;}else{this.Canvas.textBaseline='middle';rtIcon.Y=y-fontSize/2;}if(this.IsHScreen){this.Canvas.save();this.Canvas.translate(y,x);this.Canvas.rotate(90*Math.PI/180);this.Canvas.fillText(item.Symbol,0,0);this.Canvas.restore();}else{if(IFrameSplitOperator.IsNumber(item.YMove)){y+=item.YMove;rtIcon.Y+=item.YMove;}this.Canvas.fillText(item.Symbol,x,y);if(item.Text)this.IconRect.push({Rect:rtIcon,Item:item,KItem:kItem});else if(IFrameSplitOperator.IsNonEmptyArray(item.AryText))this.IconRect.push({Rect:rtIcon,Item:item,KItem:kItem});}}if(item.Line){var price=item.Line.KData=="H"?kItem.High:kItem.Low;var yPrice=this.ChartFrame.GetYFromData(price,false);var yText=y;if(Array.isArray(item.Line.Offset)&&item.Line.Offset.length==2){if(yText>yPrice)//文字在下方
|
|
4340
4340
|
{yText-=item.Line.Offset[1];yPrice+=item.Line.Offset[0];}else if(yText<yPrice){yText+=item.Line.Offset[1];yPrice-=item.Line.Offset[0];}}this.Canvas.save();if(item.Line.Dash)this.Canvas.setLineDash(item.Line.Dash);//虚线
|
|
4341
4341
|
if(item.Line.Width>0)this.Canvas.lineWidth=item.Line.Width;//线宽
|
|
@@ -7752,7 +7752,7 @@ if(!IFrameSplitOperator.IsNonEmptyArray(hisData.Data))return false;var kItem=his
|
|
|
7752
7752
|
ClientPos:this.ChartCorssCursor.ClientPos,//位置
|
|
7753
7753
|
IsShowCorss:this.ChartCorssCursor.IsShowCorss,//是否显示十字线
|
|
7754
7754
|
KItem:kItem,Symbol:this.Symbol,Name:this.Name,LastValue:this.ChartCorssCursor.LastValue};this.DialogTooltip.Update(sendData);return true;};this.DrawSelectRectDialog=function(e){if(!this.DialogSelectRect)return;this.UpdateSelectRectDialog(e);};this.UpdateSelectRectDialog=function(e){if(!this.DialogSelectRect)return false;var data=e.data;//区间统计数据
|
|
7755
|
-
var x,y;if(data&&IFrameSplitOperator.IsNumber(data.X)&&IFrameSplitOperator.IsNumber(data.Y)){var pixelRatio=GetDevicePixelRatio();var rtClient=this.UIElement.getBoundingClientRect();var rtScroll=GetScrollPosition();x=data.X;y=data.Y;x+=rtClient.left+rtScroll.Left;y+=rtClient.top+rtScroll.Top;}var sendData={Symbol:this.Symbol,Name:this.Name,SelectData:data.SelectData,X:x,Y:y,e:e};this.DialogSelectRect.Update(sendData);};this.UpdateHQFloatTooltip=function(kData){if(!this.FloatTooltip)return;if(!this.FloatTooltip.IsShow())return;if(!kData||!IFrameSplitOperator.IsNonEmptyArray(kData.Data))return;var lastItem=kData.Data[kData.Data.length-1];if(!lastItem)return;var dataID={Symbol:kData.Symbol,Date:lastItem.Date,Time:lastItem.Time};if(!this.FloatTooltip.IsEqualHQID(dataID))return;var sendData={Data:lastItem,Symbol:this.Symbol,Name:this.Name,DataType:2};this.FloatTooltip.Update(sendData);};this.GetKData=function(){if(!this.ChartPaint[0])return null;var data=this.
|
|
7755
|
+
var x,y;if(data&&IFrameSplitOperator.IsNumber(data.X)&&IFrameSplitOperator.IsNumber(data.Y)){var pixelRatio=GetDevicePixelRatio();var rtClient=this.UIElement.getBoundingClientRect();var rtScroll=GetScrollPosition();x=data.X;y=data.Y;x+=rtClient.left+rtScroll.Left;y+=rtClient.top+rtScroll.Top;}var sendData={Symbol:this.Symbol,Name:this.Name,SelectData:data.SelectData,X:x,Y:y,e:e};this.DialogSelectRect.Update(sendData);};this.UpdateHQFloatTooltip=function(kData){if(!this.FloatTooltip)return;if(!this.FloatTooltip.IsShow())return;if(!kData||!IFrameSplitOperator.IsNonEmptyArray(kData.Data))return;var lastItem=kData.Data[kData.Data.length-1];if(!lastItem)return;var dataID={Symbol:kData.Symbol,Date:lastItem.Date,Time:lastItem.Time};if(!this.FloatTooltip.IsEqualHQID(dataID))return;var sendData={Data:lastItem,Symbol:this.Symbol,Name:this.Name,DataType:2};this.FloatTooltip.Update(sendData);};this.GetKData=function(){if(!this.ChartPaint[0])return null;var data=this.ChartPaint[0].Data;if(!data)return null;return data;};}//API 返回数据 转化为array[]
|
|
7756
7756
|
KLineChartContainer.JsonDataToHistoryData=function(data){var aryDayData=[];if(!data.data)return aryDayData;var upperSymbol=null;if(data.symbol)upperSymbol=data.symbol.toUpperCase();var isFutures=false;//是否是期货
|
|
7757
7757
|
if(upperSymbol)isFutures=MARKET_SUFFIX_NAME.IsFutures(upperSymbol);var list=data.data;var date=0,yclose=1,open=2,high=3,low=4,close=5,vol=6,amount=7,position=8;var fclose=9,yfclose=10;//结算价, 前结算价
|
|
7758
7758
|
var bfactor=11,afactor=12;//前, 后复权因子
|
|
@@ -13825,7 +13825,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
13825
13825
|
this.ExecuteScript(item,data);}this.Status=0;}};this.OnExecuteFinish=function(data,indexInfo,jsExectute,jobInfo){var message={Data:data,IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT,JobInfo:jobInfo};postMessage(message);};this.OnExecuteError=function(error,indexInfo,jobData){var message={IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.ERROR_EXECUTE_SCRIPT,Error:error};postMessage(message);};}/********************************************************************************
|
|
13826
13826
|
* 版本信息输出
|
|
13827
13827
|
*
|
|
13828
|
-
*/var HQCHART_VERSION="1.1.
|
|
13828
|
+
*/var HQCHART_VERSION="1.1.14253";function PrintHQChartVersion(){var logo='\n\n*************************************************************************************************************************************************************************** \n* \n* :%@@- \n* :@@@@- \n* =@@@@ :#@@@ .:+#@@@#=: :=*@@@@@@#+-. *@@@@. \n* :@@@@@ .@@@@@ .#@@@@@@@@@@@- +@@@@@@@@@@@@@+ @@@@@ -%@@* \n* +@@@@% #@@@@# *@@@@@@@@@@@@@@%. =@@@@@@@@@@@@@@@- @@@@@ -@@@@+ \n* %@@@@* @@@@@+ .%@@@@@@@@@@@@@@@@%: #@@@@@@@@@@@@@@@% @@@@# *@@@@= \n* @@@@@= @@@@@- .%@@@@@@@*++*%@@@@@@% .%@@@@@@@%*+==+**= -@@@@+ #@@@@- \n* @@@@@. @@@@@. #@@@@@%= =@@@@@@* %@@@@@@#: *@@@@- :::. .-+*###+: ::: .+##+: -%%@@@@@%%%% \n* .@@@@@ .@@@@@. +@@@@@% .@@@@@@ *@@@@@@: %@@@@: +@@@@@%. :%@@@@@@@@@@: *@@@ :@@@@@* @@@@@@@@@@@@ \n* :@@@@@ :@@@@@ @@@@@% :@@@@@+ @@@@@@: %@@@@-@@@@@@@@@. @@@@@@@@@@@@@. :@@@%-@@@@@@.:@@@@@@@@@@@# \n* -@@@@% -@@@@@ =@@@@@. %@@@@% %@@@@@- %@@@@@@@@@@@@@@* %@@@@@@@@@@@@+ -@@@@@@@@@@# -@@@@@@@@@@@. \n* +@@@@%=========#@@@@% @@@@@# :@@@@@ .@@@@@% @@@@@@@@%@@@@@@@ -%+:. .#@@@@* +@@@@@@@%%@. .::+@@@@#:: \n* #@@@@@@@@@@@@@@@@@@@# .@@@@@ .@@@@@ :@@@@@. @@@@@@#. #@@@@@. -@@@@* #@@@@@@: *@@@@+ \n* %@@@@@@@@@@@@@@@@@@@+ :@@@@@ .@@@@@ -@@@@@ @@@@@+ @@@@@. :@@@@* @@@@@% #@@@@- \n* @@@@@@@@@@@@@@@@@@@@: :@@@@% :@@@@@ +@@@@% -@@@@+ @@@@@ -@@@@+ @@@@@. @@@@@. \n* .@@@@@@@@@@@@@@@@@@@@ :@@@@% -@@@@% *@@@@% #@@@@. @@@@@ .=*#%%%@@@@@= :@@@@# @@@@@. \n* -@@@@@:::::::::=@@@@@ :@@@@@ @@@@@* +@@@@% @@@@@ @@@@% -#@@@@@@@@@@@@: -@@@@* @@@@@ \n* =@@@@% =@@@@% .@@@@@ :@@@@@. -@@@@% @@@@@ .@@@@* +@@@@@@@@@@@@@@. =@@@@+ .@@@@@ \n* +@@@@# +@@@@# @@@@@# %@@@@% :@@@@@ .@@@@% =@@@@= -@@@@@*-:..%@@@@ +@@@@= :@@@@# \n* *@@@@* *@@@@* +@@@@@: #@@@@@+ .@@@@@@ :@@@@% *@@@@- @@@@@. @@@@% #@@@@: =@@@@+ \n* %@@@@= %@@@@+ @@@@@@- .%@@@@@# #@@@@@# :@@@@% #@@@@: @@@@% @@@@* %@@@@. #@@@@- \n* @@@@@- @@@@@= =@@@@@@#=...-*@@@@@@@: @@@@@@%=. :+**. :@@@@* %@@@@. .@@@@* *@@@@= @@@@@ %@@@@+ \n* .@@@@@: .@@@@@: *@@@@@@@@@@@@@@@@@@@# =@@@@@@@@%%%@@@@@@ +@@@@- @@@@@ .@@@@@: :%@@@@@- .@@@@% %@@@@@*+- \n* :@@@@@ :@@@@@ +@@@@@@@@@@@@@@@@@@@# =@@@@@@@@@@@@@@@@% %@@@@ @@@@@ @@@@@@@@@@@@@@@: -@@@@* *@@@@@@@@- \n* =@@@@@ -@@@@@ :@@@@@@@@@@@@@@@@@@@# :@@@@@@@@@@@@@@@% @@@@@ %@@@% #@@@@@@@@@#@@@@. +@@@@- .@@@@@@@@# \n* *@@@@# =@@@@% :#@@@@@@@#: :@@@@@= =@@@@@@@@@@@+. @@@@@ :@@@+ *@@@@@@@- %@@@ *@@@= =@@@@@@@* \n* =++++- -++++= .:::. .=*+: :-=+++=:. ****= .=+. .-++=: :+++ -+=: .-=+=:. \n* \n* \n* HQChart \n* Ver: '+HQCHART_VERSION+' \n* License: Apache License 2.0 \n* Source: https://github.com/jones2000/HQChart\n*\n************************************************************************************************************************************************************************** \n ';console.log(logo);}PrintHQChartVersion();//把给外界调用的方法暴露出来
|
|
13829
13829
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
13830
13830
|
// BaseIndex:BaseIndex,
|
|
13831
13831
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
package/src/jscommon/umychart.js
CHANGED
|
@@ -40641,34 +40641,43 @@ function ChartMultiSVGIconV2()
|
|
|
40641
40641
|
{
|
|
40642
40642
|
var imageHeight=item.Image.Height;
|
|
40643
40643
|
var imageWidth=item.Image.Width;
|
|
40644
|
-
|
|
40645
|
-
if (item.Baseline==1)
|
|
40646
|
-
{
|
|
40647
|
-
this.Canvas.textBaseline='top';
|
|
40648
|
-
rtIcon.Y=y;
|
|
40649
|
-
}
|
|
40650
|
-
else if (item.Baseline==2)
|
|
40644
|
+
if (this.IsHScreen)
|
|
40651
40645
|
{
|
|
40652
|
-
|
|
40653
|
-
|
|
40646
|
+
var xImage=x-imageWidth/2, yImage=y;
|
|
40647
|
+
if (item.Baseline==1) yImage=y-imageHeight;
|
|
40648
|
+
else if (item.Baseline==2) yImage=y;
|
|
40649
|
+
else yImage=y-imageHeight/2;
|
|
40650
|
+
|
|
40651
|
+
if (IFrameSplitOperator.IsNumber(item.YMove))
|
|
40652
|
+
{
|
|
40653
|
+
yImage-=item.YMove;
|
|
40654
|
+
y-=item.YMove;
|
|
40655
|
+
}
|
|
40656
|
+
|
|
40657
|
+
this.Canvas.save();
|
|
40658
|
+
this.Canvas.translate(yImage+imageWidth/2, xImage+imageHeight/2);
|
|
40659
|
+
this.Canvas.rotate(90 * Math.PI / 180);
|
|
40660
|
+
this.Canvas.drawImage(item.Image.Data, -imageWidth/2, -imageHeight/2, item.Image.Width, item.Image.Height);
|
|
40661
|
+
this.Canvas.restore();
|
|
40654
40662
|
}
|
|
40655
|
-
else
|
|
40663
|
+
else
|
|
40656
40664
|
{
|
|
40657
|
-
|
|
40658
|
-
rtIcon.Y=y
|
|
40659
|
-
|
|
40665
|
+
var rtIcon=new Rect(x-imageWidth/2,y-imageHeight/2,imageWidth,imageHeight);
|
|
40666
|
+
if (item.Baseline==1) rtIcon.Y=y;
|
|
40667
|
+
else if (item.Baseline==2) rtIcon.Y=y-imageHeight;
|
|
40668
|
+
else rtIcon.Y=y-imageHeight/2;
|
|
40669
|
+
|
|
40670
|
+
if (IFrameSplitOperator.IsNumber(item.YMove))
|
|
40671
|
+
{
|
|
40672
|
+
y+=item.YMove;
|
|
40673
|
+
rtIcon.Y+=item.YMove;
|
|
40674
|
+
}
|
|
40675
|
+
|
|
40676
|
+
this.Canvas.drawImage(item.Image.Data, rtIcon.X, rtIcon.Y, item.Image.Width, item.Image.Height);
|
|
40660
40677
|
|
|
40661
|
-
|
|
40662
|
-
|
|
40663
|
-
y+=item.YMove;
|
|
40664
|
-
rtIcon.Y+=item.YMove;
|
|
40678
|
+
if (item.Text) this.IconRect.push({ Rect:rtIcon , Item:item, KItem:kItem });
|
|
40679
|
+
else if (IFrameSplitOperator.IsNonEmptyArray(item.AryText)) this.IconRect.push({ Rect:rtIcon , Item:item, KItem:kItem });
|
|
40665
40680
|
}
|
|
40666
|
-
|
|
40667
|
-
this.Canvas.drawImage(item.Image.Data, rtIcon.X, rtIcon.Y, item.Image.Width, item.Image.Height);
|
|
40668
|
-
|
|
40669
|
-
if (item.Text) this.IconRect.push({ Rect:rtIcon , Item:item, KItem:kItem });
|
|
40670
|
-
else if (IFrameSplitOperator.IsNonEmptyArray(item.AryText)) this.IconRect.push({ Rect:rtIcon , Item:item, KItem:kItem });
|
|
40671
|
-
|
|
40672
40681
|
}
|
|
40673
40682
|
else
|
|
40674
40683
|
{
|
|
@@ -80733,7 +80742,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
|
|
|
80733
80742
|
this.GetKData=function()
|
|
80734
80743
|
{
|
|
80735
80744
|
if (!this.ChartPaint[0]) return null;
|
|
80736
|
-
var data=this.
|
|
80745
|
+
var data=this.ChartPaint[0].Data;
|
|
80737
80746
|
if (!data) return null;
|
|
80738
80747
|
|
|
80739
80748
|
return data;
|
|
@@ -44566,34 +44566,43 @@ function ChartMultiSVGIconV2()
|
|
|
44566
44566
|
{
|
|
44567
44567
|
var imageHeight=item.Image.Height;
|
|
44568
44568
|
var imageWidth=item.Image.Width;
|
|
44569
|
-
|
|
44570
|
-
if (item.Baseline==1)
|
|
44571
|
-
{
|
|
44572
|
-
this.Canvas.textBaseline='top';
|
|
44573
|
-
rtIcon.Y=y;
|
|
44574
|
-
}
|
|
44575
|
-
else if (item.Baseline==2)
|
|
44569
|
+
if (this.IsHScreen)
|
|
44576
44570
|
{
|
|
44577
|
-
|
|
44578
|
-
|
|
44571
|
+
var xImage=x-imageWidth/2, yImage=y;
|
|
44572
|
+
if (item.Baseline==1) yImage=y-imageHeight;
|
|
44573
|
+
else if (item.Baseline==2) yImage=y;
|
|
44574
|
+
else yImage=y-imageHeight/2;
|
|
44575
|
+
|
|
44576
|
+
if (IFrameSplitOperator.IsNumber(item.YMove))
|
|
44577
|
+
{
|
|
44578
|
+
yImage-=item.YMove;
|
|
44579
|
+
y-=item.YMove;
|
|
44580
|
+
}
|
|
44581
|
+
|
|
44582
|
+
this.Canvas.save();
|
|
44583
|
+
this.Canvas.translate(yImage+imageWidth/2, xImage+imageHeight/2);
|
|
44584
|
+
this.Canvas.rotate(90 * Math.PI / 180);
|
|
44585
|
+
this.Canvas.drawImage(item.Image.Data, -imageWidth/2, -imageHeight/2, item.Image.Width, item.Image.Height);
|
|
44586
|
+
this.Canvas.restore();
|
|
44579
44587
|
}
|
|
44580
|
-
else
|
|
44588
|
+
else
|
|
44581
44589
|
{
|
|
44582
|
-
|
|
44583
|
-
rtIcon.Y=y
|
|
44584
|
-
|
|
44590
|
+
var rtIcon=new Rect(x-imageWidth/2,y-imageHeight/2,imageWidth,imageHeight);
|
|
44591
|
+
if (item.Baseline==1) rtIcon.Y=y;
|
|
44592
|
+
else if (item.Baseline==2) rtIcon.Y=y-imageHeight;
|
|
44593
|
+
else rtIcon.Y=y-imageHeight/2;
|
|
44594
|
+
|
|
44595
|
+
if (IFrameSplitOperator.IsNumber(item.YMove))
|
|
44596
|
+
{
|
|
44597
|
+
y+=item.YMove;
|
|
44598
|
+
rtIcon.Y+=item.YMove;
|
|
44599
|
+
}
|
|
44600
|
+
|
|
44601
|
+
this.Canvas.drawImage(item.Image.Data, rtIcon.X, rtIcon.Y, item.Image.Width, item.Image.Height);
|
|
44585
44602
|
|
|
44586
|
-
|
|
44587
|
-
|
|
44588
|
-
y+=item.YMove;
|
|
44589
|
-
rtIcon.Y+=item.YMove;
|
|
44603
|
+
if (item.Text) this.IconRect.push({ Rect:rtIcon , Item:item, KItem:kItem });
|
|
44604
|
+
else if (IFrameSplitOperator.IsNonEmptyArray(item.AryText)) this.IconRect.push({ Rect:rtIcon , Item:item, KItem:kItem });
|
|
44590
44605
|
}
|
|
44591
|
-
|
|
44592
|
-
this.Canvas.drawImage(item.Image.Data, rtIcon.X, rtIcon.Y, item.Image.Width, item.Image.Height);
|
|
44593
|
-
|
|
44594
|
-
if (item.Text) this.IconRect.push({ Rect:rtIcon , Item:item, KItem:kItem });
|
|
44595
|
-
else if (IFrameSplitOperator.IsNonEmptyArray(item.AryText)) this.IconRect.push({ Rect:rtIcon , Item:item, KItem:kItem });
|
|
44596
|
-
|
|
44597
44606
|
}
|
|
44598
44607
|
else
|
|
44599
44608
|
{
|
|
@@ -84658,7 +84667,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
|
|
|
84658
84667
|
this.GetKData=function()
|
|
84659
84668
|
{
|
|
84660
84669
|
if (!this.ChartPaint[0]) return null;
|
|
84661
|
-
var data=this.
|
|
84670
|
+
var data=this.ChartPaint[0].Data;
|
|
84662
84671
|
if (!data) return null;
|
|
84663
84672
|
|
|
84664
84673
|
return data;
|
|
@@ -140382,7 +140391,7 @@ function ScrollBarBGChart()
|
|
|
140382
140391
|
|
|
140383
140392
|
|
|
140384
140393
|
|
|
140385
|
-
var HQCHART_VERSION="1.1.
|
|
140394
|
+
var HQCHART_VERSION="1.1.14253";
|
|
140386
140395
|
|
|
140387
140396
|
function PrintHQChartVersion()
|
|
140388
140397
|
{
|
|
@@ -44610,34 +44610,43 @@ function ChartMultiSVGIconV2()
|
|
|
44610
44610
|
{
|
|
44611
44611
|
var imageHeight=item.Image.Height;
|
|
44612
44612
|
var imageWidth=item.Image.Width;
|
|
44613
|
-
|
|
44614
|
-
if (item.Baseline==1)
|
|
44615
|
-
{
|
|
44616
|
-
this.Canvas.textBaseline='top';
|
|
44617
|
-
rtIcon.Y=y;
|
|
44618
|
-
}
|
|
44619
|
-
else if (item.Baseline==2)
|
|
44613
|
+
if (this.IsHScreen)
|
|
44620
44614
|
{
|
|
44621
|
-
|
|
44622
|
-
|
|
44615
|
+
var xImage=x-imageWidth/2, yImage=y;
|
|
44616
|
+
if (item.Baseline==1) yImage=y-imageHeight;
|
|
44617
|
+
else if (item.Baseline==2) yImage=y;
|
|
44618
|
+
else yImage=y-imageHeight/2;
|
|
44619
|
+
|
|
44620
|
+
if (IFrameSplitOperator.IsNumber(item.YMove))
|
|
44621
|
+
{
|
|
44622
|
+
yImage-=item.YMove;
|
|
44623
|
+
y-=item.YMove;
|
|
44624
|
+
}
|
|
44625
|
+
|
|
44626
|
+
this.Canvas.save();
|
|
44627
|
+
this.Canvas.translate(yImage+imageWidth/2, xImage+imageHeight/2);
|
|
44628
|
+
this.Canvas.rotate(90 * Math.PI / 180);
|
|
44629
|
+
this.Canvas.drawImage(item.Image.Data, -imageWidth/2, -imageHeight/2, item.Image.Width, item.Image.Height);
|
|
44630
|
+
this.Canvas.restore();
|
|
44623
44631
|
}
|
|
44624
|
-
else
|
|
44632
|
+
else
|
|
44625
44633
|
{
|
|
44626
|
-
|
|
44627
|
-
rtIcon.Y=y
|
|
44628
|
-
|
|
44634
|
+
var rtIcon=new Rect(x-imageWidth/2,y-imageHeight/2,imageWidth,imageHeight);
|
|
44635
|
+
if (item.Baseline==1) rtIcon.Y=y;
|
|
44636
|
+
else if (item.Baseline==2) rtIcon.Y=y-imageHeight;
|
|
44637
|
+
else rtIcon.Y=y-imageHeight/2;
|
|
44638
|
+
|
|
44639
|
+
if (IFrameSplitOperator.IsNumber(item.YMove))
|
|
44640
|
+
{
|
|
44641
|
+
y+=item.YMove;
|
|
44642
|
+
rtIcon.Y+=item.YMove;
|
|
44643
|
+
}
|
|
44644
|
+
|
|
44645
|
+
this.Canvas.drawImage(item.Image.Data, rtIcon.X, rtIcon.Y, item.Image.Width, item.Image.Height);
|
|
44629
44646
|
|
|
44630
|
-
|
|
44631
|
-
|
|
44632
|
-
y+=item.YMove;
|
|
44633
|
-
rtIcon.Y+=item.YMove;
|
|
44647
|
+
if (item.Text) this.IconRect.push({ Rect:rtIcon , Item:item, KItem:kItem });
|
|
44648
|
+
else if (IFrameSplitOperator.IsNonEmptyArray(item.AryText)) this.IconRect.push({ Rect:rtIcon , Item:item, KItem:kItem });
|
|
44634
44649
|
}
|
|
44635
|
-
|
|
44636
|
-
this.Canvas.drawImage(item.Image.Data, rtIcon.X, rtIcon.Y, item.Image.Width, item.Image.Height);
|
|
44637
|
-
|
|
44638
|
-
if (item.Text) this.IconRect.push({ Rect:rtIcon , Item:item, KItem:kItem });
|
|
44639
|
-
else if (IFrameSplitOperator.IsNonEmptyArray(item.AryText)) this.IconRect.push({ Rect:rtIcon , Item:item, KItem:kItem });
|
|
44640
|
-
|
|
44641
44650
|
}
|
|
44642
44651
|
else
|
|
44643
44652
|
{
|
|
@@ -84702,7 +84711,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
|
|
|
84702
84711
|
this.GetKData=function()
|
|
84703
84712
|
{
|
|
84704
84713
|
if (!this.ChartPaint[0]) return null;
|
|
84705
|
-
var data=this.
|
|
84714
|
+
var data=this.ChartPaint[0].Data;
|
|
84706
84715
|
if (!data) return null;
|
|
84707
84716
|
|
|
84708
84717
|
return data;
|
|
@@ -149987,7 +149996,7 @@ function HQChartScriptWorker()
|
|
|
149987
149996
|
|
|
149988
149997
|
|
|
149989
149998
|
|
|
149990
|
-
var HQCHART_VERSION="1.1.
|
|
149999
|
+
var HQCHART_VERSION="1.1.14253";
|
|
149991
150000
|
|
|
149992
150001
|
function PrintHQChartVersion()
|
|
149993
150002
|
{
|