提交 1768c748 编写于 作者: HQChart's avatar HQChart

ver 7190

7189 HQDateStringFormat(), UpdatePointByCursorIndex(),ShowTooltipByKeyDown() K线获取对应K线数据,修改为单独处理
7188 GetMinutePeriodData() 修正9:25, 9:30 这2个时间点 判断是否连续
上级 b33cb2ce
......@@ -5545,9 +5545,10 @@ function JSChartContainer(uielement)
this.UpdatePointByCursorIndex=function()
{
this.LastPoint.X=this.Frame.GetXFromIndex(this.CursorIndex);
var index=Math.abs(this.CursorIndex-0.5);
index=parseInt(index.toFixed(0));
if (this.ClassName=='KLineChartContainer') index=this.CursorIndex;
var data=this.Frame.Data;
if (data.DataOffset+index>=data.Data.length)
{
......@@ -5562,8 +5563,9 @@ function JSChartContainer(uielement)
{
var index=Math.abs(this.CursorIndex-0.5);
index=parseInt(index.toFixed(0));
var data=this.Frame.Data;
if (this.ClassName=='KLineChartContainer') index=this.CursorIndex;
var data=this.Frame.Data;
var toolTip=new TooltipData();
toolTip.Data=data.Data[data.DataOffset+index];
toolTip.ChartPaint=this.ChartPaint[0];
......@@ -8924,7 +8926,7 @@ function ChartData()
++j;
continue;
}
if (minData.Time == 925 || minData.Time == 930 )
if ( (preTime!=null && minData.Time == 925 && preTime!=924) || (preTime!=null && minData.Time == 930 && preTime!=929)) //9:25, 9:30 不连续就不算个数
{
}
......@@ -18675,10 +18677,10 @@ function HQDateStringFormat()
this.Operator=function()
{
if (!this.Value) return false;
if (!IFrameSplitOperator.IsNumber(this.Value)) return false;
if (!this.Data) return false;
var index=Math.abs(this.Value-0.5);
var index=this.Value;
index=parseInt(index.toFixed(0));
if (this.Data.DataOffset+index>=this.Data.Data.length) return false;
var currentData = this.Data.Data[this.Data.DataOffset+index];
......@@ -2227,9 +2227,10 @@ function JSChartContainer(uielement)
this.UpdatePointByCursorIndex=function()
{
this.LastPoint.X=this.Frame.GetXFromIndex(this.CursorIndex);
var index=Math.abs(this.CursorIndex-0.5);
index=parseInt(index.toFixed(0));
if (this.ClassName=='KLineChartContainer') index=this.CursorIndex;
var data=this.Frame.Data;
if (data.DataOffset+index>=data.Data.length)
{
......@@ -2244,8 +2245,9 @@ function JSChartContainer(uielement)
{
var index=Math.abs(this.CursorIndex-0.5);
index=parseInt(index.toFixed(0));
var data=this.Frame.Data;
if (this.ClassName=='KLineChartContainer') index=this.CursorIndex;
var data=this.Frame.Data;
var toolTip=new TooltipData();
toolTip.Data=data.Data[data.DataOffset+index];
toolTip.ChartPaint=this.ChartPaint[0];
......@@ -5606,7 +5608,7 @@ function ChartData()
++j;
continue;
}
if (minData.Time == 925 || minData.Time == 930 )
if ( (preTime!=null && minData.Time == 925 && preTime!=924) || (preTime!=null && minData.Time == 930 && preTime!=929)) //9:25, 9:30 不连续就不算个数
{
}
......@@ -15357,10 +15359,10 @@ function HQDateStringFormat()
this.Operator=function()
{
if (!this.Value) return false;
if (!IFrameSplitOperator.IsNumber(this.Value)) return false;
if (!this.Data) return false;
var index=Math.abs(this.Value-0.5);
var index=this.Value;
index=parseInt(index.toFixed(0));
if (this.Data.DataOffset+index>=this.Data.Data.length) return false;
var currentData = this.Data.Data[this.Data.DataOffset+index];
......@@ -5586,9 +5586,10 @@ function JSChartContainer(uielement)
this.UpdatePointByCursorIndex=function()
{
this.LastPoint.X=this.Frame.GetXFromIndex(this.CursorIndex);
var index=Math.abs(this.CursorIndex-0.5);
index=parseInt(index.toFixed(0));
if (this.ClassName=='KLineChartContainer') index=this.CursorIndex;
var data=this.Frame.Data;
if (data.DataOffset+index>=data.Data.length)
{
......@@ -5603,8 +5604,9 @@ function JSChartContainer(uielement)
{
var index=Math.abs(this.CursorIndex-0.5);
index=parseInt(index.toFixed(0));
var data=this.Frame.Data;
if (this.ClassName=='KLineChartContainer') index=this.CursorIndex;
var data=this.Frame.Data;
var toolTip=new TooltipData();
toolTip.Data=data.Data[data.DataOffset+index];
toolTip.ChartPaint=this.ChartPaint[0];
......@@ -8965,7 +8967,7 @@ function ChartData()
++j;
continue;
}
if (minData.Time == 925 || minData.Time == 930 )
if ( (preTime!=null && minData.Time == 925 && preTime!=924) || (preTime!=null && minData.Time == 930 && preTime!=929)) //9:25, 9:30 不连续就不算个数
{
}
......@@ -18716,10 +18718,10 @@ function HQDateStringFormat()
this.Operator=function()
{
if (!this.Value) return false;
if (!IFrameSplitOperator.IsNumber(this.Value)) return false;
if (!this.Data) return false;
var index=Math.abs(this.Value-0.5);
var index=this.Value;
index=parseInt(index.toFixed(0));
if (this.Data.DataOffset+index>=this.Data.Data.length) return false;
var currentData = this.Data.Data[this.Data.DataOffset+index];
......@@ -2227,9 +2227,10 @@ function JSChartContainer(uielement)
this.UpdatePointByCursorIndex=function()
{
this.LastPoint.X=this.Frame.GetXFromIndex(this.CursorIndex);
var index=Math.abs(this.CursorIndex-0.5);
index=parseInt(index.toFixed(0));
if (this.ClassName=='KLineChartContainer') index=this.CursorIndex;
var data=this.Frame.Data;
if (data.DataOffset+index>=data.Data.length)
{
......@@ -2244,8 +2245,9 @@ function JSChartContainer(uielement)
{
var index=Math.abs(this.CursorIndex-0.5);
index=parseInt(index.toFixed(0));
var data=this.Frame.Data;
if (this.ClassName=='KLineChartContainer') index=this.CursorIndex;
var data=this.Frame.Data;
var toolTip=new TooltipData();
toolTip.Data=data.Data[data.DataOffset+index];
toolTip.ChartPaint=this.ChartPaint[0];
......@@ -5606,7 +5608,7 @@ function ChartData()
++j;
continue;
}
if (minData.Time == 925 || minData.Time == 930 )
if ( (preTime!=null && minData.Time == 925 && preTime!=924) || (preTime!=null && minData.Time == 930 && preTime!=929)) //9:25, 9:30 不连续就不算个数
{
}
......@@ -15357,10 +15359,10 @@ function HQDateStringFormat()
this.Operator=function()
{
if (!this.Value) return false;
if (!IFrameSplitOperator.IsNumber(this.Value)) return false;
if (!this.Data) return false;
var index=Math.abs(this.Value-0.5);
var index=this.Value;
index=parseInt(index.toFixed(0));
if (this.Data.DataOffset+index>=this.Data.Data.length) return false;
var currentData = this.Data.Data[this.Data.DataOffset+index];
......@@ -2227,9 +2227,10 @@ function JSChartContainer(uielement)
this.UpdatePointByCursorIndex=function()
{
this.LastPoint.X=this.Frame.GetXFromIndex(this.CursorIndex);
var index=Math.abs(this.CursorIndex-0.5);
index=parseInt(index.toFixed(0));
if (this.ClassName=='KLineChartContainer') index=this.CursorIndex;
var data=this.Frame.Data;
if (data.DataOffset+index>=data.Data.length)
{
......@@ -2244,8 +2245,9 @@ function JSChartContainer(uielement)
{
var index=Math.abs(this.CursorIndex-0.5);
index=parseInt(index.toFixed(0));
var data=this.Frame.Data;
if (this.ClassName=='KLineChartContainer') index=this.CursorIndex;
var data=this.Frame.Data;
var toolTip=new TooltipData();
toolTip.Data=data.Data[data.DataOffset+index];
toolTip.ChartPaint=this.ChartPaint[0];
......@@ -5606,7 +5608,7 @@ function ChartData()
++j;
continue;
}
if (minData.Time == 925 || minData.Time == 930 )
if ( (preTime!=null && minData.Time == 925 && preTime!=924) || (preTime!=null && minData.Time == 930 && preTime!=929)) //9:25, 9:30 不连续就不算个数
{
}
......@@ -15357,10 +15359,10 @@ function HQDateStringFormat()
this.Operator=function()
{
if (!this.Value) return false;
if (!IFrameSplitOperator.IsNumber(this.Value)) return false;
if (!this.Data) return false;
var index=Math.abs(this.Value-0.5);
var index=this.Value;
index=parseInt(index.toFixed(0));
if (this.Data.DataOffset+index>=this.Data.Data.length) return false;
var currentData = this.Data.Data[this.Data.DataOffset+index];
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册