seolpyo-mplchart 1.1.0__tar.gz → 1.2.0__tar.gz

{seolpyo_mplchart-1.1.0/seolpyo_mplchart.egg-info → seolpyo_mplchart-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: seolpyo-mplchart
-Version: 1.1.0
+Version: 1.2.0
 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.1.0 → seolpyo_mplchart-1.2.0}/pyproject.toml

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

{seolpyo_mplchart-1.1.0 → seolpyo_mplchart-1.2.0}/seolpyo_mplchart/__init__.py

@@ -5,9 +5,9 @@ from pathlib import Path
 import matplotlib.pyplot as plt
 import pandas as pd
 
-from .draw import Chart as BaseChart
-from .cursor import Chart as BaseCursorChart, format_candleinfo_ko, format_volumeinfo_ko, format_candleinfo_en, format_volumeinfo_en
-from .slider import Chart as BaseSliderChart
+from ._draw import Chart as _BaseChart
+from ._cursor import Chart as _BaseCursorChart, format_candleinfo_ko, format_volumeinfo_ko, format_candleinfo_en, format_volumeinfo_en
+from ._slider import Chart as _BaseSliderChart
 
 
 __all__ = [
@@ -24,7 +24,7 @@ path_samsung = Path(__file__).parent / 'sample/samsung.txt'
 path_apple = Path(__file__).parent / 'sample/apple.txt'
 
 def sample(stock: Literal['samsung', 'apple']='samsung', chart: Literal['Chart', 'CursorChart', 'SliderChart']='SliderChart'):
-    C: BaseSliderChart = {'Chart': BaseChart, 'CursorChart': BaseCursorChart, 'SliderChart': BaseSliderChart}[chart]()
+    C: _BaseSliderChart = {'Chart': _BaseChart, 'CursorChart': _BaseCursorChart, 'SliderChart': _BaseSliderChart}[chart]()
     path_file = path_samsung if stock == 'samsung' else path_apple
     if stock == 'samsung':
         C.format_candleinfo = format_candleinfo_ko
@@ -68,7 +68,7 @@ def close(fig='all'):
     return plt.close(fig)
 
 
-class OnlyChart(BaseChart):
+class OnlyChart(_BaseChart):
     r"""
     You can see the guidance document:
         Korean: https://white.seolpyo.com/entry/147/
@@ -129,7 +129,7 @@ class OnlyChart(BaseChart):
     pass
 
 
-class CursorChart(BaseCursorChart):
+class CursorChart(_BaseCursorChart):
     r"""
     You can see the guidance document:
         Korean: https://white.seolpyo.com/entry/147/
@@ -193,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
@@ -201,7 +201,7 @@ class CursorChart(BaseCursorChart):
     pass
 
 
-class SliderChart(BaseSliderChart):
+class SliderChart(_BaseSliderChart):
     r"""
     You can see the guidance document:
         Korean: https://white.seolpyo.com/entry/147/
@@ -267,12 +267,12 @@ 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
         limit_wick:  Maximum number of candle wicks to draw. default 4,000
-        limit_volume: Maximum number of volume bars to draw. default 800. Applies only to drawing candle wicks or price line.
+        limit_volume: Maximum number of volume bars to draw. default 200. Applies only to drawing candle wicks or price line.
         limit_ma: If the number of displayed data is more than this, the price moving average line is not drawn. default 8,000
 
         color_navigator_line: Navigator divider color. default '#1e78ff'
@@ -303,7 +303,7 @@ def set_theme(chart: OnlyChart|CursorChart|SliderChart, theme: Literal['light',
         chart.color_box = 'w'
         chart.textboxKwargs = {'facecolor': 'k', 'edgecolor': 'w'}
         chart.textKwargs = {'color': 'w'}
-        chart.color_navigator_cover, chart.color_navigator_line = ('w', '#00FFFF')
+        chart.color_navigator_cover, chart.color_navigator_line = ('w', '#FF2400')
 
         if initialized:
             chart.change_background_color('k')

seolpyo_mplchart-1.1.0/seolpyo_mplchart/cursor.py → seolpyo_mplchart-1.2.0/seolpyo_mplchart/_cursor.py

@@ -6,7 +6,7 @@ from matplotlib.collections import LineCollection
 from matplotlib.text import Text
 import pandas as pd
 
-from .draw import BaseMixin as BM, Mixin as M
+from ._draw import BaseMixin as BM, Mixin as M
 from .utils import float_to_str
 
 
@@ -129,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']
@@ -305,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
@@ -425,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
@@ -441,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()

seolpyo_mplchart-1.1.0/seolpyo_mplchart/draw.py → seolpyo_mplchart-1.2.0/seolpyo_mplchart/_draw.py

@@ -6,11 +6,11 @@ import numpy as np
 import pandas as pd
 
 
-from .base import Base
+from ._base import Base
 
 
 class Mixin:
-    def add_collection(self):
+    def add_artist(self):
         "This method work when ```__init__()``` run."
         return
 
@@ -182,7 +182,7 @@ class SegmentMixin(DataMixin):
 
     limit_candle = 800
     limit_wick = 4_000
-    limit_volume = 800
+    limit_volume = 200
 
     color_priceline = 'k'
     format_ma = '{}일선'
@@ -348,15 +348,19 @@ class SegmentMixin(DataMixin):
         self.collection_candle.set_edgecolor(self.edgecolor_candle[index_start:index_end])
 
         if self.volume:
-            seg = self.segment_volume_wick[index_start:index_end]
+            seg_volume = self.segment_volume_wick[index_start:index_end]
+            seg_facecolor_volume = self.facecolor_volume[index_start:index_end]
+            seg_edgecolor_volume = self.edgecolor_volume[index_start:index_end]
             if simpler:
-                values = seg[:, 1, 1]
+                values = seg_volume[:, 1, 1]
                 top_index = np.argsort(-values)[:self.limit_volume]
-                seg = seg[top_index]
-            self.collection_volume.set_segments(seg)
+                seg_volume = seg_volume[top_index]
+                seg_facecolor_volume = seg_facecolor_volume[top_index]
+                seg_edgecolor_volume = seg_edgecolor_volume[top_index]
+            self.collection_volume.set_segments(seg_volume)
             self.collection_volume.set_linewidth(1.3)
-            self.collection_volume.set_facecolor(self.facecolor_volume[index_start:index_end])
-            self.collection_volume.set_edgecolor(self.facecolor_volume[index_start:index_end])
+            self.collection_volume.set_facecolor(seg_facecolor_volume)
+            self.collection_volume.set_edgecolor(seg_edgecolor_volume)
 
         self.collection_ma.set_segments(self.segment_ma[:, index_start:index_end])
         self.collection_ma.set_edgecolor(self.edgecolor_ma)
@@ -368,15 +372,19 @@ class SegmentMixin(DataMixin):
         self.collection_candle.set_edgecolor(self.color_priceline)
 
         if self.volume:
-            seg = self.segment_volume_wick[index_start:index_end]
+            seg_volume = self.segment_volume_wick[index_start:index_end]
+            seg_facecolor_volume = self.facecolor_volume[index_start:index_end]
+            seg_edgecolor_volume = self.edgecolor_volume[index_start:index_end]
             if simpler:
-                values = seg[:, 1, 1]
+                values = seg_volume[:, 1, 1]
                 top_index = np.argsort(-values)[:self.limit_volume]
-                seg = seg[top_index]
-            self.collection_volume.set_segments(seg)
+                seg_volume = seg_volume[top_index]
+                seg_facecolor_volume = seg_facecolor_volume[top_index]
+                seg_edgecolor_volume = seg_edgecolor_volume[top_index]
+            self.collection_volume.set_segments(seg_volume)
             self.collection_volume.set_linewidth(1.3)
-            self.collection_volume.set_facecolor(self.facecolor_volume[index_start:index_end])
-            self.collection_volume.set_edgecolor(self.facecolor_volume[index_start:index_end])
+            self.collection_volume.set_facecolor(seg_facecolor_volume)
+            self.collection_volume.set_edgecolor(seg_edgecolor_volume)
 
         if not set_ma: self.collection_ma.set_segments([])
         else:
@@ -548,7 +556,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()

seolpyo_mplchart-1.1.0/seolpyo_mplchart/slider.py → seolpyo_mplchart-1.2.0/seolpyo_mplchart/_slider.py

@@ -5,8 +5,8 @@ from matplotlib.text import Text
 from matplotlib.backend_bases import MouseEvent, MouseButton, cursors
 import pandas as pd
 
-from .base import convert_unit
-from .cursor import BaseMixin as BM, Mixin as M
+from ._base import convert_unit
+from ._cursor import BaseMixin as BM, Mixin as M
 
 
 class Mixin(M):
@@ -163,6 +163,7 @@ class CollectionMixin(PlotMixin):
         super().change_line_color(color)
 
         self.text_slider.get_bbox_patch().set_edgecolor(color)
+        self.slider_vline.set_edgecolor(color)
         return
 
 
@@ -239,7 +240,9 @@ class DataMixin(NavigatorMixin):
 
     def get_default_lim(self):
         xmax = self.list_index[-1]
-        return (xmax-120, xmax)
+        xmin = xmax - 120
+        if xmin < 0: xmin = 0
+        return (xmin, xmax)
 
 
 class BackgroundMixin(DataMixin):
@@ -558,7 +561,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()

{seolpyo_mplchart-1.1.0 → seolpyo_mplchart-1.2.0/seolpyo_mplchart.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: seolpyo-mplchart
-Version: 1.1.0
+Version: 1.2.0
 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.1.0 → seolpyo_mplchart-1.2.0}/seolpyo_mplchart.egg-info/SOURCES.txt

@@ -2,10 +2,10 @@ MANIFEST.in
 README.md
 pyproject.toml
 seolpyo_mplchart/__init__.py
-seolpyo_mplchart/base.py
-seolpyo_mplchart/cursor.py
-seolpyo_mplchart/draw.py
-seolpyo_mplchart/slider.py
+seolpyo_mplchart/_base.py
+seolpyo_mplchart/_cursor.py
+seolpyo_mplchart/_draw.py
+seolpyo_mplchart/_slider.py
 seolpyo_mplchart/test.py
 seolpyo_mplchart/utils.py
 seolpyo_mplchart.egg-info/PKG-INFO