Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
64c54dc
fix annotation warnings
Czaki Aug 19, 2024
8122bd1
add code for finding edge intersection
Czaki Aug 19, 2024
3f693c0
initial implementation for convex polygons
Czaki Aug 20, 2024
1918a8f
move part of conde to c++
Czaki Aug 20, 2024
4887d75
avoid name collision
Czaki Aug 20, 2024
0fb8cae
fix bug in code
Czaki Aug 20, 2024
e17cc68
Merge remote-tracking branch 'origin/master' into triangulate
Czaki Aug 20, 2024
af3754c
rewrtte finding intersection to c++
Czaki Aug 21, 2024
aa5f750
rewrite is_convex
Czaki Aug 21, 2024
8370a5c
rewrite triangle convex polygon
Czaki Aug 21, 2024
71d1fab
simplify code
Czaki Aug 22, 2024
fa5d397
clang-format
Czaki Aug 22, 2024
8e7d5e2
split functions and define helper functions
Czaki Aug 23, 2024
0db1b59
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 23, 2024
3128a31
Merge remote-tracking branch 'origin/master' into triangulate
Czaki Aug 26, 2024
d420910
start implementing sweeping line triangulation
Czaki Aug 27, 2024
51001ed
implementation part 2
Czaki Aug 27, 2024
f8dd485
Merge remote-tracking branch 'origin/master' into triangulate
Czaki Sep 27, 2024
7026fe9
reformat file
Czaki Sep 27, 2024
123274b
describe steeps
Czaki Sep 27, 2024
bc8385f
improve code structure
Czaki Sep 30, 2024
adf837d
fix type annotation
Czaki Oct 4, 2024
9fa1084
Merge remote-tracking branch 'origin/master' into triangulate
Czaki Oct 8, 2024
416b1fc
add triangulate to install targets
Czaki Oct 8, 2024
5901858
fix configuration and fix code
Czaki Oct 8, 2024
ec2ed56
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 8, 2024
22052bd
fix warning in code
Czaki Oct 11, 2024
17d6292
Merge branch 'master' into triangulate
Czaki Oct 11, 2024
cc59c27
next style fixes
Czaki Oct 11, 2024
aec7522
refactor code for better readability
Czaki Oct 11, 2024
d6bbef8
clarify code
Czaki Oct 11, 2024
0921faf
Fix finding intersections
Czaki Oct 14, 2024
e934fc0
udpate docstrings
Czaki Oct 14, 2024
8ad3ab7
add comparator for left to righe edges order, start fixing finding in…
Czaki Oct 15, 2024
adf728f
comment out debug build
Czaki Oct 15, 2024
723150a
move between computers
Czaki Oct 17, 2024
289d5b6
fixing intersection part 2
Czaki Oct 23, 2024
6a04ade
use simple workaround for intersection edge case
Czaki Oct 23, 2024
955874a
fix addin intersection points to polygon
Czaki Oct 23, 2024
95e8bcb
add monotone polygon triangulation
Czaki Oct 24, 2024
0c9f537
polygon split initial
Czaki Oct 24, 2024
6363999
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 25, 2024
faeed03
Merge remote-tracking branch 'origin/master' into triangulate
Czaki Oct 25, 2024
b69627b
initial implementation of sweeping line triangulation
Czaki Oct 29, 2024
bb18964
fix orientation of triangles
Czaki Oct 29, 2024
a5de4c7
use c++ code for triangulation
Czaki Oct 29, 2024
89f99a9
more verbose test run
Czaki Oct 29, 2024
9f2cfe0
fix checking of point dupplication
Czaki Oct 29, 2024
9358480
Fix basic bugs
Czaki Oct 30, 2024
39b9fe4
first test for triangulation
Czaki Oct 30, 2024
4244cea
add basic test and fix left-right detection
Czaki Oct 30, 2024
1de7ab7
add intersection points
Czaki Oct 31, 2024
298db17
fix point repetition bugs
Czaki Oct 31, 2024
48e27b4
add problematic test
Czaki Nov 18, 2024
bb5ce5d
fix macos specific bug
Czaki Nov 18, 2024
573ffd8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 18, 2024
06b808e
fix intersection for colinear points
Czaki Nov 18, 2024
8fd0fda
try fix linux compilation fail
Czaki Nov 18, 2024
4d95153
add next test
Czaki Nov 19, 2024
6332bde
single place to define coordinate type
Czaki Nov 20, 2024
c5ba351
cleanup code
Czaki Nov 20, 2024
36453b2
fix IDE warnings
Czaki Nov 20, 2024
9b4c38f
fix another bug
Czaki Nov 27, 2024
9c7d4cb
add missed import
Czaki Nov 28, 2024
3f5482f
fix remaining bug
Czaki Nov 28, 2024
15fb3ac
cleanup code
Czaki Nov 28, 2024
688cc97
more clanup
Czaki Nov 28, 2024
ac8b7d1
add initial implementation of triangulating edge
Czaki Nov 28, 2024
d5ae2db
initialimplementation of edge triangulation
Czaki Nov 28, 2024
065ffa5
add test and fix triangles
Czaki Nov 29, 2024
1506c87
add triangulation of edges
Czaki Nov 29, 2024
3af7302
addres part of remarks from code review
Czaki Dec 5, 2024
e72b191
Merge remote-tracking branch 'origin/master' into triangulate
Czaki Dec 5, 2024
1a3baf0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 5, 2024
4a8b806
use memory view for triangulation call
Czaki Dec 10, 2024
089b5e4
use memory view for speedup
Czaki Dec 10, 2024
fff4293
improve code based on review
Czaki Dec 10, 2024
6d8f9b5
Merge branch 'master' into triangulate
Czaki Dec 16, 2024
2749fa4
more fixes
Czaki Dec 16, 2024
c3dd09f
use shared pointer and weak pointer to manage memory
Czaki Dec 16, 2024
8d62d63
fix exception message
Czaki Dec 16, 2024
6c1eff7
do not use raw pointer
Czaki Dec 16, 2024
db9d49c
Merge branch 'master' into triangulate
Czaki Dec 17, 2024
1a96342
split function get_left_right_edges on two
Czaki Dec 18, 2024
519b1cd
fix empty edge case
Czaki Dec 18, 2024
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
18 changes: 17 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
cmake_minimum_required(VERSION 3.21)
project(${SKBUILD_PROJECT_NAME} LANGUAGES CXX)

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_FLAGS_DEBUG_INIT "-DDEBUG -g")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -DDEBUG")


# Define compiler directive
add_definitions(-DNPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION)
Expand Down Expand Up @@ -103,6 +106,18 @@ python_add_library(_napari_mapping MODULE "${napari_mapping_cython_cxx}" WITH_SO
target_include_directories(_napari_mapping PRIVATE "${NUMPY_INCLUDE_DIR}")
target_link_libraries(_napari_mapping PRIVATE OpenMP::OpenMP_CXX)

cython_transpile(src/PartSegCore_compiled_backend/triangulate.pyx LANGUAGE CXX OUTPUT_VARIABLE triangulate_cython_cxx)
python_add_library(
triangulate MODULE
"${triangulate_cython_cxx}"
src/PartSegCore_compiled_backend/triangulation/triangulate.hpp
src/PartSegCore_compiled_backend/triangulation/intersection.hpp
src/PartSegCore_compiled_backend/triangulation/point.hpp
src/PartSegCore_compiled_backend/triangulation/debug_util.hpp
WITH_SOABI)
target_include_directories(triangulate PRIVATE "${NUMPY_INCLUDE_DIR}")
target_include_directories(triangulate PRIVATE src/PartSegCore_compiled_backend/)


install(TARGETS euclidean_cython DESTINATION PartSegCore_compiled_backend/sprawl_utils)
install(TARGETS path_sprawl_cython DESTINATION PartSegCore_compiled_backend/sprawl_utils)
Expand All @@ -113,3 +128,4 @@ install(TARGETS calc_bounds DESTINATION PartSegCore_compiled_backend)
install(TARGETS mso_bind DESTINATION PartSegCore_compiled_backend/multiscale_opening)
install(TARGETS _fast_unique DESTINATION PartSegCore_compiled_backend)
install(TARGETS _napari_mapping DESTINATION PartSegCore_compiled_backend)
install(TARGETS triangulate DESTINATION PartSegCore_compiled_backend)
4 changes: 3 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ sdist.include = ["src/PartSegCore_compiled_backend/version.py"]
cmake.version = ">=3.21"
sdist.exclude = [".github", "tox.ini", "build_utils", "notebooks", ".readthedocs.yaml"]
wheel.exclude = ["**.pyx"]
#cmake.build-type = "Debug"


[project]
Expand Down Expand Up @@ -139,7 +140,8 @@ quote-style = "single"
indent-style = "space"
docstring-code-format = true
line-ending = "lf"
skip-magic-trailing-comma = true
skip-magic-trailing-comma = false


[tool.ruff.lint]
select = [
Expand Down
Loading
Loading