char101 commented 1 year ago

This is not really an issue, but I want to share some notes on building with PyQt6:

Install Visual Studio 2019 buildtools (since Qt only provides vs2019 binaries)
Install Qt 6.4 using the online installer or aqtinstall (aqt install-qt windows desktop 6.4.0 win64_msvc2019_64)
Download jom.exe and put it somewhere on the path
Install required modules: pip install -U sip PyQt-builder PyQt6

Modify pyproject.toml

diff --git a/pyproject.toml b/pyproject.toml
index c50a287..853192e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
# Specify the build system.
[build-system]
-requires = ['sip >=5.0.0, <7', 'PyQt-builder >=1.6, <2', 'PyQt5']
+requires = ['sip >=5.0.0, <7', 'PyQt-builder >=1.6, <2', 'PyQt6']
build-backend = 'sipbuild.api'

# Specify the PEP 566 metadata for the project.
@@ -35,11 +35,11 @@ classifier = [
 'Programming Language :: Python :: 3.11',
 'Topic :: Software Development :: User Interfaces'
]
-requires-dist = 'PyQt5'
+requires-dist = 'PyQt6'

[tool.sip.project]
sip-files-dir = 'sip'
-abi-version = '12'
+abi-version = '13.4'
sdist-excludes = [
 '.*',
 '.*/*',

Modify project.py


diff --git a/project.py b/project.py
index c7ba409..0698272 100644
--- a/project.py
+++ b/project.py
@@ -6,10 +6,10 @@ import subprocess
from os.path import join
from sipbuild import Option
from pyqtbuild import PyQtBindings, PyQtProject
-import PyQt5
+import PyQt6

-CPU_COUNT = os.cpu_count() if 'cpu_count' in dir(os) else 1 # number of parallel compilations +CPU_COUNT = 1 # os.cpu_count() if 'cpu_count' in dir(os) else 1 # number of parallel compilations

class QCustomPlotProject(PyQtProject): @@ -22,7 +22,7 @@ class QCustomPlotProject(PyQtProject): def update(self, tool): """Allows SIP to find PyQt5 .sip files.""" super().update(tool)

self.sip_include_dirs.append(join(PyQt5.path[0], 'bindings'))

self.sip_include_dirs.append(join(PyQt6.path[0], 'bindings'))

def build(self): self.build_qcustomplot()


7. Replace `iterator` with `const_iterator` in `datacontainer.h` since `const_iterator` cannot be `const_cast`-ed to `iterator`.
```diff
diff --git a/sip/datacontainer.h b/sip/datacontainer.h
index 1f8417a..53a4835 100644
--- a/sip/datacontainer.h
+++ b/sip/datacontainer.h
@@ -10,31 +10,31 @@ class QCPDataContainerIterator
public:
 QCPDataContainerIterator(QCPDataContainer<T> *container) :
     m_pContainer(container), m_Iter(container->begin()) {}

QCPDataContainerIterator(QCPDataContainer *container, typename QCPDataContainer::iterator itr) :
m_pContainer(container), m_Iter(itr) {}
// QCPDataContainerIterator(QCPDataContainer *container, typename QCPDataContainer::iterator itr) :
// m_pContainer(container), m_Iter(itr) {} QCPDataContainerIterator(QCPDataContainer *container, typename QCPDataContainer::const_iterator itr) :
m_pContainer(container), m_Iter(const_cast<typename QCPDataContainer::iterator>(itr)) {}
m_pContainer(container), m_Iter(itr) {}
T *next() noexcept
const T next() noexcept { // NULL if we're at the end or current item and advance iterator return (m_Iter == m_pContainer->end()) ? nullptr : &(m_Iter++); }
T *get() noexcept
const T get() noexcept { // NULL if we're at the end or current item return (m_Iter == m_pContainer->end()) ? nullptr : &(m_Iter); }
typename QCPDataContainer::iterator iterator() const noexcept
typename QCPDataContainer::const_iterator iterator() const noexcept { return m_Iter; }

protected: QCPDataContainer *m_pContainer;
typename QCPDataContainer::iterator m_Iter;

typename QCPDataContainer::const_iterator m_Iter; };

endif // __QCUSTOMPLOT_SIP_DATACONTAINER_H


8. Also update `datacontainer.sip`
```diff
diff --git a/sip/datacontainer.sip b/sip/datacontainer.sip
index 383f00e..e2939d1 100644
--- a/sip/datacontainer.sip
+++ b/sip/datacontainer.sip
@@ -103,7 +103,7 @@ class QCPDataContainerIterator
public:
QCPDataContainerIterator(QCPDataContainer<DataType> *container);

DataType *get();
const DataType *get(); %Docstring(format="deindented", signature="appended") Returns iterator current data point or None if iterator is invalid %End @@ -115,7 +115,7 @@ public: sipRes = sipCpp; %End
DataType *next();

const DataType *next(); %MethodCode sipRes = sipCpp->next(); if (!sipRes) {

9. Replace all `QVector` with `QList` in sip files
```sh
sed -i "s/QVector/QList/g" *.sip

Replace SIP_SSIZE_T with Py_ssize_t

sed -i "s/SIP_SSIZE_T/Py_ssize_t/g" *.sip

Compile the project

set PATH=<Qt Path>;%PATH%
set PATH=<Jom Path>;%PATH%
"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat" -arch=x64
sip-build --verbose

Wheel build (rename to .whl):

QCustomPlot2-2.1.1.1-cp311-none-win_amd64.zip

char101 commented 1 year ago

Test code

import sys
import math
from PyQt6.QtCore import Qt
from PyQt6.QtGui import QPen, QBrush, QColor
from PyQt6.QtWidgets import QApplication, QMainWindow
from QCustomPlot2 import *

app = QApplication(sys.argv)
window = QMainWindow()
window.resize(800, 600)

customPlot = QCustomPlot()
window.setCentralWidget(customPlot)

graph0 = customPlot.addGraph()
graph0.setPen(QPen(Qt.GlobalColor.blue))
graph0.setBrush(QBrush(QColor(0, 0, 255, 20)))

graph1 = customPlot.addGraph()
graph1.setPen(QPen(Qt.GlobalColor.red))

x, y0, y1 = [], [], []
for i in range (251):
    x.append(i)
    y0.append(math.exp(-i/150.0)*math.cos(i/10.0)) # exponentially decaying cosine
    y1.append(math.exp(-i/150.0))                  # exponential envelope

graph0.setData(x, y0)
graph1.setData(x, y1)

customPlot.rescaleAxes()
customPlot.setInteraction(QCP.Interaction.iRangeDrag)
customPlot.setInteraction(QCP.Interaction.iRangeZoom)
customPlot.setInteraction(QCP.Interaction.iSelectPlottables)

window.show()
sys.exit(app.exec())

2022-11-28 16_56_45-python

salsergey commented 1 year ago

I'm also working on Qt6 support now. I guess it will be merged soon. Maybe I'll use some code from your proposal as well. My idea is to support building QCustomPlot module with either Qt5 or Qt6 using the same code base.

salsergey / QCustomPlot-PyQt

[Windows] PyQt6 build #3

endif // __QCUSTOMPLOT_SIP_DATACONTAINER_H