hqchart 1.1.14971 → 1.1.14975
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 +7 -3
- package/package.json +1 -1
- package/src/jscommon/umychart.index.data.js +1 -1
- package/src/jscommon/umychart.js +26 -9
- package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +28 -11
- package/src/jscommon/umychart.version.js +1 -1
- package/src/jscommon/umychart.vue/umychart.vue.js +28 -11
package/lib/umychart.vue.js
CHANGED
|
@@ -299,7 +299,7 @@ LONG := SUM(RC,0);\n\
|
|
|
299
299
|
DIFF := SMA(LONG,10,1);\n\
|
|
300
300
|
DEA := SMA(LONG,20,1);\n\
|
|
301
301
|
LON : DIFF-DEA;\n\
|
|
302
|
-
LONMA : MA(LON,
|
|
302
|
+
LONMA : MA(LON,N);\n\
|
|
303
303
|
LONT : LON, COLORSTICK;'};return data;};JSIndexScript.prototype.NDB=function(){var data={Name:'NDB',Description:'脑电波',IsMainIndex:false,Args:[{Name:'P1',Value:5},{Name:'P2',Value:10}],Script://脚本
|
|
304
304
|
'HH:=IF(C/REF(C,1)>1.098 AND L>REF(H,1),2*C-REF(C,1)-H,2*C-H-L);\n\
|
|
305
305
|
V1:= BARSCOUNT(C) - 1;\n\
|
|
@@ -7107,7 +7107,11 @@ this.TopAreaConfig=CloneData(g_JSChartResource.ChartDrawTVLongPosition.TopArea);
|
|
|
7107
7107
|
this.AryRectArea=[];this.GetXYCoordinate=this.GetXYCoordinate_default;this.SetOption_Backup=this.SetOption;this.PointToValue_Backup=this.PointToValue;this.SetOption=function(option){this.SetOption_Backup();if(option){}};this.PointToValue=function(){//拖拽完成 把点移动到线段头尾
|
|
7108
7108
|
if(this.Frame.IsHScreen){this.Point[1].X=this.Point[0].X;}else{this.Point[1].Y=this.Point[0].Y;}this.PointToValue_Backup();};//0-10 鼠标对应的点索引 100=鼠标在正个图形上 -1 鼠标不在图形上
|
|
7109
7109
|
this.IsPointIn=function(x,y,option){if(this.Status!=10)return-1;var value=this.IsPointInXYValue(x,y,option);if(value>=0)return value;for(var i=0;i<this.AryRectArea.length;++i){var item=this.AryRectArea[i];if(!item)continue;if(Path2DHelper.PtInRect(x,y,item.Rect)){return item.ID;}}return-1;};this.OnFinish=function(){if(!IFrameSplitOperator.IsNonEmptyArray(this.Value))return false;if(!this.Frame)return false;var data=this.Frame.Data;if(!data)return false;var firstPoint=this.Point[0];var firstValue=this.Value[0];var entryPrice=firstValue.YValue;var topPrice=entryPrice*(1+0.05);var bottomPrice=entryPrice*(1-0.05);this.Value[2]={XValue:firstValue.XValue,YValue:topPrice};this.Value[3]={XValue:firstValue.XValue,YValue:bottomPrice};if(firstValue.DateTime){var item=firstValue.DateTime;this.Value[2].DateTime={Date:item.Date,Time:item.Time};this.Value[3].DateTime={Date:item.Date,Time:item.Time};}this.Point[2]={X:firstPoint.X,Y:this.Frame.GetYFromData(topPrice,false)};this.Point[3]={X:firstPoint.X,Y:this.Frame.GetYFromData(bottomPrice,false)};this.PointCount=4;};this.IsDrawMain=function()//选中绘制在动态绘图上， 没有选中绘制在背景上
|
|
7110
|
-
{if(!this.GetActiveDrawPicture)return true;var active=this.GetActiveDrawPicture();if(active.Select.Guid==this.Guid)return false;return true;};this.IsSelected=function(){if(!this.GetActiveDrawPicture)return false;var active=this.GetActiveDrawPicture()
|
|
7110
|
+
{if(!this.GetActiveDrawPicture)return true;var active=this.GetActiveDrawPicture();if(active.Select.Guid==this.Guid)return false;return true;};this.IsSelected=function(){if(!this.GetActiveDrawPicture)return false;var active=this.GetActiveDrawPicture();//console.log(`[IsSelected] Select=${active.Select.Guid} MoveOn=${active.MoveOn.Guid}`);
|
|
7111
|
+
if(active.Select.Guid==this.Guid||active.MoveOn.Guid==this.Guid)return true;return false;};//未选中 作为背景色绘制
|
|
7112
|
+
this.MainDraw=function(){this.AryRectArea=[];if(this.IsFrameMinSize())return;//0=开始画 1=完成第1个点 2=完成第2个点 3=完成第3个点 10=完成 20=移动)
|
|
7113
|
+
if(this.Status!=10&&this.Status!=20)return;var drawPoint=this.CalculateDrawPoint({IsCheckX:true,IsCheckY:true});if(!drawPoint)return;if(drawPoint.length<2)return;this.IsHScreen=this.Frame.IsHScreen;if(this.IsHScreen)return;this.ClipFrame();this.ChartBorder=this.Frame.ChartBorder;this.DrawArea(drawPoint);this.Canvas.restore();};//鼠标在上面 动态绘制点和文字信息
|
|
7114
|
+
this.MainPartDraw=function(){if(this.IsFrameMinSize())return;if(this.Status!=10&&this.Status!=20)return;var drawPoint=this.CalculateDrawPoint({IsCheckX:true,IsCheckY:true});if(!drawPoint)return;if(drawPoint.length<2)return;this.IsHScreen=this.Frame.IsHScreen;if(this.IsHScreen)return;this.ClipFrame();this.ChartBorder=this.Frame.ChartBorder;this.DrawLabel(drawPoint);this.DrawPoint(drawPoint);this.Canvas.restore();};this.Draw=function(){this.AryRectArea=[];if(this.IsFrameMinSize())return;var drawPoint=this.CalculateDrawPoint({IsCheckX:true,IsCheckY:true});if(!drawPoint)return;if(drawPoint.length<2)return;this.IsHScreen=this.Frame.IsHScreen;if(this.IsHScreen)return;this.ClipFrame();this.ChartBorder=this.Frame.ChartBorder;if(this.Status==10||this.Status==20)//0=开始画 1=完成第1个点 2=完成第2个点 3=完成第3个点 10=完成 20=移动)
|
|
7111
7115
|
{this.DrawArea(drawPoint);this.DrawLabel(drawPoint);this.DrawPoint(drawPoint);}else{var ptStart=drawPoint[0];var ptEnd=drawPoint[1];this.Canvas.strokeStyle=this.LineColor;this.DrawVerticalLine(ptStart,ptEnd);}this.Canvas.restore();};this.DrawVerticalLine=function(ptStart,ptEnd){var data=this.Frame.Data;if(this.IsHScreen){var left=this.ChartBorder.GetLeft();var right=this.ChartBorder.GetRight();var xValue=Math.round(this.Frame.GetXData(ptStart.Y,false))+data.DataOffset;if(xValue<0)xValue=0;else if(xValue>=data.Data.length)xValue=data.Data.length-1;var yStart=this.Frame.GetXFromIndex(xValue-data.DataOffset,false);xValue=Math.round(this.Frame.GetXData(ptEnd.Y,false))+data.DataOffset;if(xValue<0)xValue=0;else if(xValue>=data.Data.length)xValue=data.Data.length-1;var yEnd=this.Frame.GetXFromIndex(xValue-data.DataOffset,false);this.Canvas.beginPath();this.Canvas.moveTo(left,yStart);this.Canvas.lineTo(right,yStart);this.Canvas.moveTo(left,yEnd);this.Canvas.lineTo(right,yEnd);this.Canvas.stroke();this.Canvas.beginPath();this.Canvas.moveTo(ptStart.X,yStart);this.Canvas.lineTo(ptStart.X,yEnd);this.Canvas.stroke();}else{var top=this.ChartBorder.GetTopEx();var bottom=this.ChartBorder.GetBottomEx();var xValue=Math.round(this.Frame.GetXData(ptStart.X,false))+data.DataOffset;if(xValue<0)xValue=0;else if(xValue>=data.Data.length)xValue=data.Data.length-1;var xStart=this.Frame.GetXFromIndex(xValue-data.DataOffset,false);xValue=Math.round(this.Frame.GetXData(ptEnd.X,false))+data.DataOffset;if(xValue<0)xValue=0;else if(xValue>=data.Data.length)xValue=data.Data.length-1;var xEnd=this.Frame.GetXFromIndex(xValue-data.DataOffset,false);this.Canvas.beginPath();this.Canvas.moveTo(xStart,top);this.Canvas.lineTo(xStart,bottom);this.Canvas.moveTo(xEnd,top);this.Canvas.lineTo(xEnd,bottom);this.Canvas.stroke();this.Canvas.beginPath();this.Canvas.moveTo(xStart,ptStart.Y);this.Canvas.lineTo(xEnd,ptStart.Y);this.Canvas.stroke();}};this.GetCursorType=function(ptIndex){if(ptIndex==100)return"pointer";else if(ptIndex==0)return"move";else if(ptIndex==1)return"ew-resize";else if(ptIndex==2||ptIndex==3)return"ns-resize";return null;};this.DrawArea=function(drawPoint){var ptCenter=drawPoint[0];var ptRight=drawPoint[1];var ptTop=drawPoint[2];var ptBottom=drawPoint[3];var bSelected=this.IsSelected();var rtTopArea={Left:ptCenter.X,Top:ptTop.Y,Right:ptRight.X,Bottom:ptCenter.Y};rtTopArea.Width=rtTopArea.Right-rtTopArea.Left;rtTopArea.Height=rtTopArea.Bottom-rtTopArea.Top;this.Canvas.fillStyle=bSelected?this.TopAreaConfig.SelectedAreaColor:this.TopAreaConfig.AreaColor;this.Canvas.beginPath();this.Canvas.fillRect(rtTopArea.Left,rtTopArea.Top,rtTopArea.Width,rtTopArea.Height);this.AryRectArea[0]={ID:100,Rect:rtTopArea};var rtBottomArea={Left:ptCenter.X,Top:ptCenter.Y,Right:ptRight.X,Bottom:ptBottom.Y};rtBottomArea.Width=rtBottomArea.Right-rtBottomArea.Left;rtBottomArea.Height=rtBottomArea.Bottom-rtBottomArea.Top;this.Canvas.fillStyle=bSelected?this.BottomAreaConfig.SelectedAreaColor:this.BottomAreaConfig.AreaColor;this.Canvas.beginPath();this.Canvas.fillRect(rtBottomArea.Left,rtBottomArea.Top,rtBottomArea.Width,rtBottomArea.Height);this.AryRectArea[1]={ID:100,Rect:rtBottomArea};//线段
|
|
7112
7116
|
this.Canvas.strokeStyle=this.LineColor;this.Canvas.beginPath();this.Canvas.moveTo(ptCenter.X,ToFixedPoint(ptCenter.Y));this.Canvas.lineTo(ptRight.X,ToFixedPoint(ptRight.Y));this.Canvas.stroke();};this.DrawLabel=function(drawPoint){if(!this.IsActive())return;//激活状态下才显示
|
|
7113
7117
|
var aryLabel=this.FormatLabelText(drawPoint);if(!IFrameSplitOperator.IsNonEmptyArray(aryLabel))return;this.TextFontHeight=this.GetFontHeight(this.LabelConfig.Font,"擎");for(var i=0;i<aryLabel.length;++i){var item=aryLabel[i];if(!IFrameSplitOperator.IsNonEmptyArray(item.AryText))continue;this.CalculateLabelSize(item);this.DrawLabelItem(item,drawPoint);}};this.DrawLabelItem=function(lableItem,drawPoint){var ptCenter=drawPoint[0];var ptRight=drawPoint[1];var ptTop=drawPoint[2];var ptBottom=drawPoint[3];var clientWidth=ptRight.X-ptCenter.X;var config=this.LabelConfig;var margin=config.Margin;var rtText={Width:lableItem.Width+margin.Left+margin.Right,Height:lableItem.Height+margin.Top+margin.Bottom};if(lableItem.Type==0)//中间
|
|
@@ -15254,7 +15258,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
15254
15258
|
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);};}/********************************************************************************
|
|
15255
15259
|
* 版本信息输出
|
|
15256
15260
|
*
|
|
15257
|
-
*/var HQCHART_VERSION="1.1.
|
|
15261
|
+
*/var HQCHART_VERSION="1.1.14974";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();//把给外界调用的方法暴露出来
|
|
15258
15262
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
15259
15263
|
// BaseIndex:BaseIndex,
|
|
15260
15264
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
package/src/jscommon/umychart.js
CHANGED
|
@@ -75393,20 +75393,40 @@ function ChartDrawTVLongPosition()
|
|
|
75393
75393
|
if (!this.GetActiveDrawPicture) return false;
|
|
75394
75394
|
|
|
75395
75395
|
var active=this.GetActiveDrawPicture();
|
|
75396
|
-
|
|
75396
|
+
//console.log(`[IsSelected] Select=${active.Select.Guid} MoveOn=${active.MoveOn.Guid}`);
|
|
75397
|
+
if (active.Select.Guid==this.Guid || active.MoveOn.Guid==this.Guid) return true;
|
|
75397
75398
|
|
|
75398
75399
|
return false;
|
|
75399
75400
|
}
|
|
75400
75401
|
|
|
75402
|
+
//未选中 作为背景色绘制
|
|
75401
75403
|
this.MainDraw=function()
|
|
75402
75404
|
{
|
|
75403
|
-
this.
|
|
75404
|
-
|
|
75405
|
+
this.AryRectArea=[]
|
|
75406
|
+
if (this.IsFrameMinSize()) return;
|
|
75405
75407
|
|
|
75408
|
+
//0=开始画 1=完成第1个点 2=完成第2个点 3=完成第3个点 10=完成 20=移动)
|
|
75409
|
+
if (this.Status!=10 && this.Status!=20) return;
|
|
75410
|
+
|
|
75411
|
+
var drawPoint=this.CalculateDrawPoint( {IsCheckX:true, IsCheckY:true} );
|
|
75412
|
+
if (!drawPoint) return;
|
|
75413
|
+
if (drawPoint.length<2) return;
|
|
75414
|
+
this.IsHScreen=this.Frame.IsHScreen;
|
|
75415
|
+
if (this.IsHScreen) return;
|
|
75416
|
+
|
|
75417
|
+
this.ClipFrame();
|
|
75406
75418
|
|
|
75419
|
+
this.ChartBorder=this.Frame.ChartBorder;
|
|
75420
|
+
this.DrawArea(drawPoint);
|
|
75421
|
+
|
|
75422
|
+
this.Canvas.restore();
|
|
75423
|
+
}
|
|
75424
|
+
|
|
75425
|
+
//鼠标在上面 动态绘制点和文字信息
|
|
75407
75426
|
this.MainPartDraw=function()
|
|
75408
75427
|
{
|
|
75409
75428
|
if (this.IsFrameMinSize()) return;
|
|
75429
|
+
if (this.Status!=10 && this.Status!=20) return;
|
|
75410
75430
|
|
|
75411
75431
|
var drawPoint=this.CalculateDrawPoint( {IsCheckX:true, IsCheckY:true} );
|
|
75412
75432
|
if (!drawPoint) return;
|
|
@@ -75415,13 +75435,10 @@ function ChartDrawTVLongPosition()
|
|
|
75415
75435
|
if (this.IsHScreen) return;
|
|
75416
75436
|
|
|
75417
75437
|
this.ClipFrame();
|
|
75418
|
-
this.ChartBorder=this.Frame.ChartBorder;
|
|
75419
75438
|
|
|
75420
|
-
|
|
75421
|
-
|
|
75422
|
-
|
|
75423
|
-
this.DrawPoint(drawPoint);
|
|
75424
|
-
}
|
|
75439
|
+
this.ChartBorder=this.Frame.ChartBorder;
|
|
75440
|
+
this.DrawLabel(drawPoint);
|
|
75441
|
+
this.DrawPoint(drawPoint);
|
|
75425
75442
|
|
|
75426
75443
|
this.Canvas.restore();
|
|
75427
75444
|
}
|
|
@@ -1248,7 +1248,7 @@ LONG := SUM(RC,0);\n\
|
|
|
1248
1248
|
DIFF := SMA(LONG,10,1);\n\
|
|
1249
1249
|
DEA := SMA(LONG,20,1);\n\
|
|
1250
1250
|
LON : DIFF-DEA;\n\
|
|
1251
|
-
LONMA : MA(LON,
|
|
1251
|
+
LONMA : MA(LON,N);\n\
|
|
1252
1252
|
LONT : LON, COLORSTICK;'
|
|
1253
1253
|
|
|
1254
1254
|
};
|
|
@@ -79489,20 +79489,40 @@ function ChartDrawTVLongPosition()
|
|
|
79489
79489
|
if (!this.GetActiveDrawPicture) return false;
|
|
79490
79490
|
|
|
79491
79491
|
var active=this.GetActiveDrawPicture();
|
|
79492
|
-
|
|
79492
|
+
//console.log(`[IsSelected] Select=${active.Select.Guid} MoveOn=${active.MoveOn.Guid}`);
|
|
79493
|
+
if (active.Select.Guid==this.Guid || active.MoveOn.Guid==this.Guid) return true;
|
|
79493
79494
|
|
|
79494
79495
|
return false;
|
|
79495
79496
|
}
|
|
79496
79497
|
|
|
79498
|
+
//未选中 作为背景色绘制
|
|
79497
79499
|
this.MainDraw=function()
|
|
79498
79500
|
{
|
|
79499
|
-
this.
|
|
79500
|
-
|
|
79501
|
+
this.AryRectArea=[]
|
|
79502
|
+
if (this.IsFrameMinSize()) return;
|
|
79501
79503
|
|
|
79504
|
+
//0=开始画 1=完成第1个点 2=完成第2个点 3=完成第3个点 10=完成 20=移动)
|
|
79505
|
+
if (this.Status!=10 && this.Status!=20) return;
|
|
79506
|
+
|
|
79507
|
+
var drawPoint=this.CalculateDrawPoint( {IsCheckX:true, IsCheckY:true} );
|
|
79508
|
+
if (!drawPoint) return;
|
|
79509
|
+
if (drawPoint.length<2) return;
|
|
79510
|
+
this.IsHScreen=this.Frame.IsHScreen;
|
|
79511
|
+
if (this.IsHScreen) return;
|
|
79512
|
+
|
|
79513
|
+
this.ClipFrame();
|
|
79502
79514
|
|
|
79515
|
+
this.ChartBorder=this.Frame.ChartBorder;
|
|
79516
|
+
this.DrawArea(drawPoint);
|
|
79517
|
+
|
|
79518
|
+
this.Canvas.restore();
|
|
79519
|
+
}
|
|
79520
|
+
|
|
79521
|
+
//鼠标在上面 动态绘制点和文字信息
|
|
79503
79522
|
this.MainPartDraw=function()
|
|
79504
79523
|
{
|
|
79505
79524
|
if (this.IsFrameMinSize()) return;
|
|
79525
|
+
if (this.Status!=10 && this.Status!=20) return;
|
|
79506
79526
|
|
|
79507
79527
|
var drawPoint=this.CalculateDrawPoint( {IsCheckX:true, IsCheckY:true} );
|
|
79508
79528
|
if (!drawPoint) return;
|
|
@@ -79511,13 +79531,10 @@ function ChartDrawTVLongPosition()
|
|
|
79511
79531
|
if (this.IsHScreen) return;
|
|
79512
79532
|
|
|
79513
79533
|
this.ClipFrame();
|
|
79514
|
-
this.ChartBorder=this.Frame.ChartBorder;
|
|
79515
79534
|
|
|
79516
|
-
|
|
79517
|
-
|
|
79518
|
-
|
|
79519
|
-
this.DrawPoint(drawPoint);
|
|
79520
|
-
}
|
|
79535
|
+
this.ChartBorder=this.Frame.ChartBorder;
|
|
79536
|
+
this.DrawLabel(drawPoint);
|
|
79537
|
+
this.DrawPoint(drawPoint);
|
|
79521
79538
|
|
|
79522
79539
|
this.Canvas.restore();
|
|
79523
79540
|
}
|
|
@@ -152143,7 +152160,7 @@ function ScrollBarBGChart()
|
|
|
152143
152160
|
|
|
152144
152161
|
|
|
152145
152162
|
|
|
152146
|
-
var HQCHART_VERSION="1.1.
|
|
152163
|
+
var HQCHART_VERSION="1.1.14974";
|
|
152147
152164
|
|
|
152148
152165
|
function PrintHQChartVersion()
|
|
152149
152166
|
{
|
|
@@ -1292,7 +1292,7 @@ LONG := SUM(RC,0);\n\
|
|
|
1292
1292
|
DIFF := SMA(LONG,10,1);\n\
|
|
1293
1293
|
DEA := SMA(LONG,20,1);\n\
|
|
1294
1294
|
LON : DIFF-DEA;\n\
|
|
1295
|
-
LONMA : MA(LON,
|
|
1295
|
+
LONMA : MA(LON,N);\n\
|
|
1296
1296
|
LONT : LON, COLORSTICK;'
|
|
1297
1297
|
|
|
1298
1298
|
};
|
|
@@ -79533,20 +79533,40 @@ function ChartDrawTVLongPosition()
|
|
|
79533
79533
|
if (!this.GetActiveDrawPicture) return false;
|
|
79534
79534
|
|
|
79535
79535
|
var active=this.GetActiveDrawPicture();
|
|
79536
|
-
|
|
79536
|
+
//console.log(`[IsSelected] Select=${active.Select.Guid} MoveOn=${active.MoveOn.Guid}`);
|
|
79537
|
+
if (active.Select.Guid==this.Guid || active.MoveOn.Guid==this.Guid) return true;
|
|
79537
79538
|
|
|
79538
79539
|
return false;
|
|
79539
79540
|
}
|
|
79540
79541
|
|
|
79542
|
+
//未选中 作为背景色绘制
|
|
79541
79543
|
this.MainDraw=function()
|
|
79542
79544
|
{
|
|
79543
|
-
this.
|
|
79544
|
-
|
|
79545
|
+
this.AryRectArea=[]
|
|
79546
|
+
if (this.IsFrameMinSize()) return;
|
|
79545
79547
|
|
|
79548
|
+
//0=开始画 1=完成第1个点 2=完成第2个点 3=完成第3个点 10=完成 20=移动)
|
|
79549
|
+
if (this.Status!=10 && this.Status!=20) return;
|
|
79550
|
+
|
|
79551
|
+
var drawPoint=this.CalculateDrawPoint( {IsCheckX:true, IsCheckY:true} );
|
|
79552
|
+
if (!drawPoint) return;
|
|
79553
|
+
if (drawPoint.length<2) return;
|
|
79554
|
+
this.IsHScreen=this.Frame.IsHScreen;
|
|
79555
|
+
if (this.IsHScreen) return;
|
|
79556
|
+
|
|
79557
|
+
this.ClipFrame();
|
|
79546
79558
|
|
|
79559
|
+
this.ChartBorder=this.Frame.ChartBorder;
|
|
79560
|
+
this.DrawArea(drawPoint);
|
|
79561
|
+
|
|
79562
|
+
this.Canvas.restore();
|
|
79563
|
+
}
|
|
79564
|
+
|
|
79565
|
+
//鼠标在上面 动态绘制点和文字信息
|
|
79547
79566
|
this.MainPartDraw=function()
|
|
79548
79567
|
{
|
|
79549
79568
|
if (this.IsFrameMinSize()) return;
|
|
79569
|
+
if (this.Status!=10 && this.Status!=20) return;
|
|
79550
79570
|
|
|
79551
79571
|
var drawPoint=this.CalculateDrawPoint( {IsCheckX:true, IsCheckY:true} );
|
|
79552
79572
|
if (!drawPoint) return;
|
|
@@ -79555,13 +79575,10 @@ function ChartDrawTVLongPosition()
|
|
|
79555
79575
|
if (this.IsHScreen) return;
|
|
79556
79576
|
|
|
79557
79577
|
this.ClipFrame();
|
|
79558
|
-
this.ChartBorder=this.Frame.ChartBorder;
|
|
79559
79578
|
|
|
79560
|
-
|
|
79561
|
-
|
|
79562
|
-
|
|
79563
|
-
this.DrawPoint(drawPoint);
|
|
79564
|
-
}
|
|
79579
|
+
this.ChartBorder=this.Frame.ChartBorder;
|
|
79580
|
+
this.DrawLabel(drawPoint);
|
|
79581
|
+
this.DrawPoint(drawPoint);
|
|
79565
79582
|
|
|
79566
79583
|
this.Canvas.restore();
|
|
79567
79584
|
}
|
|
@@ -163522,7 +163539,7 @@ function HQChartScriptWorker()
|
|
|
163522
163539
|
|
|
163523
163540
|
|
|
163524
163541
|
|
|
163525
|
-
var HQCHART_VERSION="1.1.
|
|
163542
|
+
var HQCHART_VERSION="1.1.14974";
|
|
163526
163543
|
|
|
163527
163544
|
function PrintHQChartVersion()
|
|
163528
163545
|
{
|