From afe7c48945483b7daa673097d86be74a25fb24a5 Mon Sep 17 00:00:00 2001 From: tmontaigu Date: Mon, 7 Sep 2026 21:03:30 +0200 Subject: [PATCH] Update CC refs --- .github/workflows/Build.yml | 6 +++--- .github/workflows/CodeQL.yml | 2 +- wrapper/pycc/CMakeLists.txt | 2 +- wrapper/pycc/src/pycc.cpp | 14 +++++++++++++- wrapper/pycc/src/qcc_db/ccGenericGLDisplay.cpp | 3 ++- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 2e1b0543..958c2dae 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -17,7 +17,7 @@ jobs: uses: actions/checkout@v4 with: repository: 'CloudCompare/CloudCompare' - ref: be1fdb0fd05ec42d6922d7f18b22aab71c168ad6 + ref: 04942bfd61458d9b67b10beb0690dcefdb2debb4 submodules: recursive - name: Clone PythonRuntime @@ -80,7 +80,7 @@ jobs: uses: actions/checkout@v4 with: repository: 'CloudCompare/CloudCompare' - ref: be1fdb0fd05ec42d6922d7f18b22aab71c168ad6 + ref: 04942bfd61458d9b67b10beb0690dcefdb2debb4 submodules: recursive - name: Clone PythonRuntime @@ -149,7 +149,7 @@ jobs: uses: actions/checkout@v4 with: repository: 'CloudCompare/CloudCompare' - ref: be1fdb0fd05ec42d6922d7f18b22aab71c168ad6 + ref: 04942bfd61458d9b67b10beb0690dcefdb2debb4 submodules: recursive - name: Clone PythonRuntime diff --git a/.github/workflows/CodeQL.yml b/.github/workflows/CodeQL.yml index a42a5b88..d12e4bee 100755 --- a/.github/workflows/CodeQL.yml +++ b/.github/workflows/CodeQL.yml @@ -34,7 +34,7 @@ jobs: uses: actions/checkout@v4 with: repository: 'CloudCompare/CloudCompare' - ref: fc2fe88a33ca9e406aab43b3bda6a9c6d38a2313 + ref: 04942bfd61458d9b67b10beb0690dcefdb2debb4 submodules: recursive - name: Clone PythonRuntime diff --git a/wrapper/pycc/CMakeLists.txt b/wrapper/pycc/CMakeLists.txt index 3c964fea..06d0ede8 100644 --- a/wrapper/pycc/CMakeLists.txt +++ b/wrapper/pycc/CMakeLists.txt @@ -31,7 +31,7 @@ if(PYCC_IS_MASTER_PROJECT) GIT_REPOSITORY https://github.com/CloudCompare/CloudCompare GIT_SUBMODULES "libs/qCC_db/extern/CCCoreLib;libs/CCAppCommon/QDarkStyleSheet;plugins/core/IO/MeshIO;" GIT_PROGRESS ON - GIT_TAG be1fdb0fd05ec42d6922d7f18b22aab71c168ad6 + GIT_TAG 04942bfd61458d9b67b10beb0690dcefdb2debb4 GIT_SHALLOW OFF GIT_SUBMODULES ) diff --git a/wrapper/pycc/src/pycc.cpp b/wrapper/pycc/src/pycc.cpp index 52d1076b..710163ca 100644 --- a/wrapper/pycc/src/pycc.cpp +++ b/wrapper/pycc/src/pycc.cpp @@ -131,7 +131,19 @@ void define_someQtThings(py::module &m) std::to_string(self.height()) + ")>"; }); - py::class_(m, "QPointF"); + py::class_(m, "QPointF") + .def(py::init<>()) + .def(py::init(), "x"_a, "y"_a) + .def("x", &QPointF::x) + .def("y", &QPointF::y) + .def("isNull", &QPointF::isNull) + .def("__repr__", + [](const QPointF &self) + { + return std::string(""; + }); + py::enum_(m, "QtCursorShape") .value("ArrowCursor", Qt::CursorShape::ArrowCursor) .value("UpArrowCursor", Qt::CursorShape::UpArrowCursor) diff --git a/wrapper/pycc/src/qcc_db/ccGenericGLDisplay.cpp b/wrapper/pycc/src/qcc_db/ccGenericGLDisplay.cpp index aa397203..37b0492e 100644 --- a/wrapper/pycc/src/qcc_db/ccGenericGLDisplay.cpp +++ b/wrapper/pycc/src/qcc_db/ccGenericGLDisplay.cpp @@ -105,6 +105,7 @@ void define_ccGenericGLDisplay(py::module &m) "cameraMatrix"_a, "fov_deg"_a = 0.0f, "viewerBasedPerspective"_a = true, - "bubbleViewMode"_a = false); + "bubbleViewMode"_a = false, + "projectionCenterOffset"_a = QPointF()); // TODO as widget }