Refactor node rendering, serialization, and graph model architecture

CMakeLists.txt

@@ -4,7 +4,7 @@ cmake_policy(SET CMP0072 NEW) # new in 3.11. The NEW behavior for this policy is
 cmake_policy(SET CMP0068 NEW) # new in 3.9. The NEW behavior of this policy is to ignore the RPATH settings for install_name on macOS.
 
 
-project(QtNodesLibrary CXX)
+project(QtNodesLibrary VERSION 3.0.16 LANGUAGES CXX)
 
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 
@@ -66,12 +66,14 @@ set(CPP_SOURCE_FILES
   src/AbstractGraphModel.cpp
   src/AbstractNodeGeometry.cpp
   src/BasicGraphicsScene.cpp
+  src/BasicGraphicsSceneGroups.cpp
   src/ConnectionGraphicsObject.cpp
   src/ConnectionState.cpp
   src/ConnectionStyle.cpp
   src/DataFlowGraphModel.cpp
   src/DataFlowGraphicsScene.cpp
   src/DefaultConnectionPainter.cpp
+  src/DefaultNodeGeometryBase.cpp
   src/DefaultHorizontalNodeGeometry.cpp
   src/DefaultNodePainter.cpp
   src/DefaultVerticalNodeGeometry.cpp
@@ -82,9 +84,11 @@ set(CPP_SOURCE_FILES
   src/NodeDelegateModel.cpp
   src/NodeDelegateModelRegistry.cpp
   src/NodeGraphicsObject.cpp
+  src/NodeRenderingUtils.cpp
   src/NodeState.cpp
   src/NodeStyle.cpp
   src/StyleCollection.cpp
+  src/SerializationValidation.cpp
   src/UndoCommands.cpp
   src/locateNode.cpp
   src/GroupGraphicsObject.cpp
@@ -100,6 +104,7 @@ set(HPP_HEADER_FILES
   include/QtNodes/internal/BasicGraphicsScene.hpp
   include/QtNodes/internal/Compiler.hpp
   include/QtNodes/internal/ConnectionGraphicsObject.hpp
+  include/QtNodes/internal/ConnectionIdIndex.hpp
   include/QtNodes/internal/ConnectionIdHash.hpp
   include/QtNodes/internal/ConnectionIdUtils.hpp
   include/QtNodes/internal/ConnectionState.hpp
@@ -115,12 +120,14 @@ set(HPP_HEADER_FILES
   include/QtNodes/internal/NodeDelegateModel.hpp
   include/QtNodes/internal/NodeDelegateModelRegistry.hpp
   include/QtNodes/internal/NodeGraphicsObject.hpp
+  include/QtNodes/internal/NodeRenderingUtils.hpp
   include/QtNodes/internal/NodeState.hpp
   include/QtNodes/internal/NodeStyle.hpp
   include/QtNodes/internal/OperatingSystem.hpp
   include/QtNodes/internal/QStringStdHash.hpp
   include/QtNodes/internal/QUuidStdHash.hpp
   include/QtNodes/internal/Serializable.hpp
+  include/QtNodes/internal/SerializationValidation.hpp
   include/QtNodes/internal/Style.hpp
   include/QtNodes/internal/StyleCollection.hpp
   include/QtNodes/internal/DefaultConnectionPainter.hpp
@@ -187,14 +194,14 @@ if(NOT "${CMAKE_CXX_SIMULATE_ID}" STREQUAL "MSVC")
   )
 endif()
 
-if(QT_NODES_DEVELOPER_DEFAULTS)
-  target_compile_features(QtNodes PUBLIC cxx_std_14)
-  set_target_properties(QtNodes PROPERTIES CXX_EXTENSIONS OFF)
-endif()
+target_compile_features(QtNodes PUBLIC cxx_std_14)
+set_target_properties(QtNodes PROPERTIES CXX_EXTENSIONS OFF)
 
 
 set_target_properties(QtNodes
   PROPERTIES
+    VERSION ${PROJECT_VERSION}
+    SOVERSION ${PROJECT_VERSION_MAJOR}
     ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
     LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
@@ -232,7 +239,6 @@ set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/QtNodes)
 
 install(TARGETS QtNodes
   EXPORT QtNodesTargets
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
@@ -254,7 +260,14 @@ configure_package_config_file(${CMAKE_CURRENT_LIST_DIR}/cmake/QtNodesConfig.cmak
   INSTALL_DESTINATION ${INSTALL_CONFIGDIR}
 )
 
+write_basic_package_version_file(
+  ${CMAKE_CURRENT_BINARY_DIR}/QtNodesConfigVersion.cmake
+  VERSION ${PROJECT_VERSION}
+  COMPATIBILITY SameMajorVersion
+)
+
 install(FILES
   ${CMAKE_CURRENT_BINARY_DIR}/QtNodesConfig.cmake
+  ${CMAKE_CURRENT_BINARY_DIR}/QtNodesConfigVersion.cmake
   DESTINATION ${INSTALL_CONFIGDIR}
 )