hikyuu 2.3.0__py3-none-win_amd64.whl → 2.5.0__py3-none-win_amd64.whl

hikyuu/draw/drawplot/matplotlib_draw.py

@@ -858,7 +858,7 @@ def RGB(r: int, g: int, b: int):
     return f"#{r:02x}{g:02x}{b:02x}"
 
 
-def STICKLINE(cond: Indicator, price1: Indicator, price2: Indicator, width: int = 2.0,
+def STICKLINE(cond: Indicator, price1: Indicator, price2: Indicator, width: float = 2.0,
               empty: bool = False, color='m', alpha=1.0, kdata=None, new=False, axes=None):
     """在满足cond的条件下，在 price1 和 price2 之间绘制一个宽度为 width 的柱状图。
 
@@ -868,7 +868,7 @@ def STICKLINE(cond: Indicator, price1: Indicator, price2: Indicator, width: int
         cond (Indicator): 条件表达式，用于确定是否绘制柱状线
         price1 (Indicator): 第一个价格
         price2 (Indicator): 第二个价格
-        width (int, optional): 柱状宽度. Defaults to 2.0.
+        width (float, optional): 柱状宽度. Defaults to 2.0.
         empty (bool, optional): 空心. Defaults to False.
         kdata (_type_, optional): 指定的上下文K线. Defaults to None.
         new (bool, optional): 在新窗口中绘制. Defaults to False.
@@ -1288,7 +1288,7 @@ def DRAWIMG(cond: Indicator, price: Indicator, img: str, kdata: KData = None, ne
     w = xw / pw * pixel
     h = yh / ph * pixel
     for i in range(cond.discard, len(cond)):
-        if cond[i] > 0.:
+        if (not isnan(cond[i])) and cond[i] > 0. and (not isinf(cond[i])) and (not isnan(price[i])) and (not isinf(price[i])):
             axes.imshow(image, extent=[i-w, i+w, price[i]-h, price[i]+h], *args, **kwargs)
 
     axes.set_aspect('auto')
@@ -1301,6 +1301,21 @@ DRAWBMP = DRAWIMG
 
 
 def DRAWICON(cond: Indicator, price: Indicator, type: int, kdata: KData = None, new=False, axes=None, *args, **kwargs):
+    """绘制内置 icon
+
+    用法:DRAWICON(cond,price,1),当条件 cond 满足时,在 price 位置编号为1的内置图标
+    例如:DRAWICON(O>C,CLOSE, 1)。
+
+    可以使用 SHOWICONS() 显示所有内置图标。
+
+    Args:
+        cond (Indicator): 指定条件
+        price (Indicator): 指定价格
+        type (int): icon 编号
+        kdata (KData, optional): 指定上下文. Defaults to None.
+        new (bool, optional): 在新窗口中绘制. Defaults to False.
+        axes (_type_, optional): 在指定坐标轴中绘制. Defaults to None.
+    """
     DRAWIMG(cond, price, f'{ICON_PATH}/icon/{type}.png', kdata, new, axes, *args, **kwargs)