use zvdata 1.0.1

Former-commit-id: a63cd66
fyenne · Nov 14, 2019 · 4281c03 · 4281c03
1 parent 2c5959c
commit 4281c03
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-zvdata == 1.0.0
+zvdata == 1.0.1
 Scrapy == 1.5.1
 requests == 2.20.1
 SQLAlchemy == 1.2.14

diff --git a/zvt/drawer/drawer.py b/zvt/drawer/drawer.py
@@ -14,11 +14,22 @@
 
 
 class Drawer(object):
-    def __init__(self, data: NormalData, sub_data: NormalData = None, annotation_df: pd.DataFrame = None) -> None:
+    def __init__(self,
+                 main_df: pd.DataFrame = None,
+                 sub_df: pd.DataFrame = None,
+                 main_data: NormalData = None,
+                 sub_data: NormalData = None,
+                 annotation_df: pd.DataFrame = None) -> None:
         # 主图数据
-        self.main_data: NormalData = data
+        if main_data is None:
+            main_data = NormalData(main_df)
+        self.main_data: NormalData = main_data
+
         # 副图数据
+        if sub_data is None:
+            sub_data = NormalData(sub_df)
         self.sub_data: NormalData = sub_data
+
         # 主图的标记数据
         self.annotation_df = annotation_df
 
@@ -386,7 +397,7 @@ def to_annotations(annotation_df: pd.DataFrame):
     #
     # drawer = Drawer(data=NormalData(df=df.loc[:, ['close']]))
     # drawer.draw_histogram(entity_in_subplot=True)
-    drawer = Drawer(data=NormalData(df), sub_data=NormalData(df1[['current_count']]))
+    drawer = Drawer(df, df1[['current_count']])
     drawer.draw_kline()
 
     # df1 = df.copy()