Dev/interval

.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+indent_size = 4
+indent_style = tab
+tab_width = 4
+
+[*.{json,nix,yml}]
+indent_size = 2
+indent_style = space

.github/workflows/test_sonarcloud.yml

@@ -22,6 +22,8 @@ jobs:
           sudo apt update
           sudo apt install -y \
             gcovr
+#            gcovr \
+#            libxml2-utils
 
       - name: "Dependencies: Sonar"
         run: |
@@ -39,6 +41,11 @@ jobs:
             -o /tmp/sonar/build-wrapper-linux-x86.zip \
             -d /tmp/sonar/
 
+#      - name: "Dependencies: Report.CI"
+#        run: |
+#          curl https://report.ci/report.py \
+#            > /tmp/report.py
+
       - name: "Dependencies: Catch2"
         run: |
           git clone https://github.com/catchorg/Catch2.git
@@ -47,7 +54,7 @@ jobs:
           sudo cmake --build build/ --target install
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -78,3 +85,49 @@ jobs:
             -Dsonar.host.url="https://sonarcloud.io" \
             -Dsonar.login=${{ secrets.SONAR_TOKEN }} \
             -Dsonar.cfamily.cache.enabled=false
+
+#      - name: Produce test report
+#        run: |
+#          build/test/unit/openemsh_unittest \
+#            -r xml::out=build/test/unit/openemsh_unittest_result.catch.xml \
+#            || true
+#
+#      - name: Downgrade Catch XML format
+#        run: |
+#          sed \
+#            -i build/test/unit/openemsh_unittest_result.catch.xml \
+#            -e 's/<Catch2TestRun/<Catch/g' \
+#            -e '3i\<Group name="openemsh_unittest">' \
+#            -e "s/^<\/Catch2TestRun>/<\/Group>/"
+#          cat build/test/unit/openemsh_unittest_result.catch.xml \
+#            | tail -3 \
+#            | head -1 \
+#            >> build/test/unit/openemsh_unittest_result.catch.xml
+#          sed \
+#            -i build/test/unit/openemsh_unittest_result.catch.xml \
+#            -e '$a\</Catch>'
+#          xmllint \
+#            build/test/unit/openemsh_unittest_result.catch.xml \
+#            -o build/test/unit/openemsh_unittest_result.catch.xml \
+#            --format
+#
+#      - name: Export test report
+#        run: |
+#          python /tmp/report.py \
+#            --name "Unittest"
+#            --token ${{ secrets.REPORT_CI_TOKEN }} \
+#            --include-as-catch build/test/unit/*.catch.xml
+
+      - name: Produce test report
+        run: |
+          build/test/unit/openemsh_unittest \
+            -r junit::out=build/test/unit/openemsh_unittest_result.xml \
+          || true
+
+      - name: Export test report
+        uses: dorny/test-reporter@v1
+        with:
+          name: Unit tests
+          path: build/test/unit/openemsh_unittest_result.xml
+          reporter: java-junit
+          fail-on-error: false

.gitignore

@@ -1,3 +1,4 @@
+CMakeUserPresets.json
 *build*/
 .vscode/
 result/

CMakeLists.txt

@@ -24,11 +24,10 @@ set( CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS
 	)
 #]]
 
-find_package( CMakeUtils QUIET )
-if( CMakeUtils_FOUND )
-	message( STATUS "Found CMakeUtils: ${CMakeUtils_DIR}" )
-else()
-	message( STATUS "Not found CMakeUtils: Trying to download it with CPM" )
+option( CPM_DISABLE "Don't use CPM to retrieve dependencies" "$ENV{CPM_DISABLE}" )
+
+if( NOT CPM_DISABLE )
+	message( STATUS "Downloading dependencies with CPM" )
 
 	list( APPEND CMAKE_MODULE_PATH
 		"${CMAKE_SOURCE_DIR}/cmake"
@@ -43,14 +42,42 @@ else()
 		DOWNLOAD_ONLY
 		)
 
-	set( CMakeUtils_DIR "${FETCHCONTENT_BASE_DIR}/cmake-utils-src" )
+	set( CMakeUtils_DIR "${cmake-utils_SOURCE_DIR}" )
+
+	CPMAddPackage(
+		NAME pugixml
+		GITHUB_REPOSITORY zeux/pugixml
+		VERSION 1.12.1
+		OPTIONS
+			"BUILD_SHARED_LIBS ON"
+		)
+
+	set( pugixml_DIR "${pugixml_BINARY_DIR}" )
+
+	CPMAddPackage(
+		NAME CLI11
+		GITHUB_REPOSITORY CLIUtils/CLI11
+		VERSION 2.3.1
+		)
+
+	set( CLI11_DIR "${CLI11_BINARY_DIR}" )
+endif()
+
+find_package( CMakeUtils QUIET )
+if( CMakeUtils_FOUND )
+	message( STATUS "Found CMakeUtils: ${CMakeUtils_DIR}" )
+else()
+	message( STATUS "Not found CMakeUtils: Only minimal build enabled" )
+endif()
+
+find_package( pugixml REQUIRED )
+if( pugixml_FOUND )
+	message( STATUS "Found pugixml: ${pugixml_DIR} ${PUGIXML_VERSION}" )
+endif()
 
-	find_package( CMakeUtils QUIET )
-	if( CMakeUtils_FOUND )
-		message( STATUS "Found CMakeUtils: ${CMakeUtils_DIR}" )
-	else()
-		message( STATUS "Not found CMakeUtils: Only minimal build enabled" )
-	endif()
+find_package( CLI11 REQUIRED )
+if( CLI11_FOUND )
+	message( STATUS "Found CLI11: ${CLI11_DIR} ${CLI11_VERSION}" )
 endif()
 
 if( CMakeUtils_FOUND )

CMakePresets.json

@@ -0,0 +1,71 @@
+{
+  "version": 5,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 24,
+    "patch": 0
+  },
+  "configurePresets": [
+    {
+      "name": "common",
+      "hidden": true,
+      "binaryDir": "${sourceDir}/build",
+      "generator": "Unix Makefiles",
+      "cacheVariables": {
+        "CPM_DISABLE": "$penv{CPM_DISABLE}"
+      }
+    },
+    {
+      "name": "release",
+      "inherits": "common",
+      "environment": {
+        "CMAKE_BUILD_TYPE": "Release"
+      }
+    },
+    {
+      "name": "debug",
+      "inherits": "common",
+      "environment": {
+        "CMAKE_BUILD_TYPE": "Debug"
+      }
+    },
+    {
+      "name": "coverage",
+      "inherits": "debug",
+      "cacheVariables": {
+        "COVERAGE": true,
+        "COVERAGE_ERROR": false
+      }
+    },
+    {
+      "name": "coverage-sonar",
+      "inherits": "coverage",
+      "environment": {
+        "C": "gcc",
+        "CXX": "g++"
+      },
+      "cacheVariables": {
+        "SONAR": true
+      }
+    },
+    {
+      "name": "static",
+      "inherits": "debug",
+      "cacheVariables": {
+        "CODECHECKER_REPORT": true
+      }
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "coverage",
+      "configurePreset": "coverage",
+      "targets": "coverage"
+    },
+    {
+      "name": "codechecker",
+      "configurePreset": "static",
+      "targets": "codechecker"
+    }
+  ]
+}

cmake/CPM.cmake

@@ -1,15 +1,15 @@
-set(CPM_DOWNLOAD_VERSION 0.32.2)
+set(CPM_DOWNLOAD_VERSION 0.36.0)
 
 if(CPM_SOURCE_CACHE)
-  # Expand relative path. This is important if the provided path contains a tilde (~)
-  get_filename_component(CPM_SOURCE_CACHE ${CPM_SOURCE_CACHE} ABSOLUTE)
   set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
 elseif(DEFINED ENV{CPM_SOURCE_CACHE})
   set(CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
 else()
   set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
 endif()
 
+# Expand relative path. This is important if the provided path contains a tilde (~)
+get_filename_component(CPM_DOWNLOAD_LOCATION ${CPM_DOWNLOAD_LOCATION} ABSOLUTE)
 if(NOT (EXISTS ${CPM_DOWNLOAD_LOCATION}))
   message(STATUS "Downloading CPM.cmake to ${CPM_DOWNLOAD_LOCATION}")
   file(DOWNLOAD

default.nix

@@ -5,6 +5,7 @@
 , cmake-utils
 , git
 , texlive
+, pugixml
 }:
 
 with pkgs;
@@ -24,6 +25,19 @@ stdenv.mkDerivation {
     })
   ];
 
+  buildInputs = [
+    cli11
+    (pugixml.override { shared = true; })
+  ];
+
+  cmakeFlags = [
+    "-DCPM_DISABLE=ON"
+  ];
+
+  shellHook = ''
+    export CPM_DISABLE=ON
+  '';
+
   meta = {
     homepage = "https://github.com/Open-RFlab/openemsh";
     description = "OpenEMS mesher draft";

src/CMakeLists.txt

@@ -17,11 +17,19 @@ target_sources( openemsh
 	"${CMAKE_CURRENT_SOURCE_DIR}/domain/conflicts/conflict_too_close_meshline_policies.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/domain/conflicts/i_conflict_origin.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/domain/mesh/i_meshline_origin.cpp"
+	"${CMAKE_CURRENT_SOURCE_DIR}/domain/mesh/interval.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/domain/mesh/meshline.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/domain/mesh/meshline_policy.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/domain/meshline_policy_manager.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/domain/conflict_manager.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/domain/board.cpp"
+	"${CMAKE_CURRENT_SOURCE_DIR}/infra/parsers/csxcad_layer/point_3d.cpp"
+	"${CMAKE_CURRENT_SOURCE_DIR}/infra/parsers/parser_from_csx.cpp"
+	"${CMAKE_CURRENT_SOURCE_DIR}/infra/serializers/serializer_to_csx.cpp"
+	"${CMAKE_CURRENT_SOURCE_DIR}/infra/serializers/serializer_to_plantuml.cpp"
+	"${CMAKE_CURRENT_SOURCE_DIR}/infra/serializers/serializer_to_prettyprint.cpp"
+	"${CMAKE_CURRENT_SOURCE_DIR}/infra/utils/to_string.cpp"
+	"${CMAKE_CURRENT_SOURCE_DIR}/ui/cli.cpp"
 	)
 
 target_compile_definitions( openemsh
@@ -48,6 +56,41 @@ target_include_directories( openemsh
 	${CMAKE_CURRENT_SOURCE_DIR}
 	)
 
+target_link_libraries( openemsh
+	CLI11::CLI11
+	pugixml::shared
+	)
+
+add_executable( openemsh_bin )
+
+target_sources( openemsh_bin
+	PRIVATE
+	"${CMAKE_CURRENT_SOURCE_DIR}/main.cpp"
+	)
+
+target_compile_features( openemsh_bin
+	PRIVATE
+	cxx_std_17
+	)
+
+target_compile_options( openemsh_bin
+	PRIVATE
+	$<$<CONFIG:Coverage>:-O0>
+	$<$<OR:$<CONFIG:Coverage>,$<CONFIG:Debug>>:-Wall>
+	$<$<OR:$<CONFIG:Coverage>,$<CONFIG:Debug>>:-Wextra>
+#	$<$<OR:$<CONFIG:Coverage>,$<CONFIG:Debug>>:-Weffc++>
+	$<$<OR:$<CONFIG:Coverage>,$<CONFIG:Debug>>:-fexceptions>
+	)
+
+target_include_directories( openemsh_bin
+	PRIVATE
+	${CMAKE_CURRENT_SOURCE_DIR}
+	)
+
+target_link_libraries( openemsh_bin
+	openemsh
+	)
+
 #[[
 install(
 	TARGETS openemsh