Issue 695 - Milestone 5: Autocalibration

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "submodules/asset_generator"]
 	path = submodules/asset_generator
 	url = https://github.com/3drepo/AssetGenerator.git
+[submodule "submodules/svgexport"]
+	path = submodules/svgexport
+	url = https://github.com/3drepo/SVGExporter

.travis.yml

@@ -33,6 +33,7 @@ matrix:
       before_install:
           - echo -e "machine github.com\n  login $TESTUSER\n  password $TESTPW" >~/.netrc
           - git submodule update --init --recursive
+          - git submodule status
           - sudo apt-get install gnupg curl
           - sudo apt remove mongodb && sudo apt purge mongodb && sudo apt autoremove && sudo rm -rf /var/lib/mongodb
           - curl -fsSL https://www.mongodb.org/static/pgp/server-5.0.asc | sudo gpg -o /usr/share/keyrings/mongodb-server-5.0.gpg --dearmor

CMakeLists.txt

@@ -148,6 +148,7 @@ option (REPO_BUILD_TOOLS "If the Command Line Tool is built in addition to the l
 option (REPO_BUILD_TESTS "If the test suite for the core bouncer logic is built in addition to the library" OFF)
 option (REPO_NO_GZIP "If zlib is not compiled into boost" OFF)
 option (REPO_ASSET_GENERATOR_SUPPORT "If the AssetGenerator is present and compiled into the library" ON)
+option (REPO_SVG_EXPORT_SUPPORT "If the customised Svg Exporter is present and compiled into the library" ON)
 
 
 #Build IFCUtils
@@ -165,6 +166,11 @@ if (REPO_ASSET_GENERATOR_SUPPORT)
 	add_subdirectory(submodules/asset_generator)
 endif()
 
+if (ODA_SUPPORT AND REPO_SVG_EXPORT_SUPPORT) # (The Svg exporter is an ODA extension so ODA is required)
+	add_definitions(-DREPO_SVG_EXPORT_SUPPORT)
+	add_subdirectory(submodules/svgexport)
+endif()
+
 #bouncer library
 add_subdirectory(bouncer)
 

bouncer/CMakeLists.txt

@@ -5,15 +5,41 @@ add_subdirectory(src)
 set(VERSION_MAJOR 5)
 set(VERSION_MINOR 11_4)
 
-include_directories(${Boost_INCLUDE_DIRS} ${MONGO_INCLUDE_DIR} ${ASSIMP_INCLUDE_DIR} ${OCCT_INCLUDE_DIR} ${IFCOPENSHELL_INCLUDE_DIR} ${ODA_INCLUDE_DIR} ${SYNCHRO_READER_INCLUDE_DIR} ${AWSSDK_INCLUDE_DIR} ${CRYPTOLENS_INCLUDE_DIR} src ../)
+include_directories(
+	${Boost_INCLUDE_DIRS}
+	${MONGO_INCLUDE_DIR}
+	${ASSIMP_INCLUDE_DIR}
+	${OCCT_INCLUDE_DIR}
+	${IFCOPENSHELL_INCLUDE_DIR}
+	${ODA_INCLUDE_DIR}
+	${SYNCHRO_READER_INCLUDE_DIR}
+	${AWSSDK_INCLUDE_DIR}
+	${CRYPTOLENS_INCLUDE_DIR}
+src ../
+)
 add_definitions(-DREPO_API_LIBRARY)
 
 add_library(3drepobouncer SHARED ${SOURCES})
 set_target_properties(3drepobouncer PROPERTIES RELEASE_POSTFIX "_${VERSION_MAJOR}_${VERSION_MINOR}")
 set_target_properties(3drepobouncer PROPERTIES DEBUG_POSTFIX "_${VERSION_MAJOR}_${VERSION_MINOR}_d")
 
-target_link_libraries(3drepobouncer  ${Boost_LIBRARIES} ${MONGO_LIBRARIES} ${ASSIMP_LIBRARIES} ${OCCT_LIBRARIES} ${IFCOPENSHELL_PARSERLIB} ${IFCOPENSHELL_GEOMLIB} ${ODA_LIB} ${SYNCHRO_READER_LIBRARIES} ${THRIFT_LIBRARIES} ${ZLIB_LIBRARIES} ${SYNCHRO_LIBRARIES} ${AWSSDK_LIBRARIES} ${CRYPTOLENS_LIBRARIES} ifcUtils_2x3 ifcUtils_4)
-
+target_link_libraries(3drepobouncer
+	${Boost_LIBRARIES}
+	${MONGO_LIBRARIES}
+	${ASSIMP_LIBRARIES}
+	${OCCT_LIBRARIES}
+	${IFCOPENSHELL_PARSERLIB}
+	${IFCOPENSHELL_GEOMLIB}
+	${ODA_LIB}
+	${SYNCHRO_READER_LIBRARIES}
+	${THRIFT_LIBRARIES}
+	${ZLIB_LIBRARIES}
+	${SYNCHRO_LIBRARIES}
+	${AWSSDK_LIBRARIES}
+	${CRYPTOLENS_LIBRARIES}
+	ifcUtils_2x3
+	ifcUtils_4
+)
 
 install(DIRECTORY src/ DESTINATION include FILES_MATCHING PATTERN "*.h")
 install(TARGETS 3drepobouncer DESTINATION lib)

bouncer/src/repo/core/model/bson/CMakeLists.txt

@@ -33,6 +33,7 @@ set(HEADERS
 	${CMAKE_CURRENT_SOURCE_DIR}/repo_bson_assets.h
 	${CMAKE_CURRENT_SOURCE_DIR}/repo_bson_binmapping_builder.h
 	${CMAKE_CURRENT_SOURCE_DIR}/repo_bson_builder.h
+	${CMAKE_CURRENT_SOURCE_DIR}/repo_bson_calibration.h
 	${CMAKE_CURRENT_SOURCE_DIR}/repo_bson_element.h
 	${CMAKE_CURRENT_SOURCE_DIR}/repo_bson_factory.h
 	${CMAKE_CURRENT_SOURCE_DIR}/repo_bson_project_settings.h

bouncer/src/repo/core/model/bson/repo_bson_calibration.h

@@ -0,0 +1,38 @@
+/**
+*  Copyright (C) 2024 3D Repo Ltd
+*
+*  This program is free software: you can redistribute it and/or modify
+*  it under the terms of the GNU Affero General Public License as
+*  published by the Free Software Foundation, either version 3 of the
+*  License, or (at your option) any later version.
+*
+*  This program is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU Affero General Public License for more details.
+*
+*  You should have received a copy of the GNU Affero General Public License
+*  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "repo_bson.h"
+
+namespace repo {
+	namespace core {
+		namespace model {
+
+			class REPO_API_EXPORT RepoCalibration : public RepoBSON
+			{
+			public:
+
+				RepoCalibration() : RepoBSON() {}
+
+				RepoCalibration(RepoBSON bson) : RepoBSON(bson) {}
+
+				~RepoCalibration() {}
+			};
+		}// end namespace model
+	} // end namespace core
+} // end namespace repo