hqchart 1.1.14978 → 1.1.14986

package/src/jscommon/umychart.js

@@ -7365,6 +7365,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         var mouseStatus=null;   //鼠标状态
         var button=null;        //当前鼠标所在按钮
         var frameID=this.Frame.PtInFrame(x,y);
+        this.LastPoint.FrameID=frameID;
         if (IFrameSplitOperator.IsNumber(frameID) && frameID>=0)    //在K线内部移动,调整K线索引
             this.CursorIndex=this.Frame.GetXData(x);
         
@@ -8260,40 +8261,45 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
     this.UpdatePointByCursorIndex=function(type)    //type 1=根据十字光标更新 2=强制取消十字光标
     {
-        var pt={X:null, Y:null};
-        pt.X=this.Frame.GetXFromIndex(this.CursorIndex);
-        var index=Math.abs(this.CursorIndex-0.5);
-        if (this.IsKLineContainer()) index=this.CursorIndex;
+        if (type==1)    //根据十字光标更新
+        {           
+            if (this.LastPoint.FrameID<0) return;
 
-        var data=this.Frame.Data;
-        if (data.DataOffset+index<data.Data.length)
-        {
-            var close=data.Data[data.DataOffset+index].Close;
-            pt.Y=this.Frame.GetYFromData(close);
-        }
-       
-        if (type==1 && this.ChartCorssCursor)
-        {
-            if (this.ChartCorssCursor.Status==1)    //十字光标显示中, 不调整位置
+            var pt={ X:null, Y:this.LastPoint.Y };
+            pt.X=this.Frame.GetXFromIndex(this.CursorIndex);    //X轴动态变的
+            if (this.ChartCorssCursor)
             {
+                if (this.ChartCorssCursor.Status==1)
+                {
 
+                }
+                else
+                {
+                    pt.Y=null;
+                    pt.X=null;
+                }
             }
-            else
-            {
-                this.LastPoint.X=this.Frame.GetXFromIndex(this.CursorIndex);
-                var index=Math.abs(this.CursorIndex-0.5);
-                index=parseInt(index.toFixed(0));
-                if (this.IsKLineContainer()) index=this.CursorIndex;
-                this.LastPoint.Y=null;
-            }
+            this.LastPoint.X=pt.X;
+            this.LastPoint.Y=pt.Y;
         }
-        else if (type==2 && this.ChartCorssCursor)  //取消鼠标位置，十字光标就不显示了
+        else if (type==2)
         {
             this.LastPoint.Y=null;
             this.LastPoint.X=null;
+            this.LastPoint.FrameID=-1;
         }
         else
         {
+            var pt={ X:null, Y:null };
+            pt.X=this.Frame.GetXFromIndex(this.CursorIndex);
+            var index=this.CursorIndex;
+            var data=this.GetKData();
+            if (IFrameSplitOperator.IsGTEZero(index) && data.DataOffset+index<data.Data.length)
+            {
+                var close=data.Data[data.DataOffset+index].Close;
+                pt.Y=this.Frame.GetYFromData(close);
+                this.LastPoint.FrameID=0;
+            }
             this.LastPoint.X=pt.X;
             this.LastPoint.Y=pt.Y;
         }
@@ -54289,6 +54295,12 @@ IFrameSplitOperator.FormatDateTimeStringV2=function(datetime, format, languageID
             return `${IFrameSplitOperator.NumberToString(datetime.getHours())}:${IFrameSplitOperator.NumberToString(datetime.getMinutes())}`;
         case "HH:MM:SS.fff":
              return `${IFrameSplitOperator.NumberToString(datetime.getHours())}:${IFrameSplitOperator.NumberToString(datetime.getMinutes())}:${IFrameSplitOperator.NumberToString(datetime.getSeconds())}.${IFrameSplitOperator.MillisecondToString(datetime.getMilliseconds())}`;
+
+        case "YYYY-MM-DD HH:MM":
+            return `${datetime.getFullYear()}-${IFrameSplitOperator.NumberToString(datetime.getMonth()+1)}-${IFrameSplitOperator.NumberToString(datetime.getDate())} ${IFrameSplitOperator.NumberToString(datetime.getHours())}:${IFrameSplitOperator.NumberToString(datetime.getMinutes())}`;
+        case "MM-DD HH:MM":
+            return `${IFrameSplitOperator.NumberToString(datetime.getMonth()+1)}-${IFrameSplitOperator.NumberToString(datetime.getDate())} ${IFrameSplitOperator.NumberToString(datetime.getHours())}:${IFrameSplitOperator.NumberToString(datetime.getMinutes())}`;
+            
         default:
             return null;
     }
@@ -54344,6 +54356,15 @@ IFrameSplitOperator.IsPlusNumber=function(value)
     return value>0;
 }
 
+//>=0
+IFrameSplitOperator.IsGTEZero=function(value)
+{
+    if (value==null) return false;
+    if (isNaN(value)) return false;
+
+    return value>=0;
+}
+
 //是否是整形
 IFrameSplitOperator.IsInteger=function(x) 
 {
@@ -91528,7 +91549,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         var index=this.CursorIndex;
         index=parseInt(index.toFixed(0));
-        var data=this.Frame.SourceData;
+        var data=this.GetKData();
         if (data.DataOffset+index>=data.Data.length)
         {
             return;
@@ -91539,6 +91560,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         else close=item.Close
 
         this.LastPoint.Y=this.Frame.GetYFromData(close);
+        this.LastPoint.FrameID=0;
     }
 
 

package/src/jscommon/umychart.report.js

@@ -1803,6 +1803,16 @@ function JSReportChartContainer(uielement)
         if (IFrameSplitOperator.IsNumber(item[108])) stock.ReserveNumber8=item[108];
         if (IFrameSplitOperator.IsNumber(item[109])) stock.ReserveNumber9=item[109];
         if (IFrameSplitOperator.IsNumber(item[110])) stock.ReserveNumber10=item[110];
+        if (IFrameSplitOperator.IsNumber(item[111])) stock.ReserveNumber11=item[111];
+        if (IFrameSplitOperator.IsNumber(item[112])) stock.ReserveNumber12=item[112];
+        if (IFrameSplitOperator.IsNumber(item[113])) stock.ReserveNumber13=item[113];
+        if (IFrameSplitOperator.IsNumber(item[114])) stock.ReserveNumber14=item[114];
+        if (IFrameSplitOperator.IsNumber(item[115])) stock.ReserveNumber15=item[115];
+        if (IFrameSplitOperator.IsNumber(item[116])) stock.ReserveNumber16=item[116];
+        if (IFrameSplitOperator.IsNumber(item[117])) stock.ReserveNumber17=item[117];
+        if (IFrameSplitOperator.IsNumber(item[118])) stock.ReserveNumber18=item[118];
+        if (IFrameSplitOperator.IsNumber(item[119])) stock.ReserveNumber19=item[119];
+        if (IFrameSplitOperator.IsNumber(item[120])) stock.ReserveNumber20=item[120];
 
         //10个字符型 201-299
         if (IFrameSplitOperator.IsString(item[201]) || IFrameSplitOperator.IsObject(item[201])) stock.ReserveString1=item[201];
@@ -4197,6 +4207,16 @@ function JSReportChartContainer(uielement)
             case REPORT_COLUMN_ID.RESERVE_NUMBER8_ID:
             case REPORT_COLUMN_ID.RESERVE_NUMBER9_ID:
             case REPORT_COLUMN_ID.RESERVE_NUMBER10_ID:
+            case REPORT_COLUMN_ID.RESERVE_NUMBER11_ID:
+            case REPORT_COLUMN_ID.RESERVE_NUMBER12_ID:
+            case REPORT_COLUMN_ID.RESERVE_NUMBER13_ID:
+            case REPORT_COLUMN_ID.RESERVE_NUMBER14_ID:
+            case REPORT_COLUMN_ID.RESERVE_NUMBER15_ID:
+            case REPORT_COLUMN_ID.RESERVE_NUMBER16_ID:
+            case REPORT_COLUMN_ID.RESERVE_NUMBER17_ID:
+            case REPORT_COLUMN_ID.RESERVE_NUMBER18_ID:
+            case REPORT_COLUMN_ID.RESERVE_NUMBER19_ID:
+            case REPORT_COLUMN_ID.RESERVE_NUMBER20_ID:
             
                 return this.LocalNumberSort(left, right, column, sortType);
 
@@ -4859,7 +4879,7 @@ var REPORT_COLUMN_ID=
     MULTI_LINE_CONTAINER:108,            //多行组合输出
 
 
-    //预留数值类型 10个
+    //预留数值类型 20个
     RESERVE_NUMBER1_ID:201,         //ReserveNumber1:
     RESERVE_NUMBER2_ID:202,
     RESERVE_NUMBER3_ID:203,
@@ -4870,6 +4890,16 @@ var REPORT_COLUMN_ID=
     RESERVE_NUMBER8_ID:208,
     RESERVE_NUMBER9_ID:209,
     RESERVE_NUMBER10_ID:210,
+    RESERVE_NUMBER11_ID:211, 
+    RESERVE_NUMBER12_ID:212,
+    RESERVE_NUMBER13_ID:213,
+    RESERVE_NUMBER14_ID:214,
+    RESERVE_NUMBER15_ID:215,
+    RESERVE_NUMBER16_ID:216,
+    RESERVE_NUMBER17_ID:217,
+    RESERVE_NUMBER18_ID:218,
+    RESERVE_NUMBER19_ID:219,
+    RESERVE_NUMBER20_ID:220,
 
 
     //预留字符串类型 10个  301-399
@@ -4982,6 +5012,16 @@ var MAP_COLUMN_FIELD=new Map([
     [REPORT_COLUMN_ID.RESERVE_NUMBER8_ID,"ReserveNumber8"],
     [REPORT_COLUMN_ID.RESERVE_NUMBER9_ID,"ReserveNumber9"],
     [REPORT_COLUMN_ID.RESERVE_NUMBER10_ID,"ReserveNumber10"],
+    [REPORT_COLUMN_ID.RESERVE_NUMBER11_ID,"ReserveNumber11"],
+    [REPORT_COLUMN_ID.RESERVE_NUMBER12_ID,"ReserveNumber12"],
+    [REPORT_COLUMN_ID.RESERVE_NUMBER13_ID,"ReserveNumber13"],
+    [REPORT_COLUMN_ID.RESERVE_NUMBER14_ID,"ReserveNumber14"],
+    [REPORT_COLUMN_ID.RESERVE_NUMBER15_ID,"ReserveNumber15"],
+    [REPORT_COLUMN_ID.RESERVE_NUMBER16_ID,"ReserveNumber16"],
+    [REPORT_COLUMN_ID.RESERVE_NUMBER17_ID,"ReserveNumber17"],
+    [REPORT_COLUMN_ID.RESERVE_NUMBER18_ID,"ReserveNumber18"],
+    [REPORT_COLUMN_ID.RESERVE_NUMBER19_ID,"ReserveNumber19"],
+    [REPORT_COLUMN_ID.RESERVE_NUMBER20_ID,"ReserveNumber20"],
 
     [REPORT_COLUMN_ID.RESERVE_STRING1_ID,"ReserveString1"],
     [REPORT_COLUMN_ID.RESERVE_STRING2_ID,"ReserveString2"],
@@ -5226,6 +5266,9 @@ function ChartReport()
 
     this.LastMouseStatus;
 
+    //绘图过程中的缓存数据 绘制完清空的
+    this.TempCache=null;    //
+
     this.ReloadResource=function(resource)
     {
         this.DevicePixelRatio=GetDevicePixelRatio()
@@ -5427,6 +5470,7 @@ function ChartReport()
         else if (this.IsReserveDateTime(item.Type))
         {
             if (item.DateTimeFormat) colItem.DateTimeFormat=item.DateTimeFormat;    //日期格式化
+            if (item.SubDateTimeFormat) colItem.SubDateTimeFormat=item.SubDateTimeFormat;
         }
         else if (item.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID)
         {
@@ -5637,6 +5681,16 @@ function ChartReport()
             { Type:REPORT_COLUMN_ID.RESERVE_NUMBER8_ID, Title:"数值8", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
             { Type:REPORT_COLUMN_ID.RESERVE_NUMBER9_ID, Title:"数值9", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
             { Type:REPORT_COLUMN_ID.RESERVE_NUMBER10_ID, Title:"数值10", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
+            { Type:REPORT_COLUMN_ID.RESERVE_NUMBER11_ID, Title:"数值11", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
+            { Type:REPORT_COLUMN_ID.RESERVE_NUMBER12_ID, Title:"数值12", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
+            { Type:REPORT_COLUMN_ID.RESERVE_NUMBER13_ID, Title:"数值13", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
+            { Type:REPORT_COLUMN_ID.RESERVE_NUMBER14_ID, Title:"数值14", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
+            { Type:REPORT_COLUMN_ID.RESERVE_NUMBER15_ID, Title:"数值15", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
+            { Type:REPORT_COLUMN_ID.RESERVE_NUMBER16_ID, Title:"数值16", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
+            { Type:REPORT_COLUMN_ID.RESERVE_NUMBER17_ID, Title:"数值17", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
+            { Type:REPORT_COLUMN_ID.RESERVE_NUMBER18_ID, Title:"数值18", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
+            { Type:REPORT_COLUMN_ID.RESERVE_NUMBER19_ID, Title:"数值19", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
+            { Type:REPORT_COLUMN_ID.RESERVE_NUMBER20_ID, Title:"数值20", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
 
             { Type:REPORT_COLUMN_ID.RESERVE_STRING1_ID, Title:"文字1", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
             { Type:REPORT_COLUMN_ID.RESERVE_STRING2_ID, Title:"文字2", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
@@ -5704,6 +5758,11 @@ function ChartReport()
         this.Canvas.clip();
     }
 
+    this.CreateTempCache=function()
+    {
+        this.TempCache={ MapReserveDateTime:new Map() };  //MapReserveDateTime:key=colindex, Value:{ PreDate }
+    }
+
     this.Draw=function(lastMouseStatus)
     {
         this.ShowSymbol=[];
@@ -5712,6 +5771,7 @@ function ChartReport()
         this.AryFullSelectedRow=[];
         this.DevicePixelRatio=GetDevicePixelRatio()
         this.LastMouseStatus=lastMouseStatus;
+        this.CreateTempCache();
 
         if (this.GlobalOption) this.GlobalOption.FlashBGCount=0;
 
@@ -5750,6 +5810,7 @@ function ChartReport()
         this.LastMouseStatus=null;
         this.SizeChange=false;
         this.AryFullSelectedRow=[];
+        this.TempCache=null;
     }
 
     this.DrawDragHeaderBG=function()
@@ -7164,7 +7225,11 @@ function ChartReport()
         [
             REPORT_COLUMN_ID.RESERVE_NUMBER1_ID,REPORT_COLUMN_ID.RESERVE_NUMBER2_ID,REPORT_COLUMN_ID.RESERVE_NUMBER3_ID,
             REPORT_COLUMN_ID.RESERVE_NUMBER4_ID,REPORT_COLUMN_ID.RESERVE_NUMBER5_ID,REPORT_COLUMN_ID.RESERVE_NUMBER6_ID,REPORT_COLUMN_ID.RESERVE_NUMBER7_ID,
-            REPORT_COLUMN_ID.RESERVE_NUMBER8_ID,REPORT_COLUMN_ID.RESERVE_NUMBER9_ID,REPORT_COLUMN_ID.RESERVE_NUMBER10_ID
+            REPORT_COLUMN_ID.RESERVE_NUMBER8_ID,REPORT_COLUMN_ID.RESERVE_NUMBER9_ID,REPORT_COLUMN_ID.RESERVE_NUMBER10_ID,
+
+            REPORT_COLUMN_ID.RESERVE_NUMBER11_ID,REPORT_COLUMN_ID.RESERVE_NUMBER12_ID,REPORT_COLUMN_ID.RESERVE_NUMBER13_ID,
+            REPORT_COLUMN_ID.RESERVE_NUMBER14_ID,REPORT_COLUMN_ID.RESERVE_NUMBER15_ID,REPORT_COLUMN_ID.RESERVE_NUMBER16_ID,REPORT_COLUMN_ID.RESERVE_NUMBER17_ID,
+            REPORT_COLUMN_ID.RESERVE_NUMBER18_ID,REPORT_COLUMN_ID.RESERVE_NUMBER19_ID,REPORT_COLUMN_ID.RESERVE_NUMBER20_ID
         ];
 
         return ARARY_TYPE.includes(value);
@@ -7638,6 +7703,36 @@ function ChartReport()
         }
     }
 
+    this.GetReserveDateTimePreItem=function(colIndex)
+    {
+        if (!this.CreateTempCache) return null;
+        if (!this.TempCache.MapReserveDateTime) return null;
+        
+        var mapData=this.TempCache.MapReserveDateTime;
+        if (!mapData.has(colIndex)) return null;
+
+        return mapData.get(colIndex);
+    }
+
+    this.SetReserveDateTimePreItem=function(colIndex,data)
+    {
+        if (!this.CreateTempCache) return false;
+        if (!this.TempCache.MapReserveDateTime) return false;
+
+        var mapData=this.TempCache.MapReserveDateTime;
+        if (mapData.has(colIndex))
+        {
+            var item=mapData.get(colIndex);
+            item.PreItem.Date=data.Date;
+        }
+        else
+        {
+            mapData.set(colIndex, { PreItem:{ Date:data.Date } })
+        }
+
+        return true;
+    }
+
     this.FormatReserveDateTime=function(column, data, drawInfo)
     {
         if (column.DefaultText) drawInfo.Text=column.DefaultText;
@@ -7648,7 +7743,24 @@ function ChartReport()
         var item=data[fieldName];
         if (!IFrameSplitOperator.IsObject(item)) return;
         
-        if (item.DateTime) drawInfo.Text=IFrameSplitOperator.FormatDateTimeStringV2(item.DateTime,column.DateTimeFormat);
+        var cacheItem=this.GetReserveDateTimePreItem(drawInfo.ColumnIndex);
+        if (item.DateTime) 
+        {
+            var date=item.DateTime.getFullYear()*10000+(item.DateTime.getMonth()+1)*100+item.DateTime.getDate();
+            var format=column.DateTimeFormat;
+            if (cacheItem && cacheItem.PreItem && date==cacheItem.PreItem.Date)
+            {
+                if (column.SubDateTimeFormat) format=column.SubDateTimeFormat
+            }
+            else
+            {
+                
+                this.SetReserveDateTimePreItem(drawInfo.ColumnIndex, {Date:date});
+            }
+
+            drawInfo.Text=IFrameSplitOperator.FormatDateTimeStringV2(item.DateTime, format);
+        }
+
         if (item.TextColor) drawInfo.TextColor=item.TextColor;
         if (item.BGColor) drawInfo.BGColor=item.BGColor;
     }

package/src/jscommon/umychart.testdata.js

@@ -1844,6 +1844,10 @@ HQData.Report_RequestStockData=function(data, callback)
 
                 newItem[301]=HQData.GetRandomTestData(0,100)/100;
                 newItem[302]=HQData.GetRandomTestData(0,100)/100;
+
+                var testDate=new Date();
+                testDate.setHours(testDate.getHours() + i*2)
+                newItem[401]={ DateTime:testDate } ;
                 
 
                 item.Data=newItem;
@@ -1999,6 +2003,9 @@ HQData.Report_RequestStockSortData=function(data, callback)
             extendData[7]=(Math.round(Math.random()*60))/100;
             extendData[8]=(Math.round(Math.random()*60))/100;
                 
+            var testDate=new Date();
+            testDate.setHours(testDate.getHours() + i*2)
+            newItem[401]={ DateTime:testDate } ;
 
             item.Data=newItem;
         }
@@ -2571,6 +2578,8 @@ HQData.Report_APIIndex=function(data, callback)
         HQData.APIIndex_MARK_AREA_V2(data, callback);
     else if (request.Data.indexname=="API_CHANNELV2")
         HQData.APIIndex_CHANNEL_V2(data, callback);
+    else if (request.Data.indexname=="API_CHART_AREA_TEXT")
+        HQData.API_CHART_AREA_TEXT(data, callback);
 }
 
 
@@ -4065,3 +4074,84 @@ HQData.APIIndex_MARK_AREA_V2=function(data, callback)
 }
 
 
+HQData.API_CHART_AREA_TEXT=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var markData= 
+    { 
+        name:'区域文字', type:1, 
+        Draw: 
+        { 
+            DrawType:'JS_CHART_AREA_TEXT', 
+            DrawData:
+            {
+                AryData:[],  //[ { Start:{ }, End:{ }, AreaColor:, Text:"", BarColor:, TextColor:, ID: }]
+            },
+
+            Config:{ },
+        } 
+    };
+
+    var markItem=null;
+    for(var i=0;i<kData.Data.length;++i)
+    {
+        var kItem=kData.Data[i];
+        if (!markItem)
+        {
+            markItem=
+            {
+                Start:{ Date:kItem.Date, Time:kItem.Time },
+                End:{ Date:kItem.Date, Time:kItem.Time },
+                BGColor:"rgba(186,85,211,0.5)",
+                TextColor:"rgb(255,215,0)",
+                ID:i,
+                Count:1,
+                AryText:
+                [
+                    { 
+                        AryText:
+                        [ 
+                            { Text:`日期: ${kItem.Date} `, Color:"rgb(220,220,220)"},  
+                            { Text:`ID: ${i} `, Color:"rgb(255,165,0)" } 
+                        ], 
+                    },
+                    { 
+                        AryText:
+                        [ 
+                            { Text:`数据1: -- `, Color:"rgb(30,144,255)"},  
+                            { Text:`数据2: -- `, Color:"rgb(255,0,255)" } 
+                        ], 
+                    }
+                ]
+            }
+        }
+        else
+        {
+            markItem.End.Date=kItem.Date;
+            markItem.End.Time=kItem.Time;
+            markItem.Count++;
+
+            if (markItem.Count>150) 
+            {
+                markData.Draw.DrawData.AryData.push(markItem);
+                markItem=null;
+            }
+        }
+
+    }
+
+    var apiData=
+    {
+        code:0, 
+        stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:kData.GetDate(), time:kData.GetTime(), outvar:[markData] } 
+    };
+
+    console.log('[HQData.API_CHART_AREA_TEXT] apiData ', apiData);
+    callback(apiData);
+}
+
+