diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..6075fde --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "dependencies/eigen"] + path = dependencies/eigen + url = https://gitlab.com/libeigen/eigen.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 3cc9cb3..fea0c1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) # PlaneGCS PART set(PlaneGCS_project_name "PlaneGCS") set(INCLUDE_BOOST_DIR "C:/local/boost_1_89_0") -set(INCLUDE_EIGEN_DIR ${CMAKE_CURRENT_SOURCE_DIR}/eigen-5.0.0) +set(INCLUDE_EIGEN_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/eigen) add_library(${PlaneGCS_project_name} STATIC GCS/GCS.cpp diff --git a/DRAWer_2_0.ui b/DRAWer_2_0.ui index 8bc1f52..88e5956 100644 --- a/DRAWer_2_0.ui +++ b/DRAWer_2_0.ui @@ -6,14 +6,14 @@ 0 0 - 691 - 615 + 776 + 701 1080 - 1080 + 1060 @@ -27,64 +27,103 @@ 23 - - - - 75 - 24 - - - - Line - - + + + + + + 75 + 24 + + + + Line + + + + + + + + + Primitives + + + Qt::AlignmentFlag::AlignCenter + + + true + + + + + + - - - - 75 - 24 - - - - Parallel - - - - - - - Perpendicular - - - - - - - - 75 - 24 - - - - P2P - - - - - - - Vertical - - - - - - - Horizontal - - + + + + + Constraints + + + Qt::AlignmentFlag::AlignCenter + + + + + + + + + + 75 + 24 + + + + P2P + + + + + + + Perpendicular + + + + + + + Horizontal + + + + + + + + 75 + 24 + + + + Parallel + + + + + + + Vertical + + + + + + @@ -108,6 +147,9 @@ 16777215 + + CrossCursor + Canvas @@ -120,7 +162,7 @@ 0 0 - 691 + 776 21 diff --git a/dependencies/eigen b/dependencies/eigen new file mode 160000 index 0000000..9164d3f --- /dev/null +++ b/dependencies/eigen @@ -0,0 +1 @@ +Subproject commit 9164d3f16ad21c1546d5fc99cd28fffc8ac3c1ee