seolpyo-mplchart 0.1.0.1__tar.gz → 0.1.2__tar.gz

{seolpyo_mplchart-0.1.0.1/seolpyo_mplchart.egg-info → seolpyo_mplchart-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: seolpyo-mplchart
-Version: 0.1.0.1
+Version: 0.1.2
 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
@@ -45,3 +45,7 @@ Ethereum: 0x1c5fb8a5e0b1153cd4116c91736bd16fabf83520
 ![english sample](https://raw.githubusercontent.com/white-seolpyo/seolpyo-mplchart/refs/heads/main/images/change%20format.png)
 
 ![korean sample](https://github.com/white-seolpyo/seolpyo-mplchart/blob/main/images/sample%20kor.png?raw=true)
+
+![40,000 sample](https://github.com/white-seolpyo/seolpyo-mplchart/blob/main/images/40000.gif?raw=true)
+
+<img src="https://github.com/user-attachments/assets/f1732891-d458-4c2d-a6bf-a17a4c549af6">

{seolpyo_mplchart-0.1.0.1 → seolpyo_mplchart-0.1.2}/README.md

@@ -18,3 +18,7 @@ Ethereum: 0x1c5fb8a5e0b1153cd4116c91736bd16fabf83520
 ![english sample](https://raw.githubusercontent.com/white-seolpyo/seolpyo-mplchart/refs/heads/main/images/change%20format.png)
 
 ![korean sample](https://github.com/white-seolpyo/seolpyo-mplchart/blob/main/images/sample%20kor.png?raw=true)
+
+![40,000 sample](https://github.com/white-seolpyo/seolpyo-mplchart/blob/main/images/40000.gif?raw=true)
+
+<img src="https://github.com/user-attachments/assets/f1732891-d458-4c2d-a6bf-a17a4c549af6">

{seolpyo_mplchart-0.1.0.1 → seolpyo_mplchart-0.1.2}/pyproject.toml

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

{seolpyo_mplchart-0.1.0.1 → seolpyo_mplchart-0.1.2}/seolpyo_mplchart/__init__.py

@@ -70,8 +70,8 @@ class Chart(CM):
         textboxKwargs: Options that apply to the information text box. dufault dict(boxstyle='round', facecolor='w')
 
         fraction: Decide whether to express information as a fraction. default False
-        candleformat: Candle information text format. default '{}\n\n종가:　 {}\n등락률: {}\n대비:　 {}\n시가:　 {}({})\n고가:　 {}({})\n저가:　 {}({})\n거래량: {}({})'
-        volumeformat: Volume information text format. default '{}\n\n거래량　　　: {}\n거래량증가율: {}'
+        candleformat: 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})'
+        volumeformat: Volume information text format. default '{dt}\n\n거래량　　　: {volume}\n거래량증가율: {rate_volume}'
         digit_price, digit_volume: Number of decimal places expressed in informational text. default (0, 0)
 
         min_distance: Minimum number of candles that can be selected with the slider. default 30

{seolpyo_mplchart-0.1.0.1 → seolpyo_mplchart-0.1.2}/seolpyo_mplchart/cursor.py

@@ -61,20 +61,27 @@ class CollectionMixin(DrawMixin):
 _set_key = {'rate', 'compare', 'rate_open', 'rate_high', 'rate_low', 'rate_volume',}
 
 class DataMixin(CollectionMixin):
-    def _generate_data(self, df, sort_df=True, calc_ma=True):
-        for i in ['date', 'Open', 'high', 'low', 'close', 'volume']:
+    def _generate_data(self, df, sort_df=True, calc_ma=True, calc_info=True):
+        for i in ('date', 'Open', 'high', 'low', 'close', 'volume'):
             v = getattr(self, i)
-            if v in _set_key: raise Exception(f'you can not set "self.{i}" value in {_set_key}.\nself.{i}={v!r}')
+            if v in _set_key:
+                raise Exception(f'you can not set "self.{i}" value in {_set_key}.\nself.{i}={v!r}')
 
         super()._generate_data(df, sort_df, calc_ma)
         df = self.df
 
-        df['rate'] = ((df[self.close] - df[self.close].shift(1)) / df[self.close] * 100).__round__(2).fillna(0)
-        df['compare'] = (df[self.close] - df[self.close].shift(1)).fillna(0)
-        df['rate_open'] = ((df[self.Open] - df[self.close].shift(1)) / df[self.close] * 100).__round__(2).fillna(0)
-        df['rate_high'] = ((df[self.high] - df[self.close].shift(1)) / df[self.close] * 100).__round__(2).fillna(0)
-        df['rate_low'] = ((df[self.low] - df[self.close].shift(1)) / df[self.close] * 100).__round__(2).fillna(0)
-        df['rate_volume'] = ((df[self.volume] - df[self.volume].shift(1)) /  df[self.volume].shift(1) * 100).__round__(2).fillna(0)
+        if not calc_info:
+            keys = set(df.keys())
+            for i in ('rate', 'compare', 'rate_open', 'rate_high', 'rate_low', 'rate_volume'):
+                if i not in keys:
+                    raise Exception(f'"{i}" column not in DataFrame.\nadd column or set calc_info=True.')
+        else:
+            df['rate'] = ((df[self.close] - df[self.close].shift(1)) / df[self.close] * 100).__round__(2).fillna(0)
+            df['compare'] = (df[self.close] - df[self.close].shift(1)).fillna(0)
+            df['rate_open'] = ((df[self.Open] - df[self.close].shift(1)) / df[self.close] * 100).__round__(2).fillna(0)
+            df['rate_high'] = ((df[self.high] - df[self.close].shift(1)) / df[self.close] * 100).__round__(2).fillna(0)
+            df['rate_low'] = ((df[self.low] - df[self.close].shift(1)) / df[self.close] * 100).__round__(2).fillna(0)
+            df['rate_volume'] = ((df[self.volume] - df[self.volume].shift(1)) /  df[self.volume].shift(1) * 100).__round__(2).fillna(0)
 
         self.df = df
         return
@@ -123,8 +130,10 @@ class LineMixin(DataMixin):
         self.canvas.blit()
         return
 
-    def _set_data(self, df: pd.DataFrame, sort_df=True, calc_ma=True, change_lim=True):
-        super()._set_data(df, sort_df, calc_ma, change_lim)
+    def set_data(self, df, sort_df=True, calc_ma=True, change_lim=True, calc_info=True, *args, **kwargs):
+        return super().set_data(df, sort_df, calc_ma, change_lim, calc_info=calc_info, *args, **kwargs)
+    def _set_data(self, df: pd.DataFrame, sort_df=True, calc_ma=True, change_lim=True, calc_info=True, *args, **kwargs):
+        super()._set_data(df, sort_df, calc_ma, change_lim, calc_info=calc_info, *args, **kwargs)
 
         self.vmin, self.vmax = (self.xmin, self.xmax)
         return
@@ -242,12 +251,12 @@ class LineMixin(DataMixin):
 
 class InfoMixin(LineMixin):
     fraction = False
-    candleformat = '{}\n\n종가:　 {}\n등락률: {}\n대비:　 {}\n시가:　 {}({})\n고가:　 {}({})\n저가:　 {}({})\n거래량: {}({})'
-    volumeformat = '{}\n\n거래량　　　: {}\n거래량증가율: {}'
+    candleformat = '{dt}\n\n종가:　 {close}\n등락률: {rate}\n대비:　 {compare}\n시가:　 {open}({rate_open})\n고가:　 {high}({rate_high})\n저가:　 {low}({rate_low})\n거래량: {volume}({rate_volume})'
+    volumeformat = '{dt}\n\n거래량　　　: {volume}\n거래량증가율: {rate_volume}'
     digit_price, digit_volume = (0, 0)
 
-    def _set_data(self, df: pd.DataFrame, sort_df=True, calc_ma=True, change_lim=True):
-        super()._set_data(df, sort_df, calc_ma, change_lim)
+    def _set_data(self, df: pd.DataFrame, sort_df=True, calc_ma=True, change_lim=True, calc_info=True, *args, **kwargs):
+        super()._set_data(df, sort_df, calc_ma, change_lim, calc_info, *args, **kwargs)
 
         # 슬라이더 날짜 텍스트 y 위치
         y = self._slider_ymax - (self._slider_ymax - self._slider_ymin) / 6
@@ -357,35 +366,35 @@ class InfoMixin(LineMixin):
                 else: l = float_to_str(ld[0])
 
                 text = self.candleformat.format(
-                    dt,
-                    f'{c:>{self._length_text}}{self.unit_price}',
-                    f'{r:>{self._length_text}}%',
-                    f'{com:>{self._length_text}}{self.unit_price}',
-                    f'{o:>{self._length_text}}{self.unit_price}', f'{Or:+06,.2f}%',
-                    f'{h:>{self._length_text}}{self.unit_price}', f'{hr:+06,.2f}%',
-                    f'{l:>{self._length_text}}{self.unit_price}', f'{lr:+06,.2f}%',
-                    f'{v:>{self._length_text}}{self.unit_volume}', f'{vr:+06,.2f}%',
+                    dt=dt,
+                    close=f'{c:>{self._length_text}}{self.unit_price}',
+                    rate=f'{r:>{self._length_text}}%',
+                    compare=f'{com:>{self._length_text}}{self.unit_price}',
+                    open=f'{o:>{self._length_text}}{self.unit_price}', rate_open=f'{Or:+06,.2f}%',
+                    high=f'{h:>{self._length_text}}{self.unit_price}', rate_high=f'{hr:+06,.2f}%',
+                    low=f'{l:>{self._length_text}}{self.unit_price}', rate_low=f'{lr:+06,.2f}%',
+                    volume=f'{v:>{self._length_text}}{self.unit_volume}', rate_volume=f'{vr:+06,.2f}%',
                 )
             else:
                 o, h, l, c = (float_to_str(o, self.digit_price), float_to_str(h, self.digit_price), float_to_str(l, self.digit_price), float_to_str(c, self.digit_price))
                 com = float_to_str(compare, self.digit_price, plus=True)
 
                 text = self.candleformat.format(
-                    dt,
-                    f'{c:>{self._length_text}}{self.unit_price}',
-                    f'{r:>{self._length_text}}%',
-                    f'{com:>{self._length_text}}{self.unit_price}',
-                    f'{o:>{self._length_text}}{self.unit_price}', f'{Or:+06,.2f}%',
-                    f'{h:>{self._length_text}}{self.unit_price}', f'{hr:+06,.2f}%',
-                    f'{l:>{self._length_text}}{self.unit_price}', f'{lr:+06,.2f}%',
-                    f'{v:>{self._length_text}}{self.unit_volume}', f'{vr:+06,.2f}%',
+                    dt=dt,
+                    close=f'{c:>{self._length_text}}{self.unit_price}',
+                    rate=f'{r:>{self._length_text}}%',
+                    compare=f'{com:>{self._length_text}}{self.unit_price}',
+                    open=f'{o:>{self._length_text}}{self.unit_price}', rate_open=f'{Or:+06,.2f}%',
+                    high=f'{h:>{self._length_text}}{self.unit_price}', rate_high=f'{hr:+06,.2f}%',
+                    low=f'{l:>{self._length_text}}{self.unit_price}', rate_low=f'{lr:+06,.2f}%',
+                    volume=f'{v:>{self._length_text}}{self.unit_volume}', rate_volume=f'{vr:+06,.2f}%',
                 )
         else:
             vrate = f'{vr:+06,.2f}'
             text = self.volumeformat.format(
-                dt,
-                f'{v:>{self._length_text}}{self.unit_volume}',
-                f'{vrate:>{self._length_text}}%',
+                dt=dt,
+                volume=f'{v:>{self._length_text}}{self.unit_volume}',
+                rate_volume=f'{vrate:>{self._length_text}}%',
             )
         return text
 
@@ -426,12 +435,13 @@ if __name__ == '__main__':
     n = 2600
     data = data[n:n+100]
     df = pd.DataFrame(data)
+    print(f'{df.keys()=}')
 
     t = time()
     c = CursorMixin()
     c.unit_price = '$'
     # c.fraction = True
-    c.set_data(df=df)
+    c.set_data(df[['date', 'open', 'high', 'low', 'close', 'volume']])
     t2 = time() - t
     print(f'{t2=}')
     plt.show()

{seolpyo_mplchart-0.1.0.1 → seolpyo_mplchart-0.1.2}/seolpyo_mplchart/draw.py

@@ -37,20 +37,21 @@ class DataMixin(Base):
     # https://matplotlib.org/stable/gallery/color/named_colors.html
     list_macolor = ('darkred', 'fuchsia', 'olive', 'orange', 'navy', 'darkmagenta', 'limegreen', 'darkcyan',)
 
-    color_up = '#fe3032'
-    color_down = '#0095ff'
+    color_up, color_down = ('#fe3032', '#0095ff')
     color_flat = 'k'
-    color_up_down = 'w'
-    color_down_up = 'w'
+    color_up_down, color_down_up = ('w', 'w')
     colors_volume = '#1f77b4'
 
-    def _generate_data(self, df: pd.DataFrame, sort_df=True, calc_ma=True):
-        for i in ['date', 'Open', 'high', 'low', 'close', 'volume']:
+    candlewidth_half, volumewidth_half = (0.3, 0.36)
+
+    def _generate_data(self, df: pd.DataFrame, sort_df=True, calc_ma=True, **_):
+        for i in ('date', 'Open', 'high', 'low', 'close', 'volume'):
             k: str = getattr(self, i)
             if k in _set_key: raise Exception(f'you can not set "self.{i}" value in {_set_key}.\nself.{i}={k!r}')
             if i != 'date':
                 dtype = df[k].dtype
-                if not isinstance(dtype, (np.dtypes.Float64DType, np.dtypes.Int64DType, np.dtypes.Float32DType, np.dtypes.Int32DType)): raise TypeError(f'Data column type must be "float64" or "int64" or "float32" or "int32".(excluding "date" column)\ndf[{k!r}].dtype={dtype!r}')
+                if not isinstance(dtype, (np.dtypes.Float64DType, np.dtypes.Int64DType, np.dtypes.Float32DType, np.dtypes.Int32DType)):
+                    raise TypeError(f'column dtype must be one of "float64" or "int64" or "float32" or "int32".(excluding "date" column)\ndf[{k!r}].dtype={dtype!r}')
 
         # DataFrame 정렬
         if sort_df:
@@ -59,14 +60,17 @@ class DataMixin(Base):
         if not self.list_ma: self.list_ma = tuple()
         if calc_ma:
             for i in self.list_ma: df[f'ma{i}'] = df[self.close].rolling(i).mean()
+        else:
+            keys = set(df.keys())
+            for i in self.list_ma:
+                if f'ma{i}' not in keys:
+                    raise Exception(f'"ma{i}" column not in DataFrame.\nadd column or set calc_ma=True.')
 
-        candlewidth_half = 0.3
-        volumewidth_half = 0.36
         df['x'] = df.index + 0.5
-        df['left'] = df['x'] - candlewidth_half
-        df['right'] = df['x'] + candlewidth_half
-        df['vleft'] = df['x'] - volumewidth_half
-        df['vright'] = df['x'] + volumewidth_half
+        df['left'] = df['x'] - self.candlewidth_half
+        df['right'] = df['x'] + self.candlewidth_half
+        df['vleft'] = df['x'] - self.volumewidth_half
+        df['vright'] = df['x'] + self.volumewidth_half
 
         df['top'] = np.where(df[self.Open] <= df[self.close], df[self.close], df[self.Open])
         df['top'] = np.where(df[self.close] < df[self.Open], df[self.Open], df[self.close])
@@ -303,12 +307,12 @@ class BackgroundMixin(CollectionMixin):
         return
 
 class DrawMixin(BackgroundMixin):
-    def set_data(self, df: pd.DataFrame, sort_df=True, calc_ma=True, change_lim=True):
-        self._set_data(df, sort_df, calc_ma, change_lim)
+    def set_data(self, df: pd.DataFrame, sort_df=True, calc_ma=True, change_lim=True, *_, **kwargs):
+        self._set_data(df, sort_df, calc_ma, change_lim, **kwargs)
         return self.df
 
-    def _set_data(self, df: pd.DataFrame, sort_df=True, calc_ma=True, change_lim=True):
-        self._generate_data(df, sort_df, calc_ma)
+    def _set_data(self, df: pd.DataFrame, sort_df=True, calc_ma=True, change_lim=True, *_, **kwargs):
+        self._generate_data(df, sort_df, calc_ma, **kwargs)
         self._set_collection()
         self._draw_collection(change_lim)
         return

{seolpyo_mplchart-0.1.0.1 → seolpyo_mplchart-0.1.2}/seolpyo_mplchart/slider.py

@@ -43,8 +43,8 @@ class NavgatorMixin(Mixin):
         self.ax_slider.add_artist(self.navigator)
         return
 
-    def _set_data(self, df: pd.DataFrame, sort_df=True, calc_ma=True, change_lim=True):
-        super()._set_data(df, sort_df, calc_ma, False)
+    def _set_data(self, df: pd.DataFrame, sort_df=True, calc_ma=True, change_lim=True, calc_info=True):
+        super()._set_data(df, sort_df, calc_ma, change_lim, calc_info)
 
         # 네비게이터 라인 선택 영역
         xsub = self.xmax - self.xmin
@@ -156,8 +156,8 @@ class BackgroundMixin(NavgatorMixin):
 
 
 class DrawMixin(BackgroundMixin):
-    def _set_data(self, df: pd.DataFrame, sort_df=True, calc_ma=True, change_lim=True):
-        super()._set_data(df, sort_df, calc_ma, change_lim)
+    def _set_data(self, df: pd.DataFrame, sort_df=True, calc_ma=True, change_lim=True, calc_info=True):
+        super()._set_data(df, sort_df, calc_ma, change_lim, calc_info)
 
         # 네비게이터 높이 설정
         ysub = self._slider_ymax - self._slider_ymin
@@ -319,6 +319,7 @@ class SimpleMixin(LimMixin):
     simpler = False
     limit_volume = 1_500
     default_left, default_right = (180, 10)
+    _draw_blit = False
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -334,8 +335,8 @@ class SimpleMixin(LimMixin):
         self.ax_volume.add_collection(self.blitvolume)
         return
 
-    def _set_data(self, df: pd.DataFrame, sort_df=True, calc_ma=True, change_lim=True):
-        super()._set_data(df, sort_df, calc_ma, False)
+    def _set_data(self, df: pd.DataFrame, sort_df=True, calc_ma=True, change_lim=True, calc_info=True):
+        super()._set_data(df, sort_df, calc_ma, False, calc_info)
 
         seg = self.df[['x', self.high, 'x', self.low]].values
         seg = seg.reshape(seg.shape[0], 2, 2)
@@ -369,19 +370,15 @@ class SimpleMixin(LimMixin):
         self.ax_price.xaxis.draw(renderer)
         self.ax_price.yaxis.draw(renderer)
 
-        left, right = self._navcoordinate
-        Range = right - left
         if self.simpler:
-            if Range < 1_000: self.blitcandle.draw(renderer)
-            else: self.priceline.draw(renderer)
+            if self._draw_blit: self.priceline.draw(renderer)
+            else: self.blitcandle.draw(renderer)
         elif self.candle_on_ma:
             self.macollection.draw(renderer)
-            if 2_500 < Range: self.priceline.draw(renderer)
-            elif 800 < Range or 9_999 < self.xmax: self.blitcandle.draw(renderer)
+            if self._draw_blit: self.blitcandle.draw(renderer)
             else: self.candlecollection.draw(renderer)
         else:
-            if 2_500 < Range: self.priceline.draw(renderer)
-            elif 800 < Range or 9_999 < self.xmax: self.blitcandle.draw(renderer)
+            if self._draw_blit: self.blitcandle.draw(renderer)
             else: self.candlecollection.draw(renderer)
             self.macollection.draw(renderer)
 
@@ -477,9 +474,13 @@ class ClickMixin(SimpleMixin):
             self._change_coordinate()
             if self.is_click:
                 nsub = self._navcoordinate[1] - self._navcoordinate[0]
-                if self.min_distance <= nsub: self._lim()
                 if self.is_move: self._set_navigator(*self._navcoordinate)
-                elif self.intx is not None: self._set_navigator(self._x_click, self.intx)
+                else:
+                    self._draw_blit = 900 < nsub
+                    if self.intx is not None: self._set_navigator(self._x_click, self.intx)
+
+                if self.min_distance <= nsub: self._lim()
+
                 self.navigator.draw(self.canvas.renderer)
                 self._draw_blit_artist()
             self._slider_move_action(e)

{seolpyo_mplchart-0.1.0.1 → seolpyo_mplchart-0.1.2/seolpyo_mplchart.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: seolpyo-mplchart
-Version: 0.1.0.1
+Version: 0.1.2
 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
@@ -45,3 +45,7 @@ Ethereum: 0x1c5fb8a5e0b1153cd4116c91736bd16fabf83520
 ![english sample](https://raw.githubusercontent.com/white-seolpyo/seolpyo-mplchart/refs/heads/main/images/change%20format.png)
 
 ![korean sample](https://github.com/white-seolpyo/seolpyo-mplchart/blob/main/images/sample%20kor.png?raw=true)
+
+![40,000 sample](https://github.com/white-seolpyo/seolpyo-mplchart/blob/main/images/40000.gif?raw=true)
+
+<img src="https://github.com/user-attachments/assets/f1732891-d458-4c2d-a6bf-a17a4c549af6">