PySide6Plot 0.0.1__tar.gz → 0.0.2__tar.gz

{pyside6plot-0.0.1 → pyside6plot-0.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySide6Plot
-Version: 0.0.1
+Version: 0.0.2
 Summary: Scientific/Financial plot utilities with PySide6+pyqtgraph.
 Author-email: YQ Cui <qianyun210603@hotmail.com>
 License-Expression: MIT

{pyside6plot-0.0.1 → pyside6plot-0.0.2}/PySide6Plot/libs/data_handler.py

@@ -38,6 +38,9 @@ class ChildDataFrame:
             min_y_key (str, optional): The key to access the minimum y-value data. Defaults to None.
             x_label_key (str, optional): The key to access the x-label data. Defaults to None.
         """
+        if "date" not in data_frame.columns:
+            if isinstance(data_frame.index, pd.DatetimeIndex):
+                data_frame.reset_index(inplace=True, drop=False)
         data_keys = data_keys if isinstance(data_keys, list) else [data_keys]
         self.data_keys = deepcopy(data_keys)
         if max_y_key is not None:

{pyside6plot-0.0.1 → pyside6plot-0.0.2}/PySide6Plot/libs/plot_item.py

@@ -1,8 +1,8 @@
 from pyqtgraph import QtGui, QtCore
 import pyqtgraph as pg
-from abc import abstractclassmethod
+from abc import abstractmethod
 import numpy as np
-from .style import DEFAULT_STYLE
+from .style import DEFAULT_STYLE, LINE_DEFAULT_STYLE
 from .data_handler import ChildDataFrame, PricesDataFrame, VolumeDataFrame
 
 
@@ -37,8 +37,8 @@ class AdaptiveGraphObject(pg.GraphicsObject):
         super().__init__()
         self.style = None
 
-    @abstractclassmethod
-    def get_local_plot_range(x_start, x_end):
+    @abstractmethod
+    def get_local_plot_range(self, x_start, x_end):
         """
         Abstract method to get the local plot range for the graph object.
 
@@ -51,8 +51,8 @@ class AdaptiveGraphObject(pg.GraphicsObject):
         """
         raise NotImplementedError
 
-    @abstractclassmethod
-    def get_x_ticks():
+    @abstractmethod
+    def get_x_ticks(self):
         """
         Abstract method to get the x-axis ticks for the graph object.
 
@@ -61,8 +61,8 @@ class AdaptiveGraphObject(pg.GraphicsObject):
         """
         raise NotImplementedError
 
-    @abstractclassmethod
-    def get_feature_value(key):
+    @abstractmethod
+    def get_feature_value(self, key):
         """
         Abstract method to get the value of a specific feature for the graph object.
 
@@ -223,7 +223,7 @@ class CandlestickVolumeItem(AdaptiveGraphObject):
         """
         return self.data.get_x_ticks()
 
-    def get_feature_value(self):
+    def get_feature_value(self, key=None):
         """
         Get the feature values for the volume item.
 
@@ -231,3 +231,78 @@ class CandlestickVolumeItem(AdaptiveGraphObject):
             numpy.ndarray: An array of feature values.
         """
         return np.asarray([data[1] / 1e8 for data in self.data])
+
+
+def draw_circle_marker(p, canvas_pt, marker_size):
+    """
+    Draws a circle marker at the specified canvas point.
+
+    Args:
+        p (QPainter): The painter object used for drawing.
+        canvas_pt (QPointF): The point where the marker should be drawn.
+        marker_size (float): The size of the marker.
+    """
+    p.drawEllipse(canvas_pt, marker_size, marker_size)
+
+
+class LinePlotItem(AdaptiveGraphObject):
+    """
+    A class representing a line plot item for displaying data.
+
+    Attributes:
+        data (ChildDataFrame): The data containing the values to be plotted.
+        style (Style, optional): The style of the line plot item. Defaults to DEFAULT_STYLE.
+    """
+
+    MARKER_DRAWER = {"circle": draw_circle_marker, "o": draw_circle_marker}
+
+    def __init__(self, data: ChildDataFrame, style=LINE_DEFAULT_STYLE, marker=None):
+        super().__init__()
+        self.data = data
+        self.style = style
+        self.marker_drawer = self.MARKER_DRAWER.get(marker, None)
+        self.picture = QtGui.QPicture()
+        p = QtGui.QPainter(self.picture)
+        p.setPen(pg.mkPen(self.style.line_color, width=self.style.line_width))
+        x = data.data_frame.index.to_numpy()
+        for data_key in data.data_keys:
+            if data_key not in data.data_frame.columns:
+                raise ValueError(f"Data key '{data_key}' not found in data frame.")
+            y = data.data_frame[data_key].to_numpy()
+            p.drawPolyline(QtGui.QPolygonF([QtCore.QPointF(x[i], y[i]) for i in range(len(x))]))
+        p.end()
+
+    def paint(self, p, *args):
+        p.drawPicture(0, 0, self.picture)
+        if self.marker_drawer is not None:
+            transform = p.transform()
+            # Set marker color
+            p.setPen(pg.mkPen(self.style.marker_color, width=self.style.line_width))
+            p.setBrush(pg.mkBrush(self.style.marker_color))
+            marker_size = self.style.marker_size / 2
+            x = self.data.data_frame.index.to_numpy()
+            # Reset transformation to canvas transform, so marker is unaffected by data scaling.
+            p.resetTransform()
+            for data_key in self.data.data_keys:
+                if data_key not in self.data.data_frame.columns:
+                    continue
+                y = self.data.data_frame[data_key].to_numpy()
+                for i in range(len(x)):
+                    # Map data point to canvas coordinate.
+                    data_pt = QtCore.QPointF(x[i], y[i])
+                    canvas_pt = transform.map(data_pt)
+                    self.marker_drawer(p, canvas_pt, marker_size)
+            # Restore the original transformation
+            p.setTransform(transform)
+
+    def boundingRect(self):
+        return QtCore.QRectF(self.picture.boundingRect())
+
+    def get_local_plot_range(self, x_start, x_end):
+        return self.data.get_local_range(x_start, x_end)
+
+    def get_x_ticks(self):
+        return self.data.get_x_ticks()
+
+    def get_feature_value(self, key=None):
+        return self.data.get_feature_value(key)

{pyside6plot-0.0.1 → pyside6plot-0.0.2}/PySide6Plot/libs/style.py

@@ -72,8 +72,41 @@ def default_style_configs() -> ConfigurationsHandler:
     return configs_handler
 
 
-def make_style(style_yaml_file="", **kwargs):
-    configs_handler = default_style_configs()
+def line_style_configs() -> ConfigurationsHandler:
+    configs_handler = ConfigurationsHandler()
+    configs_handler.add_config_item(
+        "line_color",
+        default_value=(255, 0, 0),
+        value_type=tuple,
+        in_func=lambda x, other_config: tuple_to_color(x),
+        out_func=lambda x, other_config: color_to_rbg_tuple(x),
+        description="color of the line",
+    )
+    configs_handler.add_config_item(
+        "line_width",
+        default_value=2.0,
+        value_type=float,
+        description="width of the line, the unit is pixel",
+    )
+    configs_handler.add_config_item(
+        "marker_color",
+        default_value=(255, 0, 0),
+        value_type=tuple,
+        in_func=lambda x, other_config: tuple_to_color(x),
+        out_func=lambda x, other_config: color_to_rbg_tuple(x),
+        description="color of the marker",
+    )
+    configs_handler.add_config_item(
+        "marker_size",
+        default_value=5.0,
+        value_type=float,
+        description="size of the marker",
+    )
+    return configs_handler
+
+
+def make_style(configs_handler=None, style_yaml_file="", **kwargs):
+    configs_handler = configs_handler or default_style_configs()
     if style_yaml_file != "":
         configs_handler.set_config_items_from_yaml(style_yaml_file)
     configs_handler.set_config_items(**kwargs)
@@ -117,3 +150,4 @@ def set_background_with_theme(widget: QWidget, theme=None):
 
 
 DEFAULT_STYLE = make_style()
+LINE_DEFAULT_STYLE = make_style(configs_handler=line_style_configs(), line_color=(255, 0, 0))

{pyside6plot-0.0.1 → pyside6plot-0.0.2}/PySide6Plot/widgets/q_plot_widget.py

@@ -98,7 +98,7 @@ class CustomizedAxis(AxisItem):
         if self.plot_strs is None:
             return f"{value:.1f}"
         else:
-            if value >= self.min_index and value <= self.max_index:
+            if self.min_index <= value <= self.max_index:
                 return self.plot_strs[round(value)]
             else:
                 return " "

{pyside6plot-0.0.1 → pyside6plot-0.0.2}/PySide6Plot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySide6Plot
-Version: 0.0.1
+Version: 0.0.2
 Summary: Scientific/Financial plot utilities with PySide6+pyqtgraph.
 Author-email: YQ Cui <qianyun210603@hotmail.com>
 License-Expression: MIT

{pyside6plot-0.0.1 → pyside6plot-0.0.2}/PySide6Plot.egg-info/SOURCES.txt

@@ -34,5 +34,6 @@ PySide6Plot/widgets/transparent_selector.py
 PySide6Plot/widgets/value_select_box.py
 PySide6Plot/widgets/zoom_bar.py
 examples/price_volume_plotter.py
+examples/qplotwidget_line_plot.py
 examples/sample_stock_data.h5
 examples/single_plotter.py

pyside6plot-0.0.2/examples/qplotwidget_line_plot.py

@@ -0,0 +1,43 @@
+# @Time    : 2025/7/16 21:43
+# @Author  : YQ Tsui
+# @File    : qplotwidget_line_plot.py
+# @Purpose :
+from PySide6Plot import QStockPlotter
+from PySide6Plot.libs.data_handler import ChildDataFrame
+from PySide6Plot.libs.plot_item import LinePlotItem
+import numpy as np
+import pandas as pd
+
+if __name__ == "__main__":
+    from PySide6.QtWidgets import QApplication, QVBoxLayout, QWidget
+    import sys
+
+    app = QApplication(sys.argv)
+
+    # Create a main window
+    main_window = QWidget()
+    main_window.setWindowTitle("Line Plot Example")
+    main_window.setGeometry(100, 100, 800, 600)
+
+    # Create a QPlotWidget instance
+    plot_widget = QStockPlotter()
+
+    # Add some sample data to the plot
+    test_df = pd.DataFrame(
+        np.random.rand(100), index=pd.date_range(end="2025-07-15", periods=100).rename("date"), columns=["data"]
+    )
+    # plot_widget.plot(x=list(range(len(test_df["data"]))), y=test_df["data"], pen="b", name="Sample Data")
+    line_data = ChildDataFrame(test_df, "data", x_label_key="date")
+    line_data_item = LinePlotItem(line_data, marker="circle")
+
+    plot_widget.add_main_item(line_data_item, x_ticks=line_data_item.get_x_ticks())
+
+    # Set up the layout
+    layout = QVBoxLayout(main_window)
+    layout.addWidget(plot_widget)
+
+    main_window.setLayout(layout)
+
+    main_window.show()
+
+    sys.exit(app.exec())