Merge pull request #3 from Redsandyg/Redsandyg-patch-3-1
Update Ind_ADX.py
This commit is contained in:
commit
3a499ff25f
@ -34,7 +34,7 @@ class ADXI:
|
||||
def __init__(self, base_df, options={
|
||||
'dataType':'ohcl',
|
||||
|
||||
}, needShow=False,showOnlyIndex=True):
|
||||
}, needFig=False,showOnlyIndex=True,drawFig=False):
|
||||
self.base_df=base_df.reset_index(drop=True)
|
||||
self.options=options
|
||||
#self.norm_df=self.nornalize()
|
||||
@ -42,8 +42,8 @@ class ADXI:
|
||||
#self.npCol=np.asarray(self.norm_df[self.col], dtype=np.float32)
|
||||
#self.options=options
|
||||
self.ans=self.getAns()
|
||||
if needShow:
|
||||
self.fig=self.pltShow(showOnlyIndex)
|
||||
if needFig:
|
||||
self.fig=self.pltShow(showOnlyIndex,drawFig)
|
||||
|
||||
|
||||
def getDM(self):
|
||||
@ -116,7 +116,7 @@ class ADXI:
|
||||
|
||||
return ans
|
||||
|
||||
def pltShow(self,showOnlyIndex):
|
||||
def pltShow(self,showOnlyIndex,drawFig):
|
||||
ans=None
|
||||
req=[]
|
||||
|
||||
@ -161,9 +161,11 @@ class ADXI:
|
||||
|
||||
})
|
||||
|
||||
self.figDict=req
|
||||
|
||||
|
||||
|
||||
ans = CoreDraw.coreDraw(req,True)
|
||||
ans = CoreDraw.coreDraw(req,drawFig)
|
||||
|
||||
|
||||
return ans
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user