seolpyo-mplchart 1.0.1__tar.gz → 1.1.1__tar.gz

{seolpyo_mplchart-1.0.1/seolpyo_mplchart.egg-info → seolpyo_mplchart-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: seolpyo-mplchart
-Version: 1.0.1
+Version: 1.1.1
 Summary: Fast candlestick chart using Python. Includes navigator, slider, navigation, and text information display functions
 Author-email: white-seolpyo <white-seolpyo@naver.com>
 License: MIT License

{seolpyo_mplchart-1.0.1 → seolpyo_mplchart-1.1.1}/pyproject.toml

@@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "seolpyo-mplchart"
-version = "1.0.1"
+version = "1.1.1"
 dependencies  = [
   "matplotlib >= 3.7.0",
   "pandas >= 2.0.0",

{seolpyo_mplchart-1.0.1 → seolpyo_mplchart-1.1.1}/seolpyo_mplchart/__init__.py

@@ -15,7 +15,8 @@ __all__ = [
     'format_candleinfo_ko', 'format_volumeinfo_ko',
     'format_candleinfo_en', 'format_volumeinfo_en',
     'sample', 'switch_backend', 'show', 'close',
-    'Chart', 'CursorChart', 'SliderChart',
+    'OnlyChart', 'CursorChart', 'SliderChart',
+    'set_theme',
 ]
 
 
@@ -67,7 +68,7 @@ def close(fig='all'):
     return plt.close(fig)
 
 
-class Chart(BaseChart):
+class OnlyChart(BaseChart):
     r"""
     You can see the guidance document:
         Korean: https://white.seolpyo.com/entry/147/
@@ -102,17 +103,21 @@ class Chart(BaseChart):
         list_macolor: Color the moving average line. If the number of colors is greater than the moving average line, black is applied
 
         candle_on_ma: Decide whether to draw candles on the moving average line. default ```True```
+        color_navigator_line: Color of left and right dividing lines in selected area
+        color_navigator_cover: Color of unselected area.
 
-        color_up: The color of the candle. When the closing price is greater than the opening price. default '#fe3032'
-        color_down: The color of the candle. When the opening price is greater than the opening price. default '#0095ff'
-        color_flat: The color of the candle. WWhen the closing price is the same as the opening price. default 'k'
-        color_up_down: The color of the candle. If the closing price is greater than the opening price, but is lower than the previous day's closing price. default 'w'
-        color_down_up: The color of the candle. If the opening price is greater than the closing price, but is higher than the closing price of the previous day. default 'w'
-        colors_volume: The color of the volume bar. default '#1f77b4'
+        color_priceline: The color of the price line
 
-        color_priceline: The color of the price line. default 'k'
+        color_up: The color of the candle. When the closing price is greater than the opening price
+        color_down: The color of the candle. When the opening price is greater than the opening price
+        color_flat: The color of the candle. When the closing price is the same as the opening price
+        color_up_down: The color of the candle. If the closing price is greater than the opening price, but is lower than the previous day's closing price
+        color_down_up: The color of the candle. If the opening price is greater than the closing price, but is higher than the closing price of the previous day
+        colors_volume: The color of the volume bar. default '#1f77b4'
 
-        facecolor_volume, edgecolor_volume = The color of the volume. default ('#1f77b4', 'k')
+        color_volume_up: The color of the volume. When the closing price is greater than the opening price
+        color_volume_down: The color of the volume. When the opening price is greater than the opening price
+        color_volume_flatt: The color of the volume. When the closing price is the same as the opening price
 
         candle_width_half, volume_width_half: half of the thickness of the candle and volume
 
@@ -162,17 +167,21 @@ class CursorChart(BaseCursorChart):
         list_macolor: Color the moving average line. If the number of colors is greater than the moving average line, black is applied
 
         candle_on_ma: Decide whether to draw candles on the moving average line. default ```True```
+        color_navigator_line: Color of left and right dividing lines in selected area
+        color_navigator_cover: Color of unselected area.
 
-        color_up: The color of the candle. When the closing price is greater than the opening price. default '#fe3032'
-        color_down: The color of the candle. When the opening price is greater than the opening price. default '#0095ff'
-        color_flat: The color of the candle. WWhen the closing price is the same as the opening price. default 'k'
-        color_up_down: The color of the candle. If the closing price is greater than the opening price, but is lower than the previous day's closing price. default 'w'
-        color_down_up: The color of the candle. If the opening price is greater than the closing price, but is higher than the closing price of the previous day. default 'w'
-        colors_volume: The color of the volume bar. default '#1f77b4'
+        color_priceline: The color of the price line
 
-        color_priceline: The color of the price line. default 'k'
+        color_up: The color of the candle. When the closing price is greater than the opening price
+        color_down: The color of the candle. When the opening price is greater than the opening price
+        color_flat: The color of the candle. When the closing price is the same as the opening price
+        color_up_down: The color of the candle. If the closing price is greater than the opening price, but is lower than the previous day's closing price
+        color_down_up: The color of the candle. If the opening price is greater than the closing price, but is higher than the closing price of the previous day
+        colors_volume: The color of the volume bar. default '#1f77b4'
 
-        facecolor_volume, edgecolor_volume = The color of the volume. default ('#1f77b4', 'k')
+        color_volume_up: The color of the volume. When the closing price is greater than the opening price
+        color_volume_down: The color of the volume. When the opening price is greater than the opening price
+        color_volume_flatt: The color of the volume. When the closing price is the same as the opening price
 
         candle_width_half, volume_width_half: half of the thickness of the candle and volume
 
@@ -184,7 +193,7 @@ class CursorChart(BaseCursorChart):
 
         fraction: Decide whether to express information as a fraction. default False
         format_candleinfo: Candle information text format. default '{dt}\n\n종가:　 {close}\n등락률: {rate}\n대비:　 {compare}\n시가:　 {open}({rate_open})\n고가:　 {high}({rate_high})\n저가:　 {low}({rate_low})\n거래량: {volume}({rate_volume})'
-        format_volumeinfo: Volume information text format. default '{dt}\n\n거래량　　　: {volume}\n거래량증가율: {rate_volume}'
+        format_volumeinfo: Volume information text format. default '{dt}\n\n거래량:　　　 {volume}\n거래량증가율: {rate_volume}\n대비:　　　　 {compare}'
 
         limit_candle: Maximum number of candles to draw. default 800
         limit_wick:  Maximum number of candle wicks to draw. default 4,000
@@ -216,7 +225,7 @@ class SliderChart(BaseSliderChart):
         figsize: Default size when creating a matplotlib window
         slider_top: ax_slider is located at the top or bottom. default ```True```.
         ratio_ax_slider, ratio_ax_legend, ratio_ax_price, ratio_ax_volume: Axes ratio
-        ratio_ax_none: Ratio between volume chart and slider. Used only when slider_top is ```False```
+        ratio_ax_none: Ratio between volume chart and slider. Used only when ```self.slider_top``` is ```False```
         adjust: figure adjust. default ```dict(top=0.95, bottom=0.05, left=0.01, right=0.93, wspace=0, hspace=0)```.
         color_background: color of background. default '#fafafa'.
         gridKwargs: kwargs applied to the grid
@@ -232,20 +241,21 @@ class SliderChart(BaseSliderChart):
         list_macolor: Color the moving average line. If the number of colors is greater than the moving average line, black is applied
 
         candle_on_ma: Decide whether to draw candles on the moving average line. default ```True```
-        color_sliderline: Color of closing price line in ax_slider. default 'k'
-        color_navigatorline: Color of left and right dividing lines in selected area. default '#1e78ff'
-        color_navigator: Color of unselected area. default 'k'
-
-        color_up: The color of the candle. When the closing price is greater than the opening price. default '#fe3032'
-        color_down: The color of the candle. When the opening price is greater than the opening price. default '#0095ff'
-        color_flat: The color of the candle. WWhen the closing price is the same as the opening price. default 'k'
-        color_up_down: The color of the candle. If the closing price is greater than the opening price, but is lower than the previous day's closing price. default 'w'
-        color_down_up: The color of the candle. If the opening price is greater than the closing price, but is higher than the closing price of the previous day. default 'w'
-        colors_volume: The color of the volume bar. default '#1f77b4'
+        color_navigator_line: Color of left and right dividing lines in selected area
+        color_navigator_cover: Color of unselected area.
+
+        color_priceline: The color of the price line
 
-        color_priceline: The color of the price line. default 'k'
+        color_up: The color of the candle. When the closing price is greater than the opening price
+        color_down: The color of the candle. When the opening price is greater than the opening price
+        color_flat: The color of the candle. When the closing price is the same as the opening price
+        color_up_down: The color of the candle. If the closing price is greater than the opening price, but is lower than the previous day's closing price
+        color_down_up: The color of the candle. If the opening price is greater than the closing price, but is higher than the closing price of the previous day
+        colors_volume: The color of the volume bar. default '#1f77b4'
 
-        facecolor_volume, edgecolor_volume = The color of the volume. default ('#1f77b4', 'k')
+        color_volume_up: The color of the volume. When the closing price is greater than the opening price
+        color_volume_down: The color of the volume. When the opening price is greater than the opening price
+        color_volume_flatt: The color of the volume. When the closing price is the same as the opening price
 
         candle_width_half, volume_width_half: half of the thickness of the candle and volume
 
@@ -257,7 +267,7 @@ class SliderChart(BaseSliderChart):
 
         fraction: Decide whether to express information as a fraction. default False
         format_candleinfo: Candle information text format. default '{dt}\n\n종가:　 {close}\n등락률: {rate}\n대비:　 {compare}\n시가:　 {open}({rate_open})\n고가:　 {high}({rate_high})\n저가:　 {low}({rate_low})\n거래량: {volume}({rate_volume})'
-        format_volumeinfo: Volume information text format. default '{dt}\n\n거래량　　　: {volume}\n거래량증가율: {rate_volume}'
+        format_volumeinfo: Volume information text format. default '{dt}\n\n거래량:　　　 {volume}\n거래량증가율: {rate_volume}\n대비:　　　　 {compare}'
 
         min_distance: Minimum number of candles that can be selected with the slider. default 30
         limit_candle: Maximum number of candles to draw. default 800
@@ -268,4 +278,75 @@ class SliderChart(BaseSliderChart):
         color_navigator_line: Navigator divider color. default '#1e78ff'
         color_navigator_cover: Unselected slider area color. default = 'k'
     """
-    pass
+    pass
+
+
+def set_theme(chart: OnlyChart|CursorChart|SliderChart, theme: Literal['light', 'dark']='dark'):
+    initialized = hasattr(chart, 'ax_price')
+
+    if theme == 'dark':
+        chart.color_background = '#000000'
+        chart.color_tick, chart.color_tick_label = ('w', 'w')
+        chart.gridKwargs = {'color': '#FFFFFF'}
+
+        chart.color_priceline = 'w'
+        chart.color_up, chart.color_down = ('#00FF00', '#FF0000')
+        chart.color_flat = 'w'
+        chart.color_up_down, chart.color_down_up = ('#000000', '#000000')
+
+        chart.color_volume_up, chart.color_volume_down = ('#32CD32', '#FF4500')
+        chart.color_volume_flat = 'w'
+
+        chart.list_macolor = ('#FFFF00', '#7FFF00', '#00FFFF', '#FFA07A', '#FF00FF')
+
+        chart.lineKwargs = {'edgecolor': 'w'}
+        chart.color_box = 'w'
+        chart.textboxKwargs = {'facecolor': 'k', 'edgecolor': 'w'}
+        chart.textKwargs = {'color': 'w'}
+        chart.color_navigator_cover, chart.color_navigator_line = ('w', '#00FFFF')
+
+        if initialized:
+            chart.change_background_color('k')
+            chart.change_tick_color('w')
+            chart.change_line_color('w')
+            if hasattr(chart, 'navigator'): chart.navigator.set_edgecolor([chart.color_navigator_cover, chart.color_navigator_line])
+
+            if hasattr(chart, 'df'):
+                chart.set_candlecolor, chart.set_volumecolor = (True, True)
+                chart._get_color_segment()
+                chart.figure.canvas.draw()
+
+    elif theme == 'light':
+        chart.color_background = '#fafafa'
+        chart.color_tick, chart.color_tick_label = ('k', 'k')
+        chart.gridKwargs = {'color': '#d0d0d0'}
+
+        chart.color_priceline = 'k'
+        chart.color_up, chart.color_down = ('#FF2400', '#1E90FF')
+        chart.color_flat = 'k'
+        chart.color_up_down, chart.color_down_up = ('w', 'w')
+
+        chart.color_volume_up, chart.color_volume_down = ('#FF4D4D', '#5CA8F4')
+        chart.color_volume_flat = '#A9A9A9'
+
+        chart.list_macolor = ('#B22222', '#228B22', '#1E90FF', '#FF8C00', '#4B0082')
+
+        chart.lineKwargs = {'edgecolor': 'k'}
+        chart.color_box = 'k'
+        chart.textboxKwargs = {'facecolor': 'w', 'edgecolor': 'k'}
+        chart.textKwargs = {'color': 'k'}
+        chart.color_navigator_cover, chart.color_navigator_line = ('k', '#1e78ff')
+
+        if initialized:
+            chart.change_background_color('#fafafa')
+            chart.change_tick_color('k')
+            chart.change_line_color('k')
+            if hasattr(chart, 'navigator'): chart.navigator.set_edgecolor([chart.color_navigator_cover, chart.color_navigator_line])
+
+            if hasattr(chart, 'df'):
+                chart.set_candlecolor, chart.set_volumecolor = (True, True)
+                chart._get_color_segment()
+                chart.figure.canvas.draw()
+    else: raise ValueError(f'You send wrong arg.\n{theme=}')
+
+    return chart

{seolpyo_mplchart-1.0.1 → seolpyo_mplchart-1.1.1}/seolpyo_mplchart/base.py

@@ -88,7 +88,7 @@ class Base:
         self.ax_price.yaxis.set_major_formatter(lambda x, _: convert_unit(x, word=self.unit_price, digit=2))
         self.ax_volume.yaxis.set_major_formatter(lambda x, _: convert_unit(x, word=self.unit_volume, digit=2))
 
-        gridKwargs = {'visible': True, 'linewidth': 1, 'color': '#d0d0d0', 'linestyle': '--'}
+        gridKwargs = {'visible': True, 'linewidth': 0.7, 'color': '#d0d0d0', 'linestyle': '-', 'dashes': (1, 0)}
         gridKwargs.update(self.gridKwargs)
         # 공통 설정
         for ax in (self.ax_price, self.ax_volume):

{seolpyo_mplchart-1.0.1 → seolpyo_mplchart-1.1.1}/seolpyo_mplchart/cursor.py

@@ -59,6 +59,49 @@ class CollectionMixin(BM):
         self.ax_volume.add_artist(self.text_volume_info)
         return
 
+    def change_background_color(self, color):
+        super().change_background_color(color)
+
+        self.text_price.set_backgroundcolor(color)
+        self.text_volume.set_backgroundcolor(color)
+
+        self.text_date_price.set_backgroundcolor(color)
+        self.text_date_volume.set_backgroundcolor(color)
+
+        self.text_price_info.set_backgroundcolor(color)
+        self.text_volume_info.set_backgroundcolor(color)
+        return
+
+    def change_text_color(self, color):
+        super().change_text_color(color)
+
+        self.text_price.set_color(color)
+        self.text_volume.set_color(color)
+
+        self.text_date_price.set_color(color)
+        self.text_date_volume.set_color(color)
+
+        self.text_price_info.set_color(color)
+        self.text_volume_info.set_color(color)
+        return
+
+    def change_line_color(self, color):
+        self.price_crossline.set_edgecolor(color)
+        self.volume_crossline.set_edgecolor(color)
+
+        self.price_box.set_edgecolor(color)
+        self.volume_box.set_edgecolor(color)
+
+        self.text_price.get_bbox_patch().set_edgecolor(color)
+        self.text_volume.get_bbox_patch().set_edgecolor(color)
+
+        self.text_date_price.get_bbox_patch().set_edgecolor(color)
+        self.text_date_volume.get_bbox_patch().set_edgecolor(color)
+
+        self.text_price_info.get_bbox_patch().set_edgecolor(color)
+        self.text_volume_info.get_bbox_patch().set_edgecolor(color)
+        return
+
 
 _set_key = {'rate', 'compare', 'rate_open', 'rate_high', 'rate_low', 'rate_volume', '_boxheight', '_boxmin', '_boxmax', '_volumeboxmax',}
 
@@ -86,7 +129,9 @@ class DataMixin(CollectionMixin):
             self.df['rate_open'] = ((self.df[self.Open] - self.df['_pre']) / self.df[self.close] * 100).__round__(2).fillna(0)
             self.df['rate_high'] = ((self.df[self.high] - self.df['_pre']) / self.df[self.close] * 100).__round__(2).fillna(0)
             self.df['rate_low'] = ((self.df[self.low] - self.df['_pre']) / self.df[self.close] * 100).__round__(2).fillna(0)
-            if self.volume: self.df['rate_volume'] = ((self.df[self.volume] - self.df[self.volume].shift(1)) /  self.df[self.volume].shift(1) * 100).__round__(2).fillna(0)
+            if self.volume:
+                self.df['compare_volume'] = (self.df[self.volume] - self.df[self.volume].shift(1)).fillna(0)
+                self.df['rate_volume'] = (self.df['compare_volume'] / self.df[self.volume].shift(1) * 100).__round__(2).fillna(0)
 
         self.df['_boxheight'] = (self.df[self.high] - self.df[self.low]) / 5
         self.df['_boxmin'] = self.df[self.low] - self.df['_boxheight']
@@ -262,9 +307,9 @@ class LineMixin(EventMixin):
 
 
 format_candleinfo_ko = '{dt}\n\n종가:　 {close}\n등락률: {rate}\n대비:　 {compare}\n시가:　 {open}({rate_open})\n고가:　 {high}({rate_high})\n저가:　 {low}({rate_low})\n거래량: {volume}({rate_volume})'
-format_volumeinfo_ko = '{dt}\n\n거래량　　　: {volume}\n거래량증가율: {rate_volume}'
+format_volumeinfo_ko = '{dt}\n\n거래량:　　　 {volume}\n거래량증가율: {rate_volume}\n대비:　　　　 {compare}'
 format_candleinfo_en = '{dt}\n\nclose:   {close}\nrate:    {rate}\ncompare: {compare}\nopen:    {open}({rate_open})\nhigh:    {high}({rate_high})\nlow:     {low}({rate_low})\nvolume:  {volume}({rate_volume})'
-format_volumeinfo_en = '{dt}\n\nvolume:      {volume}\nvolume rate: {rate_volume}'
+format_volumeinfo_en = '{dt}\n\nvolume:      {volume}\nvolume rate: {rate_volume}\ncompare:     {compare}'
 
 class InfoMixin(LineMixin):
     fraction = False
@@ -382,10 +427,13 @@ class InfoMixin(LineMixin):
                     volume=f'{v:>{self._length_text}}{self.unit_volume}', rate_volume=vr,
                 )
         elif self.volume:
+            compare = self.df['compare_volume'][index]
+            com = float_to_str(compare, self.digit_volume, plus=True)
             text = self.format_volumeinfo.format(
                 dt=dt,
                 volume=f'{v:>{self._length_text}}{self.unit_volume}',
                 rate_volume=f'{vr:>{self._length_text}}%',
+                compare=f'{com:>{self._length_text}}{self.unit_volume}',
             )
         else: text = ''
         return text
@@ -398,7 +446,7 @@ class BaseMixin(InfoMixin):
 class Chart(BaseMixin, Mixin):
     def _add_collection(self):
         super()._add_collection()
-        return self.add_collection()
+        return self.add_artist()
 
     def _draw_artist(self):
         super()._draw_artist()
@@ -416,6 +464,21 @@ class Chart(BaseMixin, Mixin):
         self.on_pick(e)
         return super()._on_pick(e)
 
+    def _set_candle_segments(self, index_start, index_end):
+        super()._set_candle_segments(index_start, index_end)
+        self.set_segment(index_start, index_end)
+        return
+
+    def _set_wick_segments(self, index_start, index_end, simpler=False):
+        super()._set_wick_segments(index_start, index_end, simpler)
+        self.set_segment(index_start, index_end, simpler)
+        return
+
+    def _set_line_segments(self, index_start, index_end, simpler=False, set_ma=True):
+        super()._set_line_segments(index_start, index_end, simpler, set_ma)
+        self.set_segment(index_start, index_end, simpler, set_ma)
+        return
+
     def _on_move(self, e):
         super()._on_move(e)
         return self.on_move(e)

{seolpyo_mplchart-1.0.1 → seolpyo_mplchart-1.1.1}/seolpyo_mplchart/draw.py

@@ -10,7 +10,7 @@ from .base import Base
 
 
 class Mixin:
-    def add_collection(self):
+    def add_artist(self):
         "This method work when ```__init__()``` run."
         return
 
@@ -30,6 +30,10 @@ class Mixin:
         "If draw pick active, This method work."
         return
 
+    def set_segment(self, xmin, xmax, simpler=False, set_ma=True):
+        "This method work if xlim change."
+        return
+
 
 class CollectionMixin(Base):
     facecolor_volume, edgecolor_volume = ('#1f77b4', 'k')
@@ -61,6 +65,35 @@ class CollectionMixin(Base):
         self.figure.add_artist(self.text_watermark)
         return
 
+    def change_background_color(self, color):
+        self.figure.set_facecolor(color)
+        self.ax_price.set_facecolor(color)
+        self.ax_volume.set_facecolor(color)
+        legends = self.ax_legend.get_legend()
+        if legends: legends.get_frame().set_facecolor(color)
+        return
+
+    def change_tick_color(self, color):
+        for ax in (self.ax_price, self.ax_volume):
+            for i in ['top', 'bottom', 'left', 'right']: ax.spines[i].set_color(self.color_tick)
+            ax.tick_params(colors=color)
+            ax.tick_params(colors=color)
+
+        legends = self.ax_legend.get_legend()
+        if legends: legends.get_frame().set_edgecolor(color)
+
+        self.change_text_color(color)
+        return
+
+    def change_text_color(self, color):
+        self.text_watermark.set_color(color)
+        legends = self.ax_legend.get_legend()
+        if legends:
+            for i in legends.texts: i.set_color(color)
+        return
+
+    def change_line_color(self, color): return
+
 
 _set_key = {'_x', '_left', '_right', '_volleft', '_volright', '_top', '_bottom', '_pre', '_zero', '_volymax',}
 
@@ -73,10 +106,15 @@ class DataMixin(CollectionMixin):
     list_ma = (5, 20, 60, 120, 240)
 
     candle_width_half, volume_width_half = (0.24, 0.36)
-    color_up, color_down = ('#fe3032', '#0095ff')
+    color_up, color_down = ('#FF2400', '#1E90FF')
     color_flat = 'k'
     color_up_down, color_down_up = ('w', 'w')
 
+    color_volume_up, color_volume_down = ('#FF4D4D', '#5CA8F4')
+    color_volume_flat = '#A9A9A9'
+
+    set_candlecolor, set_volumecolor = (True, True)
+
     def _generate_data(self, df: pd.DataFrame, sort_df, calc_ma, set_candlecolor, set_volumecolor, *_, **__):
         self._validate_column_key()
 
@@ -120,30 +158,14 @@ class DataMixin(CollectionMixin):
             for i in ('facecolor', 'edgecolor', 'volumefacecolor',):
                 if i not in keys:
                     raise Exception(f'"{i}" column not in DataFrame.\nadd column or set set_candlecolor=True.')
-        else:
-            # 양봉
-            df.loc[:, ['facecolor', 'edgecolor']] = (self.color_up, self.color_up)
-            if self.color_up != self.color_down:
-                # 음봉
-                df.loc[df[self.close] < df[self.Open], ['facecolor', 'edgecolor']] = (self.color_down, self.color_down)
-            if self.color_up != self.color_flat:
-                # 보합
-                df.loc[df[self.close] == df[self.Open], ['facecolor', 'edgecolor']] = (self.color_flat, self.color_flat)
-            if self.color_up != self.color_up_down:
-                # 양봉(비우기)
-                df.loc[(df['facecolor'] == self.color_up) & (df[self.close] < df['_pre']), 'facecolor'] = self.color_up_down
-            if self.color_down != self.color_down_up:
-                # 음봉(비우기)
-                df.loc[(df['facecolor'] == self.color_down) & (df['_pre'] < df[self.close]), ['facecolor']] = self.color_down_up
+        self.set_candlecolor = set_candlecolor
 
         if not set_volumecolor:
             keys = set(df.keys())
             for i in ('volumefacecolor', 'volumeedgecolor',):
                 if i not in keys:
                     raise Exception(f'"{i}" column not in DataFrame.\nadd column or set set_volumecolor=True.')
-        else:
-            # 거래량
-            df.loc[:, ['volumefacecolor', 'volumeedgecolor']] = (self.facecolor_volume, self.edgecolor_volume)
+        self.set_volumecolor = set_volumecolor
 
         self.df = df
         return
@@ -165,7 +187,7 @@ class SegmentMixin(DataMixin):
     color_priceline = 'k'
     format_ma = '{}일선'
     # https://matplotlib.org/stable/gallery/color/named_colors.html
-    list_macolor = ('darkred', 'fuchsia', 'olive', 'orange', 'navy', 'darkmagenta', 'limegreen', 'darkcyan',)
+    list_macolor = ('#B22222', '#228B22', '#1E90FF', '#FF8C00', '#4B0082')
 
     def _get_segments(self):
         # 캔들 세그먼트
@@ -196,9 +218,6 @@ class SegmentMixin(DataMixin):
         segment_priceline = segment_wick = self.df[['_x', self.close]].values
         self.segment_priceline = segment_priceline.reshape(1, *segment_wick.shape)
 
-        self.facecolor_candle = self.df['facecolor'].values
-        self.edgecolor_candle = self.df['edgecolor'].values
-
         if self.volume:
             # 거래량 바 세그먼트
             segment_volume = self.df[[
@@ -216,21 +235,49 @@ class SegmentMixin(DataMixin):
             ]].values
             self.segment_volume_wick = segment_volume_wick.reshape(segment_volume_wick.shape[0], 2, 2)
 
-            self.facecolor_volume = self.df['volumefacecolor'].values
-            self.edgecolor_volume = self.df['volumeedgecolor'].values
-
         self._get_ma_segment()
+        self._get_color_segment()
         return
 
-    def _get_ma_segment(self):
+    def _get_color_segment(self):
+        if self.set_candlecolor:
+            # 양봉
+            self.df.loc[:, ['facecolor', 'edgecolor']] = (self.color_up, self.color_up)
+            if self.color_up != self.color_down:
+                # 음봉
+                self.df.loc[self.df[self.close] < self.df[self.Open], ['facecolor', 'edgecolor']] = (self.color_down, self.color_down)
+            if self.color_up != self.color_flat and self.color_down != self.color_flat:
+                # 보합
+                self.df.loc[self.df[self.close] == self.df[self.Open], ['facecolor', 'edgecolor']] = (self.color_flat, self.color_flat)
+            if self.color_up != self.color_up_down:
+                # 양봉(비우기)
+                self.df.loc[(self.df['facecolor'] == self.color_up) & (self.df[self.close] <= self.df['_pre']), 'facecolor'] = self.color_up_down
+            if self.color_down != self.color_down_up:
+                # 음봉(비우기)
+                self.df.loc[(self.df['facecolor'] == self.color_down) & (self.df['_pre'] <= self.df[self.close]), ['facecolor']] = self.color_down_up
+
+        self.facecolor_candle = self.df['facecolor'].values
+        self.edgecolor_candle = self.df['edgecolor'].values
+
+        if self.set_volumecolor:
+            # 거래량
+            self.df.loc[:, ['volumefacecolor', 'volumeedgecolor']] = (self.color_volume_up, self.color_volume_up)
+            if self.color_up != self.color_down:
+                # 전일대비 하락
+                self.df.loc[self.df[self.close] < self.df['_pre'], ['volumefacecolor', 'volumeedgecolor']] = (self.color_volume_down, self.color_volume_down)
+            if self.color_up != self.color_flat:
+                # 전일과 동일
+                self.df.loc[self.df[self.close] == self.df['_pre'], ['volumefacecolor', 'volumeedgecolor']] = (self.color_volume_flat, self.color_volume_flat)
+
+        self.facecolor_volume = self.df['volumefacecolor'].values
+        self.edgecolor_volume = self.df['volumeedgecolor'].values
+
         # 기존 legend 제거
         legends = self.ax_legend.get_legend()
         if legends: legends.remove()
 
         self._visible_ma.clear()
 
-        if not self.list_ma: return
-
         list_handle, list_label, list_color = ([], [], [])
         arr = (0, 1)
         for n, i in enumerate(self.list_ma):
@@ -242,14 +289,6 @@ class SegmentMixin(DataMixin):
             list_label.append(self.format_ma.format(i))
 
             self._visible_ma.add(i)
-
-        # 주가 차트 가격이동평균선
-        key_ma = []
-        for i in reversed(self.list_ma):
-            key_ma.append('_x')
-            key_ma.append(f'ma{i}')
-        segment_ma = self.df[key_ma].values
-        self.segment_ma = segment_ma.reshape(segment_ma.shape[0], len(self.list_ma), 2).swapaxes(0, 1)
         self.edgecolor_ma = list(reversed(list_color))
 
         # 가격이동평균선 legend 생성
@@ -262,11 +301,24 @@ class SegmentMixin(DataMixin):
             for i in legends.legend_handles: i.set_picker(5)
         return
 
+    def _get_ma_segment(self):
+        if not self.list_ma: return
+
+        # 주가 차트 가격이동평균선
+        key_ma = []
+        for i in reversed(self.list_ma):
+            key_ma.append('_x')
+            key_ma.append(f'ma{i}')
+        segment_ma = self.df[key_ma].values
+        self.segment_ma = segment_ma.reshape(segment_ma.shape[0], len(self.list_ma), 2).swapaxes(0, 1)
+        return
+
     def _set_segments(self, index_start, index_end, simpler, set_ma):
         indsub = index_end - index_start
         if index_start < 0: index_start = 0
         if index_end < 1: index_end = 1
 
+        index_end += 1
         if indsub < self.limit_candle:
             self._set_candle_segments(index_start, index_end)
         elif indsub < self.limit_wick:
@@ -276,8 +328,6 @@ class SegmentMixin(DataMixin):
         return
 
     def _set_candle_segments(self, index_start, index_end):
-        index_end += 1
-
         self.collection_candle.set_segments(self.segment_candle[index_start:index_end])
         self.collection_candle.set_facecolor(self.facecolor_candle[index_start:index_end])
         self.collection_candle.set_edgecolor(self.edgecolor_candle[index_start:index_end])
@@ -289,12 +339,10 @@ class SegmentMixin(DataMixin):
             self.collection_volume.set_edgecolor(self.edgecolor_volume[index_start:index_end])
 
         self.collection_ma.set_segments(self.segment_ma[:, index_start:index_end])
-        self.collection_ma.set_edgecolor(list(reversed(self.edgecolor_ma)))
+        self.collection_ma.set_edgecolor(self.edgecolor_ma)
         return
 
     def _set_wick_segments(self, index_start, index_end, simpler=False):
-        index_end += 1
-
         self.collection_candle.set_segments(self.segment_candle_wick[index_start:index_end])
         self.collection_candle.set_facecolor([])
         self.collection_candle.set_edgecolor(self.edgecolor_candle[index_start:index_end])
@@ -311,12 +359,10 @@ class SegmentMixin(DataMixin):
             self.collection_volume.set_edgecolor(self.facecolor_volume[index_start:index_end])
 
         self.collection_ma.set_segments(self.segment_ma[:, index_start:index_end])
-        self.collection_ma.set_edgecolor(list(reversed(self.edgecolor_ma)))
+        self.collection_ma.set_edgecolor(self.edgecolor_ma)
         return
 
     def _set_line_segments(self, index_start, index_end, simpler=False, set_ma=True):
-        index_end += 1
-
         self.collection_candle.set_segments(self.segment_priceline[:, index_start:index_end])
         self.collection_candle.set_facecolor([])
         self.collection_candle.set_edgecolor(self.color_priceline)
@@ -335,7 +381,7 @@ class SegmentMixin(DataMixin):
         if not set_ma: self.collection_ma.set_segments([])
         else:
             self.collection_ma.set_segments(self.segment_ma[:, index_start:index_end])
-            self.collection_ma.set_edgecolor(list(reversed(self.edgecolor_ma)))
+            self.collection_ma.set_edgecolor(self.edgecolor_ma)
         return
 
 
@@ -502,7 +548,7 @@ class BaseMixin(BackgroundMixin):
 class Chart(BaseMixin, Mixin):
     def _add_collection(self):
         super()._add_collection()
-        return self.add_collection()
+        return self.add_artist()
 
     def _draw_artist(self):
         super()._draw_artist()
@@ -520,3 +566,18 @@ class Chart(BaseMixin, Mixin):
         self.on_pick(e)
         return super()._on_pick(e)
 
+    def _set_candle_segments(self, index_start, index_end):
+        super()._set_candle_segments(index_start, index_end)
+        self.set_segment(index_start, index_end)
+        return
+
+    def _set_wick_segments(self, index_start, index_end, simpler=False):
+        super()._set_wick_segments(index_start, index_end, simpler)
+        self.set_segment(index_start, index_end, simpler)
+        return
+
+    def _set_line_segments(self, index_start, index_end, simpler=False, set_ma=True):
+        super()._set_line_segments(index_start, index_end, simpler, set_ma)
+        self.set_segment(index_start, index_end, simpler, set_ma)
+        return
+

{seolpyo_mplchart-1.0.1 → seolpyo_mplchart-1.1.1}/seolpyo_mplchart/slider.py

@@ -63,7 +63,7 @@ class PlotMixin(BM):
         self.ax_price.yaxis.set_major_formatter(lambda x, _: convert_unit(x, word=self.unit_price, digit=2))
         self.ax_volume.yaxis.set_major_formatter(lambda x, _: convert_unit(x, word=self.unit_volume, digit=2))
 
-        gridKwargs = {'visible': True, 'linewidth': 1, 'color': '#d0d0d0', 'linestyle': '--'}
+        gridKwargs = {'visible': True, 'linewidth': 0.5, 'color': '#d0d0d0', 'linestyle': '-', 'dashes': (1, 0)}
         gridKwargs.update(self.gridKwargs)
         # 공통 설정
         for ax in (self.ax_slider, self.ax_price, self.ax_volume):
@@ -100,7 +100,7 @@ class CollectionMixin(PlotMixin):
         self.ax_slider.add_artist(self.collection_slider)
 
         # 슬라이더 네비게이터
-        self.navigator = LineCollection([], animated=True, edgecolors=[self.color_navigator_cover, self.color_navigator_line], alpha=(0.2, 1.0))
+        self.navigator = LineCollection([], animated=True, edgecolors=[self.color_navigator_cover, self.color_navigator_line], alpha=(0.3, 1.0))
         self.ax_slider.add_artist(self.navigator)
 
         lineKwargs = {'edgecolor': 'k', 'linewidth': 1, 'linestyle': '-'}
@@ -131,9 +131,40 @@ class CollectionMixin(PlotMixin):
         segment_slider = self.df[keys + ['_x', self.close] ].values
         segment_slider = segment_slider.reshape(segment_slider.shape[0], len(self.list_ma)+1, 2).swapaxes(0, 1)
         self.collection_slider.set_segments(segment_slider)
+        return
+
+    def _get_color_segment(self):
+        super()._get_color_segment()
+
         self.collection_slider.set_edgecolor(self.edgecolor_ma + [self.color_priceline])
         return
 
+    def change_background_color(self, color):
+        super().change_background_color(color)
+
+        self.ax_slider.set_facecolor(color)
+        self.text_slider.set_backgroundcolor(color)
+        return
+
+    def change_tick_color(self, color):
+        super().change_tick_color(color)
+
+        for i in ['top', 'bottom', 'left', 'right']: self.ax_slider.spines[i].set_color(self.color_tick)
+        self.ax_slider.tick_params(colors=color)
+        return
+
+    def change_text_color(self, color):
+        super().change_text_color(color)
+
+        self.text_slider.set_color(color)
+        return
+
+    def change_line_color(self, color):
+        super().change_line_color(color)
+
+        self.text_slider.get_bbox_patch().set_edgecolor(color)
+        return
+
 
 class NavigatorMixin(CollectionMixin):
     def _set_slider_lim(self):
@@ -527,7 +558,7 @@ class BaseMixin(ChartClickMixin):
 class Chart(BaseMixin, Mixin):
     def _add_collection(self):
         super()._add_collection()
-        return self.add_collection()
+        return self.add_artist()
 
     def _draw_artist(self):
         super()._draw_artist()
@@ -545,6 +576,21 @@ class Chart(BaseMixin, Mixin):
         self.on_pick(e)
         return super()._on_pick(e)
 
+    def _set_candle_segments(self, index_start, index_end):
+        super()._set_candle_segments(index_start, index_end)
+        self.set_segment(index_start, index_end)
+        return
+
+    def _set_wick_segments(self, index_start, index_end, simpler=False):
+        super()._set_wick_segments(index_start, index_end, simpler)
+        self.set_segment(index_start, index_end, simpler)
+        return
+
+    def _set_line_segments(self, index_start, index_end, simpler=False, set_ma=True):
+        super()._set_line_segments(index_start, index_end, simpler, set_ma)
+        self.set_segment(index_start, index_end, simpler, set_ma)
+        return
+
     def _on_move(self, e):
         super()._on_move(e)
         return self.on_move(e)

{seolpyo_mplchart-1.0.1 → seolpyo_mplchart-1.1.1/seolpyo_mplchart.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: seolpyo-mplchart
-Version: 1.0.1
+Version: 1.1.1
 Summary: Fast candlestick chart using Python. Includes navigator, slider, navigation, and text information display functions
 Author-email: white-seolpyo <white-seolpyo@naver.com>
 License: MIT License