diff --git a/hikyuu/interactive/kaufman.py b/hikyuu/interactive/kaufman.py index d6ec2370..413d67b9 100644 --- a/hikyuu/interactive/kaufman.py +++ b/hikyuu/interactive/kaufman.py @@ -79,7 +79,7 @@ def draw(stock, query = Query(-130), slow_op = EMA(n = 2*n)(fast_op) sg = SG_Cross(fast_op, slow_op) sg.plot(axes = ax1, kdata = kdata) - ind = slow_op(KDATA(kdata)) + ind = slow_op(kdata) ind.name = "EMA(CAMA)" ind.plot(axes = ax1, color = 'm', legend_on = True) diff --git a/hikyuu_cpp/hikyuu/indicator/imp/Vigor.cpp b/hikyuu_cpp/hikyuu/indicator/imp/Vigor.cpp index c66de4b8..154d1ef3 100644 --- a/hikyuu_cpp/hikyuu/indicator/imp/Vigor.cpp +++ b/hikyuu_cpp/hikyuu/indicator/imp/Vigor.cpp @@ -18,7 +18,7 @@ Vigor::Vigor(): IndicatorImp("VIGOR", 1) { } Vigor::Vigor(int n): IndicatorImp() { - setParam("n", 2); + setParam("n", n); } diff --git a/hikyuu_pywrap/indicator/_Indicator.cpp b/hikyuu_pywrap/indicator/_Indicator.cpp index 622be0a7..4dab88ab 100644 --- a/hikyuu_pywrap/indicator/_Indicator.cpp +++ b/hikyuu_pywrap/indicator/_Indicator.cpp @@ -62,6 +62,7 @@ void export_Indicator() { .def("get", &Indicator::get, get_overloads()) .def("getResult", &Indicator::getResult) .def("getResultAsPriceList", &Indicator::getResultAsPriceList) + .def("getCurrentKData", &Indicator::getCurrentKData) .def("__len__", &Indicator::size) .def("__call__", &Indicator::operator()) #if HKU_PYTHON_SUPPORT_PICKLE