Add 4 stock chart support for add_chart and add_chart_sheet function

xuri · xuri · commit 834d53f09e0d · 2025-09-06T22:15:20.000+08:00
- Support create 4 kinds of box and whisker stock charts: "High-Low-Close", "Open-High-Low-Close", "Volume-High-Low-Close", "Volume-Open-High-Low-Close"
- Add new ChartUpDownBar data type
- Add 2 new fields up_bars and down_bars in the ChartPlotArea type
- Upgrade the dependencies package version
- Upgrade GitHub action tools version
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,7 +5,6 @@ permissions:
   pull-requests: write
 
 jobs:
-
   test:
     strategy:
       matrix:
@@ -17,54 +16,53 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go-version }}
+          cache: false
+
+      - name: Install Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Checkout code
+        uses: actions/checkout@v5
+
+      - name: Get dependencies
+        run: |
+          env GO111MODULE=on go vet ./...
+          pip install coverage
+
+      - name: Build
+        run: go build -v .
+
+      - name: Test on Windows
+        env:
+          CGO_ENABLED: 1
+        if: matrix.os == 'windows-latest'
+        run: go build -buildmode=c-shared -o libexcelize.amd64.windows.dll main.go && coverage run -m unittest
+
+      - name: Test on Linux
+        env:
+          CGO_ENABLED: 1
+        if: matrix.os == 'ubuntu-24.04'
+        run: go build -buildmode=c-shared -o libexcelize.amd64.linux.so main.go && coverage run -m unittest
+
+      - name: Test on macOS
+        env:
+          CGO_ENABLED: 1
+        if: matrix.os == 'macos-latest'
+        run: go build -buildmode=c-shared -o libexcelize.arm64.darwin.dylib main.go && coverage run -m unittest
 
-    - name: Install Go
-      uses: actions/setup-go@v5
-      with:
-        go-version: ${{ matrix.go-version }}
-        cache: false
-
-    - name: Install Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Checkout code
-      uses: actions/checkout@v4
-
-    - name: Get dependencies
-      run: |
-        env GO111MODULE=on go vet ./...
-        pip install coverage
-
-    - name: Build
-      run: go build -v .
-
-    - name: Test on Windows
-      env:
-        CGO_ENABLED: 1
-      if: matrix.os == 'windows-latest'
-      run: go build -buildmode=c-shared -o libexcelize.amd64.windows.dll main.go && coverage run -m unittest
-
-    - name: Test on Linux
-      env:
-        CGO_ENABLED: 1
-      if: matrix.os == 'ubuntu-24.04'
-      run: go build -buildmode=c-shared -o libexcelize.amd64.linux.so main.go && coverage run -m unittest
-
-    - name: Test on macOS
-      env:
-        CGO_ENABLED: 1
-      if: matrix.os == 'macos-latest'
-      run: go build -buildmode=c-shared -o libexcelize.arm64.darwin.dylib main.go && coverage run -m unittest
-
-    - name: Codecov
-      uses: codecov/codecov-action@v5
-      env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-      with:
-        flags: unittests
-        name: codecov-umbrella
+      - name: Codecov
+        uses: codecov/codecov-action@v5
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        with:
+          flags: unittests
+          name: codecov-umbrella
 
   build:
     runs-on: ${{ matrix.os }}
@@ -75,20 +73,19 @@ jobs:
         os: [ubuntu-24.04, macos-latest]
 
     steps:
-
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.24.x
+          go-version: 1.25.x
           cache: false
 
       - name: Install Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.9"
 
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Get dependencies
         run: |
@@ -155,24 +152,24 @@ jobs:
 
     if: github.event_name == 'release' && github.event.action == 'published'
     steps:
-    - name: Install Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: "3.9"
-
-    - name: Checkout code
-      uses: actions/checkout@v4
-
-    - name: Download Artifacts
-      uses: actions/download-artifact@v4
-      with:
-        merge-multiple: true
-        path: ./
-
-    - name: Build Python Package
-      run: |
-        pip install build setuptools wheel
-        python -m build
-
-    - name: Publish package distributions to PyPI
-      uses: pypa/gh-action-pypi-publish@release/v1
+      - name: Install Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.9"
+
+      - name: Checkout code
+        uses: actions/checkout@v5
+
+      - name: Download Artifacts
+        uses: actions/download-artifact@v5
+        with:
+          merge-multiple: true
+          path: ./
+
+      - name: Build Python Package
+        run: |
+          pip install build setuptools wheel
+          python -m build
+
+      - name: Publish package distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/excelize.py b/excelize.py
@@ -250,7 +250,7 @@ def c_value_to_py(ctypes_instance, py_instance):
                                     else c_array[i].contents.value
                                 )
                         else:
-                            #  Pointer array of the Go struct, for example: []*excelize.Options
+                            # Pointer array of the Go struct, for example: []*excelize.Options
                             for i in range(l):
                                 py_list.append(
                                     c_value_to_py(
@@ -419,7 +419,7 @@ def py_value_to_c(py_instance, ctypes_instance):
                                     py_to_base_ctype(py_list[i], c_type)
                                 )
                         else:
-                            #  Pointer array of the Go struct, for example: []*excelize.Options
+                            # Pointer array of the Go struct, for example: []*excelize.Options
                             for i in range(l):
                                 c_array[i] = pointer(
                                     py_value_to_c(py_list[i], c_type())
@@ -835,6 +835,8 @@ def add_chart(self, sheet: str, cell: str, chart: Chart, **combo: Chart) -> None
         | 52  | WireframeContour            | Wireframe contour chart                  |
         | 53  | Bubble                      | Bubble chart                             |
         | 54  | Bubble3D                    | 3D bubble chart                          |
+        | 55  | StockHighLowClose           | High-Low-Close stock chart               |
+        | 56  | StockOpenHighLowClose       | Open-High-Low-Close stock chart          |
 
         In Excel a chart series is a collection of information that defines
         which data is plotted such as values, axis labels and formatting.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/xuri/excelize-py
 go 1.23.0
 
 require (
-	github.com/xuri/excelize/v2 v2.9.2-0.20250819233021-845a2746d755
+	github.com/xuri/excelize/v2 v2.9.2-0.20250904030645-aca295923b09
 	golang.org/x/image v0.30.0
 )
 
diff --git a/go.sum b/go.sum
@@ -13,8 +13,8 @@ github.com/tiendc/go-deepcopy v1.6.1 h1:uVRTItFeNHkMcLueHS7OCsxgxT9P8MzGB/taUa2Y
 github.com/tiendc/go-deepcopy v1.6.1/go.mod h1:toXoeQoUqXOOS/X4sKuiAoSk6elIdqc0pN7MTgOOo2I=
 github.com/xuri/efp v0.0.1 h1:fws5Rv3myXyYni8uwj2qKjVaRP30PdjeYe2Y6FDsCL8=
 github.com/xuri/efp v0.0.1/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
-github.com/xuri/excelize/v2 v2.9.2-0.20250819233021-845a2746d755 h1:iEw4Ruca4g+xm/+BO6l7TKWYmc4vIAJ7j7VXuLWfQuQ=
-github.com/xuri/excelize/v2 v2.9.2-0.20250819233021-845a2746d755/go.mod h1:kJNWyr0LiVxr4LZiOJiN9w8t177/VpVsR4GIXvgzoAc=
+github.com/xuri/excelize/v2 v2.9.2-0.20250904030645-aca295923b09 h1:DJYS6eCwMDWmqyUBqSr5zEvMUy+SLXMT9r2H9k7J15U=
+github.com/xuri/excelize/v2 v2.9.2-0.20250904030645-aca295923b09/go.mod h1:kJNWyr0LiVxr4LZiOJiN9w8t177/VpVsR4GIXvgzoAc=
 github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9 h1:+C0TIdyyYmzadGaL/HBLbf3WdLgC29pgyhTjAT/0nuE=
 github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
 golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
diff --git a/types_c.h b/types_c.h
@@ -422,6 +422,24 @@ struct ChartDimension
     unsigned int Height;
 };
 
+// ChartLine directly maps the format settings of the chart line.
+struct ChartLine
+{
+    unsigned char Type;
+    unsigned char Dash;
+    struct Fill Fill;
+    bool Smooth;
+    double Width;
+};
+
+// ChartUpDownBar directly maps the format settings of the stock chart up bars
+// and down bars.
+struct ChartUpDownBar
+{
+    struct Fill Fill;
+    struct ChartLine Border;
+};
+
 // ChartPlotArea directly maps the format settings of the plot area.
 struct ChartPlotArea
 {
@@ -435,6 +453,8 @@ struct ChartPlotArea
     bool ShowSerName;
     bool ShowVal;
     struct Fill Fill;
+    struct ChartUpDownBar UpBars;
+    struct ChartUpDownBar DownBars;
     struct ChartNumFmt NumFmt;
 };
 
@@ -446,16 +466,6 @@ struct ChartLegend
     struct Font *Font;
 };
 
-// ChartLine directly maps the format settings of the chart line.
-struct ChartLine
-{
-    unsigned char Type;
-	unsigned char Dash;
-	struct Fill Fill;
-    bool Smooth;
-    double Width;
-};
-
 // ChartMarker directly maps the format settings of the chart marker.
 struct ChartMarker
 {
@@ -754,7 +764,8 @@ struct StringArrayErrorResult
     char *Err;
 };
 
-struct IntStringResult {
+struct IntStringResult
+{
     int K;
     char *V;
 };
@@ -824,13 +835,15 @@ struct GetSheetPropsResult
     char *err;
 };
 
-struct GetSheetMapResult {
+struct GetSheetMapResult
+{
     int ArrLen;
     struct IntStringResult *Arr;
     char *Err;
 };
 
-struct GetCommentsResult {
+struct GetCommentsResult
+{
     int CommentsLen;
     struct Comment *Comments;
     char *Err;
diff --git a/types_go.py b/types_go.py
@@ -394,6 +394,23 @@ class _ChartDimension(Structure):
     ]
 
 
+class _ChartLine(Structure):
+    _fields_ = [
+        ("Type", c_uint),
+        ("Dash", c_uint),
+        ("Fill", _Fill),
+        ("Smooth", c_bool),
+        ("Width", c_double),
+    ]
+
+
+class _ChartUpDownBar(Structure):
+    _fields_ = [
+        ("Fill", _Fill),
+        ("Border", _ChartLine),
+    ]
+
+
 class _ChartPlotArea(Structure):
     _fields_ = [
         ("SecondPlotValues", c_int),
@@ -406,6 +423,8 @@ class _ChartPlotArea(Structure):
         ("ShowSerName", c_bool),
         ("ShowVal", c_bool),
         ("Fill", _Fill),
+        ("UpBars", _ChartUpDownBar),
+        ("DownBars", _ChartUpDownBar),
         ("NumFmt", _ChartNumFmt),
     ]
 
@@ -418,16 +437,6 @@ class _ChartLegend(Structure):
     ]
 
 
-class _ChartLine(Structure):
-    _fields_ = [
-        ("Type", c_uint),
-        ("Dash", c_uint),
-        ("Fill", _Fill),
-        ("Smooth", c_bool),
-        ("Width", c_double),
-    ]
-
-
 class _ChartMarker(Structure):
     _fields_ = [
         ("Border", _ChartLine),
diff --git a/types_py.py b/types_py.py

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ module github.com/xuri/excelize-py`
`3`	`3`	`go 1.23.0`
`4`	`4`
`5`	`5`	`require (`
`6`		`- github.com/xuri/excelize/v2 v2.9.2-0.20250819233021-845a2746d755`
	`6`	`+ github.com/xuri/excelize/v2 v2.9.2-0.20250904030645-aca295923b09`
`7`	`7`	`golang.org/x/image v0.30.0`
`8`	`8`	`)`
`9`	`9`