seolpyo-mplchart 0.0.6__tar.gz → 0.0.31__tar.gz

{seolpyo_mplchart-0.0.6/seolpyo_mplchart.egg-info → seolpyo_mplchart-0.0.31}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: seolpyo-mplchart
-Version: 0.0.6
-Summary: Fast candlestick chart using Python. Includes navigator, slider, navigation, and text information display functions
+Version: 0.0.31
+Summary: Fast candlestick chart using Python.
 Author-email: white-seolpyo <white-seolpyo@naver.com>
 License: MIT License
 Project-URL: Homepage, https://white.seolpyo.com/
@@ -22,8 +22,8 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: matplotlib>=3.7.0
-Requires-Dist: pandas>=2.0.0
+Requires-Dist: matplotlib>=3.9.2
+Requires-Dist: pandas>=2.2.2
 
 # Donation
 Bitcoin: 1MKCHW8smDZv5DFMiVkA5G3DeXcMn871ZX
@@ -38,10 +38,6 @@ Ethereum: 0x1c5fb8a5e0b1153cd4116c91736bd16fabf83520
 
 
 # Sample
-![sample gif](https://github.com/user-attachments/assets/f1732891-d458-4c2d-a6bf-a17a4c549af6)
+![sample image](https://github.com/white-seolpyo/seolpyo-mplchart/blob/main/images/sample.gif?raw=true)
 
-![tkinter sample gif](https://github.com/user-attachments/assets/b9bd451c-71a7-4295-9bcc-0d2f7d440bbd)
-
-![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)
+![tkinter sample image](https://github.com/white-seolpyo/seolpyo-mplchart/blob/main/images/with%20tkinter.gif?raw=true)

seolpyo_mplchart-0.0.31/README.md

@@ -0,0 +1,16 @@
+# Donation
+Bitcoin: 1MKCHW8smDZv5DFMiVkA5G3DeXcMn871ZX
+
+Ethereum: 0x1c5fb8a5e0b1153cd4116c91736bd16fabf83520
+
+
+# Document
+[English](https://white.seolpyo.com/entry/148/)
+
+[한글](https://white.seolpyo.com/entry/147/)
+
+
+# Sample
+![sample image](https://github.com/white-seolpyo/seolpyo-mplchart/blob/main/images/sample.gif?raw=true)
+
+![tkinter sample image](https://github.com/white-seolpyo/seolpyo-mplchart/blob/main/images/with%20tkinter.gif?raw=true)

{seolpyo_mplchart-0.0.6 → seolpyo_mplchart-0.0.31}/pyproject.toml

@@ -1,20 +1,20 @@
 [build-system]
 requires = [
   "setuptools >= 65.0",
-  "matplotlib >= 3.7.0",
-  "pandas >= 2.0.0",
+  "matplotlib >= 3.9.2",
+  "pandas >= 2.2.2",
 ]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "seolpyo-mplchart"
-version = "0.0.6"
+version = "0.0.31"
 dependencies  = [
-  "matplotlib >= 3.7.0",
-  "pandas >= 2.0.0",
+  "matplotlib >= 3.9.2",
+  "pandas >= 2.2.2",
 ]
 license = {text = "MIT License"}
-description = "Fast candlestick chart using Python. Includes navigator, slider, navigation, and text information display functions"
+description = "Fast candlestick chart using Python.\nIncludes navigator, slider, navigation, and text information display functions"
 readme = "README.md"
 requires-python = ">= 3.11"
 authors = [

{seolpyo_mplchart-0.0.6 → seolpyo_mplchart-0.0.31}/seolpyo_mplchart/cursor.py

@@ -79,34 +79,6 @@ class DataMixin(CollectionMixin):
         df['rate_volume'] = ((df[self.volume] - df[self.volume].shift(1)) /  df[self.volume].shift(1) * 100).__round__(2).fillna(0)
         return
 
-    def set_text_coordante(self, vmin, vmax, pmin, pmax, volmax):
-        # 주가, 거래량 텍스트 x 위치
-        x_distance = (vmax - vmin) / 30
-        self.v0, self.v1 = (vmin + x_distance, vmax - x_distance)
-        self.text_price.set_x(self.v0)
-        self.text_volume.set_x(self.v0)
-
-        self.vmin, self.vmax = (vmin, vmax)
-        self.vmiddle = vmax - int((vmax - vmin) / 2)
-
-        psub = pmax - pmin
-        self.min_psub = psub / 12
-
-        # 주가 날짜 텍스트 y 위치
-        y = (psub) / 20 + pmin
-        self.text_date_price.set_y(y)
-        # 주가 정보 y 위치
-        y = pmax - (psub) / 20
-        self.text_price_info.set_y(y)
-
-        # 거래량 날짜 텍스트 y 위치
-        y = volmax * 0.85
-        self.text_date_volume.set_y(y)
-        # 거래량 정보 y 위치
-        self.text_volume_info.set_y(y)
-
-        return
-
 
 class LineMixin(DataMixin):
     in_slider, in_price, in_volume = (False, False, False)
@@ -200,12 +172,8 @@ class LineMixin(DataMixin):
         if self.in_index:
             intx = self.intx
             
-            h = self.df[self.high][intx]
-            l = self.df[self.low][intx]
-            sub = (h - l) / 2
-            if sub < self.min_psub: sub = self.min_psub
-            high = h + sub
-            low = l - sub
+            high = self.df[self.high][intx] * 1.02
+            low = self.df[self.low][intx] * 0.98
             if high < y or y < low: self._in_candle = False
             else:
                 self._in_candle = True
@@ -259,6 +227,31 @@ class InfoMixin(LineMixin):
 
         return
 
+    def set_text_coordante(self, vmin, vmax, pmin, pmax, volmax):
+        # 주가, 거래량 텍스트 x 위치
+        x_distance = (vmax - vmin) / 30
+        self.v0, self.v1 = (vmin + x_distance, vmax - x_distance)
+        self.text_price.set_x(self.v0)
+        self.text_volume.set_x(self.v0)
+
+        self.vmin, self.vmax = (vmin, vmax)
+        self.vmiddle = vmax - int((vmax - vmin) / 2)
+
+        # 주가 날짜 텍스트 y 위치
+        y = (pmax - pmin) / 20 + pmin
+        self.text_date_price.set_y(y)
+        # 주가 정보 y 위치
+        y = pmax - (pmax - pmin) / 20
+        self.text_price_info.set_y(y)
+
+        # 거래량 날짜 텍스트 y 위치
+        y = volmax * 0.85
+        self.text_date_volume.set_y(y)
+        # 거래량 정보 y 위치
+        self.text_volume_info.set_y(y)
+
+        return
+
     def _slider_move_action(self, e):
         super()._slider_move_action(e)
 
@@ -431,8 +424,7 @@ if __name__ == '__main__':
     file = Path(__file__).parent / 'data/apple.txt'
     with open(file, 'r', encoding='utf-8') as txt:
         data = json.load(txt)
-    n = 2600
-    data = data[n:n+100]
+    data = data[:100]
     df = pd.DataFrame(data)
 
     t = time()

{seolpyo_mplchart-0.0.6 → seolpyo_mplchart-0.0.31}/seolpyo_mplchart/draw.py

@@ -54,7 +54,7 @@ class DataMixin(Base):
             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): raise TypeError(f'Data column type must be "float64".(excluding "date" column)\ndf[{k!r}].dtype={dtype!r}')
 
         for i in self.list_ma: df[f'ma{i}'] = df[self.close].rolling(i).mean()
 
@@ -66,25 +66,25 @@ class DataMixin(Base):
         df['vleft'] = df['x'] - volumewidth_half
         df['vright'] = df['x'] + 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])
-        df['bottom'] = np.where(df[self.Open] <= df[self.close], df[self.Open], df[self.close])
-        df['bottom'] = np.where(df[self.close] < df[self.Open], df[self.close], df[self.Open])
+        df['top'] = np.where(df['open'] <= df['close'], df['close'], df['open'])
+        df['top'] = np.where(df['close'] < df['open'], df['open'], df['close'])
+        df['bottom'] = np.where(df['open'] <= df['close'], df['open'], df['close'])
+        df['bottom'] = np.where(df['close'] < df['open'], df['close'], df['open'])
 
         # 양봉
         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)
+            df.loc[df['close'] < df['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)
+            df.loc[df['close'] == df['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[self.close].shift(1)), 'facecolor'] = self.color_up_down
+            df.loc[(df['facecolor'] == self.color_up) & (df['close'] < df['close'].shift(1)), 'facecolor'] = self.color_up_down
         if self.color_down != self.color_down_up:
             # 음봉(비우기)
-            df.loc[(df['facecolor'] == self.color_down) & (df[self.close].shift(1) < df[self.close]), ['facecolor']] = self.color_down_up
+            df.loc[(df['facecolor'] == self.color_down) & (df['close'].shift(1) < df['close']), ['facecolor']] = self.color_down_up
 
         self.df = df
         return

{seolpyo_mplchart-0.0.6 → seolpyo_mplchart-0.0.31}/seolpyo_mplchart/slider.py

@@ -96,6 +96,9 @@ class NavgatorMixin(Mixin):
 
         if self._navcoordinate[0] == self._navcoordinate[1]:
             self._navcoordinate = (self._navcoordinate[0], self._navcoordinate[1]+self.min_distance)
+
+        self.background = None
+        self._draw()
         return
 
 
@@ -105,27 +108,19 @@ class BackgroundMixin(NavgatorMixin):
         self._restore_region()
         return
 
-    def _restore_region(self, with_nav=True, empty=False, empty_with_nav=False):
+    def _restore_region(self, with_nav=True):
         if not self.background: self._create_background()
 
-        if empty: self.canvas.restore_region(self.background_empty)
-        elif empty_with_nav: self.canvas.restore_region(self.background_empty_with_nav)
-        elif with_nav: self.canvas.restore_region(self.background_with_nav)
+        if with_nav: self.canvas.restore_region(self.background_with_nav)
         else: self.canvas.renderer.restore_region(self.background)
         return
 
     def _copy_bbox(self):
-        renderer = self.canvas.renderer
+        self.ax_slider.xaxis.draw(self.canvas.renderer)
+        self.ax_slider.yaxis.draw(self.canvas.renderer)
+        self.slidercollection.draw(self.canvas.renderer)
 
-        self.background_empty = renderer.copy_from_bbox(self.fig.bbox)
-
-        self.ax_slider.xaxis.draw(renderer)
-        self.ax_slider.yaxis.draw(renderer)
-        self.slidercollection.draw(renderer)
-        self.background_empty_with_nav = self.canvas.renderer.copy_from_bbox(self.fig.bbox)
-
-        self._draw_artist()
-        self.background = self.canvas.renderer.copy_from_bbox(self.fig.bbox)
+        super()._copy_bbox()
 
         self.navigator.draw(self.canvas.renderer)
         self.background_with_nav = self.canvas.renderer.copy_from_bbox(self.fig.bbox)
@@ -163,14 +158,15 @@ class DrawMixin(BackgroundMixin):
         return
 
     def _on_release(self, e: MouseEvent):
-        super()._on_release(e)
+        if e.inaxes is not self.ax_slider: return
+        self.is_click, self.is_move = (False, False)
+
+        if self._navcoordinate[0] == self._navcoordinate[1]:
+            self._navcoordinate = (self._navcoordinate[0], self._navcoordinate[1]+self.min_distance)
         self._set_navigator(*self._navcoordinate)
 
-        self._restore_region(empty=True)
-        self._creating_background = False
-        self._create_background()
-        self._restore_region()
-        self._blit()
+        self.background = None
+        self._draw()
         return
 
     def _on_move(self, e: MouseEvent):
@@ -242,6 +238,27 @@ class DrawMixin(BackgroundMixin):
 
 
 class LimMixin(DrawMixin):
+    def _restore_region(self, with_nav=True, empty=False):
+        if not self.background: self._create_background()
+
+        if empty: self.canvas.restore_region(self.background_empty)
+        elif with_nav: self.canvas.restore_region(self.background_with_nav)
+        else: self.canvas.renderer.restore_region(self.background)
+        return
+
+    def _copy_bbox(self):
+        self.ax_slider.xaxis.draw(self.canvas.renderer)
+        self.ax_slider.yaxis.draw(self.canvas.renderer)
+        self.slidercollection.draw(self.canvas.renderer)
+        self.background_empty = self.canvas.renderer.copy_from_bbox(self.fig.bbox)
+
+        self._draw_artist()
+        self.background = self.canvas.renderer.copy_from_bbox(self.fig.bbox)
+
+        self.navigator.draw(self.canvas.renderer)
+        self.background_with_nav = self.canvas.renderer.copy_from_bbox(self.fig.bbox)
+        return
+
     def _on_release(self, e: MouseEvent):
         if e.inaxes is not self.ax_slider: return
         self.is_click, self.is_move = (False, False)
@@ -251,14 +268,12 @@ class LimMixin(DrawMixin):
         self._set_navigator(*self._navcoordinate)
         self._lim()
 
-        self._restore_region(empty=True)
-        self._creating_background = False
-        self._create_background()
-        self._blit()
+        self.background = None
+        self._draw()
         return
 
     def _on_move(self, e):
-        self._restore_region(with_nav=(not self.is_click), empty_with_nav=self.is_click)
+        self._restore_region(with_nav=(not self.is_click), empty=self.is_click)
 
         self._on_move_action(e)
 
@@ -314,7 +329,7 @@ class LimMixin(DrawMixin):
 
 class SimpleMixin(LimMixin):
     simpler = False
-    limit_volume = 1_500
+    limit_volume = 2_000
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -336,7 +351,7 @@ class SimpleMixin(LimMixin):
         seg = self.df[['x', self.high, self.low]].agg(get_wickline, axis=1)
         self.blitcandle.set_segments(seg)
         self.blitcandle.set_edgecolor(self.df['edgecolor'])
-        self.priceline.set_verts(pd.array([self.df[['x', self.close]].apply(tuple, axis=1).to_list()]))
+        self.priceline.set_verts([self.df[['x', self.close]].apply(tuple, axis=1).tolist()])
 
         volmax = self.df[self.volume].max()
         l = self.df.__len__()
@@ -366,20 +381,12 @@ 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.simpler: self.blitcandle.draw(renderer)
         elif self.candle_on_ma:
             self.macollection.draw(renderer)
-            if 2_500 < Range: self.priceline.draw(renderer)
-            elif 800 < Range: self.blitcandle.draw(renderer)
-            else: self.candlecollection.draw(renderer)
+            self.candlecollection.draw(renderer)
         else:
-            if 2_500 < Range: self.priceline.draw(renderer)
-            elif 800 < Range: self.blitcandle.draw(renderer)
-            else: self.candlecollection.draw(renderer)
+            self.candlecollection.draw(renderer)
             self.macollection.draw(renderer)
 
         self.ax_volume.xaxis.draw(renderer)
@@ -429,16 +436,12 @@ class ClickMixin(SimpleMixin):
         if not self.is_click: return
         elif e.inaxes is self.ax_slider: return super()._on_release(e)
         elif not self.in_price and not self.in_volume and not self.is_click_chart: return
-        # 차트 click release action
         self.canvas.set_cursor(cursors.POINTER)
         self.is_click, self.is_move = (False, False)
         self.is_click_chart = False
 
-        self._restore_region(empty=True)
-        self._creating_background = False
-        self._create_background()
-        self._blit()
-        return
+        self._draw()
+        return self._restore_region()
 
     def _on_chart_click(self, e: MouseEvent):
         self.is_click = True
@@ -466,7 +469,7 @@ class ClickMixin(SimpleMixin):
         return
 
     def _on_move(self, e):
-        self._restore_region(with_nav=(not self.is_click), empty_with_nav=self.is_click)
+        self._restore_region(with_nav=(not self.is_click), empty=self.is_click)
 
         self._on_move_action(e)
 
@@ -591,7 +594,6 @@ if __name__ == '__main__':
     df = pd.DataFrame(data)
 
     t = time()
-    # c = SimpleMixin()
     c = SliderMixin()
     c.set_data(df)
     t2 = time() - t

{seolpyo_mplchart-0.0.6 → seolpyo_mplchart-0.0.31/seolpyo_mplchart.egg-info}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: seolpyo-mplchart
-Version: 0.0.6
-Summary: Fast candlestick chart using Python. Includes navigator, slider, navigation, and text information display functions
+Version: 0.0.31
+Summary: Fast candlestick chart using Python.
 Author-email: white-seolpyo <white-seolpyo@naver.com>
 License: MIT License
 Project-URL: Homepage, https://white.seolpyo.com/
@@ -22,8 +22,8 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: matplotlib>=3.7.0
-Requires-Dist: pandas>=2.0.0
+Requires-Dist: matplotlib>=3.9.2
+Requires-Dist: pandas>=2.2.2
 
 # Donation
 Bitcoin: 1MKCHW8smDZv5DFMiVkA5G3DeXcMn871ZX
@@ -38,10 +38,6 @@ Ethereum: 0x1c5fb8a5e0b1153cd4116c91736bd16fabf83520
 
 
 # Sample
-![sample gif](https://github.com/user-attachments/assets/f1732891-d458-4c2d-a6bf-a17a4c549af6)
+![sample image](https://github.com/white-seolpyo/seolpyo-mplchart/blob/main/images/sample.gif?raw=true)
 
-![tkinter sample gif](https://github.com/user-attachments/assets/b9bd451c-71a7-4295-9bcc-0d2f7d440bbd)
-
-![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)
+![tkinter sample image](https://github.com/white-seolpyo/seolpyo-mplchart/blob/main/images/with%20tkinter.gif?raw=true)

seolpyo_mplchart-0.0.31/seolpyo_mplchart.egg-info/requires.txt

@@ -0,0 +1,2 @@
+matplotlib>=3.9.2
+pandas>=2.2.2

seolpyo_mplchart-0.0.6/README.md

@@ -1,20 +0,0 @@
-# Donation
-Bitcoin: 1MKCHW8smDZv5DFMiVkA5G3DeXcMn871ZX
-
-Ethereum: 0x1c5fb8a5e0b1153cd4116c91736bd16fabf83520
-
-
-# Document
-[English](https://white.seolpyo.com/entry/148/)
-
-[한글](https://white.seolpyo.com/entry/147/)
-
-
-# Sample
-![sample gif](https://github.com/user-attachments/assets/f1732891-d458-4c2d-a6bf-a17a4c549af6)
-
-![tkinter sample gif](https://github.com/user-attachments/assets/b9bd451c-71a7-4295-9bcc-0d2f7d440bbd)
-
-![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)

seolpyo_mplchart-0.0.6/seolpyo_mplchart.egg-info/requires.txt

@@ -1,2 +0,0 @@
-matplotlib>=3.7.0
-pandas>=2.0.0