seolpyo-mplchart 0.0.5__py3-none-any.whl → 0.0.6__py3-none-any.whl

seolpyo_mplchart/cursor.py

@@ -79,6 +79,34 @@ 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)
@@ -172,8 +200,12 @@ class LineMixin(DataMixin):
         if self.in_index:
             intx = self.intx
             
-            high = self.df[self.high][intx] * 1.02
-            low = self.df[self.low][intx] * 0.98
+            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
             if high < y or y < low: self._in_candle = False
             else:
                 self._in_candle = True
@@ -227,31 +259,6 @@ 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)
 
@@ -424,7 +431,8 @@ if __name__ == '__main__':
     file = Path(__file__).parent / 'data/apple.txt'
     with open(file, 'r', encoding='utf-8') as txt:
         data = json.load(txt)
-    data = data[:100]
+    n = 2600
+    data = data[n:n+100]
     df = pd.DataFrame(data)
 
     t = time()

seolpyo_mplchart/slider.py

@@ -96,9 +96,6 @@ 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
 
 
@@ -108,19 +105,27 @@ class BackgroundMixin(NavgatorMixin):
         self._restore_region()
         return
 
-    def _restore_region(self, with_nav=True):
+    def _restore_region(self, with_nav=True, empty=False, empty_with_nav=False):
         if not self.background: self._create_background()
 
-        if with_nav: self.canvas.restore_region(self.background_with_nav)
+        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)
         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)
+        renderer = self.canvas.renderer
 
-        super()._copy_bbox()
+        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)
 
         self.navigator.draw(self.canvas.renderer)
         self.background_with_nav = self.canvas.renderer.copy_from_bbox(self.fig.bbox)
@@ -158,15 +163,14 @@ class DrawMixin(BackgroundMixin):
         return
 
     def _on_release(self, e: MouseEvent):
-        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)
+        super()._on_release(e)
         self._set_navigator(*self._navcoordinate)
 
-        self.background = None
-        self._draw()
+        self._restore_region(empty=True)
+        self._creating_background = False
+        self._create_background()
+        self._restore_region()
+        self._blit()
         return
 
     def _on_move(self, e: MouseEvent):
@@ -238,27 +242,6 @@ 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)
@@ -268,12 +251,14 @@ class LimMixin(DrawMixin):
         self._set_navigator(*self._navcoordinate)
         self._lim()
 
-        self.background = None
-        self._draw()
+        self._restore_region(empty=True)
+        self._creating_background = False
+        self._create_background()
+        self._blit()
         return
 
     def _on_move(self, e):
-        self._restore_region(with_nav=(not self.is_click), empty=self.is_click)
+        self._restore_region(with_nav=(not self.is_click), empty_with_nav=self.is_click)
 
         self._on_move_action(e)
 
@@ -444,12 +429,16 @@ 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._draw()
-        return self._restore_region()
+        self._restore_region(empty=True)
+        self._creating_background = False
+        self._create_background()
+        self._blit()
+        return
 
     def _on_chart_click(self, e: MouseEvent):
         self.is_click = True
@@ -477,7 +466,7 @@ class ClickMixin(SimpleMixin):
         return
 
     def _on_move(self, e):
-        self._restore_region(with_nav=(not self.is_click), empty=self.is_click)
+        self._restore_region(with_nav=(not self.is_click), empty_with_nav=self.is_click)
 
         self._on_move_action(e)
 
@@ -602,6 +591,7 @@ if __name__ == '__main__':
     df = pd.DataFrame(data)
 
     t = time()
+    # c = SimpleMixin()
     c = SliderMixin()
     c.set_data(df)
     t2 = time() - t

{seolpyo_mplchart-0.0.5.dist-info → seolpyo_mplchart-0.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seolpyo-mplchart
-Version: 0.0.5
+Version: 0.0.6
 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-0.0.5.dist-info → seolpyo_mplchart-0.0.6.dist-info}/RECORD

@@ -1,13 +1,13 @@
 seolpyo_mplchart/__init__.py,sha256=bsfjo70OG4go5ZNaFziLpXPMZ9wWSGQdx1ujuaGBzCQ,1289
 seolpyo_mplchart/base.py,sha256=vQ4OOBm3nGwjJ4wjDLaD_3LGxYzlP6AWpI6SZrZiwnQ,3600
-seolpyo_mplchart/cursor.py,sha256=-IUk2JcjvIM-TjHyeJx3lJFVI_Sx0xccDcO_RL-Co4c,17185
+seolpyo_mplchart/cursor.py,sha256=JI4Fg935unIrisr_n5oIA7gxqVuXaX5-US7n34CADyg,17377
 seolpyo_mplchart/draw.py,sha256=ai8dpiz1ot4L9fphA3SRKhWMhNcWzvHUvQnZYo5p94I,12963
-seolpyo_mplchart/slider.py,sha256=NwlfkUWIhOdVuARQBF0XTBGWcKIWDBKb0xDHSGSai04,23482
+seolpyo_mplchart/slider.py,sha256=8jNNTloCun-_3rrcqXGmG48TLqthLc605Vn3i3EY5q4,23117
 seolpyo_mplchart/test.py,sha256=cW2hoaVbRtoSXlpmA4i1BKHBjI3-FAqYq__kryxkrC8,1007
 seolpyo_mplchart/utils.py,sha256=-8cq4-WwiqKQxtwu3NPxOVTDDvoWH28tu4OTWr4hPTg,1208
 seolpyo_mplchart/data/apple.txt,sha256=0izAfweu1lLsC0IwVthdVlo9reG8KGbKGTSX5knI5Zc,1380864
 seolpyo_mplchart/data/samsung.txt,sha256=UejaSkbzr4E5K3lkelCT0yJiWUPfmViBEaTyoXyphIs,2476424
-seolpyo_mplchart-0.0.5.dist-info/METADATA,sha256=mS3hGubW6hiJsyJkYnPy9RropeHZy2PnDzHP4g14a5g,2176
-seolpyo_mplchart-0.0.5.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-seolpyo_mplchart-0.0.5.dist-info/top_level.txt,sha256=KgqFn7rKWize7OjMaTCHxKm9ie6vqnyb5c8fN7y_tSo,17
-seolpyo_mplchart-0.0.5.dist-info/RECORD,,
+seolpyo_mplchart-0.0.6.dist-info/METADATA,sha256=9JA9JZ6a6NGzbCgvonyfJgIJat9tUY8apzBLLSUfe7g,2176
+seolpyo_mplchart-0.0.6.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+seolpyo_mplchart-0.0.6.dist-info/top_level.txt,sha256=KgqFn7rKWize7OjMaTCHxKm9ie6vqnyb5c8fN7y_tSo,17
+seolpyo_mplchart-0.0.6.dist-info/RECORD,,