seolpyo-mplchart 1.4.1.1__py3-none-any.whl → 1.4.1.3__py3-none-any.whl

seolpyo_mplchart/_cursor.py

@@ -234,7 +234,7 @@ class CrossLineMixin(EventMixin):
 
         if self.in_price_chart or self.in_volume_chart:
             self._restore_region()
-            self._draw_crossline(e, self.in_price_chart)
+            self._draw_crossline(e)
             self.figure.canvas.blit()
         else:
             if self._erase_crossline():
@@ -249,10 +249,10 @@ class CrossLineMixin(EventMixin):
             return True
         return False
 
-    def _draw_crossline(self, e: MouseEvent, in_price_chart):
+    def _draw_crossline(self, e: MouseEvent):
         x, y = (e.xdata, e.ydata)
 
-        if in_price_chart:
+        if self.in_price_chart:
             self.collection_price_crossline.set_segments([((x, self.price_ymin), (x, self.price_ymax)), ((self.vxmin, y), (self.vxmax, y))])
             self.collection_volume_crossline.set_segments([((x, 0), (x, self.volume_ymax))])
         else:
@@ -263,14 +263,14 @@ class CrossLineMixin(EventMixin):
         self.collection_price_crossline.draw(renderer)
         self.collection_volume_crossline.draw(renderer)
 
-        self._draw_text_artist(e, in_price_chart)
+        self._draw_text_artist(e)
         return
 
-    def _draw_text_artist(self, e: MouseEvent, in_price_chart):
+    def _draw_text_artist(self, e: MouseEvent):
         x, y = (e.xdata, e.ydata)
 
         renderer = self.figure.canvas.renderer
-        if in_price_chart:
+        if self.in_price_chart:
             # 가격
             self.artist_text_price.set_text(f'{float_to_str(y, self.digit_price)}{self.unit_price}')
             self.artist_text_price.set_x(self.v0 if self.veighth < x else self.vsixth)
@@ -298,17 +298,20 @@ class CrossLineMixin(EventMixin):
 
 
 class BoxMixin(CrossLineMixin):
-    def _draw_crossline(self, e, in_price_chart):
-        super()._draw_crossline(e, in_price_chart)
-        self._draw_box_artist(e, in_price_chart)
+    def _draw_crossline(self, e):
+        super()._draw_crossline(e)
+        self._draw_box_artist(e)
         return
 
-    def _draw_box_artist(self, e: MouseEvent, in_price_chart):
+    def _draw_box_artist(self, e: MouseEvent):
         y = e.ydata
 
         renderer = self.figure.canvas.renderer
+
+        self.in_candle = False
+        self.in_volumebar = False
         if self.intx is not None:
-            if in_price_chart:
+            if self.in_price_chart:
                 # 박스 크기
                 high = self.df['top_box_candle'][self.intx]
                 low = self.df['bottom_box_candle'][self.intx]
@@ -318,21 +321,19 @@ class BoxMixin(CrossLineMixin):
                     high, low = (high+sub, low-sub)
 
                 # 커서가 캔들 사이에 있는지 확인
-                if high < y or y < low: self.in_candle = False
-                else:
+                if low <= y and y <= high:
                     # 캔들 강조
                     self.in_candle = True
                     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)
-            elif self.volume:
+            elif self.in_volume_chart and self.volume:
                 # 거래량 강조
                 high = self.df['max_box_volume'][self.intx]
                 low = 0
                 if high < self.min_height_box_volume: high = self.min_height_box_volume
 
-                if high < y or y < low: self.in_volumebar = False
-                else:
+                if low <= y and y <= high:
                     self.in_volumebar = True
                     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))])
@@ -395,8 +396,8 @@ class InfoMixin(BoxMixin):
         self._length_text = lenth_high if lenth_volume < lenth_high else lenth_volume
         return
 
-    def _draw_box_artist(self, e, in_price_chart):
-        super()._draw_box_artist(e, in_price_chart)
+    def _draw_box_artist(self, e):
+        super()._draw_box_artist(e)
 
         if self.intx is not None:
             if self.in_candle: self._draw_candle_info_artist(e)

seolpyo_mplchart/_draw.py

@@ -251,11 +251,11 @@ class CandleSegmentMixin(DataMixin):
             tuple[tuple[float, float]]: candle segment
         """
         return (
-            (x, high), (x, top),
+            (x, top),
             (left, top), (left, bottom),
             (x, bottom), (x, low), (x, bottom),
             (right, bottom), (right, top),
-            (x, top), (x, high), (x, top),
+            (x, top), (x, high)
         )
 
     def _create_candle_segments(self):
@@ -411,9 +411,8 @@ class VolumeSegmentMixin(MaSegmentMixin):
             tuple[tuple[float, float]]: volume bar segment
         """
         return (
-            (left, top), (left, 0),
-            (right, 0), (right, top),
-            (left, top), (left, 0),
+            (left, 0), (left, top),
+            (right, top), (right, 0), 
         )
 
     def _create_volume_segments(self):

seolpyo_mplchart/_slider.py

@@ -131,7 +131,9 @@ class CollectionMixin(PlotMixin):
             keys.append('x')
             keys.append(f'ma{i}')
 
-        segment_slider = self.df[keys + ['x', self.close] ].values
+        series = self.df[keys + ['x', self.close]]
+        series['x'] = series['x'] - 0.5
+        segment_slider = series.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)
         linewidth = [1 for _ in self.list_ma]
@@ -300,7 +302,7 @@ class MouseMoveMixin(BackgroundMixin):
             self.figure.canvas.blit()
         elif self.in_price_chart or self.in_volume_chart:
             self._restore_region()
-            self._draw_crossline(e, self.in_price_chart)
+            self._draw_crossline(e)
             self.figure.canvas.blit()
         else:
             if self._erase_crossline():
@@ -376,10 +378,10 @@ class MouseMoveMixin(BackgroundMixin):
                 self.artist_text_slider.draw(renderer)
         return
 
-    def _draw_crossline(self, e: MouseEvent, in_price_chart):
+    def _draw_crossline(self, e: MouseEvent):
         self.collection_slider_vline.set_segments([((e.xdata, self.slider_ymin), (e.xdata, self.slider_ymax))])
         self.collection_slider_vline.draw(self.figure.canvas.renderer)
-        return super()._draw_crossline(e, in_price_chart)
+        return super()._draw_crossline(e)
 
 
 class ClickMixin(MouseMoveMixin):
@@ -405,7 +407,7 @@ class ClickMixin(MouseMoveMixin):
 
         navleft, navright = self.navcoordinate
         x = e.xdata.__round__()
-        
+
         leftmax = navleft + self._navLineWidth_half
         rightmin = navright - self._navLineWidth_half
 
@@ -565,7 +567,7 @@ class ChartClickMixin(ReleaseMixin):
         elif self.in_price_chart or self.in_volume_chart:
             self._restore_region(self.is_click_chart)
             if not self.is_click_chart:
-                self._draw_crossline(e, self.in_price_chart)
+                self._draw_crossline(e)
             else: self._move_chart(e)
             self.figure.canvas.blit()
         else:

seolpyo_mplchart/test.py

@@ -13,7 +13,7 @@ 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
+    min_distance = 2
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -29,27 +29,17 @@ class Chart(mc.SliderChart):
     def get_candle_segment(self, *, x, left, right, top, bottom, is_up, high, low):
         if is_up:
             return (
+                (x, top), (right, top), (x, top),
                 (x, high),
-                (x, top),
-                (right, top),
-                (x, top),
-                (x, bottom),
-                (left, bottom),
-                (x, bottom),
                 (x, low),
-                (x, high)
+                (x, bottom), (left, bottom), (x, bottom),
             )
         else:
             return (
+                (x, bottom), (right, bottom), (x, bottom),
                 (x, high),
-                (x, bottom),
-                (right, bottom),
-                (x, bottom),
-                (x, top),
-                (left, top),
-                (x, top),
                 (x, low),
-                (x, high)
+                (x, top), (left, top), (x, top),
             )
 
 
@@ -63,7 +53,7 @@ path_file = Path(__file__).parent / 'sample/samsung.txt'
 
 with open(path_file, 'r', encoding='utf-8') as txt:
     data = json.load(txt)
-df = pd.DataFrame(data[:20])
+df = pd.DataFrame(data[:100])
 
 C.set_data(df)
 

{seolpyo_mplchart-1.4.1.1.dist-info → seolpyo_mplchart-1.4.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: seolpyo-mplchart
-Version: 1.4.1.1
+Version: 1.4.1.3
 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
@@ -50,8 +50,9 @@ 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
+## change Candle shape sample(draw Bar Chart)
 ![Candle shape sample](https://raw.githubusercontent.com/white-seolpyo/seolpyo-mplchart/refs/heads/main/images/change%20candle%20segment.png)
 
-# 40,000 data sample
+# Mass Data Testing (40,000 Stock Price Data Points)
 ![40,000 sample](https://raw.githubusercontent.com/white-seolpyo/seolpyo-mplchart/refs/heads/main/images/40000.gif)
+

{seolpyo_mplchart-1.4.1.1.dist-info → seolpyo_mplchart-1.4.1.3.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=sQqMOkd8xgWMEs1RoUcAluiCQni680ri4WKCnzMiPHw,23515
-seolpyo_mplchart/_draw.py,sha256=W6nTcODv58ObNhWYCzF2gJad9_afFCE05svVPt3Xetk,23115
-seolpyo_mplchart/_slider.py,sha256=6GxxpAwDSTrqgr2dBpgU0sC6Xu5MAu5Hzpvrr9BKuuE,23374
+seolpyo_mplchart/_cursor.py,sha256=v__66q2P4MdIsHjCZL_WcW2A-iFmXZaQMvOmbXvvkno,23370
+seolpyo_mplchart/_draw.py,sha256=kD-FliRDDB7Jpfj_wbOtDs9bHla0oNr9_ksh5PXhUDI,23057
+seolpyo_mplchart/_slider.py,sha256=Tuaz0_R9_U0oFqsGPzOZ1Gc2RnDiHdDP-gJrNyMFUBc,23357
 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=fUVC4kaoiKk2GDbQRT1ed1O9Diuvi1Yeucms7KtGhU4,1835
+seolpyo_mplchart/test.py,sha256=hfqxvgffRxM7hZCNakpWGkzVdENMc31Nrmp4RpY05Lg,1646
 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.1.1.dist-info/METADATA,sha256=26Tk7uR7ILue3y3Nfs2MvHI24HbbJ4WpLWZrAb7-KqY,2678
-seolpyo_mplchart-1.4.1.1.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-seolpyo_mplchart-1.4.1.1.dist-info/top_level.txt,sha256=KgqFn7rKWize7OjMaTCHxKm9ie6vqnyb5c8fN7y_tSo,17
-seolpyo_mplchart-1.4.1.1.dist-info/RECORD,,
+seolpyo_mplchart-1.4.1.3.dist-info/METADATA,sha256=ytPqKuBmE7XSdhKLXat4HRGLp9PRPJfoI9qIgfymU3w,2728
+seolpyo_mplchart-1.4.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+seolpyo_mplchart-1.4.1.3.dist-info/top_level.txt,sha256=KgqFn7rKWize7OjMaTCHxKm9ie6vqnyb5c8fN7y_tSo,17
+seolpyo_mplchart-1.4.1.3.dist-info/RECORD,,

{seolpyo_mplchart-1.4.1.1.dist-info → seolpyo_mplchart-1.4.1.3.dist-info}/WHEEL

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