Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: 'CloudCompare/CloudCompare'
ref: be1fdb0fd05ec42d6922d7f18b22aab71c168ad6
ref: 04942bfd61458d9b67b10beb0690dcefdb2debb4
submodules: recursive

- name: Clone PythonRuntime
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: 'CloudCompare/CloudCompare'
ref: be1fdb0fd05ec42d6922d7f18b22aab71c168ad6
ref: 04942bfd61458d9b67b10beb0690dcefdb2debb4
submodules: recursive

- name: Clone PythonRuntime
Expand Down Expand Up @@ -149,7 +149,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: 'CloudCompare/CloudCompare'
ref: be1fdb0fd05ec42d6922d7f18b22aab71c168ad6
ref: 04942bfd61458d9b67b10beb0690dcefdb2debb4
submodules: recursive

- name: Clone PythonRuntime
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/CodeQL.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: 'CloudCompare/CloudCompare'
ref: fc2fe88a33ca9e406aab43b3bda6a9c6d38a2313
ref: 04942bfd61458d9b67b10beb0690dcefdb2debb4
submodules: recursive

- name: Clone PythonRuntime
Expand Down
2 changes: 1 addition & 1 deletion wrapper/pycc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
14 changes: 13 additions & 1 deletion wrapper/pycc/src/pycc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,19 @@ void define_someQtThings(py::module &m)
std::to_string(self.height()) + ")>";
});

py::class_<QPointF>(m, "QPointF");
py::class_<QPointF>(m, "QPointF")
.def(py::init<>())
.def(py::init<qreal, qreal>(), "x"_a, "y"_a)
.def("x", &QPointF::x)
.def("y", &QPointF::y)
.def("isNull", &QPointF::isNull)
.def("__repr__",
[](const QPointF &self)
{
return std::string("<QPointF(") + std::to_string(self.x()) + ", " +
std::to_string(self.y()) + ")>";
});

py::enum_<Qt::CursorShape>(m, "QtCursorShape")
.value("ArrowCursor", Qt::CursorShape::ArrowCursor)
.value("UpArrowCursor", Qt::CursorShape::UpArrowCursor)
Expand Down
3 changes: 2 additions & 1 deletion wrapper/pycc/src/qcc_db/ccGenericGLDisplay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Loading