finish up fill_between tests; deepcopy to not modify input

Author: DanielGoldfarb

examples/fill_between.ipynb

@@ -745,8 +745,8 @@
     "\n",
     "fb_macd_up = dict(y1=macd.values,y2=signal.values,where=signal<macd,color=\"#93c47d\",alpha=0.6,interpolate=True)\n",
     "fb_macd_dn = dict(y1=macd.values,y2=signal.values,where=signal>macd,color=\"#e06666\",alpha=0.6,interpolate=True)\n",
-    "#fb_macd_up['panel'] = 1\n",
-    "#fb_macd_dn['panel'] = 1\n",
+    "fb_macd_up['panel'] = 1\n",
+    "fb_macd_dn['panel'] = 1\n",
     "\n",
     "fb_macd = [fb_macd_up,fb_macd_dn]\n",
     "\n",
@@ -755,19 +755,26 @@
     "        mpf.make_addplot(histogram,type='bar',width=0.7,panel=1,\n",
     "                         color='dimgray',alpha=0.65,secondary_y=True),\n",
     "        mpf.make_addplot(macd,panel=1,color='fuchsia',secondary_y=False),\n",
-    "        mpf.make_addplot(signal,panel=1,color='b',secondary_y=False,fill_between=fb_macd),\n",
+    "        mpf.make_addplot(signal,panel=1,color='b',secondary_y=False)#,fill_between=fb_macd),\n",
     "       ]\n",
     "\n",
     "s = mpf.make_mpf_style(base_mpf_style='blueskies',facecolor='aliceblue')#,rc={'figure.facecolor':'lightcyan'})\n",
     "\n",
     "mpf.plot(df,type='candle',addplot=apds,figscale=1.6,figratio=(1,1),title='\\n\\nMACD',\n",
     "         style=s,volume=True,volume_panel=2,panel_ratios=(3,4,1),tight_layout=True,\n",
-    "         fill_between=fb_exp12)\n",
+    "         fill_between=fb_macd+fb_exp12)\n",
     "\n",
     "\n",
     "\n"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
   {
    "cell_type": "code",
    "execution_count": null,

src/mplfinance/plotting.py

@@ -703,8 +703,7 @@ def plot( data, **kwargs ):
     # fill_between is NOT supported for external_axes_mode
     # (caller can easily call ax.fill_between() themselves).
     if config['fill_between'] is not None and not external_axes_mode:
-        fblist = config['fill_between']
-        panid  = config['main_panel']
+        fblist = copy.deepcopy(config['fill_between'])
         if _num_or_seq_of_num(fblist):
             fblist = [dict(y1=fblist),]
         elif isinstance(fblist,dict):
@@ -714,10 +713,11 @@ def plot( data, **kwargs ):
         for fb in fblist:
             if 'x' in fb:
                 raise ValueError('fill_between dict may not contain `x`')
+            panid = config['main_panel']
             if 'panel' in fb:
                 panid = fb['panel']
                 del fb['panel']
-            fb['x'] = xdates
+            fb['x'] = xdates # add 'x' to caller's fb dict
             ax = panels.at[panid,'axes'][0]
             ax.fill_between(**fb)
 
@@ -1063,13 +1063,18 @@ def _addplot_apply_supplements(ax,apdict,xdates):
         ax.set_yscale(ysd)
     # added by Wen
     if "fill_between" in apdict and apdict['fill_between'] is not None:
-        fblist = apdict['fill_between']
+        # deep copy because mplfinance code sometimes modifies the fill_between dict
+        fblist = copy.deepcopy(apdict['fill_between'])
         if isinstance(fblist,dict):
             fblist = [fblist,]
         if _list_of_dict(fblist):
             for fb in fblist:
-                fb['x'] = xdates
+                if 'x' in fb:
+                    raise ValueError('fill_between dict may not contain `x`')
+                fb['x'] = xdates # add 'x' to caller's fb dict
                 ax.fill_between(**fb)
+        else:
+            raise ValueError('Invalid addplot fill_between: must be `dict` or `list of dict`')
 
 def _set_ylabels_side(ax_pri,ax_sec,primary_on_right):
     # put the primary axis on one side,

tests/reference_images/fill_between06.png

@@ -163,35 +163,74 @@ def test_fill_between06(bolldata):
     signal    = macd.ewm(span=9, adjust=False).mean()
     histogram = macd - signal
 
-    fb_12up = dict(y1=exp12.values,y2=exp26.values,where=exp12>exp26,color="#93c47d",alpha=0.6,interpolate=True)
-    fb_12dn = dict(y1=exp12.values,y2=exp26.values,where=exp12<exp26,color="#e06666",alpha=0.6,interpolate=True)
+    fb_12up = dict(y1=exp12.values,y2=exp26.values,where=(exp12>exp26).values,color="#93c47d",alpha=0.6,interpolate=True)
+    fb_12dn = dict(y1=exp12.values,y2=exp26.values,where=(exp12<exp26).values,color="#e06666",alpha=0.6,interpolate=True)
     fb_exp12 = [fb_12up,fb_12dn]
 
-    fb_macd_up = dict(y1=macd.values,y2=signal.values,where=signal<macd,color="#93c47d",alpha=0.6,interpolate=True)
-    fb_macd_dn = dict(y1=macd.values,y2=signal.values,where=signal>macd,color="#e06666",alpha=0.6,interpolate=True)
-    #fb_macd_up['panel'] = 1
-    #fb_macd_dn['panel'] = 1
+    fb_macd_up = dict(y1=macd.values,y2=signal.values,where=(signal<macd).values,color="#93c47d",alpha=0.6,interpolate=True)
+    fb_macd_dn = dict(y1=macd.values,y2=signal.values,where=(signal>macd).values,color="#e06666",alpha=0.6,interpolate=True)
 
     fb_macd = [fb_macd_up,fb_macd_dn]
 
-    apds = [mpf.make_addplot(exp12,color='lime'),
-            mpf.make_addplot(exp26,color='c'),
-            mpf.make_addplot(histogram,type='bar',width=0.7,panel=1,
-                             color='dimgray',alpha=0.65,secondary_y=True),
-            mpf.make_addplot(macd,panel=1,color='fuchsia',secondary_y=False),
-            mpf.make_addplot(signal,panel=1,color='b',secondary_y=False,fill_between=fb_macd),
-           ]
+    s = mpf.make_mpf_style(base_mpf_style='blueskies',facecolor='aliceblue')
+
+    import pprint
+    pp = pprint.PrettyPrinter(indent=4)
+
+    for tag in ['a','b','c']:
+        apds = [mpf.make_addplot(exp12,color='lime'),
+                mpf.make_addplot(exp26,color='c'),
+                mpf.make_addplot(histogram,type='bar',width=0.7,panel=1,
+                                 color='dimgray',alpha=0.65,secondary_y=True),
+                mpf.make_addplot(macd,panel=1,color='fuchsia',secondary_y=False),
+                mpf.make_addplot(signal,panel=1,color='b',secondary_y=False)
+               ]
+
+        new_tname = tname[0:-4]+tag+tname[-4:]
+        if tag == 'a':
+            print('fb_exp12')
+            pp.pprint(fb_exp12)
+            print('fb_macd')
+            pp.pprint(fb_macd)
+            apds[ 0] = mpf.make_addplot(exp12,color='lime',fill_between=fb_exp12)
+            apds[-1] = mpf.make_addplot(signal,panel=1,color='b',secondary_y=False,fill_between=fb_macd)
+            mpf.plot(df,type='candle',addplot=apds,figscale=0.8,figratio=(1,1),title='\n\nMACD',
+                     style=s,volume=True,volume_panel=2,panel_ratios=(3,4,1),tight_layout=True,
+                     savefig=new_tname)
+        elif tag == 'b':
+            print('fb_exp12')
+            pp.pprint(fb_exp12)
+            print('fb_macd')
+            pp.pprint(fb_macd)
+            apds[ 0] = mpf.make_addplot(exp12,color='lime')
+            apds[-1] = mpf.make_addplot(signal,panel=1,color='b',secondary_y=False,fill_between=fb_macd)
+            mpf.plot(df,type='candle',addplot=apds,figscale=0.8,figratio=(1,1),title='\n\nMACD',
+                     style=s,volume=True,volume_panel=2,panel_ratios=(3,4,1),tight_layout=True,
+                     fill_between=fb_exp12,
+                     savefig=new_tname)
+        elif tag == 'c':
+            apds[ 0] = mpf.make_addplot(exp12,color='lime')
+            apds[-1] = mpf.make_addplot(signal,panel=1,color='b',secondary_y=False)
+            fb_macd[0]['panel'] = 1
+            fb_macd[1]['panel'] = 1
+            print('fb_exp12')
+            pp.pprint(fb_exp12)
+            print('fb_macd')
+            pp.pprint(fb_macd)
+            print('fb_macd+fb_exp12')
+            pp.pprint(fb_macd+fb_exp12)
+            mpf.plot(df,type='candle',addplot=apds,figscale=0.8,figratio=(1,1),title='\n\nMACD',
+                     style=s,volume=True,volume_panel=2,panel_ratios=(3,4,1),tight_layout=True,
+                     fill_between=fb_macd+fb_exp12,
+                     savefig=new_tname)
+        else:
+            print('Should NEVER get to here!')
+            raise ValueError('Should NEVER get to here!')
 
-    s = mpf.make_mpf_style(base_mpf_style='blueskies',facecolor='aliceblue')#,rc={'figure.facecolor':'lightcyan'})
-    
-    mpf.plot(df,type='candle',addplot=apds,figscale=1.6,figratio=(1,1),title='\n\nMACD',
-             style=s,volume=True,volume_panel=2,panel_ratios=(3,4,1),tight_layout=True,
-             fill_between=fb_exp12,
-             savefig=tname)
-    
-    _report_file_sizes(tname,rname)
+        _report_file_sizes(new_tname,rname)
+
+        result = compare_images(rname,new_tname,tol=IMGCOMP_TOLERANCE)
+        if result is not None:
+           print('result=',result)
+        assert result is None
 
-    result = compare_images(rname,tname,tol=IMGCOMP_TOLERANCE)
-    if result is not None:
-       print('result=',result)
-    assert result is None