seolpyo-mplchart 1.4.0.3__py3-none-any.whl → 1.4.0.4__py3-none-any.whl

seolpyo_mplchart/_cursor.py

@@ -321,10 +321,10 @@ class BoxMixin(CrossLineMixin):
                 else:
                     # 캔들 강조
                     self.in_candle = True
-                    x1, x2 = (self.intx-0.3, self.intx+1.4)
+                    x1, x2 = (self.intx-0.3, self.intx+1.3)
                     self.collection_price_box.set_segments([((x1, high), (x2, high), (x2, low), (x1, low), (x1, high))])
                     self.collection_price_box.draw(renderer)
-            else:
+            elif self.volume:
                 # 거래량 강조
                 high = self.df['max_box_volume'][self.intx]
                 low = 0
@@ -333,7 +333,7 @@ class BoxMixin(CrossLineMixin):
                 if high < y or y < low: self.in_volumebar = False
                 else:
                     self.in_volumebar = True
-                    x1, x2 = (self.intx-0.3, self.intx+1.4)
+                    x1, x2 = (self.intx-0.3, self.intx+1.3)
                     self.collection_volume_box.set_segments([((x1, high), (x2, high), (x2, low), (x1, low), (x1, high))])
                     self.collection_volume_box.draw(renderer)
         return
@@ -399,7 +399,7 @@ class InfoMixin(BoxMixin):
 
         if self.intx is not None:
             if self.in_candle: self._draw_candle_info_artist(e)
-            elif self.in_volumebar: self._draw_volume_info_artist(e)
+            elif self.volume and self.in_volumebar: self._draw_volume_info_artist(e)
         return
 
     def _draw_candle_info_artist(self, e: MouseEvent):
@@ -437,6 +437,18 @@ class InfoMixin(BoxMixin):
         self.artist_text_volume_info.draw(self.figure.canvas.renderer)
         return
 
+    def get_info_kwargs(self, is_price: bool, **kwargs)-> dict:
+        """
+        get text info kwargs
+
+        Args:
+            is_price (bool): is price chart info or not
+
+        Returns:
+            dict[str, any]: text info kwargs
+        """
+        return kwargs
+
     def _get_info(self, index, is_price=True):
         dt = self.df[self.date][index]
         if not self.volume: v, vr = ('-', '-')
@@ -474,7 +486,8 @@ class InfoMixin(BoxMixin):
                 if ld[1]: l = f'{float_to_str(ld[0])} {Fraction(ld[1])}'
                 else: l = float_to_str(ld[0])
 
-                text = self.format_candleinfo.format(
+                kwargs = self.get_info_kwargs(
+                    is_price=is_price,
                     dt=dt,
                     close=f'{c:>{self._length_text}}{self.unit_price}',
                     rate=f'{r:>{self._length_text}}%',
@@ -484,11 +497,13 @@ class InfoMixin(BoxMixin):
                     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}%',
                 )
+                text = self.format_candleinfo.format(**kwargs)
             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.format_candleinfo.format(
+                kwargs = self.get_info_kwargs(
+                    is_price=is_price,
                     dt=dt,
                     close=f'{c:>{self._length_text}}{self.unit_price}',
                     rate=f'{r:>{self._length_text}}%',
@@ -498,15 +513,18 @@ class InfoMixin(BoxMixin):
                     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}%',
                 )
+                text = self.format_candleinfo.format(**kwargs)
         elif self.volume:
             compare = self.df['compare_volume'][index]
             com = float_to_str(compare, self.digit_volume, plus=True)
-            text = self.format_volumeinfo.format(
+            kwargs = self.get_info_kwargs(
+                is_price=is_price,
                 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}',
             )
+            text = self.format_volumeinfo.format(**kwargs)
         else: text = ''
         
         return text

seolpyo_mplchart/_draw.py

@@ -140,7 +140,9 @@ class DrawMixin(CollectionMixin):
 
 _set_key = {
     'x', 'zero', 'close_pre', 'ymax_volume',
-    'top_candle', 'bottom_candle', 'left_candle', 'right_candle',
+    'is_up',
+    'top_candle', 'bottom_candle',
+    'left_candle', 'right_candle',
     'left_volume', 'right_volume',
 }
 
@@ -166,6 +168,9 @@ class DataMixin(DrawMixin):
         self.set_candlecolor = set_candlecolor
         self.set_volumecolor = set_volumecolor
 
+        self.chart_price_ymax = df[self.high].max() * 1.3
+        self.chart_volume_ymax = df[self.volume].max() * 1.3
+
         self._validate_column_key(df)
 
         # 오름차순 정렬
@@ -195,10 +200,9 @@ class DataMixin(DrawMixin):
         df['right_volume'] = df['x'] + self.volume_width_half
         df.loc[:, 'zero'] = 0
 
-        df['top_candle'] = np.where(df[self.Open] <= df[self.close], df[self.close], df[self.Open])
-        df['top_candle'] = np.where(df[self.close] < df[self.Open], df[self.Open], df[self.close])
-        df['bottom_candle'] = np.where(df[self.Open] <= df[self.close], df[self.Open], df[self.close])
-        df['bottom_candle'] = np.where(df[self.close] < df[self.Open], df[self.close], df[self.Open])
+        df['is_up'] = np.where(df[self.Open] < df[self.close], True, False)
+        df['top_candle'] = np.where(df['is_up'], df[self.close], df[self.Open])
+        df['bottom_candle'] = np.where(df['is_up'], df[self.Open], df[self.close])
 
         df['close_pre'] = df[self.close].shift(1)
         if self.volume: df['ymax_volume'] = df[self.volume] * 1.2
@@ -229,23 +233,58 @@ class CandleSegmentMixin(DataMixin):
     color_priceline = 'k'
     limit_candle = 800
 
+    def get_candle_segment(self, *, is_up, x, left, right, top, bottom, high, low):
+        """
+        get candle segment
+
+        Args:
+            is_up (bool): (True if open < close else False)
+            x (float): center of candle
+            left (float): left of candle
+            right (float): right of candle
+            top (float): top of candle(close if open < close else open)
+            bottom (float): bottom of candle(open if open < close else close)
+            high (float): top of candle wick
+            low (float): bottom of candle wick
+
+        Returns:
+            tuple[tuple[float, float]]: candle segment
+        """
+        return (
+            (x, high),
+            (x, top),
+            (left, top),
+            (left, bottom),
+            (x, bottom),
+            (x, low),
+            (x, bottom),
+            (right, bottom),
+            (right, top),
+            (x, top),
+            (x, high),
+            (x, top),
+        )
+
     def _create_candle_segments(self):
         # 캔들 세그먼트
-        segment_candle = self.df[[
-            'x', self.high,
-            'x', 'top_candle',
-            'left_candle', 'top_candle',
-            'left_candle', 'bottom_candle',
-            'x', 'bottom_candle',
-            'x', self.low,
-            'x', 'bottom_candle',
-            'right_candle', 'bottom_candle',
-            'right_candle', 'top_candle',
-            'x', 'top_candle',
-            'x', self.high,
-            'x', 'top_candle',
-        ]].values
-        self.segment_candle = segment_candle.reshape(segment_candle.shape[0], 12, 2)
+        segment_candle = []
+        for x, left, right, top, bottom, is_up, high, low in zip(
+            self.df['x'].to_numpy().tolist(),
+            self.df['left_candle'].to_numpy().tolist(), self.df['right_candle'].to_numpy().tolist(),
+            self.df['top_candle'].to_numpy().tolist(), self.df['bottom_candle'].to_numpy().tolist(),
+            self.df['is_up'].to_numpy().tolist(),
+            self.df[self.high].to_numpy().tolist(), self.df[self.low].to_numpy().tolist(),
+        ):
+            segment_candle.append(
+                self.get_candle_segment(
+                    is_up=is_up,
+                    x=x,
+                    left=left, right=right,
+                    top=top, bottom=bottom,
+                    high=high, low=low,
+                )
+            )
+        self.segment_candle = np.array(segment_candle)
 
         # 심지 세그먼트
         segment_wick = self.df[[
@@ -261,22 +300,26 @@ class CandleSegmentMixin(DataMixin):
         self._create_candle_color_segments()
         return
 
+    def add_candle_color_column(self):
+        columns = ['facecolor', 'edgecolor']
+        # 양봉
+        self.df.loc[:, columns] = (self.color_up, self.color_up)
+        if self.color_up != self.color_down:
+            # 음봉
+            self.df.loc[self.df[self.close] < self.df[self.Open], columns] = (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], columns] = (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['close_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['close_pre'] <= self.df[self.close]), ['facecolor']] = self.color_down_up
+        return
+
     def _create_candle_color_segments(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['close_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['close_pre'] <= self.df[self.close]), ['facecolor']] = self.color_down_up
+        if self.set_candlecolor: self.add_candle_color_column()
 
         self.facecolor_candle = self.df['facecolor'].values
         self.edgecolor_candle = self.df['edgecolor'].values
@@ -362,15 +405,39 @@ class MaSegmentMixin(CandleSegmentMixin):
 class VolumeSegmentMixin(MaSegmentMixin):
     limit_volume = 200
 
+    def get_volume_segment(self, *, x, left, right, top):
+        """
+        get volume bar segment
+
+        Args:
+            x (float): center of volume bar
+            left (float): left of volume bar
+            right (float): right of volume bar
+            top (float): top of volume bar
+
+        Returns:
+            tuple[tuple[float, float]]: volume bar segment
+        """
+        return (
+            (left, top),
+            (left, 0),
+            (right, 0),
+            (right, top),
+            (left, top),
+        )
+
     def _create_volume_segments(self):
         # 거래량 바 세그먼트
-        segment_volume = self.df[[
-            'left_volume', 'zero',
-            'left_volume', self.volume,
-            'right_volume', self.volume,
-            'right_volume', 'zero',
-        ]].values
-        self.segment_volume = segment_volume.reshape(segment_volume.shape[0], 4, 2)
+        segment_volume = []
+        for x, left, right, top in zip(
+            self.df['x'].to_numpy().tolist(),
+            self.df['left_volume'].to_numpy().tolist(), self.df['right_volume'].to_numpy().tolist(),
+            self.df[self.volume].to_numpy().tolist(),
+        ):
+            segment_volume.append(
+                self.get_volume_segment(x=x, left=left, right=right, top=top)
+            )
+        self.segment_volume = np.array(segment_volume)
 
         # 거래량 심지 세그먼트
         segment_volume_wick = self.df[[
@@ -382,19 +449,22 @@ class VolumeSegmentMixin(MaSegmentMixin):
         self._create_volume_color_segments()
         return
 
+    def add_volume_color_column(self):
+        columns = ['facecolor_volume', 'edgecolor_volume']
+        # 거래량
+        self.df.loc[:, columns] = (self.color_volume_up, self.color_volume_up)
+        if self.color_up != self.color_down:
+            # 전일대비 하락
+            condition = self.df[self.close] < self.df['close_pre']
+            self.df.loc[condition, columns] = (self.color_volume_down, self.color_volume_down)
+        if self.color_up != self.color_flat:
+            # 전일과 동일
+            condition = self.df[self.close] == self.df['close_pre']
+            self.df.loc[condition, columns] = (self.color_volume_flat, self.color_volume_flat)
+        return
+
     def _create_volume_color_segments(self):
-        if self.set_volumecolor:
-            columns = ['facecolor_volume', 'edgecolor_volume']
-            # 거래량
-            self.df.loc[:, columns] = (self.color_volume_up, self.color_volume_up)
-            if self.color_up != self.color_down:
-                # 전일대비 하락
-                condition = self.df[self.close] < self.df['close_pre']
-                self.df.loc[condition, columns] = (self.color_volume_down, self.color_volume_down)
-            if self.color_up != self.color_flat:
-                # 전일과 동일
-                condition = self.df[self.close] == self.df['close_pre']
-                self.df.loc[condition, columns] = (self.color_volume_flat, self.color_volume_flat)
+        if self.set_volumecolor: self.add_volume_color_column()
 
         self.facecolor_volume = self.df['facecolor_volume'].values
         self.edgecolor_volume = self.df['edgecolor_volume'].values

seolpyo_mplchart/test.py

@@ -1,11 +1,71 @@
+import json
 import sys
 from pathlib import Path
 
+import pandas as pd
+
 sys.path.insert(0, Path(__file__).parent.parent.__str__())
 # print(f'{sys.path=}')
 
-from seolpyo_mplchart import sample
+import seolpyo_mplchart as mc
+
+
+class Chart(mc.SliderChart):
+    format_candleinfo = mc.format_candleinfo_ko + '\nCustom info: {ci}'
+    format_volumeinfo = mc.format_volumeinfo_ko
+    min_distance = 5
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.collection_candle.set_linewidth(1.5)
+        return
+
+    def get_info_kwargs(self, is_price, **kwargs):
+        if is_price:
+            kwargs['ci'] = 'You can add Custom text Info or Change text info.'
+            kwargs['close'] = 'You can Change close price info.'
+        return kwargs
+
+    def get_candle_segment(self, *, x, left, right, top, bottom, is_up, high, low):
+        if is_up:
+            return (
+                (x, high),
+                (x, top),
+                (right, top),
+                (x, top),
+                (x, bottom),
+                (left, bottom),
+                (x, bottom),
+                (x, low),
+                (x, high)
+            )
+        else:
+            return (
+                (x, high),
+                (x, bottom),
+                (right, bottom),
+                (x, bottom),
+                (x, top),
+                (left, top),
+                (x, top),
+                (x, low),
+                (x, high)
+            )
+
+
+
+C = Chart()
+path_file = Path(__file__).parent / 'sample/samsung.txt'
+# C.format_candleinfo = mc.format_candleinfo_ko
+# C.format_volumeinfo = mc.format_volumeinfo_ko
+# C.volume = None
+
 
+with open(path_file, 'r', encoding='utf-8') as txt:
+    data = json.load(txt)
+df = pd.DataFrame(data)
 
-sample()
+C.set_data(df)
 
+mc.show()
+mc.close()

{seolpyo_mplchart-1.4.0.3.dist-info → seolpyo_mplchart-1.4.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: seolpyo-mplchart
-Version: 1.4.0.3
+Version: 1.4.0.4
 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
@@ -32,9 +32,9 @@ Ethereum: 0x1c5fb8a5e0b1153cd4116c91736bd16fabf83520
 
 
 # Document
-[English Document](https://white.seolpyo.com/entry/148/)
+[English Document](https://white.seolpyo.com/entry/148/?from=pypi)
 
-[한글 설명서](https://white.seolpyo.com/entry/147/)
+[한글 설명서](https://white.seolpyo.com/entry/147/?from=pypi)
 
 
 # Sample Image
@@ -50,6 +50,8 @@ Ethereum: 0x1c5fb8a5e0b1153cd4116c91736bd16fabf83520
 ## Korean format sample
 ![korean sample](https://raw.githubusercontent.com/white-seolpyo/seolpyo-mplchart/refs/heads/main/images/sample%20kor.png)
 
+## change Candle shape sample
+![Candle shape sample](https://github.com/white-seolpyo/seolpyo-mplchart/blob/main/images/change%20candle%20segment.png)
 
 # 40,000 data sample
 ![40,000 sample](https://raw.githubusercontent.com/white-seolpyo/seolpyo-mplchart/refs/heads/main/images/40000.gif)

{seolpyo_mplchart-1.4.0.3.dist-info → seolpyo_mplchart-1.4.0.4.dist-info}/RECORD

@@ -1,17 +1,17 @@
 seolpyo_mplchart/__init__.py,sha256=1rY6PP1OMMr1d_5x7dlAD2ImQAXChT5spvB45j6yDp8,18255
 seolpyo_mplchart/_base.py,sha256=3iG4AVwHR_h3rh6c1oJahWt7NvBpBFrS0bUZd4PaHfY,3921
-seolpyo_mplchart/_cursor.py,sha256=051qy_fn0zypA5ceYKzSF8XMypdjqV3GE35kmtKeCU4,22845
-seolpyo_mplchart/_draw.py,sha256=TGPo80yJocmXbWoCfzYKlWK6ntBElvb9IR8O54A2X5w,21174
+seolpyo_mplchart/_cursor.py,sha256=w3ndsyfFMRp8nnkAEVXtJH8-YLm1r-mA8bCdS82iSWE,23442
+seolpyo_mplchart/_draw.py,sha256=iBaFkllpaXewjECU82gZ0RQm8qTG0c1kP0PZdq8PtFo,23242
 seolpyo_mplchart/_slider.py,sha256=4zcanX9KSdtjn12IE3zKERaqTh07x42LKfFD2KEMcB8,23309
 seolpyo_mplchart/base.py,sha256=0qdImsIMPzTTkkHzPv479BVe_ojrn45FidGE46eT5x4,3797
 seolpyo_mplchart/cursor.py,sha256=qq1WJJa7vCE5C2XeGBECt2XqxR_WxfybZZ5u6zVx5Ps,20415
 seolpyo_mplchart/draw.py,sha256=MiqDhbMJOSlWD6qdAghsyrZwCixcwm4nfmiinvwtt-o,21520
 seolpyo_mplchart/slider.py,sha256=-jZ6D23orDj3NmtnOviO1NRx4BrRxWvwTV5pzGQuWNI,22188
-seolpyo_mplchart/test.py,sha256=TFnIXphJsl-B7iIhBh7-PZKUz2Gjh7mwNwrk8aUS4SA,180
+seolpyo_mplchart/test.py,sha256=VWpAbgALqeW04LKvvf8-lLK6OwwJWuMlqfTB5ylTpnY,1830
 seolpyo_mplchart/utils.py,sha256=a3XycRBTndrsjBw_1VKTxbSvOGpVYXHRK87v7azgRe8,1433
 seolpyo_mplchart/data/apple.txt,sha256=0izAfweu1lLsC0IwVthdVlo9reG8KGbKGTSX5knI5Zc,1380864
 seolpyo_mplchart/data/samsung.txt,sha256=UejaSkbzr4E5K3lkelCT0yJiWUPfmViBEaTyoXyphIs,2476424
-seolpyo_mplchart-1.4.0.3.dist-info/METADATA,sha256=ptAsq-0kfzKL5Gyg3pjbSkuPC_GKBe2LJvO8eT0wO18,2484
-seolpyo_mplchart-1.4.0.3.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-seolpyo_mplchart-1.4.0.3.dist-info/top_level.txt,sha256=KgqFn7rKWize7OjMaTCHxKm9ie6vqnyb5c8fN7y_tSo,17
-seolpyo_mplchart-1.4.0.3.dist-info/RECORD,,
+seolpyo_mplchart-1.4.0.4.dist-info/METADATA,sha256=_bkVwBE4cCryceC2bHQPZSgGG13xFigx80EzOfogrYQ,2657
+seolpyo_mplchart-1.4.0.4.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+seolpyo_mplchart-1.4.0.4.dist-info/top_level.txt,sha256=KgqFn7rKWize7OjMaTCHxKm9ie6vqnyb5c8fN7y_tSo,17
+seolpyo_mplchart-1.4.0.4.dist-info/RECORD,,

{seolpyo_mplchart-1.4.0.3.dist-info → seolpyo_mplchart-1.4.0.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.1.0)
+Generator: setuptools (79.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any