From c7fbef50a59e16733d0e661d16e739521f4de9e3 Mon Sep 17 00:00:00 2001 From: Jean-Nicolas Date: Thu, 14 Jan 2021 13:55:15 +0100 Subject: [PATCH 01/43] Clean-ups before release (#82) * Clean-ups before release * Swap the cmake dependent option SP3_LINK_TO_USER_SITE to a regular cmake option. * Missing SofaBaseLinearSolver in RestShapeForcefied test --- CMake/SofaPython3Tools.cmake | 6 --- CMakeLists.txt | 52 +++++++++++++------ Plugin/CMakeLists.txt | 7 +++ bindings/Sofa/SofaPython3_SofaConfig.cmake.in | 5 -- .../tests/Core/PythonRestShapeForceField.py | 1 + runFromPython.py | 39 -------------- runSimu.py | 34 ------------ sofaenv.py | 19 ------- 8 files changed, 44 insertions(+), 119 deletions(-) delete mode 100644 bindings/Sofa/SofaPython3_SofaConfig.cmake.in delete mode 100644 runFromPython.py delete mode 100644 runSimu.py delete mode 100644 sofaenv.py diff --git a/CMake/SofaPython3Tools.cmake b/CMake/SofaPython3Tools.cmake index d3302db2..a5635943 100644 --- a/CMake/SofaPython3Tools.cmake +++ b/CMake/SofaPython3Tools.cmake @@ -69,7 +69,6 @@ function(SP3_add_python_package) ) endforeach() - message(STATUS "Python package ${A_SOURCE_DIRECTORY} added to directory ${SP3_PYTHON_PACKAGES_DIRECTORY}/${A_TARGET_DIRECTORY}") endfunction() # - Create a target for a python module binding code with pybind11 support. @@ -239,9 +238,4 @@ function(SP3_add_python_module) ) endforeach() - - if (NOT A_QUIET) - message(STATUS "Python module '${MODULE_NAME}' added to ${SP3_PYTHON_PACKAGES_DIRECTORY}/${DESTINATION}") - endif () - endfunction() diff --git a/CMakeLists.txt b/CMakeLists.txt index aee9d14b..2779322f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.12) project(SofaPython3) # Manually define VERSION -set(SOFAPYTHON3_VERSION_MAJOR 1) -set(SOFAPYTHON3_VERSION_MINOR 0) +set(SOFAPYTHON3_VERSION_MAJOR 20) +set(SOFAPYTHON3_VERSION_MINOR 12) set(SOFAPYTHON3_VERSION_PATCH 0) set(SOFAPYTHON3_VERSION ${SOFAPYTHON3_VERSION_MAJOR}.${SOFAPYTHON3_VERSION_MINOR}.${SOFAPYTHON3_VERSION_PATCH}) @@ -19,6 +19,18 @@ else() unset(SP3_COMPILED_AS_SUBPROJECT) endif () +# If the plugin is compiled within SOFA, add an option to deactivate it, in which case the remaining +# of this file won't run and therefore will not generate any error if the requirements (python, pybind11) +# are not found. +if (SP3_COMPILED_AS_SOFA_SUBPROJECT) + option(PLUGIN_SOFAPYTHON3 "Build the SofaPython3 plugin." ON) + if (NOT PLUGIN_SOFAPYTHON3) + return() + else() + message("Adding plugin SofaPython3") + endif() +endif() + # CMAKE TOOLS list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMake") include(SofaPython3Tools) @@ -89,12 +101,16 @@ set(SP3_PYTHON_PACKAGES_DIRECTORY This will be prepend to LIBRARY_OUTPUT_DIRECTORY (default to site-packages)" ) -# Get the Python's user site packages directory, or FASLE if not found +# Get the Python's user site packages directory, or FALSE if not found SP3_get_python_user_site() -CMAKE_DEPENDENT_OPTION( + +# Add an option to automatically create links towards the python packages of SP3 +# into the python's user site packages directory. +option( SP3_LINK_TO_USER_SITE "Install python packages to python's user site directory. The directory path can be changed by setting SP3_PYTHON_PACKAGES_LINK_DIRECTORY." - ON "PYTHON_USER_SITE" OFF) + OFF +) set(SP3_PYTHON_PACKAGES_LINK_DIRECTORY "${PYTHON_USER_SITE}" @@ -103,13 +119,17 @@ set(SP3_PYTHON_PACKAGES_LINK_DIRECTORY (default to $(python3 -m site --user-site))" ) -message("-- Python version: ${PYTHON_VERSION_STRING}") -message("-- Python executable: ${PYTHON_EXECUTABLE}") -message("-- Python include dirs: ${PYTHON_INCLUDE_DIRS}") -message("-- Python libraries: ${PYTHON_LIBRARIES}") -message("-- Python user site: ${PYTHON_USER_SITE}") -message("-- pybind11 version: ${pybind11_VERSION}") -message("-- pybind11 config: ${pybind11_CONFIG}") +message(STATUS "Python: + Version: ${PYTHON_VERSION_STRING} + Executable: ${PYTHON_EXECUTABLE} + Headers: ${PYTHON_INCLUDE_DIRS} + Libraries: ${PYTHON_LIBRARIES} + User site: ${PYTHON_USER_SITE}" +) +message(STATUS "pybind11: + Version: ${pybind11_VERSION} + Config: ${pybind11_CONFIG}" +) # When using python3 from XCode on MacOS, the RPath is wrongly set to XCode frameworks directory: # LC_LOAD_DYLIB @rpath/Python3.framework/Versions/3.7/Python3 @@ -134,10 +154,10 @@ if (NOT SP3_COMPILED_AS_SUBPROJECT) message(STATUS "SOFA Framework:\n\tVersion: ${SofaFramework_VERSION}\n\tLocation: ${SOFA_ROOT_DIR}") endif() -sofa_add_plugin(Plugin SofaPython3 ON) -sofa_add_plugin(bindings SofaPython3_Bindings ON) -sofa_add_plugin(examples SofaPython3_Examples ON) -sofa_add_plugin(docs SofaPython3_Docs ON) +add_subdirectory(Plugin) +add_subdirectory(bindings) +add_subdirectory(examples) +add_subdirectory(docs) SP3_add_python_package( SOURCE_DIRECTORY diff --git a/Plugin/CMakeLists.txt b/Plugin/CMakeLists.txt index 871a4e2c..d7d9ea21 100644 --- a/Plugin/CMakeLists.txt +++ b/Plugin/CMakeLists.txt @@ -77,6 +77,13 @@ if (CMAKE_SYSTEM_NAME STREQUAL Windows ) target_compile_definitions(${PROJECT_NAME} PUBLIC "-DHAVE_SNPRINTF") endif() +set_target_properties( + ${PROJECT_NAME} + PROPERTIES + CXX_VISIBILITY_PRESET "hidden" + CUDA_VISIBILITY_PRESET "hidden" +) + # Install header files foreach(header ${HEADER_FILES}) file(RELATIVE_PATH relative_path "${CMAKE_CURRENT_SOURCE_DIR}/src" "${header}") diff --git a/bindings/Sofa/SofaPython3_SofaConfig.cmake.in b/bindings/Sofa/SofaPython3_SofaConfig.cmake.in deleted file mode 100644 index 85e89c32..00000000 --- a/bindings/Sofa/SofaPython3_SofaConfig.cmake.in +++ /dev/null @@ -1,5 +0,0 @@ -#CMake package configuration file for the @PROJECT_NAME@ plugin - -@PACKAGE_INIT@ - -set(SOFAPYTHON3_BINDING_SOFA_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/package/Sofa") diff --git a/bindings/Sofa/tests/Core/PythonRestShapeForceField.py b/bindings/Sofa/tests/Core/PythonRestShapeForceField.py index a3fcab6b..79d7b15b 100644 --- a/bindings/Sofa/tests/Core/PythonRestShapeForceField.py +++ b/bindings/Sofa/tests/Core/PythonRestShapeForceField.py @@ -38,6 +38,7 @@ def RestShapeObject(impl, name="unnamed", position=[]): return node def createScene(node): + node.addObject("RequiredPlugin", name="SofaBaseLinearSolver") node.addObject("RequiredPlugin", name="SofaImplicitOdeSolver") node.addObject("DefaultAnimationLoop", name="loop") node.addObject("EulerImplicitSolver") diff --git a/runFromPython.py b/runFromPython.py deleted file mode 100644 index ba28caf2..00000000 --- a/runFromPython.py +++ /dev/null @@ -1,39 +0,0 @@ -# encoding: utf-8 -#!/usr/bin/python3 -import sys -import os - -if "SOFA_ROOT" not in os.environ: - print("WARNING: missing SOFA_ROOT in you environment variable. ") - sys.exit(-1) - -sys.path.append(os.path.abspath("./bindings/Sofa/package")) -sys.path.append(os.path.abspath("./bindings/SofaRuntime/package")) -sys.path.append(os.path.abspath("./bindings/SofaTypes/package")) - -import Sofa -import SofaRuntime - -## Register all the common component in the factory. -SofaRuntime.importPlugin("SofaAllCommonComponents") - -class MyController(Sofa.Controller): - def __init__(self, *args, **kwargs): - Sofa.Controller.__init__(self,*args, **kwargs) - print("INITED") - - def onEvent(self, event): - print("Event: "+event) - - -root = Sofa.Node("myroot") -root.addChild("child1") -root.addObject(MyController()) - -Sofa.Simulation.init(root) -Sofa.Simulation.print(root) -for i in range(0, 10): - print("step: "+str(i)) - Sofa.Simulation.animate(root, 0.1) - - diff --git a/runSimu.py b/runSimu.py deleted file mode 100644 index 6a9ad25d..00000000 --- a/runSimu.py +++ /dev/null @@ -1,34 +0,0 @@ -# encoding: utf-8 -#!/usr/bin/python3 -import sys -import os - -if "SOFA_ROOT" not in os.environ: - print("WARNING: missing SOFA_ROOT in you environment variable. ") - sys.exit(-1) - -sys.path.append(os.path.abspath("./bindings/Sofa/package")) -sys.path.append(os.path.abspath("./bindings/SofaRuntime/package")) -sys.path.append(os.path.abspath("./bindings/SofaTypes/package")) - -import Sofa -import SofaRuntime - -## Register all the common component in the factory. -SofaRuntime.importPlugin("SofaAllCommonComponents") - -if len(sys.argv) != 2: - print("USAGE: python3 runSimu.py scene.py") - sys.exit(-1) - -## Version 1 -print("READY FOR INIT 0") -s = SofaRuntime.loadSimulationFromFile(sys.argv[1]) -s.init() -for i in range(10): - print("Iteration: ...") - s.animate(0.1) - - - - diff --git a/sofaenv.py b/sofaenv.py deleted file mode 100644 index bf0d9ffd..00000000 --- a/sofaenv.py +++ /dev/null @@ -1,19 +0,0 @@ -#encoding: utf-8 -#!/usr/bin/python3 - -import sys -import os - - #if "SOFA_ROOT" not in os.environ: - # print("WARNING: missing SOFA_ROOT in you environment variable. ") - # sys.exit(-1) - -#sys.path.append(os.path.abspath("./bindings/Sofa/package")) -#sys.path.append(os.path.abspath("./bindings/SofaRuntime/package")) -#sys.path.append(os.path.abspath("./bindings/SofaTypes/package")) - -#import Sofa -#import SofaRuntime - - - From a3804e9dd7d3befffe6c86b3b4f9bf9821e4b686 Mon Sep 17 00:00:00 2001 From: Guillaume Paran Date: Thu, 14 Jan 2021 23:12:16 +0100 Subject: [PATCH 02/43] Improve CMake for v20.12 (#83) * Build SofaPython3 alongside SofaPython because it's possible. * Keep only one ON-OFF option: PLUGIN_SOFAPYTHON3 * Use new macros from SofaMacros * Improve install tree * [cmake] Fix rpaths for both in-tree and out-of-tree * [cmake] Use a global cmake variable to set the RPath to all targets under the bindings directory Co-authored-by: Jean-Nicolas Brunet --- CMake/SofaPython3Tools.cmake | 36 ++++++- CMakeLists.txt | 44 +++----- Plugin/CMakeLists.txt | 55 ++-------- .../src/SofaPython3/PythonTestExtractor.cpp | 5 + bindings/CMakeLists.txt | 70 ++++++------ bindings/Modules/tests/CMakeLists.txt | 16 +-- bindings/Sofa/tests/CMakeLists.txt | 16 +-- bindings/SofaExporter/CMakeLists.txt | 6 +- bindings/SofaExporter/tests/CMakeLists.txt | 34 ------ .../tests/PythonModule_SofaExporter_test.cpp | 101 ------------------ .../SofaExporter/tests/tests/STLExporter.py | 11 -- bindings/SofaRuntime/tests/CMakeLists.txt | 22 ++-- .../tests/PythonModule_SofaRuntime_test.cpp | 2 +- .../tests/{tests => SofaRuntime}/Base.py | 0 bindings/SofaTypes/tests/CMakeLists.txt | 14 +-- 15 files changed, 119 insertions(+), 313 deletions(-) delete mode 100644 bindings/SofaExporter/tests/CMakeLists.txt delete mode 100644 bindings/SofaExporter/tests/PythonModule_SofaExporter_test.cpp delete mode 100644 bindings/SofaExporter/tests/tests/STLExporter.py rename bindings/SofaRuntime/tests/{tests => SofaRuntime}/Base.py (100%) diff --git a/CMake/SofaPython3Tools.cmake b/CMake/SofaPython3Tools.cmake index a5635943..5fe03fd3 100644 --- a/CMake/SofaPython3Tools.cmake +++ b/CMake/SofaPython3Tools.cmake @@ -65,7 +65,7 @@ function(SP3_add_python_package) get_filename_component(relative_directory ${file_relative_path} DIRECTORY) install( FILES "${OUTPUT_DIRECTORY}/${file_relative_path}" - DESTINATION "${LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}/${A_TARGET_DIRECTORY}/${relative_directory}" + DESTINATION "lib/${SP3_PYTHON_PACKAGES_DIRECTORY}/${A_TARGET_DIRECTORY}/${relative_directory}" ) endforeach() @@ -171,9 +171,35 @@ function(SP3_add_python_module) if (APPLE) # In MacOS, the target dependency name is RPATH/site-packages/PackageName, so we need to add - # an RPATH to the directory that contains "site-paclages" + # an RPATH to the directory that contains "site-packages" list(APPEND ${A_TARGET}_DEPENDECIES_RPATH "$ORIGIN/../..") endif() + + # Compute the installation RPATHs from the target's SOFA relocatable dependencies + # 1. First, compute the relative path from the current target towards the "plugins" relocatable directory of SOFA + # 2. Append to the previous computed path the RELOCATABLE_INSTALL_DIR target property of the dependency since the + # latter is formulated with respect to the "plugins" relocatable (e.g. "plugins/SofaBoundaryConditions/lib") + foreach(DEPENDENCY ${A_DEPENDS}) + if (TARGET ${DEPENDENCY}) + get_target_property(DEPENDENCY_RELOCATABLE_INSTALL_DIR "${DEPENDENCY}" RELOCATABLE_INSTALL_DIR) + if (DEPENDENCY_RELOCATABLE_INSTALL_DIR) + # Get the relative path from this binding module to the install lib directory + # For example, for lib/python3/site-packages/Sofa/Core.***.so, the relative path will be + # "../../.." + file(RELATIVE_PATH relative_towards_plugins_dir "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}/${DESTINATION}" "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") + # Here, we assume that the SP3 plugin will be installed in the SOFA plugins directory (i.e. $SOFA_ROOT/plugins) + # Hence, we need to compute the relative path from this plugins directory to the current binding + # modules, for example, plugins/SofaPython3/lib/python3/site-packages/Sofa/Core.***.so + # will become "../../../../../.." (three levels upper than the previous computed relative path) + set(relative_towards_plugins_dir "${relative_towards_plugins_dir}../../..") + + # Alright, now we have the path from the current target towards the "plugins" relocatable directory of SOFA + # We can compute the relative path from the current target towards the dependency relocatable path. + set(relative_towards_dependency_dir "${relative_towards_plugins_dir}/${DEPENDENCY_RELOCATABLE_INSTALL_DIR}") + list(APPEND ${A_TARGET}_DEPENDECIES_RPATH "$ORIGIN/${relative_towards_dependency_dir}/lib") + endif() + endif() + endforeach() set_target_properties( ${A_TARGET} @@ -220,9 +246,9 @@ function(SP3_add_python_module) install(TARGETS ${A_TARGET} EXPORT BindingsTargets - RUNTIME DESTINATION "${LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}/${DESTINATION}" COMPONENT applications - LIBRARY DESTINATION "${LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}/${DESTINATION}" COMPONENT libraries - ARCHIVE DESTINATION "${LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}/${DESTINATION}" COMPONENT libraries + RUNTIME DESTINATION "lib/${SP3_PYTHON_PACKAGES_DIRECTORY}/${DESTINATION}" COMPONENT applications + LIBRARY DESTINATION "lib/${SP3_PYTHON_PACKAGES_DIRECTORY}/${DESTINATION}" COMPONENT libraries + ARCHIVE DESTINATION "lib/${SP3_PYTHON_PACKAGES_DIRECTORY}/${DESTINATION}" COMPONENT libraries ) foreach(header ${A_HEADERS}) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2779322f..73500a03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,12 +1,6 @@ cmake_minimum_required(VERSION 3.12) -project(SofaPython3) - -# Manually define VERSION -set(SOFAPYTHON3_VERSION_MAJOR 20) -set(SOFAPYTHON3_VERSION_MINOR 12) -set(SOFAPYTHON3_VERSION_PATCH 0) -set(SOFAPYTHON3_VERSION ${SOFAPYTHON3_VERSION_MAJOR}.${SOFAPYTHON3_VERSION_MINOR}.${SOFAPYTHON3_VERSION_PATCH}) +project(SofaPython3 VERSION 20.12.0) # Detect if SofaPython3 is a subproject of another project (eg. when compiled within Sofa) if (NOT "${CMAKE_PROJECT_NAME}" STREQUAL "${PROJECT_NAME}") @@ -31,16 +25,17 @@ if (SP3_COMPILED_AS_SOFA_SUBPROJECT) endif() endif() -# CMAKE TOOLS -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMake") -include(SofaPython3Tools) - +# SofaPython3 cannot be compiled alongside SofaPython(2) if (SP3_COMPILED_AS_SOFA_SUBPROJECT) if(PLUGIN_SOFAPYTHON) message(FATAL_ERROR "SofaPython3 cannot be built alongside SofaPython. Please set PLUGIN_SOFAPYTHON to OFF") endif() endif() +# CMAKE TOOLS +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMake") +include(SofaPython3Tools) + # OPTIONS include(CMakeDependentOption) @@ -173,24 +168,11 @@ SP3_add_python_package( Sofa/constants ) -configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/SofaPython3Config.cmake.in" - "${CMAKE_BINARY_DIR}/cmake/SofaPython3/SofaPython3Config.cmake" - INSTALL_DESTINATION - "${LIBRARY_OUTPUT_DIRECTORY}/cmake/SofaPython3" -) -write_basic_package_version_file( - ${CMAKE_BINARY_DIR}/cmake/SofaPython3/SofaPython3ConfigVersion.cmake - VERSION ${SOFAPYTHON3_VERSION} - COMPATIBILITY AnyNewerVersion -) - -install(FILES - "${CMAKE_BINARY_DIR}/cmake/SofaPython3/SofaPython3Config.cmake" - "${CMAKE_BINARY_DIR}/cmake/SofaPython3/SofaPython3ConfigVersion.cmake" - DESTINATION - "${LIBRARY_OUTPUT_DIRECTORY}/cmake/SofaPython3" -) +sofa_create_package( + PACKAGE_NAME ${PROJECT_NAME} + PACKAGE_VERSION ${PROJECT_VERSION} + RELOCATABLE "plugins" + ) if (SP3_LINK_TO_USER_SITE AND SP3_PYTHON_PACKAGES_LINK_DIRECTORY) file(GLOB directories RELATIVE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}" "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}/*") @@ -202,7 +184,7 @@ if (SP3_LINK_TO_USER_SITE AND SP3_PYTHON_PACKAGES_LINK_DIRECTORY) install(CODE "\ execute_process( \ COMMAND ${CMAKE_COMMAND} -E copy_directory \ - ${CMAKE_INSTALL_PREFIX}/${LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}/${directory}/ \ + ${CMAKE_INSTALL_PREFIX}/lib/${SP3_PYTHON_PACKAGES_DIRECTORY}/${directory}/ \ ${SP3_PYTHON_PACKAGES_LINK_DIRECTORY}/${directory} \ )" ) @@ -210,7 +192,7 @@ if (SP3_LINK_TO_USER_SITE AND SP3_PYTHON_PACKAGES_LINK_DIRECTORY) install(CODE "\ execute_process( \ COMMAND ${CMAKE_COMMAND} -E create_symlink \ - ${CMAKE_INSTALL_PREFIX}/${LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}/${directory}/ \ + ${CMAKE_INSTALL_PREFIX}/lib/${SP3_PYTHON_PACKAGES_DIRECTORY}/${directory}/ \ ${SP3_PYTHON_PACKAGES_LINK_DIRECTORY}/${directory} \ )" ) diff --git a/Plugin/CMakeLists.txt b/Plugin/CMakeLists.txt index d7d9ea21..df66d320 100644 --- a/Plugin/CMakeLists.txt +++ b/Plugin/CMakeLists.txt @@ -41,24 +41,12 @@ find_package(SofaSimulation REQUIRED) add_library(${PROJECT_NAME} SHARED ${HEADER_FILES} ${SOURCE_FILES}) add_library(SofaPython3::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) -set_target_properties(${PROJECT_NAME} PROPERTIES DEBUG_POSTFIX "_d") target_compile_definitions(${PROJECT_NAME} PRIVATE "-DSOFA_BUILD_SOFAPYTHON3") -target_compile_definitions(${PROJECT_NAME} PUBLIC "-DSOFA_HAVE_SOFAPYTHON3") - -target_include_directories(${PROJECT_NAME} PUBLIC "$") -target_include_directories(${PROJECT_NAME} PUBLIC "$") target_link_libraries(${PROJECT_NAME} PUBLIC SofaCore SofaDefaultType SofaSimulationCore SofaSimulationGraph SofaHelper) -target_link_libraries(${PROJECT_NAME} PUBLIC pybind11::module pybind11::embed) +target_link_libraries(${PROJECT_NAME} PUBLIC pybind11::module pybind11::embed) set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME SofaPython3) -set_target_properties(${target} PROPERTIES VERSION "${SOFAPYTHON3_VERSION}") - -set_target_properties( - ${PROJECT_NAME} - PROPERTIES - INSTALL_RPATH_USE_LINK_PATH TRUE -) if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") # Sized deallocaion is not enabled by default under clang after c++14 @@ -84,34 +72,13 @@ set_target_properties( CUDA_VISIBILITY_PRESET "hidden" ) -# Install header files -foreach(header ${HEADER_FILES}) - file(RELATIVE_PATH relative_path "${CMAKE_CURRENT_SOURCE_DIR}/src" "${header}") - get_filename_component(relative_directory ${relative_path} DIRECTORY) - - install(FILES "${header}" DESTINATION "include/${relative_directory}" COMPONENT headers) -endforeach() - -configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/PluginConfig.cmake.in" - "${CMAKE_BINARY_DIR}/cmake/SofaPython3/PluginConfig.cmake" - INSTALL_DESTINATION - "${LIBRARY_OUTPUT_DIRECTORY}/cmake/SofaPython3" -) - -install(FILES "${CMAKE_BINARY_DIR}/cmake/SofaPython3/PluginConfig.cmake" DESTINATION "${LIBRARY_OUTPUT_DIRECTORY}/cmake/SofaPython3") - -install(TARGETS ${PROJECT_NAME} - EXPORT PluginTargets - RUNTIME DESTINATION "${RUNTIME_OUTPUT_DIRECTORY}" COMPONENT applications - LIBRARY DESTINATION "${LIBRARY_OUTPUT_DIRECTORY}" COMPONENT libraries - ARCHIVE DESTINATION "${ARCHIVE_OUTPUT_DIRECTORY}" COMPONENT libraries -) - -install( - EXPORT PluginTargets - NAMESPACE SofaPython3:: - DESTINATION "${LIBRARY_OUTPUT_DIRECTORY}/cmake/SofaPython3" - COMPONENT headers -) - +sofa_create_component_in_package_with_targets( + COMPONENT_NAME ${PROJECT_NAME} + COMPONENT_VERSION ${SofaPython3_VERSION} + PACKAGE_NAME SofaPython3 + TARGETS ${PROJECT_NAME} AUTO_SET_TARGET_PROPERTIES + INCLUDE_SOURCE_DIR "src" + INCLUDE_INSTALL_DIR "." + OPTIMIZE_BUILD_DIR FALSE + RELOCATABLE ".." + ) diff --git a/Plugin/src/SofaPython3/PythonTestExtractor.cpp b/Plugin/src/SofaPython3/PythonTestExtractor.cpp index 8ac5d093..a027dd99 100644 --- a/Plugin/src/SofaPython3/PythonTestExtractor.cpp +++ b/Plugin/src/SofaPython3/PythonTestExtractor.cpp @@ -5,6 +5,9 @@ #include #include +#include +using sofa::helper::system::PluginManager; + using sofa::helper::system::SetDirectory; namespace py = pybind11; @@ -45,6 +48,8 @@ py::object PythonTestExtractor::getTestSuite(py::module& unittest, py::module& m std::vector PythonTestExtractor::extract () const { + PluginManager::getInstance().loadPlugin("SofaPython3"); + PythonEnvironment::Init(); PythonEnvironment::gil scoped_gil; diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt index c1a588c8..4257e2a0 100644 --- a/bindings/CMakeLists.txt +++ b/bindings/CMakeLists.txt @@ -1,15 +1,30 @@ project(Bindings) set(BINDINGS_MODULE_LIST Sofa SofaRuntime SofaGui SofaTypes Modules) +if(SP3_WITH_SOFAEXPORTER) + list(APPEND BINDINGS_MODULE_LIST SofaExporter) +endif() + +# This will set rpaths relative to SP3 plugin library +if(UNIX) + set(CMAKE_INSTALL_RPATH + "$ORIGIN/../lib" + "$$ORIGIN/../lib" + ) + if(APPLE) + set(CMAKE_MACOSX_RPATH ON) + list(APPEND CMAKE_INSTALL_RPATH + "@loader_path/../lib" + "@executable_path/../lib" + ) + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + endif() +endif() foreach(bindings_module ${BINDINGS_MODULE_LIST}) add_subdirectory(${bindings_module}) endforeach() -if (SP3_WITH_SOFAEXPORTER) - add_subdirectory(SofaExporter) -endif() - add_library(${PROJECT_NAME} INTERFACE) add_library(SofaPython3::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) @@ -17,38 +32,23 @@ foreach(bindings_module ${BINDINGS_MODULE_LIST}) target_link_libraries(${PROJECT_NAME} INTERFACE ${PROJECT_NAME}.${bindings_module}) endforeach() -if (SP3_WITH_SOFAEXPORTER) - target_link_libraries(${PROJECT_NAME} INTERFACE ${PROJECT_NAME}.SofaExporter) -endif() - -configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/BindingsConfig.cmake.in" - "${CMAKE_BINARY_DIR}/cmake/SofaPython3/BindingsConfig.cmake" - INSTALL_DESTINATION - "${LIBRARY_OUTPUT_DIRECTORY}/cmake/SofaPython3" -) - -install(FILES "${CMAKE_BINARY_DIR}/cmake/SofaPython3/BindingsConfig.cmake" DESTINATION "${LIBRARY_OUTPUT_DIRECTORY}/cmake/SofaPython3") - -install(TARGETS ${PROJECT_NAME} EXPORT BindingsTargets) - -install( - EXPORT BindingsTargets - NAMESPACE SofaPython3:: - DESTINATION "${LIBRARY_OUTPUT_DIRECTORY}/cmake/SofaPython3" - COMPONENT headers -) +sofa_create_component_in_package_with_targets( + COMPONENT_NAME ${PROJECT_NAME} + COMPONENT_VERSION ${SofaPython3_VERSION} + PACKAGE_NAME SofaPython3 + TARGETS ${PROJECT_NAME} + ) -if (SP3_COMPILED_AS_SOFA_SUBPROJECT) - ## Python configuration file (build tree), the lib in the source dir (easier while developping .py files) - file(WRITE "${CMAKE_BINARY_DIR}/etc/sofa/python.d/plugin.SofaPython3.bindings" "${CMAKE_BINARY_DIR}/${SP3_PYTHON_PACKAGES_DIRECTORY}\n") +#if (SP3_COMPILED_AS_SOFA_SUBPROJECT) +# ## Python configuration file (build tree), the lib in the source dir (easier while developping .py files) +# file(WRITE "${CMAKE_BINARY_DIR}/etc/sofa/python.d/plugin.SofaPython3.bindings" "${CMAKE_BINARY_DIR}/${SP3_PYTHON_PACKAGES_DIRECTORY}\n") - ## Python configuration file (install tree) - file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/installed-bindings-config" - "${CMAKE_INSTALL_PREFIX}/${SP3_PYTHON_PACKAGES_DIRECTORY}\n") +# ## Python configuration file (install tree) +# file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/installed-bindings-config" +# "${CMAKE_INSTALL_PREFIX}/${SP3_PYTHON_PACKAGES_DIRECTORY}\n") - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/installed-bindings-config" - DESTINATION "etc/sofa/python.d" - RENAME "plugin.SofaPython3.bindings") -endif() \ No newline at end of file +# install(FILES "${CMAKE_CURRENT_BINARY_DIR}/installed-bindings-config" +# DESTINATION "etc/sofa/python.d" +# RENAME "plugin.SofaPython3.bindings") +#endif() diff --git a/bindings/Modules/tests/CMakeLists.txt b/bindings/Modules/tests/CMakeLists.txt index b4bba4c0..27632d42 100644 --- a/bindings/Modules/tests/CMakeLists.txt +++ b/bindings/Modules/tests/CMakeLists.txt @@ -14,20 +14,14 @@ find_package(SofaFramework REQUIRED) enable_testing() add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${PYTHON_FILES}) -target_link_libraries(${PROJECT_NAME} SofaGTestMain SofaHelper SofaPython3::Plugin SofaPython3::Bindings.Modules) +target_link_libraries(${PROJECT_NAME} SofaGTestMain SofaHelper SofaPython3::Plugin) target_compile_definitions(${PROJECT_NAME} PRIVATE "PYTHON_TESTFILES_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/\"") set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Bindings/Tests") -set(RPATH "$ORIGIN/../lib") -if (APPLE) - list(APPEND RPATH "@executable_path/../lib") -endif() - -set_target_properties( - ${PROJECT_NAME} - PROPERTIES - INSTALL_RPATH_USE_LINK_PATH TRUE - INSTALL_RPATH "${RPATH}" +# This will set rpaths relative to all SOFA core AND relocatable dependencies +sofa_auto_set_target_rpath( + TARGETS ${PROJECT_NAME} + RELOCATABLE "plugins" ) add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME}) diff --git a/bindings/Sofa/tests/CMakeLists.txt b/bindings/Sofa/tests/CMakeLists.txt index eef73a1a..a2c083e7 100644 --- a/bindings/Sofa/tests/CMakeLists.txt +++ b/bindings/Sofa/tests/CMakeLists.txt @@ -37,20 +37,14 @@ find_package(SofaFramework REQUIRED) enable_testing() add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${HEADER_FILES} ${PYTHON_FILES}) -target_link_libraries(${PROJECT_NAME} SofaGTestMain SofaHelper SofaPython3::Plugin SofaPython3::Bindings.Sofa SofaPython3::Bindings.SofaTypes SofaPython3::Bindings.SofaRuntime) +target_link_libraries(${PROJECT_NAME} SofaGTestMain SofaHelper SofaPython3::Plugin) target_compile_definitions(${PROJECT_NAME} PRIVATE "PYTHON_TESTFILES_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/\"") set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Bindings/Tests") -set(RPATH "$ORIGIN/../lib") -if (APPLE) - list(APPEND RPATH "@executable_path/../lib") -endif() - -set_target_properties( - ${PROJECT_NAME} - PROPERTIES - INSTALL_RPATH_USE_LINK_PATH TRUE - INSTALL_RPATH "${RPATH}" +# This will set rpaths relative to all SOFA core AND relocatable dependencies +sofa_auto_set_target_rpath( + TARGETS ${PROJECT_NAME} + RELOCATABLE "plugins" ) add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME}) diff --git a/bindings/SofaExporter/CMakeLists.txt b/bindings/SofaExporter/CMakeLists.txt index bf5feef5..93550e62 100644 --- a/bindings/SofaExporter/CMakeLists.txt +++ b/bindings/SofaExporter/CMakeLists.txt @@ -18,8 +18,4 @@ SP3_add_python_module( SOURCES ${SOURCE_FILES} HEADERS ${HEADER_FILES} DEPENDS SofaExporter SofaPython3::Plugin SofaPython3::Bindings.Sofa.Core -) - -if(SP3_BUILD_TEST) - add_subdirectory(tests) -endif() +) \ No newline at end of file diff --git a/bindings/SofaExporter/tests/CMakeLists.txt b/bindings/SofaExporter/tests/CMakeLists.txt deleted file mode 100644 index b6f0c2a6..00000000 --- a/bindings/SofaExporter/tests/CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -project(Bindings.SofaExporter.Tests) - -set(SOURCE_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/PythonModule_SofaExporter_test.cpp -) - -set(PYTHON_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/tests/STLExporter.py - ) - -find_package(SofaGTestMain REQUIRED) -find_package(SofaFramework REQUIRED) - -add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${PYTHON_FILES}) -target_link_libraries(${PROJECT_NAME} SofaGTestMain SofaHelper SofaPython3::Plugin SofaPython3::Bindings.SofaExporter) -target_compile_definitions(${PROJECT_NAME} PRIVATE "PYTHON_TESTFILES_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/\"") - -set_target_properties( - ${PROJECT_NAME} - PROPERTIES - INSTALL_RPATH_USE_LINK_PATH TRUE - INSTALL_RPATH "$ORIGIN/../lib" -) - -add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME}) - -SP3_configure_directory(${CMAKE_CURRENT_SOURCE_DIR}/tests ${CMAKE_BINARY_DIR}/${RUNTIME_OUTPUT_DIRECTORY}/tests) -install(DIRECTORY ${CMAKE_BINARY_DIR}/${RUNTIME_OUTPUT_DIRECTORY}/tests DESTINATION ${RUNTIME_OUTPUT_DIRECTORY}) - -install( - TARGETS ${PROJECT_NAME} - EXPORT BindingsTargets - RUNTIME DESTINATION ${RUNTIME_OUTPUT_DIRECTORY} -) \ No newline at end of file diff --git a/bindings/SofaExporter/tests/PythonModule_SofaExporter_test.cpp b/bindings/SofaExporter/tests/PythonModule_SofaExporter_test.cpp deleted file mode 100644 index 56adce02..00000000 --- a/bindings/SofaExporter/tests/PythonModule_SofaExporter_test.cpp +++ /dev/null @@ -1,101 +0,0 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ - -/****************************************************************************** -* SOFA, Simulation Open-Framework Architecture, development version * -* (c) 2006-2018 INRIA, USTL, UJF, CNRS, MGH * -* * -* This program is free software; you can redistribute it and/or modify it * -* under the terms of the GNU Lesser General Public License as published by * -* the Free Software Foundation; either version 2.1 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 Lesser General Public License * -* for more details. * -* * -* You should have received a copy of the GNU Lesser General Public License * -* along with this program. If not, see . * -******************************************************************************* -* Authors: The SOFA Team and external contributors (see Authors.txt) * -* * -* Contact information: contact@sofa-framework.org * -******************************************************************************/ -/****************************************************************************** - * Contributors: * - * - damien.marchal@univ-lille1.fr * - *****************************************************************************/ - -#include - -#include -#include -#include - -using sofapython3::PythonTest ; -using sofapython3::PythonTestExtractor ; -using sofapython3::PrintTo ; -using std::string; - -#include -using sofa::helper::logging::MessageDispatcher; -using sofa::helper::logging::MainPerComponentLoggingMessageHandler; - -namespace -{ - -bool init() -{ - MessageDispatcher::addHandler(&MainPerComponentLoggingMessageHandler::getInstance()) ; - return true; -} - -static int _inited_=init(); - -class SofaExporter : public PythonTest {}; - -/// static build of the test list -static struct PythonModule_SofaExporter_tests : public PythonTestExtractor -{ - PythonModule_SofaExporter_tests() - { - const std::string executable_directory = sofa::helper::Utils::getExecutableDirectory(); - addTestDirectory(executable_directory+"/tests", "SofaExporter_"); - } -} python_tests; - -/// run test list using the custom name function getTestName. -/// this allows to do gtest_filter=*FileName* -INSTANTIATE_TEST_CASE_P(SofaPython3, - SofaExporter, - ::testing::ValuesIn(python_tests.extract()), - SofaExporter::getTestName); - -TEST_P(SofaExporter, all_tests) { run(GetParam()); } - -} diff --git a/bindings/SofaExporter/tests/tests/STLExporter.py b/bindings/SofaExporter/tests/tests/STLExporter.py deleted file mode 100644 index a000fa5b..00000000 --- a/bindings/SofaExporter/tests/tests/STLExporter.py +++ /dev/null @@ -1,11 +0,0 @@ -# coding: utf8 - -import Sofa.Core -import Sofa.Helper -import unittest -import numpy - -class Test(unittest.TestCase): - def test_STLExporter(self): - import Exporter - Sofa.Helper.msg_error("Not implemented yet") diff --git a/bindings/SofaRuntime/tests/CMakeLists.txt b/bindings/SofaRuntime/tests/CMakeLists.txt index 24eb3405..d46d798e 100644 --- a/bindings/SofaRuntime/tests/CMakeLists.txt +++ b/bindings/SofaRuntime/tests/CMakeLists.txt @@ -5,7 +5,7 @@ set(SOURCE_FILES ) set(PYTHON_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/tests/Base.py + ${CMAKE_CURRENT_SOURCE_DIR}/SofaRuntime/Base.py ) find_package(SofaGTestMain REQUIRED) @@ -13,26 +13,20 @@ find_package(SofaFramework REQUIRED) enable_testing() add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${PYTHON_FILES}) -target_link_libraries(${PROJECT_NAME} SofaGTestMain SofaHelper SofaPython3::Plugin SofaPython3::Bindings.Sofa.Core) +target_link_libraries(${PROJECT_NAME} SofaGTestMain SofaHelper SofaPython3::Plugin) target_compile_definitions(${PROJECT_NAME} PRIVATE "PYTHON_TESTFILES_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}\"") set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Bindings/Tests") -set(RPATH "$ORIGIN/../lib") -if (APPLE) - list(APPEND RPATH "@executable_path/../lib") -endif() - -set_target_properties( - ${PROJECT_NAME} - PROPERTIES - INSTALL_RPATH_USE_LINK_PATH TRUE - INSTALL_RPATH "${RPATH}" +# This will set rpaths relative to all SOFA core AND relocatable dependencies +sofa_auto_set_target_rpath( + TARGETS ${PROJECT_NAME} + RELOCATABLE "plugins" ) add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME}) -SP3_configure_directory(${CMAKE_CURRENT_SOURCE_DIR}/tests ${CMAKE_BINARY_DIR}/${RUNTIME_OUTPUT_DIRECTORY}/tests) -install(DIRECTORY ${CMAKE_BINARY_DIR}/${RUNTIME_OUTPUT_DIRECTORY}/tests DESTINATION ${RUNTIME_OUTPUT_DIRECTORY}) +SP3_configure_directory(${CMAKE_CURRENT_SOURCE_DIR}/SofaRuntime ${CMAKE_BINARY_DIR}/${RUNTIME_OUTPUT_DIRECTORY}/SofaRuntime) +install(DIRECTORY ${CMAKE_BINARY_DIR}/${RUNTIME_OUTPUT_DIRECTORY}/SofaRuntime DESTINATION ${RUNTIME_OUTPUT_DIRECTORY}) install( TARGETS ${PROJECT_NAME} diff --git a/bindings/SofaRuntime/tests/PythonModule_SofaRuntime_test.cpp b/bindings/SofaRuntime/tests/PythonModule_SofaRuntime_test.cpp index 251cdfdc..f954f075 100644 --- a/bindings/SofaRuntime/tests/PythonModule_SofaRuntime_test.cpp +++ b/bindings/SofaRuntime/tests/PythonModule_SofaRuntime_test.cpp @@ -63,7 +63,7 @@ static struct PythonModule_Sofa_tests : public PythonTestExtractor PythonModule_Sofa_tests() { const std::string executable_directory = sofa::helper::Utils::getExecutableDirectory(); - addTestDirectory(executable_directory+"/tests", "SofaRuntime_"); + addTestDirectory(executable_directory+"/SofaRuntime", "SofaRuntime_"); } } python_tests; diff --git a/bindings/SofaRuntime/tests/tests/Base.py b/bindings/SofaRuntime/tests/SofaRuntime/Base.py similarity index 100% rename from bindings/SofaRuntime/tests/tests/Base.py rename to bindings/SofaRuntime/tests/SofaRuntime/Base.py diff --git a/bindings/SofaTypes/tests/CMakeLists.txt b/bindings/SofaTypes/tests/CMakeLists.txt index 4799cdda..52e919d4 100644 --- a/bindings/SofaTypes/tests/CMakeLists.txt +++ b/bindings/SofaTypes/tests/CMakeLists.txt @@ -17,16 +17,10 @@ target_link_libraries(${PROJECT_NAME} SofaGTestMain SofaHelper SofaPython3::Plu target_compile_definitions(${PROJECT_NAME} PRIVATE "PYTHON_TESTFILES_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/pyfiles/\"") set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Bindings/Tests") -set(RPATH "$ORIGIN/../lib") -if (APPLE) - list(APPEND RPATH "@executable_path/../lib") -endif() - -set_target_properties( - ${PROJECT_NAME} - PROPERTIES - INSTALL_RPATH_USE_LINK_PATH TRUE - INSTALL_RPATH "${RPATH}" +# This will set rpaths relative to all SOFA core AND relocatable dependencies +sofa_auto_set_target_rpath( + TARGETS ${PROJECT_NAME} + RELOCATABLE "plugins" ) add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME}) From 3ed6f221c3f0a0fc77efe4fab0cb8ad16697d260 Mon Sep 17 00:00:00 2001 From: Jean-Nicolas Brunet Date: Fri, 15 Jan 2021 16:03:19 +0100 Subject: [PATCH 03/43] [cmake] Fix rpath for MacOS on SOFA relocatable dependencies --- CMake/SofaPython3Tools.cmake | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/CMake/SofaPython3Tools.cmake b/CMake/SofaPython3Tools.cmake index 5fe03fd3..e50cb4ef 100644 --- a/CMake/SofaPython3Tools.cmake +++ b/CMake/SofaPython3Tools.cmake @@ -156,14 +156,14 @@ function(SP3_add_python_module) # We compute its path relative to this target output file # Ex: ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/site-packages/Sofa --> $ORIGIN/../Sofa # 3. Add the relative path computed in 2 to the list of RPATHS - set(${A_TARGET}_DEPENDECIES_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBRARY_OUTPUT_DIRECTORY}") + set(${A_TARGET}_DEPENDENCIES_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBRARY_OUTPUT_DIRECTORY}") foreach(DEPENDENCY ${A_DEPENDS}) if (TARGET ${DEPENDENCY}) get_target_property(DEPENDENCY_LIBRARY_OUTPUT_DIRECTORY "${DEPENDENCY}" LIBRARY_OUTPUT_DIRECTORY) if (DEPENDENCY_LIBRARY_OUTPUT_DIRECTORY) file(RELATIVE_PATH dependency_path_from_packages "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}" "${DEPENDENCY_LIBRARY_OUTPUT_DIRECTORY}") if (NOT "${dependency_path_from_packages}" STREQUAL "" AND NOT "${dependency_path_from_packages}" STREQUAL "../") - list(APPEND ${A_TARGET}_DEPENDECIES_RPATH "$ORIGIN/../${dependency_path_from_packages}") + list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "$ORIGIN/../${dependency_path_from_packages}") endif() endif() endif() @@ -172,7 +172,7 @@ function(SP3_add_python_module) if (APPLE) # In MacOS, the target dependency name is RPATH/site-packages/PackageName, so we need to add # an RPATH to the directory that contains "site-packages" - list(APPEND ${A_TARGET}_DEPENDECIES_RPATH "$ORIGIN/../..") + list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "$ORIGIN/../..") endif() # Compute the installation RPATHs from the target's SOFA relocatable dependencies @@ -196,7 +196,10 @@ function(SP3_add_python_module) # Alright, now we have the path from the current target towards the "plugins" relocatable directory of SOFA # We can compute the relative path from the current target towards the dependency relocatable path. set(relative_towards_dependency_dir "${relative_towards_plugins_dir}/${DEPENDENCY_RELOCATABLE_INSTALL_DIR}") - list(APPEND ${A_TARGET}_DEPENDECIES_RPATH "$ORIGIN/${relative_towards_dependency_dir}/lib") + list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "$ORIGIN/${relative_towards_dependency_dir}/lib") + list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "$$ORIGIN/${relative_towards_dependency_dir}/lib") + list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "@loader_path/${relative_towards_dependency_dir}/lib") + list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "@executable_path/${relative_towards_dependency_dir}/lib") endif() endif() endforeach() @@ -210,7 +213,7 @@ function(SP3_add_python_module) INSTALL_RPATH_USE_LINK_PATH TRUE # This will set the remaining RPATHs from our Bindings targets dependencies (install/lib/site-packages/*) - INSTALL_RPATH "${${A_TARGET}_DEPENDECIES_RPATH}" + INSTALL_RPATH "${${A_TARGET}_DEPENDENCIES_RPATH}" # Don't use the installation RPATH for built files BUILD_WITH_INSTALL_RPATH FALSE From 418bbdca13073cfa83e8674be51fbbba732440bd Mon Sep 17 00:00:00 2001 From: Jean-Nicolas Brunet Date: Fri, 15 Jan 2021 16:28:22 +0100 Subject: [PATCH 04/43] [cmake] Fix rpath for MacOS on SOFA relocatable dependencies (part 2) --- CMake/SofaPython3Tools.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMake/SofaPython3Tools.cmake b/CMake/SofaPython3Tools.cmake index e50cb4ef..2cd7109e 100644 --- a/CMake/SofaPython3Tools.cmake +++ b/CMake/SofaPython3Tools.cmake @@ -164,6 +164,9 @@ function(SP3_add_python_module) file(RELATIVE_PATH dependency_path_from_packages "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}" "${DEPENDENCY_LIBRARY_OUTPUT_DIRECTORY}") if (NOT "${dependency_path_from_packages}" STREQUAL "" AND NOT "${dependency_path_from_packages}" STREQUAL "../") list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "$ORIGIN/../${dependency_path_from_packages}") + list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "$$ORIGIN/../${dependency_path_from_packages}") + list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "@loader_path/../${dependency_path_from_packages}") + list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "@executable_path/../${dependency_path_from_packages}") endif() endif() endif() @@ -173,6 +176,9 @@ function(SP3_add_python_module) # In MacOS, the target dependency name is RPATH/site-packages/PackageName, so we need to add # an RPATH to the directory that contains "site-packages" list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "$ORIGIN/../..") + list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "$$ORIGIN/../..") + list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "@loader_path/../..") + list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "@executable_path/../..") endif() # Compute the installation RPATHs from the target's SOFA relocatable dependencies From 4651242c42416aaefae64e534af42c82960bb59b Mon Sep 17 00:00:00 2001 From: Jean-Nicolas Brunet Date: Fri, 15 Jan 2021 18:44:44 +0100 Subject: [PATCH 05/43] [examples] Add an advanced timer scene demonstration (#84) --- examples/advanced_timer.py | 94 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 examples/advanced_timer.py diff --git a/examples/advanced_timer.py b/examples/advanced_timer.py new file mode 100644 index 00000000..bf7904b9 --- /dev/null +++ b/examples/advanced_timer.py @@ -0,0 +1,94 @@ +#! python3 +import Sofa +from SofaRuntime import Timer + + +# This controller will extract the timer records from the simulation at each steps +class TimerController(Sofa.Core.Controller): + + def __init__(self, *args, **kwargs): + Sofa.Core.Controller.__init__(self, *args, **kwargs) + + # This is needed to avoid a conflict with the timer of runSofa + self.use_sofa_profiler_timer = False + + def onAnimateBeginEvent(self, event): + if len(Timer.getRecords('Animate')): + self.use_sofa_profiler_timer = True + else: + Timer.setEnabled("cg_timer", True) + Timer.begin("cg_timer") + + def onAnimateEndEvent(self, event): + if self.use_sofa_profiler_timer: + records = Timer.getRecords("Animate") + else: + records = Timer.getRecords("cg_timer") + + step_time = records['AnimateVisitor']['Mechanical (meca)']['total_time'] + print(f"Step took {step_time:.2f} ms") + + nb_iterations = records['AnimateVisitor']['Mechanical (meca)']['StaticSolver::Solve']['nb_iterations'] + for i in range(int(nb_iterations)): + total_time = records['AnimateVisitor']['Mechanical (meca)']['StaticSolver::Solve']['step_'+str(i)]['total_time'] + CG_iterations = records['AnimateVisitor']['Mechanical (meca)']['StaticSolver::Solve']['step_'+str(i)]['CG iterations'] + print(f" Newton iteration #{i} took {total_time:.2f} ms using {int(CG_iterations)} CG iterations") + + if not self.use_sofa_profiler_timer: + Timer.end("cg_timer") + + +# Scene creation - This is automatically called by SofaPython3 when using runSofa +def createScene(root): + root.dt = 0.01 + + # List of required plugins + root.addObject('RequiredPlugin', name='SofaSparseSolver') + root.addObject('RequiredPlugin', name='SofaGraphComponent') + root.addObject('RequiredPlugin', name='SofaOpenglVisual') + root.addObject('RequiredPlugin', name='SofaPreconditioner') + root.addObject('RequiredPlugin', name='SofaBoundaryCondition') + root.addObject('RequiredPlugin', name='SofaEngine') + root.addObject('RequiredPlugin', name='SofaImplicitOdeSolver') + root.addObject('RequiredPlugin', name='SofaSimpleFem') + + # Visual style + root.addObject('VisualStyle', displayFlags='showBehaviorModels showForceFields') + + # Add the python controller in the scene + root.addObject( TimerController() ) + + # Create a grid topology of 10x10x60 centered on (0,0,0) + root.addObject('RegularGridTopology', name='grid', min=[-5, -5, -30], max=[5, 5, 30], n=[11, 11, 61]) + + # Create our mechanical node + root.addChild("meca") + root.meca.addObject("StaticSolver", newton_iterations=5, printLog=False) + root.meca.addObject("CGLinearSolver") + + root.meca.addObject('MechanicalObject', name='mo', position='@../grid.position') + root.meca.addObject('HexahedronSetTopologyContainer', name='mechanical_topology', src='@../grid') + root.meca.addObject('HexahedronFEMForceField', youngModulus=3000, poissonRatio=0) + + root.meca.addObject('BoxROI', name='base_roi', box=[-5.01, -5.01, -30.01, 30.01, 30.01, -29.99]) + root.meca.addObject('BoxROI', name='top_roi', box=[-5.01, -5.01, +29.99, 5.01, 5.01, +30.01], quad='@mechanical_topology.quads') + + root.meca.addObject('FixedConstraint', indices='@base_roi.indices') + root.meca.addObject('QuadSetGeometryAlgorithms') + root.meca.addObject('QuadPressureForceField', pressure=[0, -30, 0], quadList='@top_roi.quadInROI', showForces=False) + + +# When not using runSofa, this main function will be called python +def main(): + root = Sofa.Core.Node("root") + createScene(root) + Sofa.Simulation.init(root) + + # Run the simulation for 5 steps + for iteration in range(5): + print(f'Iteration #{iteration}') + Sofa.Simulation.animate(root, root.dt.value) + + +if __name__ == '__main__': + main() From 5a3094eef47bdfa2238a2db0e3ff071176c85545 Mon Sep 17 00:00:00 2001 From: Jean-Nicolas Brunet Date: Fri, 15 Jan 2021 18:58:38 +0100 Subject: [PATCH 06/43] Update license before the release (#85) --- License.md | 529 +++++++++++++++++- Plugin/src/SofaPython3/DataCache.cpp | 45 +- Plugin/src/SofaPython3/DataCache.h | 45 +- Plugin/src/SofaPython3/DataFactory.cpp | 45 +- Plugin/src/SofaPython3/DataFactory.h | 45 +- Plugin/src/SofaPython3/DataHelper.cpp | 45 +- Plugin/src/SofaPython3/DataHelper.h | 45 +- Plugin/src/SofaPython3/EventFactory.cpp | 45 +- Plugin/src/SofaPython3/EventFactory.h | 45 +- Plugin/src/SofaPython3/Prefab.cpp | 20 + Plugin/src/SofaPython3/Prefab.h | 20 + Plugin/src/SofaPython3/PythonEnvironment.cpp | 34 +- Plugin/src/SofaPython3/PythonEnvironment.h | 34 +- Plugin/src/SofaPython3/PythonFactory.cpp | 45 +- Plugin/src/SofaPython3/PythonFactory.h | 45 +- Plugin/src/SofaPython3/PythonTest.cpp | 34 +- Plugin/src/SofaPython3/PythonTest.h | 45 +- .../src/SofaPython3/PythonTestExtractor.cpp | 20 + Plugin/src/SofaPython3/PythonTestExtractor.h | 36 +- Plugin/src/SofaPython3/SceneLoaderPY3.cpp | 34 +- Plugin/src/SofaPython3/SceneLoaderPY3.h | 34 +- Plugin/src/SofaPython3/config.h | 34 +- Plugin/src/SofaPython3/initModule.cpp | 34 +- Plugin/src/SofaPython3/initModule.h | 34 +- .../Binding_RegularGridTopology.cpp | 45 +- .../Binding_RegularGridTopology.h | 45 +- .../Binding_RegularGridTopology_doc.h | 45 +- .../Binding_SparseGridTopology.cpp | 45 +- .../Binding_SparseGridTopology.h | 45 +- .../Binding_SparseGridTopology_doc.h | 45 +- .../Module_SofaBaseTopology.cpp | 45 +- .../SofaDeformable/Binding_LinearSpring.cpp | 41 +- .../SofaDeformable/Binding_LinearSpring.h | 37 +- .../SofaDeformable/Binding_LinearSpring_doc.h | 37 +- .../Binding_SpringForceField.cpp | 43 +- .../SofaDeformable/Binding_SpringForceField.h | 37 +- .../Binding_SpringForceField_doc.h | 37 +- .../SofaDeformable/Module_SofaDeformable.cpp | 37 +- bindings/Modules/tests/main.cpp | 6 +- .../Sofa/Components/Submodule_Components.cpp | 45 +- .../Sofa/Components/Submodule_Components.h | 45 +- .../SofaPython3/Sofa/Core/Binding_Base.cpp | 45 +- .../src/SofaPython3/Sofa/Core/Binding_Base.h | 45 +- .../Sofa/Core/Binding_BaseCamera.cpp | 45 +- .../Sofa/Core/Binding_BaseCamera.h | 45 +- .../Sofa/Core/Binding_BaseCamera_doc.h | 45 +- .../Sofa/Core/Binding_BaseContext.cpp | 45 +- .../Sofa/Core/Binding_BaseContext.h | 45 +- .../Sofa/Core/Binding_BaseData.cpp | 45 +- .../SofaPython3/Sofa/Core/Binding_BaseData.h | 45 +- .../Sofa/Core/Binding_BaseData_doc.h | 45 +- .../Sofa/Core/Binding_BaseLink.cpp | 45 +- .../SofaPython3/Sofa/Core/Binding_BaseLink.h | 45 +- .../Sofa/Core/Binding_BaseLink_doc.h | 45 +- .../Sofa/Core/Binding_BaseObject.cpp | 45 +- .../Sofa/Core/Binding_BaseObject.h | 45 +- .../Sofa/Core/Binding_BaseObject_doc.h | 45 +- .../SofaPython3/Sofa/Core/Binding_Base_doc.h | 45 +- .../Sofa/Core/Binding_ContactListener.cpp | 46 +- .../Sofa/Core/Binding_ContactListener.h | 46 +- .../Sofa/Core/Binding_ContactListener_doc.h | 46 +- .../SofaPython3/Sofa/Core/Binding_Context.cpp | 45 +- .../SofaPython3/Sofa/Core/Binding_Context.h | 45 +- .../Sofa/Core/Binding_Controller.cpp | 45 +- .../Sofa/Core/Binding_Controller.h | 45 +- .../Sofa/Core/Binding_Controller_doc.h | 45 +- .../Sofa/Core/Binding_DataDict.cpp | 45 +- .../SofaPython3/Sofa/Core/Binding_DataDict.h | 45 +- .../Sofa/Core/Binding_DataDict_doc.h | 45 +- .../Sofa/Core/Binding_DataEngine.cpp | 45 +- .../Sofa/Core/Binding_DataEngine.h | 45 +- .../Sofa/Core/Binding_DataEngine_doc.h | 45 +- .../Sofa/Core/Binding_ForceField.cpp | 45 +- .../Sofa/Core/Binding_ForceField.h | 45 +- .../Sofa/Core/Binding_ForceField_doc.h | 45 +- .../SofaPython3/Sofa/Core/Binding_Node.cpp | 45 +- .../src/SofaPython3/Sofa/Core/Binding_Node.h | 45 +- .../Sofa/Core/Binding_NodeIterator.cpp | 45 +- .../Sofa/Core/Binding_NodeIterator.h | 45 +- .../SofaPython3/Sofa/Core/Binding_Node_doc.h | 45 +- .../Sofa/Core/Binding_ObjectFactory.cpp | 45 +- .../Sofa/Core/Binding_ObjectFactory.h | 45 +- .../Sofa/Core/Binding_ObjectFactory_doc.h | 45 +- .../SofaPython3/Sofa/Core/Binding_Prefab.cpp | 45 +- .../SofaPython3/Sofa/Core/Binding_Prefab.h | 45 +- .../Sofa/Core/Binding_Prefab_doc.h | 45 +- .../Sofa/Core/Binding_PythonScriptEvent.cpp | 45 +- .../Sofa/Core/Binding_PythonScriptEvent.h | 45 +- .../Sofa/Core/Data/Binding_DataContainer.cpp | 45 +- .../Sofa/Core/Data/Binding_DataContainer.h | 45 +- .../Core/Data/Binding_DataContainer_doc.h | 45 +- .../Sofa/Core/Data/Binding_DataDict.cpp | 45 +- .../Sofa/Core/Data/Binding_DataDict.h | 45 +- .../Sofa/Core/Data/Binding_DataLink.cpp | 20 + .../Sofa/Core/Data/Binding_DataLink.h | 20 + .../Sofa/Core/Data/Binding_DataString.cpp | 45 +- .../Sofa/Core/Data/Binding_DataString.h | 45 +- .../Sofa/Core/Data/Binding_DataString_doc.h | 45 +- .../Core/Data/Binding_DataVectorString.cpp | 45 +- .../Sofa/Core/Data/Binding_DataVectorString.h | 45 +- .../Core/Data/Binding_DataVectorString_doc.h | 45 +- .../Sofa/Core/Data/binding_datadict_doc.h | 45 +- .../SofaPython3/Sofa/Core/Submodule_Core.cpp | 45 +- .../Sofa/Helper/Binding_MessageHandler.cpp | 45 +- .../Sofa/Helper/Binding_MessageHandler.h | 45 +- .../Sofa/Helper/Binding_Vector.cpp | 45 +- .../SofaPython3/Sofa/Helper/Binding_Vector.h | 45 +- .../Sofa/Helper/Submodule_Helper.cpp | 45 +- .../Helper/System/Binding_FileRepository.cpp | 45 +- .../Helper/System/Binding_FileRepository.h | 45 +- .../System/Binding_FileRepository_doc.h | 45 +- .../Sofa/Helper/System/Submodule_System.cpp | 45 +- .../Sofa/Helper/System/Submodule_System.h | 45 +- .../Sofa/Simulation/Submodule_Simulation.cpp | 45 +- .../Simulation/Submodule_Simulation_doc.h | 45 +- .../Sofa/Types/Binding_BoundingBox.cpp | 45 +- .../Sofa/Types/Binding_BoundingBox.h | 45 +- .../Sofa/Types/Submodule_Types.cpp | 45 +- .../Binding_BaseObject_MockComponent.cpp | 45 +- .../tests/Binding_BaseObject_MockComponent.h | 45 +- .../Sofa/tests/PythonModule_Sofa_test.cpp | 15 +- .../src/SofaExporter/Binding_STLExporter.cpp | 45 +- .../src/SofaExporter/Binding_STLExporter.h | 45 +- .../SofaExporter/Binding_STLExporter_doc.h | 45 +- .../src/SofaExporter/Module_SofaExporter.cpp | 45 +- .../SofaPython3/SofaGui/Binding_BaseGui.cpp | 45 +- .../src/SofaPython3/SofaGui/Binding_BaseGui.h | 45 +- .../SofaGui/Binding_GUIManager.cpp | 45 +- .../SofaPython3/SofaGui/Binding_GUIManager.h | 45 +- .../SofaPython3/SofaGui/Module_SofaGui.cpp | 45 +- .../SofaRuntime/Module_SofaRuntime.cpp | 45 +- .../SofaRuntime/Timer/Submodule_Timer.cpp | 45 +- .../SofaRuntime/Timer/Submodule_Timer.h | 45 +- .../SofaRuntime/Timer/Submodule_Timer_doc.h | 45 +- .../tests/PythonModule_SofaRuntime_test.cpp | 15 +- .../src/SofaPython3/SofaTypes/Binding_Mat.cpp | 45 +- .../src/SofaPython3/SofaTypes/Binding_Mat.h | 45 +- .../SofaPython3/SofaTypes/Binding_Quat.cpp | 45 +- .../src/SofaPython3/SofaTypes/Binding_Quat.h | 45 +- .../src/SofaPython3/SofaTypes/Binding_Vec.cpp | 45 +- .../src/SofaPython3/SofaTypes/Binding_Vec.h | 45 +- .../SofaTypes/Module_SofaTypes.cpp | 45 +- .../tests/PythonModule_SofaTypes_test.cpp | 10 +- contributors.txt | 6 + 144 files changed, 3016 insertions(+), 3510 deletions(-) create mode 100644 contributors.txt diff --git a/License.md b/License.md index 1dabf0c5..248ea8a3 100644 --- a/License.md +++ b/License.md @@ -1,27 +1,504 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 +Copyright (C) 1991, 1999 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. + +(This is the first released version of the Lesser GPL. It also counts +as the successor of the GNU Library Public License, version 2, hence +the version number 2.1.) + + Preamble + +The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + +This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + +When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + +To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + +For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + +We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + +To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + +Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + +Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + +When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + +We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + +For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + +In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + +Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + +The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License Agreement applies to any software library or other + program which contains a notice placed by the copyright holder or + other authorized party saying it may be distributed under the terms of + this Lesser General Public License (also called "this License"). + Each licensee is addressed as "you". + +A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + +The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + +"Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + +1. You may copy and distribute verbatim copies of the Library's + complete source code as you receive it, in any medium, provided that + you conspicuously and appropriately publish on each copy an + appropriate copyright notice and disclaimer of warranty; keep intact + all the notices that refer to this License and to the absence of any + warranty; and distribute a copy of this License along with the + Library. + +You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + +2. You may modify your copy or copies of the Library or any portion + of it, thus forming a work based on the Library, and copy and + distribute such modifications or work under the terms of Section 1 + above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + +3. You may opt to apply the terms of the ordinary GNU General Public + License instead of this License to a given copy of the Library. To do + this, you must alter all the notices that refer to this License, so + that they refer to the ordinary GNU General Public License, version 2, + instead of to this License. (If a newer version than version 2 of the + ordinary GNU General Public License has appeared, then you can specify + that version instead if you wish.) Do not make any other change in + these notices. + +Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + +This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + +4. You may copy and distribute the Library (or a portion or + derivative of it, under Section 2) in object code or executable form + under the terms of Sections 1 and 2 above provided that you accompany + it with the complete corresponding machine-readable source code, which + must be distributed under the terms of Sections 1 and 2 above on a + medium customarily used for software interchange. + +If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + +5. A program that contains no derivative of any portion of the + Library, but is designed to work with the Library by being compiled or + linked with it, is called a "work that uses the Library". Such a + work, in isolation, is not a derivative work of the Library, and + therefore falls outside the scope of this License. + +However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + +When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + +If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + +Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + +6. As an exception to the Sections above, you may also combine or + link a "work that uses the Library" with the Library to produce a + work containing portions of the Library, and distribute that work + under terms of your choice, provided that the terms permit + modification of the work for the customer's own use and reverse + engineering for debugging such modifications. + +You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + +For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + +It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + +7. You may place library facilities that are a work based on the + Library side-by-side in a single library together with other library + facilities not covered by this License, and distribute such a combined + library, provided that the separate distribution of the work based on + the Library and of the other library facilities is otherwise + permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + +8. You may not copy, modify, sublicense, link with, or distribute + the Library except as expressly provided under this License. Any + attempt otherwise to copy, modify, sublicense, link with, or + distribute the Library is void, and will automatically terminate your + rights under this License. However, parties who have received copies, + or rights, from you under this License will not have their licenses + terminated so long as such parties remain in full compliance. + +9. You are not required to accept this License, since you have not + signed it. However, nothing else grants you permission to modify or + distribute the Library or its derivative works. These actions are + prohibited by law if you do not accept this License. Therefore, by + modifying or distributing the Library (or any work based on the + Library), you indicate your acceptance of this License to do so, and + all its terms and conditions for copying, distributing or modifying + the Library or works based on it. + +10. Each time you redistribute the Library (or any work based on the + Library), the recipient automatically receives a license from the + original licensor to copy, distribute, link with or modify the Library + subject to these terms and conditions. You may not impose any further + restrictions on the recipients' exercise of the rights granted herein. + You are not responsible for enforcing compliance by third parties with + this License. + +11. If, as a consequence of a court judgment or allegation of patent + infringement or for any other reason (not limited to patent issues), + conditions are imposed on you (whether by court order, agreement or + otherwise) that contradict the conditions of this License, they do not + excuse you from the conditions of this License. If you cannot + distribute so as to satisfy simultaneously your obligations under this + License and any other pertinent obligations, then as a consequence you + may not distribute the Library at all. For example, if a patent + license would not permit royalty-free redistribution of the Library by + all those who receive copies directly or indirectly through you, then + the only way you could satisfy both it and this License would be to + refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + +12. If the distribution and/or use of the Library is restricted in + certain countries either by patents or by copyrighted interfaces, the + original copyright holder who places the Library under this License may add + an explicit geographical distribution limitation excluding those countries, + so that distribution is permitted only in or among countries not thus + excluded. In such case, this License incorporates the limitation as if + written in the body of this License. + +13. The Free Software Foundation may publish revised and/or new + versions of the Lesser General Public License from time to time. + Such new versions will be similar in spirit to the present version, + but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + +14. If you wish to incorporate parts of the Library into other free + programs whose distribution conditions are incompatible with these, + write to the author to ask for permission. For software which is + copyrighted by the Free Software Foundation, write to the Free + Software Foundation; we sometimes make exceptions for this. Our + decision will be guided by the two goals of preserving the free status + of all derivatives of our free software and of promoting the sharing + and reuse of software generally. + + NO WARRANTY + +15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO + WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. + EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR + OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY + KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE + LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME + THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN + WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY + AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU + FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR + CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE + LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING + RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A + FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF + SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + +If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + +To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + {description} + Copyright (C) {year} {fullname} + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + +Yoyodyne, Inc., hereby disclaims all copyright interest in the +library `Frob' (a library for tweaking knobs) written by James Random +Hacker. + +{signature of Ty Coon}, 1 April 1990 +Ty Coon, President of Vice + +That's all there is to it! diff --git a/Plugin/src/SofaPython3/DataCache.cpp b/Plugin/src/SofaPython3/DataCache.cpp index 469d1c66..61ce58ad 100644 --- a/Plugin/src/SofaPython3/DataCache.cpp +++ b/Plugin/src/SofaPython3/DataCache.cpp @@ -1,28 +1,21 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include "DataCache.h" diff --git a/Plugin/src/SofaPython3/DataCache.h b/Plugin/src/SofaPython3/DataCache.h index b3da0320..96848fb7 100644 --- a/Plugin/src/SofaPython3/DataCache.h +++ b/Plugin/src/SofaPython3/DataCache.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/Plugin/src/SofaPython3/DataFactory.cpp b/Plugin/src/SofaPython3/DataFactory.cpp index 0211bab6..378bbaf9 100644 --- a/Plugin/src/SofaPython3/DataFactory.cpp +++ b/Plugin/src/SofaPython3/DataFactory.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include "DataFactory.h" diff --git a/Plugin/src/SofaPython3/DataFactory.h b/Plugin/src/SofaPython3/DataFactory.h index be7b2dd0..24c81486 100644 --- a/Plugin/src/SofaPython3/DataFactory.h +++ b/Plugin/src/SofaPython3/DataFactory.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/Plugin/src/SofaPython3/DataHelper.cpp b/Plugin/src/SofaPython3/DataHelper.cpp index f434ae16..864d1a1c 100644 --- a/Plugin/src/SofaPython3/DataHelper.cpp +++ b/Plugin/src/SofaPython3/DataHelper.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include diff --git a/Plugin/src/SofaPython3/DataHelper.h b/Plugin/src/SofaPython3/DataHelper.h index a5d7bdca..f7999826 100644 --- a/Plugin/src/SofaPython3/DataHelper.h +++ b/Plugin/src/SofaPython3/DataHelper.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/Plugin/src/SofaPython3/EventFactory.cpp b/Plugin/src/SofaPython3/EventFactory.cpp index 2fc7a15f..55c4d891 100644 --- a/Plugin/src/SofaPython3/EventFactory.cpp +++ b/Plugin/src/SofaPython3/EventFactory.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include "EventFactory.h" diff --git a/Plugin/src/SofaPython3/EventFactory.h b/Plugin/src/SofaPython3/EventFactory.h index 2f0dfe10..2a707fa1 100644 --- a/Plugin/src/SofaPython3/EventFactory.h +++ b/Plugin/src/SofaPython3/EventFactory.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/Plugin/src/SofaPython3/Prefab.cpp b/Plugin/src/SofaPython3/Prefab.cpp index 96197efb..2c5b119b 100644 --- a/Plugin/src/SofaPython3/Prefab.cpp +++ b/Plugin/src/SofaPython3/Prefab.cpp @@ -1,3 +1,23 @@ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ + #include #include #include diff --git a/Plugin/src/SofaPython3/Prefab.h b/Plugin/src/SofaPython3/Prefab.h index 9966d0b1..49ef5fbb 100644 --- a/Plugin/src/SofaPython3/Prefab.h +++ b/Plugin/src/SofaPython3/Prefab.h @@ -1,3 +1,23 @@ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ + #pragma once #include #include diff --git a/Plugin/src/SofaPython3/PythonEnvironment.cpp b/Plugin/src/SofaPython3/PythonEnvironment.cpp index d2460457..46f6c673 100644 --- a/Plugin/src/SofaPython3/PythonEnvironment.cpp +++ b/Plugin/src/SofaPython3/PythonEnvironment.cpp @@ -1,33 +1,6 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ - /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture, development version * -* (c) 2006-2018 INRIA, USTL, UJF, CNRS, MGH * +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * @@ -42,10 +15,9 @@ along with sofaqtquick. If not, see . * You should have received a copy of the GNU Lesser General Public License * * along with this program. If not, see . * ******************************************************************************* -* Authors: The SOFA Team and external contributors (see Authors.txt) * -* * * Contact information: contact@sofa-framework.org * ******************************************************************************/ + #include #if defined(__linux__) diff --git a/Plugin/src/SofaPython3/PythonEnvironment.h b/Plugin/src/SofaPython3/PythonEnvironment.h index 27a2e8de..b53d1599 100644 --- a/Plugin/src/SofaPython3/PythonEnvironment.h +++ b/Plugin/src/SofaPython3/PythonEnvironment.h @@ -1,33 +1,6 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ - /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture, development version * -* (c) 2006-2018 INRIA, USTL, UJF, CNRS, MGH * +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * @@ -42,10 +15,9 @@ along with sofaqtquick. If not, see . * You should have received a copy of the GNU Lesser General Public License * * along with this program. If not, see . * ******************************************************************************* -* Authors: The SOFA Team and external contributors (see Authors.txt) * -* * * Contact information: contact@sofa-framework.org * ******************************************************************************/ + #pragma once #include diff --git a/Plugin/src/SofaPython3/PythonFactory.cpp b/Plugin/src/SofaPython3/PythonFactory.cpp index 4ad7143f..2c05c1e2 100644 --- a/Plugin/src/SofaPython3/PythonFactory.cpp +++ b/Plugin/src/SofaPython3/PythonFactory.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include #include diff --git a/Plugin/src/SofaPython3/PythonFactory.h b/Plugin/src/SofaPython3/PythonFactory.h index bbf653a8..87d3dc26 100644 --- a/Plugin/src/SofaPython3/PythonFactory.h +++ b/Plugin/src/SofaPython3/PythonFactory.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/Plugin/src/SofaPython3/PythonTest.cpp b/Plugin/src/SofaPython3/PythonTest.cpp index a10de902..a7f724b6 100644 --- a/Plugin/src/SofaPython3/PythonTest.cpp +++ b/Plugin/src/SofaPython3/PythonTest.cpp @@ -1,33 +1,6 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ - /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture, development version * -* (c) 2006-2018 INRIA, USTL, UJF, CNRS, MGH * +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * @@ -42,10 +15,9 @@ along with sofaqtquick. If not, see . * You should have received a copy of the GNU Lesser General Public License * * along with this program. If not, see . * ******************************************************************************* -* Authors: The SOFA Team and external contributors (see Authors.txt) * -* * * Contact information: contact@sofa-framework.org * ******************************************************************************/ + #include #include diff --git a/Plugin/src/SofaPython3/PythonTest.h b/Plugin/src/SofaPython3/PythonTest.h index 84d4bf46..49da826b 100644 --- a/Plugin/src/SofaPython3/PythonTest.h +++ b/Plugin/src/SofaPython3/PythonTest.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/Plugin/src/SofaPython3/PythonTestExtractor.cpp b/Plugin/src/SofaPython3/PythonTestExtractor.cpp index a027dd99..51fc7e35 100644 --- a/Plugin/src/SofaPython3/PythonTestExtractor.cpp +++ b/Plugin/src/SofaPython3/PythonTestExtractor.cpp @@ -1,3 +1,23 @@ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ + #include #include diff --git a/Plugin/src/SofaPython3/PythonTestExtractor.h b/Plugin/src/SofaPython3/PythonTestExtractor.h index f686a42a..783ea7e6 100644 --- a/Plugin/src/SofaPython3/PythonTestExtractor.h +++ b/Plugin/src/SofaPython3/PythonTestExtractor.h @@ -1,21 +1,23 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ #include #include diff --git a/Plugin/src/SofaPython3/SceneLoaderPY3.cpp b/Plugin/src/SofaPython3/SceneLoaderPY3.cpp index cc5f646c..13f23800 100644 --- a/Plugin/src/SofaPython3/SceneLoaderPY3.cpp +++ b/Plugin/src/SofaPython3/SceneLoaderPY3.cpp @@ -1,33 +1,6 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ - /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture, development version * -* (c) 2006-2018 INRIA, USTL, UJF, CNRS, MGH * +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * @@ -42,10 +15,9 @@ along with sofaqtquick. If not, see . * You should have received a copy of the GNU Lesser General Public License * * along with this program. If not, see . * ******************************************************************************* -* Authors: The SOFA Team and external contributors (see Authors.txt) * -* * * Contact information: contact@sofa-framework.org * ******************************************************************************/ + #include #include diff --git a/Plugin/src/SofaPython3/SceneLoaderPY3.h b/Plugin/src/SofaPython3/SceneLoaderPY3.h index 1c563391..0c254761 100644 --- a/Plugin/src/SofaPython3/SceneLoaderPY3.h +++ b/Plugin/src/SofaPython3/SceneLoaderPY3.h @@ -1,33 +1,6 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ - /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture, development version * -* (c) 2006-2018 INRIA, USTL, UJF, CNRS, MGH * +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * @@ -42,10 +15,9 @@ along with sofaqtquick. If not, see . * You should have received a copy of the GNU Lesser General Public License * * along with this program. If not, see . * ******************************************************************************* -* Authors: The SOFA Team and external contributors (see Authors.txt) * -* * * Contact information: contact@sofa-framework.org * ******************************************************************************/ + #pragma once #include diff --git a/Plugin/src/SofaPython3/config.h b/Plugin/src/SofaPython3/config.h index b1623ef0..feb0c694 100644 --- a/Plugin/src/SofaPython3/config.h +++ b/Plugin/src/SofaPython3/config.h @@ -1,33 +1,6 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ - /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture, development version * -* (c) 2006-2018 INRIA, USTL, UJF, CNRS, MGH * +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * @@ -42,10 +15,9 @@ along with sofaqtquick. If not, see . * You should have received a copy of the GNU Lesser General Public License * * along with this program. If not, see . * ******************************************************************************* -* Authors: The SOFA Team and external contributors (see Authors.txt) * -* * * Contact information: contact@sofa-framework.org * ******************************************************************************/ + #pragma once #include diff --git a/Plugin/src/SofaPython3/initModule.cpp b/Plugin/src/SofaPython3/initModule.cpp index ab448c30..b9959d93 100644 --- a/Plugin/src/SofaPython3/initModule.cpp +++ b/Plugin/src/SofaPython3/initModule.cpp @@ -1,33 +1,6 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ - /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture, development version * -* (c) 2006-2018 INRIA, USTL, UJF, CNRS, MGH * +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * @@ -42,10 +15,9 @@ along with sofaqtquick. If not, see . * You should have received a copy of the GNU Lesser General Public License * * along with this program. If not, see . * ******************************************************************************* -* Authors: The SOFA Team and external contributors (see Authors.txt) * -* * * Contact information: contact@sofa-framework.org * ******************************************************************************/ + #include "config.h" #include "PythonEnvironment.h" diff --git a/Plugin/src/SofaPython3/initModule.h b/Plugin/src/SofaPython3/initModule.h index 1a3571c7..41cfcb27 100644 --- a/Plugin/src/SofaPython3/initModule.h +++ b/Plugin/src/SofaPython3/initModule.h @@ -1,33 +1,6 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ - /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture, development version * -* (c) 2006-2018 INRIA, USTL, UJF, CNRS, MGH * +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * @@ -42,10 +15,9 @@ along with sofaqtquick. If not, see . * You should have received a copy of the GNU Lesser General Public License * * along with this program. If not, see . * ******************************************************************************* -* Authors: The SOFA Team and external contributors (see Authors.txt) * -* * * Contact information: contact@sofa-framework.org * ******************************************************************************/ + #pragma once #include diff --git a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_RegularGridTopology.cpp b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_RegularGridTopology.cpp index a8170d68..f9ced04a 100644 --- a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_RegularGridTopology.cpp +++ b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_RegularGridTopology.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include #include "Binding_RegularGridTopology.h" diff --git a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_RegularGridTopology.h b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_RegularGridTopology.h index c4979e73..9b985c1c 100644 --- a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_RegularGridTopology.h +++ b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_RegularGridTopology.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_RegularGridTopology_doc.h b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_RegularGridTopology_doc.h index a5279f69..ac6f460b 100644 --- a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_RegularGridTopology_doc.h +++ b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_RegularGridTopology_doc.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_SparseGridTopology.cpp b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_SparseGridTopology.cpp index b9f26281..43914c52 100644 --- a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_SparseGridTopology.cpp +++ b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_SparseGridTopology.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include #include diff --git a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_SparseGridTopology.h b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_SparseGridTopology.h index 9e0ed332..e53abd4d 100644 --- a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_SparseGridTopology.h +++ b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_SparseGridTopology.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_SparseGridTopology_doc.h b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_SparseGridTopology_doc.h index 95cdadcc..5a7b5ff0 100644 --- a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_SparseGridTopology_doc.h +++ b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_SparseGridTopology_doc.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Module_SofaBaseTopology.cpp b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Module_SofaBaseTopology.cpp index 35d3fb36..69a43d65 100644 --- a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Module_SofaBaseTopology.cpp +++ b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Module_SofaBaseTopology.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include diff --git a/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_LinearSpring.cpp b/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_LinearSpring.cpp index 0da05dc9..508eff36 100644 --- a/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_LinearSpring.cpp +++ b/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_LinearSpring.cpp @@ -1,25 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - paul.scheikl@kit.edu -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include diff --git a/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_LinearSpring.h b/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_LinearSpring.h index 8b411785..f1c26bc6 100644 --- a/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_LinearSpring.h +++ b/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_LinearSpring.h @@ -1,21 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_LinearSpring_doc.h b/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_LinearSpring_doc.h index 21f76936..ed42155b 100644 --- a/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_LinearSpring_doc.h +++ b/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_LinearSpring_doc.h @@ -1,21 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_SpringForceField.cpp b/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_SpringForceField.cpp index fdae252e..be8e0ac6 100644 --- a/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_SpringForceField.cpp +++ b/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_SpringForceField.cpp @@ -1,27 +1,22 @@ - -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - jean-nicolas.brunet@inria.fr - - paul.scheikl@kit.edu -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include #include diff --git a/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_SpringForceField.h b/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_SpringForceField.h index d6a220c4..35b3c8e8 100644 --- a/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_SpringForceField.h +++ b/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_SpringForceField.h @@ -1,21 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_SpringForceField_doc.h b/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_SpringForceField_doc.h index 199fb11f..5acf094c 100644 --- a/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_SpringForceField_doc.h +++ b/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_SpringForceField_doc.h @@ -1,21 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Modules/src/SofaPython3/SofaDeformable/Module_SofaDeformable.cpp b/bindings/Modules/src/SofaPython3/SofaDeformable/Module_SofaDeformable.cpp index 298d2c94..01cdb194 100644 --- a/bindings/Modules/src/SofaPython3/SofaDeformable/Module_SofaDeformable.cpp +++ b/bindings/Modules/src/SofaPython3/SofaDeformable/Module_SofaDeformable.cpp @@ -1,21 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include #include diff --git a/bindings/Modules/tests/main.cpp b/bindings/Modules/tests/main.cpp index 8661bcb9..01d63bc3 100644 --- a/bindings/Modules/tests/main.cpp +++ b/bindings/Modules/tests/main.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture, development version * -* (c) 2006-2018 INRIA, USTL, UJF, CNRS, MGH * +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * @@ -15,8 +15,6 @@ * You should have received a copy of the GNU Lesser General Public License * * along with this program. If not, see . * ******************************************************************************* -* Authors: The SOFA Team and external contributors (see Authors.txt) * -* * * Contact information: contact@sofa-framework.org * ******************************************************************************/ diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Components/Submodule_Components.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Components/Submodule_Components.cpp index 8e4d0bb5..639ea6d2 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Components/Submodule_Components.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Components/Submodule_Components.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Components/Submodule_Components.h b/bindings/Sofa/src/SofaPython3/Sofa/Components/Submodule_Components.h index f640265a..8c22387f 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Components/Submodule_Components.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Components/Submodule_Components.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base.cpp index e84b52cb..f8dc3021 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base.h index ced532ad..7f5a6c15 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseCamera.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseCamera.cpp index ac613071..091012d3 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseCamera.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseCamera.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseCamera.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseCamera.h index b9e52665..fc708833 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseCamera.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseCamera.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseCamera_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseCamera_doc.h index 0c467f9a..a989499d 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseCamera_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseCamera_doc.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseContext.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseContext.cpp index 324e1bff..cb098c39 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseContext.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseContext.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseContext.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseContext.h index 6d639aa8..05e3e8f7 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseContext.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseContext.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseData.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseData.cpp index 901cce4a..a701c119 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseData.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseData.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseData.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseData.h index 304e862d..6a747d1d 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseData.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseData.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseData_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseData_doc.h index 3daee213..347d1f72 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseData_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseData_doc.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseLink.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseLink.cpp index 61cac759..a090d4fe 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseLink.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseLink.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include using sofa::core::objectmodel::BaseLink; diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseLink.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseLink.h index 2002444b..6f03d5af 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseLink.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseLink.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseLink_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseLink_doc.h index 205bcf9c..1fb70d62 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseLink_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseLink_doc.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseObject.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseObject.cpp index 7125d738..6bd48a9c 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseObject.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseObject.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseObject.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseObject.h index 7b116a92..3e40176d 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseObject.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseObject.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseObject_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseObject_doc.h index cb496cc5..ccdcfb23 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseObject_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseObject_doc.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base_doc.h index efe4570f..2086ac27 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base_doc.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ContactListener.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ContactListener.cpp index 5dd751e7..2500ab34 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ContactListener.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ContactListener.cpp @@ -1,30 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr - - paul.scheikl@kit.edu -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include "sofa/config.h" diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ContactListener.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ContactListener.h index 36f6f97d..b07f19d8 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ContactListener.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ContactListener.h @@ -1,30 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr - - paul.scheikl@kit.edu -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ContactListener_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ContactListener_doc.h index 48b59606..71710c4b 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ContactListener_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ContactListener_doc.h @@ -1,30 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr - - paul.scheikl@kit.edu -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Context.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Context.cpp index 594067c3..ae7bae3f 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Context.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Context.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Context.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Context.h index d1272c15..dedac611 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Context.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Context.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller.cpp index 6411bcd0..0d5bbf16 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller.h index e2651cb6..e3261999 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller_doc.h index b6ec0dc8..46c6f46e 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller_doc.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict.cpp index 20304b25..de822629 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict.h index 61c9d806..b6fad69c 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict_doc.h index 6a45dee2..83e11db4 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict_doc.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine.cpp index 9d9aa36f..1c41bcb7 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include #include #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine.h index b6b7f7b7..8944e8e5 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine_doc.h index 1a8fc5bb..d10abee5 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine_doc.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField.cpp index 22048fb4..60849a4f 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField.h index 5aad6ddf..9eabbf37 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField_doc.h index 9682520f..553369df 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField_doc.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.cpp index 7f44387f..8ac1c97f 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ /// Neede to have automatic conversion from pybind types to stl container. diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.h index 9c118361..77e9c0fe 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_NodeIterator.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_NodeIterator.cpp index f2944cd6..f9fcb1d6 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_NodeIterator.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_NodeIterator.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ /// Neede to have automatic conversion from pybind types to stl container. #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_NodeIterator.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_NodeIterator.h index fb9c47dd..cf7b4110 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_NodeIterator.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_NodeIterator.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node_doc.h index 178cde16..14c6b646 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node_doc.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory.cpp index 0d0d8c33..786c97aa 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory.h index 9aa788ba..7b9ecc86 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory_doc.h index bf494b16..9366af8f 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory_doc.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab.cpp index 6aafb581..26db4fbc 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab.h index b88eb945..44961619 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab_doc.h index dd8019cd..83b82546 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab_doc.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_PythonScriptEvent.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_PythonScriptEvent.cpp index 5dba7d41..64f3be6e 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_PythonScriptEvent.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_PythonScriptEvent.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_PythonScriptEvent.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_PythonScriptEvent.h index 90119176..0aee9f72 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_PythonScriptEvent.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_PythonScriptEvent.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataContainer.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataContainer.cpp index ba6f91f0..faa2dec7 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataContainer.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataContainer.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataContainer.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataContainer.h index bfe14833..66baffb5 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataContainer.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataContainer.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataContainer_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataContainer_doc.h index 17c96f56..88f24007 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataContainer_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataContainer_doc.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataDict.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataDict.cpp index 2d621a5c..c773c5cf 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataDict.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataDict.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include "Binding_DataDict.h" diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataDict.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataDict.h index 61847458..e9772469 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataDict.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataDict.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #ifndef BINDING_DATADICT_H #define BINDING_DATADICT_H diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataLink.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataLink.cpp index a76f5afc..ba395479 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataLink.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataLink.cpp @@ -1,3 +1,23 @@ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ + #include "Binding_DataLink.h" #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataLink.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataLink.h index 6175a12f..9d91c347 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataLink.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataLink.h @@ -1,3 +1,23 @@ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ + #pragma once #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataString.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataString.cpp index 1eeb60a1..050897ec 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataString.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataString.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include using sofa::defaulttype::AbstractTypeInfo; diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataString.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataString.h index 94521eda..f7abed7c 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataString.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataString.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataString_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataString_doc.h index a5cec481..01bc89b8 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataString_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataString_doc.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataVectorString.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataVectorString.cpp index e0e2c0e2..48a5ce24 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataVectorString.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataVectorString.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include using sofa::defaulttype::AbstractTypeInfo; diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataVectorString.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataVectorString.h index e7a0078f..6f3deaba 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataVectorString.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataVectorString.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataVectorString_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataVectorString_doc.h index 1f559b5f..d4243a1e 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataVectorString_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataVectorString_doc.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/binding_datadict_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/binding_datadict_doc.h index bf1a1fae..3e161015 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/binding_datadict_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/binding_datadict_doc.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #ifndef BINDING_DATADICT_DOC_H #define BINDING_DATADICT_DOC_H diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Submodule_Core.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Submodule_Core.cpp index a05c2272..649e0979 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Submodule_Core.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Submodule_Core.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_MessageHandler.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_MessageHandler.cpp index 1b46ac4e..682a8138 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_MessageHandler.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_MessageHandler.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_MessageHandler.h b/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_MessageHandler.h index fce3c7ca..9d6a121e 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_MessageHandler.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_MessageHandler.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_Vector.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_Vector.cpp index 6034abdd..77caeb08 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_Vector.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_Vector.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include "Binding_Vector.h" diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_Vector.h b/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_Vector.h index 246ef21c..67a0f39c 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_Vector.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_Vector.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Helper/Submodule_Helper.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Helper/Submodule_Helper.cpp index eaeb2811..afff54d9 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Helper/Submodule_Helper.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Helper/Submodule_Helper.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Binding_FileRepository.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Binding_FileRepository.cpp index 59f6a913..fff18b19 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Binding_FileRepository.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Binding_FileRepository.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Binding_FileRepository.h b/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Binding_FileRepository.h index bf989ad7..81bcd4db 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Binding_FileRepository.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Binding_FileRepository.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Binding_FileRepository_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Binding_FileRepository_doc.h index 8d2420f1..140d21a5 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Binding_FileRepository_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Binding_FileRepository_doc.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Submodule_System.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Submodule_System.cpp index c3a1373f..566de0da 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Submodule_System.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Submodule_System.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Submodule_System.h b/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Submodule_System.h index c9d2ad82..9352bf5a 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Submodule_System.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Submodule_System.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation.cpp index f1767960..eac2f5b1 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation_doc.h index 06d66900..8a2bde3a 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation_doc.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once namespace sofapython3::doc::simulation { diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Types/Binding_BoundingBox.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Types/Binding_BoundingBox.cpp index 6555998a..f4e12d3c 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Types/Binding_BoundingBox.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Types/Binding_BoundingBox.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Types/Binding_BoundingBox.h b/bindings/Sofa/src/SofaPython3/Sofa/Types/Binding_BoundingBox.h index 03d27ade..c0ff336e 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Types/Binding_BoundingBox.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Types/Binding_BoundingBox.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Types/Submodule_Types.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Types/Submodule_Types.cpp index 0218054f..370c9d07 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Types/Submodule_Types.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Types/Submodule_Types.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include #include diff --git a/bindings/Sofa/tests/Binding_BaseObject_MockComponent.cpp b/bindings/Sofa/tests/Binding_BaseObject_MockComponent.cpp index e821b559..0cd493ec 100644 --- a/bindings/Sofa/tests/Binding_BaseObject_MockComponent.cpp +++ b/bindings/Sofa/tests/Binding_BaseObject_MockComponent.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include "Binding_BaseObject_MockComponent.h" #include diff --git a/bindings/Sofa/tests/Binding_BaseObject_MockComponent.h b/bindings/Sofa/tests/Binding_BaseObject_MockComponent.h index e0e7e2e0..f4a0f197 100644 --- a/bindings/Sofa/tests/Binding_BaseObject_MockComponent.h +++ b/bindings/Sofa/tests/Binding_BaseObject_MockComponent.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/Sofa/tests/PythonModule_Sofa_test.cpp b/bindings/Sofa/tests/PythonModule_Sofa_test.cpp index 9a30e5c1..2ee85f07 100644 --- a/bindings/Sofa/tests/PythonModule_Sofa_test.cpp +++ b/bindings/Sofa/tests/PythonModule_Sofa_test.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture, development version * -* (c) 2006-2018 INRIA, USTL, UJF, CNRS, MGH * +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * @@ -15,19 +15,8 @@ * You should have received a copy of the GNU Lesser General Public License * * along with this program. If not, see . * ******************************************************************************* -* Authors: The SOFA Team and external contributors (see Authors.txt) * -* * * Contact information: contact@sofa-framework.org * ******************************************************************************/ -/****************************************************************************** - * Contributors: * - * - damien.marchal@univ-lille.fr * - * - bruno.josue.marques@inria.fr * - * - eve.le-guillou@centrale.centralelille.fr * - * - jean-nicolas.brunet@inria.fr * - * - thierry.gaugry@inria.fr * - * - damien.marchal@univ-lille1.fr * - *****************************************************************************/ #include diff --git a/bindings/SofaExporter/src/SofaExporter/Binding_STLExporter.cpp b/bindings/SofaExporter/src/SofaExporter/Binding_STLExporter.cpp index d5a69e95..7d1d3e09 100644 --- a/bindings/SofaExporter/src/SofaExporter/Binding_STLExporter.cpp +++ b/bindings/SofaExporter/src/SofaExporter/Binding_STLExporter.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include #include diff --git a/bindings/SofaExporter/src/SofaExporter/Binding_STLExporter.h b/bindings/SofaExporter/src/SofaExporter/Binding_STLExporter.h index 44f34aa8..745c8f8a 100644 --- a/bindings/SofaExporter/src/SofaExporter/Binding_STLExporter.h +++ b/bindings/SofaExporter/src/SofaExporter/Binding_STLExporter.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/SofaExporter/src/SofaExporter/Binding_STLExporter_doc.h b/bindings/SofaExporter/src/SofaExporter/Binding_STLExporter_doc.h index ee42e6ca..95b911a6 100644 --- a/bindings/SofaExporter/src/SofaExporter/Binding_STLExporter_doc.h +++ b/bindings/SofaExporter/src/SofaExporter/Binding_STLExporter_doc.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/SofaExporter/src/SofaExporter/Module_SofaExporter.cpp b/bindings/SofaExporter/src/SofaExporter/Module_SofaExporter.cpp index b93f398b..47977b02 100644 --- a/bindings/SofaExporter/src/SofaExporter/Module_SofaExporter.cpp +++ b/bindings/SofaExporter/src/SofaExporter/Module_SofaExporter.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include namespace py = pybind11; diff --git a/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_BaseGui.cpp b/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_BaseGui.cpp index 4bff5892..6e9fc237 100644 --- a/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_BaseGui.cpp +++ b/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_BaseGui.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include "Binding_BaseGui.h" diff --git a/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_BaseGui.h b/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_BaseGui.h index 30d6459c..8720bff9 100644 --- a/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_BaseGui.h +++ b/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_BaseGui.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_GUIManager.cpp b/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_GUIManager.cpp index 6238c972..38a9a3a2 100644 --- a/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_GUIManager.cpp +++ b/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_GUIManager.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include diff --git a/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_GUIManager.h b/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_GUIManager.h index affe0e03..11e3644f 100644 --- a/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_GUIManager.h +++ b/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_GUIManager.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/SofaGui/src/SofaPython3/SofaGui/Module_SofaGui.cpp b/bindings/SofaGui/src/SofaPython3/SofaGui/Module_SofaGui.cpp index 01aa01a9..6bd7aa36 100644 --- a/bindings/SofaGui/src/SofaPython3/SofaGui/Module_SofaGui.cpp +++ b/bindings/SofaGui/src/SofaPython3/SofaGui/Module_SofaGui.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include diff --git a/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Module_SofaRuntime.cpp b/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Module_SofaRuntime.cpp index 3ab66ae0..a40d6db1 100644 --- a/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Module_SofaRuntime.cpp +++ b/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Module_SofaRuntime.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include namespace py = pybind11; diff --git a/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer.cpp b/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer.cpp index 4658540e..b952d4d2 100644 --- a/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer.cpp +++ b/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include using sofa::helper::AdvancedTimer; diff --git a/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer.h b/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer.h index b10920ca..a26d51a3 100644 --- a/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer.h +++ b/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer_doc.h b/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer_doc.h index c84491d2..55bd6e0c 100644 --- a/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer_doc.h +++ b/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer_doc.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/SofaRuntime/tests/PythonModule_SofaRuntime_test.cpp b/bindings/SofaRuntime/tests/PythonModule_SofaRuntime_test.cpp index f954f075..3063c387 100644 --- a/bindings/SofaRuntime/tests/PythonModule_SofaRuntime_test.cpp +++ b/bindings/SofaRuntime/tests/PythonModule_SofaRuntime_test.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture, development version * -* (c) 2006-2018 INRIA, USTL, UJF, CNRS, MGH * +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * @@ -15,19 +15,8 @@ * You should have received a copy of the GNU Lesser General Public License * * along with this program. If not, see . * ******************************************************************************* -* Authors: The SOFA Team and external contributors (see Authors.txt) * -* * * Contact information: contact@sofa-framework.org * ******************************************************************************/ -/****************************************************************************** - * Contributors: * - * - damien.marchal@univ-lille.fr * - * - bruno.josue.marques@inria.fr * - * - eve.le-guillou@centrale.centralelille.fr * - * - jean-nicolas.brunet@inria.fr * - * - thierry.gaugry@inria.fr * - * - damien.marchal@univ-lille1.fr * - *****************************************************************************/ #include diff --git a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Mat.cpp b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Mat.cpp index e1be718a..b209626c 100644 --- a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Mat.cpp +++ b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Mat.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include "Binding_Mat.h" #include diff --git a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Mat.h b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Mat.h index b18015e0..a55e1c32 100644 --- a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Mat.h +++ b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Mat.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Quat.cpp b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Quat.cpp index db1f6822..5aa36395 100644 --- a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Quat.cpp +++ b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Quat.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include "Binding_Quat.h" typedef sofa::helper::Quater Quat; diff --git a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Quat.h b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Quat.h index 7b5eac96..853098c1 100644 --- a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Quat.h +++ b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Quat.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once diff --git a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Vec.cpp b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Vec.cpp index de008536..db3f0413 100644 --- a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Vec.cpp +++ b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Vec.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include "Binding_Vec.h" #include diff --git a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Vec.h b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Vec.h index ee58f0cc..69cb9040 100644 --- a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Vec.h +++ b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Vec.h @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #pragma once #include diff --git a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Module_SofaTypes.cpp b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Module_SofaTypes.cpp index 9c25b906..2ca40aaf 100644 --- a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Module_SofaTypes.cpp +++ b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Module_SofaTypes.cpp @@ -1,29 +1,22 @@ -/********************************************************************* -Copyright 2019, CNRS, University of Lille, INRIA - -This file is part of sofaPython3 - -sofaPython3 is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -sofaPython3 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with sofaqtquick. If not, see . -*********************************************************************/ -/******************************************************************** - Contributors: - - damien.marchal@univ-lille.fr - - bruno.josue.marques@inria.fr - - eve.le-guillou@centrale.centralelille.fr - - jean-nicolas.brunet@inria.fr - - thierry.gaugry@inria.fr -********************************************************************/ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 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 Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Contact information: contact@sofa-framework.org * +******************************************************************************/ #include diff --git a/bindings/SofaTypes/tests/PythonModule_SofaTypes_test.cpp b/bindings/SofaTypes/tests/PythonModule_SofaTypes_test.cpp index 33461f34..2b0c7417 100644 --- a/bindings/SofaTypes/tests/PythonModule_SofaTypes_test.cpp +++ b/bindings/SofaTypes/tests/PythonModule_SofaTypes_test.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture, development version * -* (c) 2006-2018 INRIA, USTL, UJF, CNRS, MGH * +* SOFA, Simulation Open-Framework Architecture * +* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * @@ -15,14 +15,8 @@ * You should have received a copy of the GNU Lesser General Public License * * along with this program. If not, see . * ******************************************************************************* -* Authors: The SOFA Team and external contributors (see Authors.txt) * -* * * Contact information: contact@sofa-framework.org * ******************************************************************************/ -/****************************************************************************** - * Contributors: * - * - damien.marchal@univ-lille1.fr * - *****************************************************************************/ #include diff --git a/contributors.txt b/contributors.txt new file mode 100644 index 00000000..66dec828 --- /dev/null +++ b/contributors.txt @@ -0,0 +1,6 @@ +bruno.josue.marques@inria.fr +damien.marchal@univ-lille.fr +eve.le-guillou@centrale.centralelille.fr +jean-nicolas.brunet@inria.fr +paul.scheikl@kit.edu +thierry.gaugry@inria.fr \ No newline at end of file From 82c98ce9d91e4aca1cc7629cdc8d1b30763e3eec Mon Sep 17 00:00:00 2001 From: Guillaume Paran Date: Fri, 15 Jan 2021 18:59:44 +0100 Subject: [PATCH 07/43] [CMake] Re-enable building SofaPython3 alongside SofaPython --- CMakeLists.txt | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 73500a03..974bcbd5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,13 +25,6 @@ if (SP3_COMPILED_AS_SOFA_SUBPROJECT) endif() endif() -# SofaPython3 cannot be compiled alongside SofaPython(2) -if (SP3_COMPILED_AS_SOFA_SUBPROJECT) - if(PLUGIN_SOFAPYTHON) - message(FATAL_ERROR "SofaPython3 cannot be built alongside SofaPython. Please set PLUGIN_SOFAPYTHON to OFF") - endif() -endif() - # CMAKE TOOLS list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMake") include(SofaPython3Tools) @@ -86,6 +79,30 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON) # Set the minimum python version to 3.7 set(PYBIND11_PYTHON_VERSION 3.7) +# Find Python3 executable and set PYTHON_EXECUTABLE before finding pybind11 +# to be sure that pybind11 relies on the right Python version +set(python_version "${PYBIND11_PYTHON_VERSION}") +set(python_version_flag "") +if(PYTHON_EXECUTABLE) + execute_process( + COMMAND "${PYTHON_EXECUTABLE}" "--version" + OUTPUT_VARIABLE cmd_output + ) + string(REGEX MATCH "[0-9]+\.[0-9]+" python_exec_version "${cmd_output}") + if(python_exec_version VERSION_GREATER_EQUAL PYBIND11_PYTHON_VERSION) + set(python_version "${python_exec_version}") + set(python_version_flag "EXACT") + endif() +endif() +message("${PROJECT_NAME}: Searching Python ${python_version} ${python_version_flag}") +find_package(Python ${python_version} ${python_version_flag} COMPONENTS Interpreter Development REQUIRED) +set(PYTHON_VERSION ${Python_VERSION}) +set(PYTHON_EXECUTABLE ${Python_EXECUTABLE}) +set(PYTHON_LIBRARIES ${Python_LIBRARIES}) +set(PYTHON_INCLUDE_DIRS ${Python_INCLUDE_DIRS}) +set(PYTHON_LIBRARY ${Python_LIBRARY}) +set(PYTHON_INCLUDE_DIR ${Python_INCLUDE_DIR}) + # Set the minimum pybind11 version to 2.3 (before that the pybind11::embed target did not exist) find_package(pybind11 2.3 CONFIG QUIET REQUIRED) @@ -115,7 +132,7 @@ set(SP3_PYTHON_PACKAGES_LINK_DIRECTORY ) message(STATUS "Python: - Version: ${PYTHON_VERSION_STRING} + Version: ${PYTHON_VERSION} Executable: ${PYTHON_EXECUTABLE} Headers: ${PYTHON_INCLUDE_DIRS} Libraries: ${PYTHON_LIBRARIES} From b7bdc9757361cf65115fff3a6b3dedca52b5b18c Mon Sep 17 00:00:00 2001 From: Hugo Date: Sat, 16 Jan 2021 10:21:59 +0100 Subject: [PATCH 08/43] Rename contributors.txt to Authors.txt (cherry picked from commit 475250a62cc13d3dca1a478b31ef76dd25ac04b7) --- contributors.txt => Authors.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename contributors.txt => Authors.txt (86%) diff --git a/contributors.txt b/Authors.txt similarity index 86% rename from contributors.txt rename to Authors.txt index 66dec828..411904df 100644 --- a/contributors.txt +++ b/Authors.txt @@ -3,4 +3,4 @@ damien.marchal@univ-lille.fr eve.le-guillou@centrale.centralelille.fr jean-nicolas.brunet@inria.fr paul.scheikl@kit.edu -thierry.gaugry@inria.fr \ No newline at end of file +thierry.gaugry@inria.fr From 8d4bf9ee96c650ec054382ae2f64bf950a99ad5e Mon Sep 17 00:00:00 2001 From: Hugo Date: Sat, 16 Jan 2021 11:41:24 +0100 Subject: [PATCH 09/43] Add badges for Doc and License (#89) (cherry picked from commit 1b675c8fb6f84112282b678ea1c14c913d18c345) --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 0a71984a..c9054d6f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # plugin.SofaPython3 +[![Documentation Status](https://readthedocs.org/projects/ansicolortags/badge/?version=latest)](https://sofapython3.readthedocs.io/en/latest/?badge=latest) [![Join the chat at https://gitter.im/sofa-framework/plugin.SofaPython3](https://badges.gitter.im/sofa-framework/plugin.SofaPython3.svg)](https://gitter.im/sofa-framework/plugin.SofaPython3?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +![License: LGPL v2.1](https://img.shields.io/badge/License-LGPL%20v2.1-blue.svg) This project is composed of a Sofa plugin to embed a python interpreter into a Sofa based simulation as well as several python modules that exposes the different c++ components used in Sofa. The binding is designed to be idiomatic python3 API with tight integration for numpy. This project is in a WIP state, please use it only if you are willing to help in the developement. From a852361bf4afdb3e8acfbb760ab36b5f8502859c Mon Sep 17 00:00:00 2001 From: Hugo Date: Sat, 16 Jan 2021 11:44:03 +0100 Subject: [PATCH 10/43] Update examples 202101 (#86) * Add example to load XML file from python environment * Update scenes with pluginization * Missing plugin SofaOpenglVisual in scenes (cherry picked from commit e496cb16d303a1d1634b821f2c59a4081bf39add) --- examples/basic-addGUI.py | 7 ++--- examples/basic.py | 10 +++---- examples/emptyController.py | 1 + examples/emptyDataEngine.py | 1 + examples/emptyForceField.py | 4 +++ examples/example-forcefield.py | 36 ++++++++++++++++++++---- examples/liver.py | 1 + examples/loadXMLfromPython.py | 51 ++++++++++++++++++++++++++++++++++ 8 files changed, 95 insertions(+), 16 deletions(-) create mode 100644 examples/loadXMLfromPython.py diff --git a/examples/basic-addGUI.py b/examples/basic-addGUI.py index b7df9bb5..d53ac9be 100644 --- a/examples/basic-addGUI.py +++ b/examples/basic-addGUI.py @@ -10,6 +10,7 @@ def main(): # Make sure to load all SOFA libraries + SofaRuntime.importPlugin("SofaBaseMechanics") SofaRuntime.importPlugin("SofaOpenglVisual") #Create the root node @@ -48,11 +49,9 @@ def createScene(root): node1 = root.addChild("Node1") node2 = root.addChild("Node2") - node1.addObject("MechanicalObject") - node1.addObject("OglModel") + node1.addObject("MechanicalObject", template="Rigid3d", position="0 0 0 0 0 0 1", showObject="1") - node2.addObject("MechanicalObject") - node2.addObject("OglModel") + node2.addObject("MechanicalObject", template="Rigid3d", position="1 1 1 0 0 0 1", showObject="1") return root diff --git a/examples/basic.py b/examples/basic.py index f27ad13e..63fc9192 100644 --- a/examples/basic.py +++ b/examples/basic.py @@ -5,8 +5,8 @@ def main(): # Make sure to load all SOFA libraries - SofaRuntime.importPlugin("SofaOpenglVisual") - + SofaRuntime.importPlugin("SofaBaseMechanics") + # Call the above function to create the scene graph root = Sofa.Core.Node("root") createScene(root) @@ -29,11 +29,9 @@ def createScene(root): node1 = root.addChild("Node1") node2 = root.addChild("Node2") - node1.addObject("MechanicalObject", position="0 0 0") - node1.addObject("OglModel") + node1.addObject("MechanicalObject", template="Rigid3d", position="0 0 0 0 0 0 1", showObject="1") - node2.addObject("MechanicalObject", position="1 1 1") - node2.addObject("OglModel") + node2.addObject("MechanicalObject", template="Rigid3d", position="1 1 1 0 0 0 1", showObject="1") return root diff --git a/examples/emptyController.py b/examples/emptyController.py index e3dcd1c4..488edc2c 100644 --- a/examples/emptyController.py +++ b/examples/emptyController.py @@ -94,6 +94,7 @@ def createScene(root): def main(): + SofaRuntime.importPlugin("SofaOpenglVisual") root=Sofa.Core.Node("root") createScene(root) diff --git a/examples/emptyDataEngine.py b/examples/emptyDataEngine.py index 5b43f0fe..bc492e90 100644 --- a/examples/emptyDataEngine.py +++ b/examples/emptyDataEngine.py @@ -30,6 +30,7 @@ def createScene(root): def main(): + SofaRuntime.importPlugin("SofaOpenglVisual") root=Sofa.Core.Node("root") createScene(root) Sofa.Simulation.init(root) diff --git a/examples/emptyForceField.py b/examples/emptyForceField.py index f033fcc2..7174041f 100644 --- a/examples/emptyForceField.py +++ b/examples/emptyForceField.py @@ -1,4 +1,5 @@ import Sofa +import SofaRuntime import Sofa.Gui from Sofa.Helper import msg_info import numpy as np @@ -52,6 +53,9 @@ def createScene(root): def main(): + SofaRuntime.importPlugin("SofaOpenglVisual") + SofaRuntime.importPlugin("SofaImplicitOdeSolver") + root=Sofa.Core.Node("root") createScene(root) Sofa.Simulation.init(root) diff --git a/examples/example-forcefield.py b/examples/example-forcefield.py index 381f2bac..af953a0e 100644 --- a/examples/example-forcefield.py +++ b/examples/example-forcefield.py @@ -1,6 +1,8 @@ """Implementation of a RestShapeForceField in python""" # coding: utf8 import Sofa +import SofaRuntime +import Sofa.Gui import numpy as np class RestShapeForceField(Sofa.Core.ForceField): @@ -8,16 +10,18 @@ class RestShapeForceField(Sofa.Core.ForceField): def __init__(self, ks=1.0, kd=1.0, *args, **kwargs): Sofa.Core.ForceField.__init__(self, *args, **kwargs) self.addData("ks", type="float", value=ks, help="The stiffness spring", group="Spring's Properties") - self.addData("kd", type="float", value=kd, help="The stiffness spring", group="Spring's Properties") + self.addData("kd", type="float", value=kd, help="The damping spring", group="Spring's Properties") def init(self): - self.initpos = self.mstate.position.array().copy() + mstate = self.getContext().mechanical + self.initpos = mstate.position.array().copy() self.k = np.zeros((1,1)) self.f = [] self.d = 0.5 def addForce(self, m, out_force, pos, vel): - out_force.value += ( (self.initpos-pos.value) * self.ks.value ) + with out_force.writeableArray() as wa: + wa[:] += ( (self.initpos-pos.value) * self.ks.value ) def addDForce(self, df, dx, params): pass @@ -40,8 +44,28 @@ def createScene(node): c.showColor = [1.0,0.0,0.0,1.0] c.drawMode = 1 - o.addObject("UniformMass", name="mass", vertexMass=0.1) - o.addObject( RestShapeForceField(name="CPPObject", kd=2.0)) - + o.addObject("UniformMass", name="mass", totalMass=[0.1]) + o.addObject( RestShapeForceField(name="CPPObject", ks=2.0, kd=0.1)) + return node +def main(): + SofaRuntime.importPlugin("SofaOpenglVisual") + SofaRuntime.importPlugin("SofaBaseMechanics") + SofaRuntime.importPlugin("SofaImplicitOdeSolver") + + root=Sofa.Core.Node("root") + createScene(root) + Sofa.Simulation.init(root) + + Sofa.Gui.GUIManager.Init("myscene", "qglviewer") + Sofa.Gui.GUIManager.createGUI(root, __file__) + Sofa.Gui.GUIManager.SetDimension(1080, 1080) + Sofa.Gui.GUIManager.MainLoop(root) + Sofa.Gui.GUIManager.closeGUI() + + print("End of simulation.") + + +if __name__ == '__main__': + main() diff --git a/examples/liver.py b/examples/liver.py index 97ac43fe..38cb45cc 100644 --- a/examples/liver.py +++ b/examples/liver.py @@ -10,6 +10,7 @@ def main(): SofaRuntime.importPlugin("SofaOpenglVisual") + SofaRuntime.importPlugin("SofaImplicitOdeSolver") root = Sofa.Core.Node("root") createScene(root) diff --git a/examples/loadXMLfromPython.py b/examples/loadXMLfromPython.py new file mode 100644 index 00000000..5b3ef22f --- /dev/null +++ b/examples/loadXMLfromPython.py @@ -0,0 +1,51 @@ +import Sofa +import Sofa.Gui +import SofaRuntime +import tempfile +import os + + + +def main(): + # Make sure to load all SOFA libraries + SofaRuntime.importPlugin("SofaOpenglVisual") + + root = Sofa.Core.Node("root") + + # Call the above function to create the scene graph + scene=""" + + + + + + + + + + + + + + """ + tf = tempfile.NamedTemporaryFile(mode="w+t", suffix=".scn", delete=False) + tf.write(scene) + tf.flush() + node = Sofa.Simulation.load(tf.name) + + # Find out the supported GUIs + print ("Supported GUIs are: " + Sofa.Gui.GUIManager.ListSupportedGUI(",")) + # Launch the GUI (qt or qglviewer) + Sofa.Gui.GUIManager.Init("myscene", "qglviewer") + Sofa.Gui.GUIManager.createGUI(node, __file__) + Sofa.Gui.GUIManager.SetDimension(1080, 1080) + # Initialization of the scene will be done here + Sofa.Gui.GUIManager.MainLoop(node) + Sofa.Gui.GUIManager.closeGUI() + print("GUI was closed") + print("Simulation is done.") + os.remove(tf.name) + +# Function used only if this script is called from a python environment +if __name__ == '__main__': + main() \ No newline at end of file From 2639e6645178c87460a98f5eceb30e5984944afb Mon Sep 17 00:00:00 2001 From: Hugo Date: Sat, 16 Jan 2021 14:21:39 +0100 Subject: [PATCH 11/43] Fix institutions (#88) (cherry picked from commit e75afab549d68f476bd2baeb56b3a5837e8a0f21) --- Plugin/src/SofaPython3/DataCache.cpp | 4 ++-- Plugin/src/SofaPython3/DataCache.h | 4 ++-- Plugin/src/SofaPython3/DataFactory.cpp | 4 ++-- Plugin/src/SofaPython3/DataFactory.h | 4 ++-- Plugin/src/SofaPython3/DataHelper.cpp | 4 ++-- Plugin/src/SofaPython3/DataHelper.h | 4 ++-- Plugin/src/SofaPython3/EventFactory.cpp | 4 ++-- Plugin/src/SofaPython3/EventFactory.h | 4 ++-- Plugin/src/SofaPython3/Prefab.cpp | 4 ++-- Plugin/src/SofaPython3/Prefab.h | 4 ++-- Plugin/src/SofaPython3/PythonEnvironment.cpp | 4 ++-- Plugin/src/SofaPython3/PythonEnvironment.h | 4 ++-- Plugin/src/SofaPython3/PythonFactory.cpp | 4 ++-- Plugin/src/SofaPython3/PythonFactory.h | 4 ++-- Plugin/src/SofaPython3/PythonTest.cpp | 4 ++-- Plugin/src/SofaPython3/PythonTest.h | 4 ++-- Plugin/src/SofaPython3/PythonTestExtractor.cpp | 4 ++-- Plugin/src/SofaPython3/PythonTestExtractor.h | 4 ++-- Plugin/src/SofaPython3/SceneLoaderPY3.cpp | 4 ++-- Plugin/src/SofaPython3/SceneLoaderPY3.h | 4 ++-- Plugin/src/SofaPython3/config.h | 4 ++-- Plugin/src/SofaPython3/initModule.cpp | 4 ++-- Plugin/src/SofaPython3/initModule.h | 4 ++-- .../SofaBaseTopology/Binding_RegularGridTopology.cpp | 4 ++-- .../SofaBaseTopology/Binding_RegularGridTopology.h | 4 ++-- .../SofaBaseTopology/Binding_RegularGridTopology_doc.h | 4 ++-- .../SofaBaseTopology/Binding_SparseGridTopology.cpp | 4 ++-- .../SofaPython3/SofaBaseTopology/Binding_SparseGridTopology.h | 4 ++-- .../SofaBaseTopology/Binding_SparseGridTopology_doc.h | 4 ++-- .../SofaPython3/SofaBaseTopology/Module_SofaBaseTopology.cpp | 4 ++-- .../src/SofaPython3/SofaDeformable/Binding_LinearSpring.cpp | 4 ++-- .../src/SofaPython3/Sofa/Core/Binding_ContactListener.cpp | 4 ++-- .../src/SofaPython3/Sofa/Core/Binding_ContactListener_doc.h | 4 ++-- bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Context.cpp | 4 ++-- bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Context.h | 4 ++-- .../Sofa/src/SofaPython3/Sofa/Core/Binding_Controller.cpp | 4 ++-- bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller.h | 4 ++-- .../Sofa/src/SofaPython3/Sofa/Core/Binding_Controller_doc.h | 4 ++-- bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict.cpp | 4 ++-- bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict.h | 4 ++-- .../Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict_doc.h | 4 ++-- .../Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine.cpp | 4 ++-- bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine.h | 4 ++-- .../Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine_doc.h | 4 ++-- .../Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField.cpp | 4 ++-- bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField.h | 4 ++-- .../Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField_doc.h | 4 ++-- bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.cpp | 4 ++-- bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.h | 4 ++-- .../Sofa/src/SofaPython3/Sofa/Core/Binding_NodeIterator.cpp | 4 ++-- .../Sofa/src/SofaPython3/Sofa/Core/Binding_NodeIterator.h | 4 ++-- bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node_doc.h | 4 ++-- .../Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory.cpp | 4 ++-- .../Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory.h | 4 ++-- .../src/SofaPython3/Sofa/Core/Binding_ObjectFactory_doc.h | 4 ++-- bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab.cpp | 4 ++-- bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab.h | 4 ++-- bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab_doc.h | 4 ++-- .../src/SofaPython3/Sofa/Core/Binding_PythonScriptEvent.cpp | 4 ++-- .../src/SofaPython3/Sofa/Core/Binding_PythonScriptEvent.h | 4 ++-- .../src/SofaPython3/Sofa/Core/Data/Binding_DataContainer.cpp | 4 ++-- .../src/SofaPython3/Sofa/Core/Data/Binding_DataContainer.h | 4 ++-- .../SofaPython3/Sofa/Core/Data/Binding_DataContainer_doc.h | 4 ++-- .../Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataDict.cpp | 4 ++-- .../Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataDict.h | 4 ++-- .../Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataLink.cpp | 4 ++-- .../Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataLink.h | 4 ++-- .../src/SofaPython3/Sofa/Core/Data/Binding_DataString.cpp | 4 ++-- .../Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataString.h | 4 ++-- .../src/SofaPython3/Sofa/Core/Data/Binding_DataString_doc.h | 4 ++-- .../SofaPython3/Sofa/Core/Data/Binding_DataVectorString.cpp | 4 ++-- .../src/SofaPython3/Sofa/Core/Data/Binding_DataVectorString.h | 4 ++-- .../SofaPython3/Sofa/Core/Data/Binding_DataVectorString_doc.h | 4 ++-- .../src/SofaPython3/Sofa/Core/Data/binding_datadict_doc.h | 4 ++-- bindings/Sofa/src/SofaPython3/Sofa/Core/Submodule_Core.cpp | 4 ++-- .../src/SofaPython3/Sofa/Helper/Binding_MessageHandler.cpp | 4 ++-- .../Sofa/src/SofaPython3/Sofa/Helper/Binding_MessageHandler.h | 4 ++-- bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_Vector.cpp | 4 ++-- bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_Vector.h | 4 ++-- .../Sofa/src/SofaPython3/Sofa/Helper/Submodule_Helper.cpp | 4 ++-- .../SofaPython3/Sofa/Helper/System/Binding_FileRepository.cpp | 4 ++-- .../SofaPython3/Sofa/Helper/System/Binding_FileRepository.h | 4 ++-- .../Sofa/Helper/System/Binding_FileRepository_doc.h | 4 ++-- .../src/SofaPython3/Sofa/Helper/System/Submodule_System.cpp | 4 ++-- .../src/SofaPython3/Sofa/Helper/System/Submodule_System.h | 4 ++-- .../src/SofaPython3/Sofa/Simulation/Submodule_Simulation.cpp | 4 ++-- .../SofaPython3/Sofa/Simulation/Submodule_Simulation_doc.h | 4 ++-- bindings/Sofa/src/SofaPython3/Sofa/Types/Submodule_Types.cpp | 4 ++-- bindings/Sofa/tests/Binding_BaseObject_MockComponent.cpp | 4 ++-- bindings/Sofa/tests/Binding_BaseObject_MockComponent.h | 4 ++-- bindings/Sofa/tests/PythonModule_Sofa_test.cpp | 4 ++-- .../SofaExporter/src/SofaExporter/Binding_STLExporter.cpp | 4 ++-- bindings/SofaExporter/src/SofaExporter/Binding_STLExporter.h | 4 ++-- .../SofaExporter/src/SofaExporter/Binding_STLExporter_doc.h | 4 ++-- .../SofaExporter/src/SofaExporter/Module_SofaExporter.cpp | 4 ++-- bindings/SofaGui/src/SofaPython3/SofaGui/Binding_BaseGui.h | 4 ++-- .../SofaGui/src/SofaPython3/SofaGui/Binding_GUIManager.cpp | 4 ++-- bindings/SofaGui/src/SofaPython3/SofaGui/Binding_GUIManager.h | 4 ++-- bindings/SofaGui/src/SofaPython3/SofaGui/Module_SofaGui.cpp | 4 ++-- .../src/SofaPython3/SofaRuntime/Module_SofaRuntime.cpp | 4 ++-- .../src/SofaPython3/SofaRuntime/Timer/Submodule_Timer.cpp | 4 ++-- .../src/SofaPython3/SofaRuntime/Timer/Submodule_Timer.h | 4 ++-- .../src/SofaPython3/SofaRuntime/Timer/Submodule_Timer_doc.h | 4 ++-- bindings/SofaRuntime/tests/PythonModule_SofaRuntime_test.cpp | 4 ++-- bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Mat.cpp | 4 ++-- bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Mat.h | 4 ++-- bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Quat.cpp | 4 ++-- bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Quat.h | 4 ++-- bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Vec.cpp | 4 ++-- bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Vec.h | 4 ++-- .../SofaTypes/src/SofaPython3/SofaTypes/Module_SofaTypes.cpp | 4 ++-- bindings/SofaTypes/tests/PythonModule_SofaTypes_test.cpp | 4 ++-- 112 files changed, 224 insertions(+), 224 deletions(-) diff --git a/Plugin/src/SofaPython3/DataCache.cpp b/Plugin/src/SofaPython3/DataCache.cpp index 61ce58ad..ed20809b 100644 --- a/Plugin/src/SofaPython3/DataCache.cpp +++ b/Plugin/src/SofaPython3/DataCache.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/Plugin/src/SofaPython3/DataCache.h b/Plugin/src/SofaPython3/DataCache.h index 96848fb7..ddf6b14d 100644 --- a/Plugin/src/SofaPython3/DataCache.h +++ b/Plugin/src/SofaPython3/DataCache.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/Plugin/src/SofaPython3/DataFactory.cpp b/Plugin/src/SofaPython3/DataFactory.cpp index 378bbaf9..f96c38a1 100644 --- a/Plugin/src/SofaPython3/DataFactory.cpp +++ b/Plugin/src/SofaPython3/DataFactory.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/Plugin/src/SofaPython3/DataFactory.h b/Plugin/src/SofaPython3/DataFactory.h index 24c81486..8e365edc 100644 --- a/Plugin/src/SofaPython3/DataFactory.h +++ b/Plugin/src/SofaPython3/DataFactory.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/Plugin/src/SofaPython3/DataHelper.cpp b/Plugin/src/SofaPython3/DataHelper.cpp index 864d1a1c..4169272c 100644 --- a/Plugin/src/SofaPython3/DataHelper.cpp +++ b/Plugin/src/SofaPython3/DataHelper.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/Plugin/src/SofaPython3/DataHelper.h b/Plugin/src/SofaPython3/DataHelper.h index f7999826..b3483553 100644 --- a/Plugin/src/SofaPython3/DataHelper.h +++ b/Plugin/src/SofaPython3/DataHelper.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/Plugin/src/SofaPython3/EventFactory.cpp b/Plugin/src/SofaPython3/EventFactory.cpp index 55c4d891..1301a675 100644 --- a/Plugin/src/SofaPython3/EventFactory.cpp +++ b/Plugin/src/SofaPython3/EventFactory.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/Plugin/src/SofaPython3/EventFactory.h b/Plugin/src/SofaPython3/EventFactory.h index 2a707fa1..0d89d837 100644 --- a/Plugin/src/SofaPython3/EventFactory.h +++ b/Plugin/src/SofaPython3/EventFactory.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/Plugin/src/SofaPython3/Prefab.cpp b/Plugin/src/SofaPython3/Prefab.cpp index 2c5b119b..e2178bb8 100644 --- a/Plugin/src/SofaPython3/Prefab.cpp +++ b/Plugin/src/SofaPython3/Prefab.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/Plugin/src/SofaPython3/Prefab.h b/Plugin/src/SofaPython3/Prefab.h index 49ef5fbb..238f5983 100644 --- a/Plugin/src/SofaPython3/Prefab.h +++ b/Plugin/src/SofaPython3/Prefab.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/Plugin/src/SofaPython3/PythonEnvironment.cpp b/Plugin/src/SofaPython3/PythonEnvironment.cpp index 46f6c673..4959b7f5 100644 --- a/Plugin/src/SofaPython3/PythonEnvironment.cpp +++ b/Plugin/src/SofaPython3/PythonEnvironment.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/Plugin/src/SofaPython3/PythonEnvironment.h b/Plugin/src/SofaPython3/PythonEnvironment.h index b53d1599..f74e968f 100644 --- a/Plugin/src/SofaPython3/PythonEnvironment.h +++ b/Plugin/src/SofaPython3/PythonEnvironment.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/Plugin/src/SofaPython3/PythonFactory.cpp b/Plugin/src/SofaPython3/PythonFactory.cpp index 2c05c1e2..9bc3c400 100644 --- a/Plugin/src/SofaPython3/PythonFactory.cpp +++ b/Plugin/src/SofaPython3/PythonFactory.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/Plugin/src/SofaPython3/PythonFactory.h b/Plugin/src/SofaPython3/PythonFactory.h index 87d3dc26..c7de2f1c 100644 --- a/Plugin/src/SofaPython3/PythonFactory.h +++ b/Plugin/src/SofaPython3/PythonFactory.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/Plugin/src/SofaPython3/PythonTest.cpp b/Plugin/src/SofaPython3/PythonTest.cpp index a7f724b6..245afc87 100644 --- a/Plugin/src/SofaPython3/PythonTest.cpp +++ b/Plugin/src/SofaPython3/PythonTest.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/Plugin/src/SofaPython3/PythonTest.h b/Plugin/src/SofaPython3/PythonTest.h index 49da826b..5032b728 100644 --- a/Plugin/src/SofaPython3/PythonTest.h +++ b/Plugin/src/SofaPython3/PythonTest.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/Plugin/src/SofaPython3/PythonTestExtractor.cpp b/Plugin/src/SofaPython3/PythonTestExtractor.cpp index 51fc7e35..66de69d8 100644 --- a/Plugin/src/SofaPython3/PythonTestExtractor.cpp +++ b/Plugin/src/SofaPython3/PythonTestExtractor.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/Plugin/src/SofaPython3/PythonTestExtractor.h b/Plugin/src/SofaPython3/PythonTestExtractor.h index 783ea7e6..b399461b 100644 --- a/Plugin/src/SofaPython3/PythonTestExtractor.h +++ b/Plugin/src/SofaPython3/PythonTestExtractor.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/Plugin/src/SofaPython3/SceneLoaderPY3.cpp b/Plugin/src/SofaPython3/SceneLoaderPY3.cpp index 13f23800..1651b020 100644 --- a/Plugin/src/SofaPython3/SceneLoaderPY3.cpp +++ b/Plugin/src/SofaPython3/SceneLoaderPY3.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/Plugin/src/SofaPython3/SceneLoaderPY3.h b/Plugin/src/SofaPython3/SceneLoaderPY3.h index 0c254761..efcbd566 100644 --- a/Plugin/src/SofaPython3/SceneLoaderPY3.h +++ b/Plugin/src/SofaPython3/SceneLoaderPY3.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/Plugin/src/SofaPython3/config.h b/Plugin/src/SofaPython3/config.h index feb0c694..405de221 100644 --- a/Plugin/src/SofaPython3/config.h +++ b/Plugin/src/SofaPython3/config.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/Plugin/src/SofaPython3/initModule.cpp b/Plugin/src/SofaPython3/initModule.cpp index b9959d93..63b9857b 100644 --- a/Plugin/src/SofaPython3/initModule.cpp +++ b/Plugin/src/SofaPython3/initModule.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/Plugin/src/SofaPython3/initModule.h b/Plugin/src/SofaPython3/initModule.h index 41cfcb27..8080ad90 100644 --- a/Plugin/src/SofaPython3/initModule.h +++ b/Plugin/src/SofaPython3/initModule.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_RegularGridTopology.cpp b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_RegularGridTopology.cpp index f9ced04a..8c90c2c1 100644 --- a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_RegularGridTopology.cpp +++ b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_RegularGridTopology.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_RegularGridTopology.h b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_RegularGridTopology.h index 9b985c1c..ed838ddc 100644 --- a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_RegularGridTopology.h +++ b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_RegularGridTopology.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_RegularGridTopology_doc.h b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_RegularGridTopology_doc.h index ac6f460b..d48e9043 100644 --- a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_RegularGridTopology_doc.h +++ b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_RegularGridTopology_doc.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_SparseGridTopology.cpp b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_SparseGridTopology.cpp index 43914c52..70c3b42d 100644 --- a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_SparseGridTopology.cpp +++ b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_SparseGridTopology.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_SparseGridTopology.h b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_SparseGridTopology.h index e53abd4d..6a0a332b 100644 --- a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_SparseGridTopology.h +++ b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_SparseGridTopology.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_SparseGridTopology_doc.h b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_SparseGridTopology_doc.h index 5a7b5ff0..75c23855 100644 --- a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_SparseGridTopology_doc.h +++ b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Binding_SparseGridTopology_doc.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Module_SofaBaseTopology.cpp b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Module_SofaBaseTopology.cpp index 69a43d65..b954d21c 100644 --- a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Module_SofaBaseTopology.cpp +++ b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Module_SofaBaseTopology.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_LinearSpring.cpp b/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_LinearSpring.cpp index 508eff36..34031b80 100644 --- a/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_LinearSpring.cpp +++ b/bindings/Modules/src/SofaPython3/SofaDeformable/Binding_LinearSpring.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ContactListener.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ContactListener.cpp index 2500ab34..2e843f9e 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ContactListener.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ContactListener.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ContactListener_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ContactListener_doc.h index 71710c4b..8672208a 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ContactListener_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ContactListener_doc.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Context.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Context.cpp index ae7bae3f..e1536f12 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Context.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Context.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Context.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Context.h index dedac611..d56dee0c 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Context.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Context.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller.cpp index 0d5bbf16..d9b69ace 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller.h index e3261999..7e04b6c3 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller_doc.h index 46c6f46e..374ac899 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller_doc.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict.cpp index de822629..57913707 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict.h index b6fad69c..80435d00 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict_doc.h index 83e11db4..ba937ae2 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataDict_doc.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine.cpp index 1c41bcb7..8ecf8bee 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine.h index 8944e8e5..b1360fc7 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine_doc.h index d10abee5..239dbff9 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine_doc.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField.cpp index 60849a4f..dbef2354 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField.h index 9eabbf37..3c3cfa74 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField_doc.h index 553369df..564a843e 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField_doc.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.cpp index 8ac1c97f..0fdf376a 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.h index 77e9c0fe..9224ab1d 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_NodeIterator.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_NodeIterator.cpp index f9fcb1d6..7cb25343 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_NodeIterator.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_NodeIterator.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_NodeIterator.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_NodeIterator.h index cf7b4110..07775e4d 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_NodeIterator.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_NodeIterator.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node_doc.h index 14c6b646..b0fbfee0 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node_doc.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory.cpp index 786c97aa..345ec0d9 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory.h index 7b9ecc86..73280d14 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory_doc.h index 9366af8f..a99a6bca 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ObjectFactory_doc.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab.cpp index 26db4fbc..fed22938 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab.h index 44961619..2a2efdda 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab_doc.h index 83b82546..2bc1e598 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab_doc.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_PythonScriptEvent.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_PythonScriptEvent.cpp index 64f3be6e..70712d4d 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_PythonScriptEvent.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_PythonScriptEvent.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_PythonScriptEvent.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_PythonScriptEvent.h index 0aee9f72..fec66dae 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_PythonScriptEvent.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_PythonScriptEvent.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataContainer.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataContainer.cpp index faa2dec7..b1afece1 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataContainer.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataContainer.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataContainer.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataContainer.h index 66baffb5..a1e14804 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataContainer.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataContainer.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataContainer_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataContainer_doc.h index 88f24007..8b4b8c5e 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataContainer_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataContainer_doc.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataDict.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataDict.cpp index c773c5cf..121e25f2 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataDict.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataDict.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataDict.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataDict.h index e9772469..0e853b49 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataDict.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataDict.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataLink.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataLink.cpp index ba395479..6b8ac694 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataLink.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataLink.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataLink.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataLink.h index 9d91c347..b263f137 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataLink.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataLink.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataString.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataString.cpp index 050897ec..e9109828 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataString.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataString.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataString.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataString.h index f7abed7c..81cdcc2a 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataString.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataString.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataString_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataString_doc.h index 01bc89b8..abe05b56 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataString_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataString_doc.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataVectorString.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataVectorString.cpp index 48a5ce24..a9465645 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataVectorString.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataVectorString.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataVectorString.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataVectorString.h index 6f3deaba..97a1a7ad 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataVectorString.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataVectorString.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataVectorString_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataVectorString_doc.h index d4243a1e..aea5529e 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataVectorString_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/Binding_DataVectorString_doc.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/binding_datadict_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/binding_datadict_doc.h index 3e161015..aed952fd 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/binding_datadict_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Data/binding_datadict_doc.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Submodule_Core.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Submodule_Core.cpp index 649e0979..5a5ba2b7 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Submodule_Core.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Submodule_Core.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_MessageHandler.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_MessageHandler.cpp index 682a8138..61af509f 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_MessageHandler.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_MessageHandler.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_MessageHandler.h b/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_MessageHandler.h index 9d6a121e..e882db3d 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_MessageHandler.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_MessageHandler.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_Vector.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_Vector.cpp index 77caeb08..8c1231ae 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_Vector.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_Vector.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_Vector.h b/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_Vector.h index 67a0f39c..9a0d4f4a 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_Vector.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Helper/Binding_Vector.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Helper/Submodule_Helper.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Helper/Submodule_Helper.cpp index afff54d9..d5e03992 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Helper/Submodule_Helper.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Helper/Submodule_Helper.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Binding_FileRepository.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Binding_FileRepository.cpp index fff18b19..6cd5e08c 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Binding_FileRepository.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Binding_FileRepository.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Binding_FileRepository.h b/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Binding_FileRepository.h index 81bcd4db..67ddee89 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Binding_FileRepository.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Binding_FileRepository.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Binding_FileRepository_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Binding_FileRepository_doc.h index 140d21a5..6c083ac5 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Binding_FileRepository_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Binding_FileRepository_doc.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Submodule_System.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Submodule_System.cpp index 566de0da..df9fcffc 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Submodule_System.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Submodule_System.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Submodule_System.h b/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Submodule_System.h index 9352bf5a..1e316be3 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Submodule_System.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Helper/System/Submodule_System.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation.cpp index eac2f5b1..e83bb18b 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation_doc.h index 8a2bde3a..03fc66fb 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation_doc.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Types/Submodule_Types.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Types/Submodule_Types.cpp index 370c9d07..86324bc3 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Types/Submodule_Types.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Types/Submodule_Types.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/tests/Binding_BaseObject_MockComponent.cpp b/bindings/Sofa/tests/Binding_BaseObject_MockComponent.cpp index 0cd493ec..8d25080f 100644 --- a/bindings/Sofa/tests/Binding_BaseObject_MockComponent.cpp +++ b/bindings/Sofa/tests/Binding_BaseObject_MockComponent.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/tests/Binding_BaseObject_MockComponent.h b/bindings/Sofa/tests/Binding_BaseObject_MockComponent.h index f4a0f197..777e96df 100644 --- a/bindings/Sofa/tests/Binding_BaseObject_MockComponent.h +++ b/bindings/Sofa/tests/Binding_BaseObject_MockComponent.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/Sofa/tests/PythonModule_Sofa_test.cpp b/bindings/Sofa/tests/PythonModule_Sofa_test.cpp index 2ee85f07..aff8e9f5 100644 --- a/bindings/Sofa/tests/PythonModule_Sofa_test.cpp +++ b/bindings/Sofa/tests/PythonModule_Sofa_test.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/SofaExporter/src/SofaExporter/Binding_STLExporter.cpp b/bindings/SofaExporter/src/SofaExporter/Binding_STLExporter.cpp index 7d1d3e09..b5488359 100644 --- a/bindings/SofaExporter/src/SofaExporter/Binding_STLExporter.cpp +++ b/bindings/SofaExporter/src/SofaExporter/Binding_STLExporter.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/SofaExporter/src/SofaExporter/Binding_STLExporter.h b/bindings/SofaExporter/src/SofaExporter/Binding_STLExporter.h index 745c8f8a..b5b8d5e5 100644 --- a/bindings/SofaExporter/src/SofaExporter/Binding_STLExporter.h +++ b/bindings/SofaExporter/src/SofaExporter/Binding_STLExporter.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/SofaExporter/src/SofaExporter/Binding_STLExporter_doc.h b/bindings/SofaExporter/src/SofaExporter/Binding_STLExporter_doc.h index 95b911a6..b894027c 100644 --- a/bindings/SofaExporter/src/SofaExporter/Binding_STLExporter_doc.h +++ b/bindings/SofaExporter/src/SofaExporter/Binding_STLExporter_doc.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/SofaExporter/src/SofaExporter/Module_SofaExporter.cpp b/bindings/SofaExporter/src/SofaExporter/Module_SofaExporter.cpp index 47977b02..6bba79c2 100644 --- a/bindings/SofaExporter/src/SofaExporter/Module_SofaExporter.cpp +++ b/bindings/SofaExporter/src/SofaExporter/Module_SofaExporter.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_BaseGui.h b/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_BaseGui.h index 8720bff9..a665793b 100644 --- a/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_BaseGui.h +++ b/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_BaseGui.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_GUIManager.cpp b/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_GUIManager.cpp index 38a9a3a2..ae156cd3 100644 --- a/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_GUIManager.cpp +++ b/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_GUIManager.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_GUIManager.h b/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_GUIManager.h index 11e3644f..cbd5a254 100644 --- a/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_GUIManager.h +++ b/bindings/SofaGui/src/SofaPython3/SofaGui/Binding_GUIManager.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/SofaGui/src/SofaPython3/SofaGui/Module_SofaGui.cpp b/bindings/SofaGui/src/SofaPython3/SofaGui/Module_SofaGui.cpp index 6bd7aa36..16872c1d 100644 --- a/bindings/SofaGui/src/SofaPython3/SofaGui/Module_SofaGui.cpp +++ b/bindings/SofaGui/src/SofaPython3/SofaGui/Module_SofaGui.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Module_SofaRuntime.cpp b/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Module_SofaRuntime.cpp index a40d6db1..cc554c19 100644 --- a/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Module_SofaRuntime.cpp +++ b/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Module_SofaRuntime.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer.cpp b/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer.cpp index b952d4d2..8e375197 100644 --- a/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer.cpp +++ b/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer.h b/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer.h index a26d51a3..1d7761bc 100644 --- a/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer.h +++ b/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer_doc.h b/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer_doc.h index 55bd6e0c..98dda43e 100644 --- a/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer_doc.h +++ b/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer_doc.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/SofaRuntime/tests/PythonModule_SofaRuntime_test.cpp b/bindings/SofaRuntime/tests/PythonModule_SofaRuntime_test.cpp index 3063c387..fdff0f01 100644 --- a/bindings/SofaRuntime/tests/PythonModule_SofaRuntime_test.cpp +++ b/bindings/SofaRuntime/tests/PythonModule_SofaRuntime_test.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Mat.cpp b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Mat.cpp index b209626c..88637491 100644 --- a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Mat.cpp +++ b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Mat.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Mat.h b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Mat.h index a55e1c32..6bceab14 100644 --- a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Mat.h +++ b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Mat.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Quat.cpp b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Quat.cpp index 5aa36395..7785165a 100644 --- a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Quat.cpp +++ b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Quat.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Quat.h b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Quat.h index 853098c1..06121584 100644 --- a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Quat.h +++ b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Quat.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Vec.cpp b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Vec.cpp index db3f0413..36041b64 100644 --- a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Vec.cpp +++ b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Vec.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Vec.h b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Vec.h index 69cb9040..47d7ceb5 100644 --- a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Vec.h +++ b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Binding_Vec.h @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Module_SofaTypes.cpp b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Module_SofaTypes.cpp index 2ca40aaf..e6a55a83 100644 --- a/bindings/SofaTypes/src/SofaPython3/SofaTypes/Module_SofaTypes.cpp +++ b/bindings/SofaTypes/src/SofaPython3/SofaTypes/Module_SofaTypes.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * diff --git a/bindings/SofaTypes/tests/PythonModule_SofaTypes_test.cpp b/bindings/SofaTypes/tests/PythonModule_SofaTypes_test.cpp index 2b0c7417..f033bd48 100644 --- a/bindings/SofaTypes/tests/PythonModule_SofaTypes_test.cpp +++ b/bindings/SofaTypes/tests/PythonModule_SofaTypes_test.cpp @@ -1,6 +1,6 @@ /****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2021 INRIA, USTL, UJF, CNRS, MGH * +* SofaPython3 plugin * +* (c) 2021 CNRS, University of Lille, INRIA * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * From 963202e3137b5e5c202b65d21f7f1699a3874c79 Mon Sep 17 00:00:00 2001 From: Jean-Nicolas Brunet Date: Mon, 18 Jan 2021 09:18:34 +0100 Subject: [PATCH 12/43] [cmake] Fix compilation issue on MacOS (#90) --- .github/workflows/macos.yml | 1 + CMake/SofaPython3Tools.cmake | 44 +++++++++++++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 4574ae63..b608b482 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -70,6 +70,7 @@ jobs: -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_PREFIX_PATH=$SOFA_ROOT/lib/cmake -DCMAKE_BUILD_TYPE=Release + -DPYTHON_EXECUTABLE=$(which python) . && ninja && ninja install && echo ${CCACHE_BASEDIR} diff --git a/CMake/SofaPython3Tools.cmake b/CMake/SofaPython3Tools.cmake index 2cd7109e..54d7a171 100644 --- a/CMake/SofaPython3Tools.cmake +++ b/CMake/SofaPython3Tools.cmake @@ -122,14 +122,56 @@ function(SP3_add_python_module) find_package(pybind11 CONFIG QUIET REQUIRED) - pybind11_add_module(${A_TARGET} SHARED NO_EXTRAS "${A_SOURCES}") + # We are doing manually what's usually done with pybind11_add_module(${A_TARGET} SHARED "${A_SOURCES}") + # since we got some problems on MacOS using recent versions of pybind11 where the SHARED argument wasn't taken + # into account + python_add_library(${A_TARGET} SHARED "${A_SOURCES}") add_library(SofaPython3::${A_TARGET} ALIAS ${A_TARGET}) + if ("${pybind11_VERSION}" VERSION_GREATER_EQUAL "2.6.0") + target_link_libraries(${A_TARGET} PRIVATE pybind11::headers) + target_link_libraries(${A_TARGET} PRIVATE pybind11::embed) + target_link_libraries(${A_TARGET} PRIVATE pybind11::lto) + if(MSVC) + target_link_libraries(${A_TARGET} PRIVATE pybind11::windows_extras) + endif() + + pybind11_extension(${A_TARGET}) + pybind11_strip(${A_TARGET}) + else() + target_link_libraries(${A_TARGET} PRIVATE pybind11::module) + + # Equivalent to pybind11_extension(${A_TARGET}) which doesn't exists on pybind11 versions < 5 + set_target_properties(${A_TARGET} PROPERTIES PREFIX "" SUFFIX "${PYTHON_MODULE_EXTENSION}") + + if(NOT MSVC AND NOT ${CMAKE_BUILD_TYPE} MATCHES Debug|RelWithDebInfo) + # Equivalent to pybind11_strip(${A_TARGET}) which doesn't exists on pybind11 versions < 5 + # Strip unnecessary sections of the binary on Linux/macOS + if(CMAKE_STRIP) + if(APPLE) + set(x_opt -x) + endif() + + add_custom_command( + TARGET ${A_TARGET} + POST_BUILD + COMMAND ${CMAKE_STRIP} ${x_opt} $) + endif() + endif() + endif() + + set_target_properties(${A_TARGET} + PROPERTIES + CXX_VISIBILITY_PRESET "hidden" + CUDA_VISIBILITY_PRESET "hidden") + target_include_directories(${A_TARGET} PUBLIC "$" PUBLIC $ ) + + if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") # Clang or AppleCLang target_compile_options(${A_TARGET} PUBLIC -fsized-deallocation) endif() From 19bf4d889b7060f2771565311115c2b51f6db808 Mon Sep 17 00:00:00 2001 From: Paul Scheikl Date: Mon, 18 Jan 2021 10:21:06 +0100 Subject: [PATCH 13/43] Added a binding for getLookAtFromOrientation. (#91) --- .../src/SofaPython3/Sofa/Core/Binding_BaseCamera.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseCamera.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseCamera.cpp index 091012d3..8ebc8b8a 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseCamera.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseCamera.cpp @@ -18,7 +18,9 @@ * Contact information: contact@sofa-framework.org * ******************************************************************************/ +#include "sofa/defaulttype/Quat.h" #include +#include #include #include @@ -109,6 +111,14 @@ void moduleAddBaseCamera(py::module &m) return (self->getOrientationFromLookAt(vec1, vec2)); }); + c.def("getLookAtFromOrientation", [](BaseCamera *self, py::list pos, double distance, py::list quat) { + sofa::defaulttype::Vec3 position; + sofa::defaulttype::Quat orientation; + position = sofa::defaulttype::Vec3(py::cast(pos[0]),py::cast(pos[1]),py::cast(pos[2])); + orientation = sofa::defaulttype::Quat(py::cast(quat[0]),py::cast(quat[1]),py::cast(quat[2]),py::cast(quat[3])); + return (self->getLookAtFromOrientation(position, distance, orientation)); + }); + c.def("getPositionFromOrientation", [](BaseCamera *self, py::list p1, py::float_ p2, py::list p3) { sofa::defaulttype::Vec3 vec1; double vec2; From af21c4a2a798493f8296317b0d7edf916565a2ef Mon Sep 17 00:00:00 2001 From: Jean-Nicolas Brunet Date: Thu, 21 Jan 2021 08:35:57 +0100 Subject: [PATCH 14/43] [cmake] Export SP3 cmake tools for usage in external projects (#94) --- CMake/SofaPython3Tools.cmake | 38 ++++++++++--------- CMakeLists.txt | 7 +++- Plugin/PluginConfig.cmake.in | 1 - SofaPython3Config.cmake.in | 20 ++++++++++ .../SofaBaseTopology/CMakeLists.txt | 5 ++- .../SofaPython3/SofaDeformable/CMakeLists.txt | 5 ++- .../Sofa/Components/CMakeLists.txt | 5 ++- .../src/SofaPython3/Sofa/Core/CMakeLists.txt | 5 ++- .../SofaPython3/Sofa/Helper/CMakeLists.txt | 5 ++- .../Sofa/Simulation/CMakeLists.txt | 5 ++- .../src/SofaPython3/Sofa/Types/CMakeLists.txt | 5 ++- bindings/SofaExporter/CMakeLists.txt | 3 +- bindings/SofaGui/CMakeLists.txt | 5 ++- bindings/SofaRuntime/CMakeLists.txt | 5 ++- bindings/SofaTypes/CMakeLists.txt | 5 ++- 15 files changed, 79 insertions(+), 40 deletions(-) diff --git a/CMake/SofaPython3Tools.cmake b/CMake/SofaPython3Tools.cmake index 54d7a171..d6bc9eb9 100644 --- a/CMake/SofaPython3Tools.cmake +++ b/CMake/SofaPython3Tools.cmake @@ -75,26 +75,27 @@ endfunction() # # SP3_add_python_module(TARGET MODULE_NAME DESTINATION SOURCES PYTHON_VERSION DEPENDS QUIET) # TARGET - (input) The name of the generated target. Only used when cpp files are included in the sources. -# PACKAGE_NAME - (input) The name of the package that will contain this module. -# MODULE_NAME - (input) The name of the module. +# PACKAGE - (input) The name of the cmake package that will contain this target. Note that the package must +# be created later on during the cmake configure stage using the macro sofa_create_package(), +# or be manually created using cmake's install command with "Targets" as suffix, e.g.: +# install(EXPORT ${PACKAGE}Targets). +# MODULE - (input) The name of the module. This is the name that will be used in python to do the actual +# import of the python module containing the bindings, i.e. "from MODULE import *". # DESTINATION - (input) The output directory that will contain the compiled module. -# For the build tree, it will be ${SP3_PYTHON_PACKAGES_BUILD_DIRECTORY}/${DESTINATION}. -# For the install tree, it will be ${SP3_PYTHON_PACKAGES_INSTALL_DIRECTORY}/${DESTINATION}. -# The default is ${PACKAGE_NAME} +# For the build tree, it will be ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_BUILD_DIRECTORY}/${DESTINATION}. +# For the install tree, it will be ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_INSTALL_DIRECTORY}/${DESTINATION}. # SOURCES - (input) list of source files that will be compiled with pybind11 support. # HEADERS - (input) list of header files that will be installed after the build. # DEPENDS - (input) set of target the generated target will depends on. # QUIET - (input) if set, not information messages will be printed out. function(SP3_add_python_module) set(options QUIET) - set(oneValueArgs TARGET PACKAGE_NAME MODULE_NAME DESTINATION PYTHON_VERSION ) + set(oneValueArgs TARGET PACKAGE MODULE DESTINATION PYTHON_VERSION ) set(multiValueArgs SOURCES HEADERS DEPENDS) cmake_parse_arguments(A "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - if (NOT A_DESTINATION) - set(DESTINATION "${A_PACKAGE_NAME}") - endif () + set(DESTINATION "${A_DESTINATION}") # Fetch the current path relative to /bindings/*/src # Must test if the result is nested into the CMAKE_CURRENT_SOURCE_DIR (case where src exists outside the plugin directory) @@ -108,11 +109,11 @@ function(SP3_add_python_module) endif() - if (NOT DEFINED A_MODULE_NAME) + if (NOT DEFINED A_MODULE) message(FATAL_ERROR "A module name must be provided.") endif() - set(MODULE_NAME ${A_MODULE_NAME}) + set(MODULE_NAME ${A_MODULE}) if (NOT DEFINED A_TARGET) set(A_TARGET ${MODULE_NAME}) @@ -295,12 +296,15 @@ function(SP3_add_python_module) endif() - install(TARGETS ${A_TARGET} - EXPORT BindingsTargets - RUNTIME DESTINATION "lib/${SP3_PYTHON_PACKAGES_DIRECTORY}/${DESTINATION}" COMPONENT applications - LIBRARY DESTINATION "lib/${SP3_PYTHON_PACKAGES_DIRECTORY}/${DESTINATION}" COMPONENT libraries - ARCHIVE DESTINATION "lib/${SP3_PYTHON_PACKAGES_DIRECTORY}/${DESTINATION}" COMPONENT libraries - ) + if (A_PACKAGE) + install( + TARGETS ${A_TARGET} + EXPORT ${A_PACKAGE}Targets + RUNTIME DESTINATION "lib/${SP3_PYTHON_PACKAGES_DIRECTORY}/${DESTINATION}" COMPONENT applications + LIBRARY DESTINATION "lib/${SP3_PYTHON_PACKAGES_DIRECTORY}/${DESTINATION}" COMPONENT libraries + ARCHIVE DESTINATION "lib/${SP3_PYTHON_PACKAGES_DIRECTORY}/${DESTINATION}" COMPONENT libraries + ) + endif() foreach(header ${A_HEADERS}) file(RELATIVE_PATH path_from_package "${path_to_src}" "${header}") diff --git a/CMakeLists.txt b/CMakeLists.txt index 974bcbd5..bde9aa57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,7 +94,6 @@ if(PYTHON_EXECUTABLE) set(python_version_flag "EXACT") endif() endif() -message("${PROJECT_NAME}: Searching Python ${python_version} ${python_version_flag}") find_package(Python ${python_version} ${python_version_flag} COMPONENTS Interpreter Development REQUIRED) set(PYTHON_VERSION ${Python_VERSION}) set(PYTHON_EXECUTABLE ${Python_EXECUTABLE}) @@ -191,6 +190,12 @@ sofa_create_package( RELOCATABLE "plugins" ) +install(FILES + "${CMAKE_CURRENT_SOURCE_DIR}/CMake/SofaPython3Tools.cmake" + DESTINATION lib/cmake/SofaPython3 + COMPONENT headers +) + if (SP3_LINK_TO_USER_SITE AND SP3_PYTHON_PACKAGES_LINK_DIRECTORY) file(GLOB directories RELATIVE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}" "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}/*") # Create the site-package link directory if it doesn't exists yet diff --git a/Plugin/PluginConfig.cmake.in b/Plugin/PluginConfig.cmake.in index 57bcaffd..50b01f8b 100644 --- a/Plugin/PluginConfig.cmake.in +++ b/Plugin/PluginConfig.cmake.in @@ -5,7 +5,6 @@ find_package(pybind11 CONFIG REQUIRED) find_package(SofaFramework REQUIRED) find_package(SofaSimulation REQUIRED) -find_package(SofaGeneral REQUIRED) # If we are importing this config file and the target is not yet there this is indicating that # target is an imported one. So we include it diff --git a/SofaPython3Config.cmake.in b/SofaPython3Config.cmake.in index 364460b5..c68b1842 100644 --- a/SofaPython3Config.cmake.in +++ b/SofaPython3Config.cmake.in @@ -4,6 +4,26 @@ @PACKAGE_INIT@ set(SP3_WITH_SOFAEXPORTER @SP3_WITH_SOFAEXPORTER@) +set(SP3_PYTHON_PACKAGES_DIRECTORY @SP3_PYTHON_PACKAGES_DIRECTORY@) + +include("${CMAKE_CURRENT_LIST_DIR}/SofaPython3Tools.cmake") + +# Find Python3 executable and set PYTHON_EXECUTABLE before finding pybind11 +# to be sure that pybind11 relies on the right Python version +set(python_version @PYBIND11_PYTHON_VERSION@) +set(python_version_flag @python_version_flag@) + +find_package(Python ${python_version} ${python_version_flag} COMPONENTS Interpreter Development REQUIRED) + +set(PYTHON_VERSION ${Python_VERSION}) +set(PYTHON_EXECUTABLE ${Python_EXECUTABLE}) +set(PYTHON_LIBRARIES ${Python_LIBRARIES}) +set(PYTHON_INCLUDE_DIRS ${Python_INCLUDE_DIRS}) +set(PYTHON_LIBRARY ${Python_LIBRARY}) +set(PYTHON_INCLUDE_DIR ${Python_INCLUDE_DIR}) + +# Set the minimum pybind11 version to 2.3 (before that the pybind11::embed target did not exist) +find_package(pybind11 2.3 CONFIG QUIET REQUIRED) if (SofaPython3_FIND_COMPONENTS) foreach(component ${SofaPython3_FIND_COMPONENTS}) diff --git a/bindings/Modules/src/SofaPython3/SofaBaseTopology/CMakeLists.txt b/bindings/Modules/src/SofaPython3/SofaBaseTopology/CMakeLists.txt index 831f0217..b9604287 100644 --- a/bindings/Modules/src/SofaPython3/SofaBaseTopology/CMakeLists.txt +++ b/bindings/Modules/src/SofaPython3/SofaBaseTopology/CMakeLists.txt @@ -17,8 +17,9 @@ find_package(SofaBaseTopology REQUIRED) SP3_add_python_module( TARGET ${PROJECT_NAME} - PACKAGE_NAME Sofa - MODULE_NAME SofaBaseTopology + PACKAGE Bindings + MODULE SofaBaseTopology + DESTINATION Sofa SOURCES ${SOURCE_FILES} HEADERS ${HEADER_FILES} DEPENDS SofaBaseTopology SofaPython3::Plugin diff --git a/bindings/Modules/src/SofaPython3/SofaDeformable/CMakeLists.txt b/bindings/Modules/src/SofaPython3/SofaDeformable/CMakeLists.txt index a226bd44..d4f3f54e 100644 --- a/bindings/Modules/src/SofaPython3/SofaDeformable/CMakeLists.txt +++ b/bindings/Modules/src/SofaPython3/SofaDeformable/CMakeLists.txt @@ -22,8 +22,9 @@ find_package(SofaDeformable REQUIRED) SP3_add_python_module( TARGET ${PROJECT_NAME} - PACKAGE_NAME Sofa - MODULE_NAME SofaDeformable + PACKAGE Bindings + MODULE SofaDeformable + DESTINATION Sofa SOURCES ${SOURCE_FILES} HEADERS ${HEADER_FILES} DEPENDS SofaBase SofaDeformable SofaPython3::Plugin SofaPython3::Bindings.Sofa.Core diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Components/CMakeLists.txt b/bindings/Sofa/src/SofaPython3/Sofa/Components/CMakeLists.txt index dc1a91da..cc9b8235 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Components/CMakeLists.txt +++ b/bindings/Sofa/src/SofaPython3/Sofa/Components/CMakeLists.txt @@ -12,8 +12,9 @@ find_package(SofaFramework REQUIRED) SP3_add_python_module( TARGET ${PROJECT_NAME} - PACKAGE_NAME Sofa - MODULE_NAME Components + PACKAGE Bindings + MODULE Components + DESTINATION Sofa SOURCES ${SOURCE_FILES} HEADERS ${HEADER_FILES} DEPENDS SofaCore SofaHelper SofaSimulationCore SofaPython3::Plugin diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/CMakeLists.txt b/bindings/Sofa/src/SofaPython3/Sofa/Core/CMakeLists.txt index 5c01a657..0a1fb34f 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/CMakeLists.txt +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/CMakeLists.txt @@ -77,8 +77,9 @@ find_package(SofaBaseUtils REQUIRED) SP3_add_python_module( TARGET ${PROJECT_NAME} - PACKAGE_NAME Sofa - MODULE_NAME Core + PACKAGE Bindings + MODULE Core + DESTINATION Sofa SOURCES ${SOURCE_FILES} HEADERS ${HEADER_FILES} DEPENDS SofaBaseUtils SofaBaseCollision SofaCore SofaHelper SofaSimulationCore SofaDefaultType SofaBaseVisual SofaPython3::Plugin diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Helper/CMakeLists.txt b/bindings/Sofa/src/SofaPython3/Sofa/Helper/CMakeLists.txt index 56595470..4019ef06 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Helper/CMakeLists.txt +++ b/bindings/Sofa/src/SofaPython3/Sofa/Helper/CMakeLists.txt @@ -19,8 +19,9 @@ find_package(SofaFramework REQUIRED) SP3_add_python_module( TARGET ${PROJECT_NAME} - PACKAGE_NAME Sofa - MODULE_NAME Helper + PACKAGE Bindings + MODULE Helper + DESTINATION Sofa SOURCES ${SOURCE_FILES} HEADERS ${HEADER_FILES} DEPENDS SofaCore SofaHelper SofaPython3::Plugin diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Simulation/CMakeLists.txt b/bindings/Sofa/src/SofaPython3/Sofa/Simulation/CMakeLists.txt index ace92e79..1cd7bbd8 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Simulation/CMakeLists.txt +++ b/bindings/Sofa/src/SofaPython3/Sofa/Simulation/CMakeLists.txt @@ -17,8 +17,9 @@ find_package(SofaSimulation REQUIRED) SP3_add_python_module( TARGET ${PROJECT_NAME} - PACKAGE_NAME Sofa - MODULE_NAME Simulation + PACKAGE Bindings + MODULE Simulation + DESTINATION Sofa SOURCES ${SOURCE_FILES} HEADERS ${HEADER_FILES} DEPENDS SofaCore SofaSimulationCore SofaSimulationGraph SofaPython3::Plugin diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Types/CMakeLists.txt b/bindings/Sofa/src/SofaPython3/Sofa/Types/CMakeLists.txt index 4b170a03..f3edb626 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Types/CMakeLists.txt +++ b/bindings/Sofa/src/SofaPython3/Sofa/Types/CMakeLists.txt @@ -13,8 +13,9 @@ find_package(SofaFramework REQUIRED) SP3_add_python_module( TARGET ${PROJECT_NAME} - PACKAGE_NAME Sofa - MODULE_NAME Types + PACKAGE Bindings + MODULE Types + DESTINATION Sofa SOURCES ${SOURCE_FILES} HEADERS ${HEADER_FILES} DEPENDS SofaCore SofaDefaultType SofaPython3::Plugin SofaPython3::Bindings.Sofa.Core diff --git a/bindings/SofaExporter/CMakeLists.txt b/bindings/SofaExporter/CMakeLists.txt index 93550e62..e933c2cd 100644 --- a/bindings/SofaExporter/CMakeLists.txt +++ b/bindings/SofaExporter/CMakeLists.txt @@ -14,7 +14,8 @@ find_package(SofaExporter REQUIRED) SP3_add_python_module( TARGET ${PROJECT_NAME} - MODULE_NAME SofaExporter + PACKAGE Bindings + MODULE SofaExporter SOURCES ${SOURCE_FILES} HEADERS ${HEADER_FILES} DEPENDS SofaExporter SofaPython3::Plugin SofaPython3::Bindings.Sofa.Core diff --git a/bindings/SofaGui/CMakeLists.txt b/bindings/SofaGui/CMakeLists.txt index 38e09284..2ebe32f9 100644 --- a/bindings/SofaGui/CMakeLists.txt +++ b/bindings/SofaGui/CMakeLists.txt @@ -17,8 +17,9 @@ find_package(SofaFramework REQUIRED) SP3_add_python_module( TARGET ${PROJECT_NAME} - PACKAGE_NAME Sofa - MODULE_NAME Gui + PACKAGE Bindings + MODULE Gui + DESTINATION Sofa SOURCES ${SOURCE_FILES} HEADERS ${HEADER_FILES} DEPENDS SofaCore SofaGuiCommon SofaGuiMain SofaPython3::Plugin SofaPython3::Bindings.Sofa.Core diff --git a/bindings/SofaRuntime/CMakeLists.txt b/bindings/SofaRuntime/CMakeLists.txt index 67050b4b..1ebd6897 100644 --- a/bindings/SofaRuntime/CMakeLists.txt +++ b/bindings/SofaRuntime/CMakeLists.txt @@ -21,8 +21,9 @@ SP3_add_python_package( SP3_add_python_module( TARGET ${PROJECT_NAME} - PACKAGE_NAME SofaRuntime - MODULE_NAME SofaRuntime + PACKAGE Bindings + MODULE SofaRuntime + DESTINATION SofaRuntime SOURCES ${SOURCE_FILES} HEADERS ${HEADER_FILES} DEPENDS SofaCore SofaHelper SofaSimulationCore SofaSimulationGraph SofaSimulationCommon SofaPython3::Plugin SofaPython3::Bindings.Sofa.Core diff --git a/bindings/SofaTypes/CMakeLists.txt b/bindings/SofaTypes/CMakeLists.txt index e044cb16..452a5a46 100644 --- a/bindings/SofaTypes/CMakeLists.txt +++ b/bindings/SofaTypes/CMakeLists.txt @@ -24,8 +24,9 @@ find_package(SofaFramework REQUIRED) SP3_add_python_module( TARGET ${PROJECT_NAME} - PACKAGE_NAME SofaTypes - MODULE_NAME SofaTypes + PACKAGE Bindings + MODULE SofaTypes + DESTINATION SofaTypes SOURCES ${SOURCE_FILES} HEADERS ${HEADER_FILES} DEPENDS SofaDefaultType SofaPython3::Plugin SofaPython3::Bindings.Sofa.Core From a0a7e564c6ab6dc97bdc89e06d221a253686c25a Mon Sep 17 00:00:00 2001 From: Guillaume Paran Date: Thu, 21 Jan 2021 09:16:02 +0100 Subject: [PATCH 15/43] Wider RPATH for python modules (#95) * CLEAN SofaPython3Config.cmake.in * [cmake] Wider RPATH support for python modules --- CMake/SofaPython3Tools.cmake | 80 +++++++++++++++++++++--------------- CMakeLists.txt | 4 +- SofaPython3Config.cmake.in | 32 ++++++--------- 3 files changed, 61 insertions(+), 55 deletions(-) diff --git a/CMake/SofaPython3Tools.cmake b/CMake/SofaPython3Tools.cmake index d6bc9eb9..257b8dd9 100644 --- a/CMake/SofaPython3Tools.cmake +++ b/CMake/SofaPython3Tools.cmake @@ -190,6 +190,8 @@ function(SP3_add_python_module) LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}/${DESTINATION}" ) + sofa_get_target_dependencies(DEPENDS_ALL ${A_TARGET}) + # Compute the installation RPATHs from the target's SP3 dependencies since they are not installed in a same directory # and are not automatically added from the cmake option INSTALL_RPATH_USE_LINK_PATH. # 1. Get all dependencies that are @@ -199,18 +201,23 @@ function(SP3_add_python_module) # We compute its path relative to this target output file # Ex: ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/site-packages/Sofa --> $ORIGIN/../Sofa # 3. Add the relative path computed in 2 to the list of RPATHS - set(${A_TARGET}_DEPENDENCIES_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBRARY_OUTPUT_DIRECTORY}") - foreach(DEPENDENCY ${A_DEPENDS}) - if (TARGET ${DEPENDENCY}) - get_target_property(DEPENDENCY_LIBRARY_OUTPUT_DIRECTORY "${DEPENDENCY}" LIBRARY_OUTPUT_DIRECTORY) - if (DEPENDENCY_LIBRARY_OUTPUT_DIRECTORY) - file(RELATIVE_PATH dependency_path_from_packages "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}" "${DEPENDENCY_LIBRARY_OUTPUT_DIRECTORY}") - if (NOT "${dependency_path_from_packages}" STREQUAL "" AND NOT "${dependency_path_from_packages}" STREQUAL "../") - list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "$ORIGIN/../${dependency_path_from_packages}") - list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "$$ORIGIN/../${dependency_path_from_packages}") - list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "@loader_path/../${dependency_path_from_packages}") - list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "@executable_path/../${dependency_path_from_packages}") - endif() + get_target_property(${A_TARGET}_DEPENDENCIES_RPATH ${A_TARGET} "INSTALL_RPATH") + foreach(DEPENDENCY ${DEPENDS_ALL}) + if(NOT TARGET ${DEPENDENCY}) + continue() + endif() + get_target_property(aliased_dep ${DEPENDENCY} ALIASED_TARGET) + if(aliased_dep) + set(DEPENDENCY ${aliased_dep}) + endif() + get_target_property(DEPENDENCY_LIBRARY_OUTPUT_DIRECTORY "${DEPENDENCY}" LIBRARY_OUTPUT_DIRECTORY) + if (DEPENDENCY_LIBRARY_OUTPUT_DIRECTORY) + file(RELATIVE_PATH dependency_path_from_packages "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}" "${DEPENDENCY_LIBRARY_OUTPUT_DIRECTORY}") + if (NOT "${dependency_path_from_packages}" STREQUAL "" AND NOT "${dependency_path_from_packages}" STREQUAL "../") + list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "$ORIGIN/../${dependency_path_from_packages}") + list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "$$ORIGIN/../${dependency_path_from_packages}") + list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "@loader_path/../${dependency_path_from_packages}") + list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "@executable_path/../${dependency_path_from_packages}") endif() endif() endforeach() @@ -228,28 +235,33 @@ function(SP3_add_python_module) # 1. First, compute the relative path from the current target towards the "plugins" relocatable directory of SOFA # 2. Append to the previous computed path the RELOCATABLE_INSTALL_DIR target property of the dependency since the # latter is formulated with respect to the "plugins" relocatable (e.g. "plugins/SofaBoundaryConditions/lib") - foreach(DEPENDENCY ${A_DEPENDS}) - if (TARGET ${DEPENDENCY}) - get_target_property(DEPENDENCY_RELOCATABLE_INSTALL_DIR "${DEPENDENCY}" RELOCATABLE_INSTALL_DIR) - if (DEPENDENCY_RELOCATABLE_INSTALL_DIR) - # Get the relative path from this binding module to the install lib directory - # For example, for lib/python3/site-packages/Sofa/Core.***.so, the relative path will be - # "../../.." - file(RELATIVE_PATH relative_towards_plugins_dir "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}/${DESTINATION}" "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") - # Here, we assume that the SP3 plugin will be installed in the SOFA plugins directory (i.e. $SOFA_ROOT/plugins) - # Hence, we need to compute the relative path from this plugins directory to the current binding - # modules, for example, plugins/SofaPython3/lib/python3/site-packages/Sofa/Core.***.so - # will become "../../../../../.." (three levels upper than the previous computed relative path) - set(relative_towards_plugins_dir "${relative_towards_plugins_dir}../../..") - - # Alright, now we have the path from the current target towards the "plugins" relocatable directory of SOFA - # We can compute the relative path from the current target towards the dependency relocatable path. - set(relative_towards_dependency_dir "${relative_towards_plugins_dir}/${DEPENDENCY_RELOCATABLE_INSTALL_DIR}") - list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "$ORIGIN/${relative_towards_dependency_dir}/lib") - list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "$$ORIGIN/${relative_towards_dependency_dir}/lib") - list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "@loader_path/${relative_towards_dependency_dir}/lib") - list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "@executable_path/${relative_towards_dependency_dir}/lib") - endif() + foreach(DEPENDENCY ${DEPENDS_ALL}) + if(NOT TARGET ${DEPENDENCY}) + continue() + endif() + get_target_property(aliased_dep ${DEPENDENCY} ALIASED_TARGET) + if(aliased_dep) + set(DEPENDENCY ${aliased_dep}) + endif() + get_target_property(DEPENDENCY_RELOCATABLE_INSTALL_DIR "${DEPENDENCY}" RELOCATABLE_INSTALL_DIR) + if (DEPENDENCY_RELOCATABLE_INSTALL_DIR) + # Get the relative path from this binding module to the install lib directory + # For example, for lib/python3/site-packages/Sofa/Core.***.so, the relative path will be + # "../../.." + file(RELATIVE_PATH relative_towards_plugins_dir "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}/${DESTINATION}" "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") + # Here, we assume that the SP3 plugin will be installed in the SOFA plugins directory (i.e. $SOFA_ROOT/plugins) + # Hence, we need to compute the relative path from this plugins directory to the current binding + # modules, for example, plugins/SofaPython3/lib/python3/site-packages/Sofa/Core.***.so + # will become "../../../../../.." (three levels upper than the previous computed relative path) + set(relative_towards_plugins_dir "${relative_towards_plugins_dir}../../..") + + # Alright, now we have the path from the current target towards the "plugins" relocatable directory of SOFA + # We can compute the relative path from the current target towards the dependency relocatable path. + set(relative_towards_dependency_dir "${relative_towards_plugins_dir}/${DEPENDENCY_RELOCATABLE_INSTALL_DIR}") + list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "$ORIGIN/${relative_towards_dependency_dir}/lib") + list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "$$ORIGIN/${relative_towards_dependency_dir}/lib") + list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "@loader_path/${relative_towards_dependency_dir}/lib") + list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "@executable_path/${relative_towards_dependency_dir}/lib") endif() endforeach() diff --git a/CMakeLists.txt b/CMakeLists.txt index bde9aa57..806c1b2f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.12) project(SofaPython3 VERSION 20.12.0) +find_package(SofaFramework REQUIRED) + # Detect if SofaPython3 is a subproject of another project (eg. when compiled within Sofa) if (NOT "${CMAKE_PROJECT_NAME}" STREQUAL "${PROJECT_NAME}") set(SP3_COMPILED_AS_SUBPROJECT 1) @@ -158,8 +160,6 @@ if (APPLE) set(CMAKE_BUILD_RPATH "/Applications/Xcode.app/Contents/Developer/Library/Frameworks") endif() -find_package(SofaFramework REQUIRED) - if (NOT SP3_COMPILED_AS_SUBPROJECT) get_filename_component(SOFA_ROOT_DIR "${SofaFramework_DIR}/../../.." ABSOLUTE) message(STATUS "SOFA Framework:\n\tVersion: ${SofaFramework_VERSION}\n\tLocation: ${SOFA_ROOT_DIR}") diff --git a/SofaPython3Config.cmake.in b/SofaPython3Config.cmake.in index c68b1842..0953100f 100644 --- a/SofaPython3Config.cmake.in +++ b/SofaPython3Config.cmake.in @@ -25,26 +25,20 @@ set(PYTHON_INCLUDE_DIR ${Python_INCLUDE_DIR}) # Set the minimum pybind11 version to 2.3 (before that the pybind11::embed target did not exist) find_package(pybind11 2.3 CONFIG QUIET REQUIRED) -if (SofaPython3_FIND_COMPONENTS) - foreach(component ${SofaPython3_FIND_COMPONENTS}) - if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/${component}Config.cmake") - # For requested component, execute its "config" script - set_and_check(config_file ${CMAKE_CURRENT_LIST_DIR}/${component}Config.cmake) - include(${config_file}) - set(SofaPython3_${component}_FOUND True) - else() - set(SofaPython3_FOUND False) - set(SofaPython3_NOT_FOUND_MESSAGE "Unsupported component: ${component}.") - endif() - endforeach() -else() - foreach(component Plugin Bindings) - # For all available components, execute its "config" script - set_and_check(config_file "${CMAKE_CURRENT_LIST_DIR}/${component}Config.cmake") - include(${config_file}) - set(Caribou_${component}_FOUND True) - endforeach() +if(NOT SofaPython3_FIND_COMPONENTS) + set(SofaPython3_FIND_COMPONENTS Plugin Bindings) endif() +foreach(component ${SofaPython3_FIND_COMPONENTS}) + if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/${component}Config.cmake") + # For requested component, execute its "config" script + set_and_check(config_file ${CMAKE_CURRENT_LIST_DIR}/${component}Config.cmake) + include(${config_file}) + set(SofaPython3_${component}_FOUND True) + else() + set(SofaPython3_FOUND False) + set(SofaPython3_NOT_FOUND_MESSAGE "Unsupported component: ${component}.") + endif() +endforeach() # Check that the component/target is there. check_required_components(@PROJECT_NAME@) From a40e0ed4257bbacc0607667eee31425fa0f7c0eb Mon Sep 17 00:00:00 2001 From: Guillaume Paran Date: Thu, 21 Jan 2021 17:15:11 +0100 Subject: [PATCH 16/43] [CMake] Simplify RPATH (#96) * [CMake] Simplify RPATH management * [CMake] Simplify RPATH management (2) * [CMake] Simplify RPATH management (3) * [CMake] Handle dep. to other python modules in RPATH * [CMake] CLEAN SofaPython3Tools.cmake --- CMake/SofaPython3Tools.cmake | 90 ++++++++++++++++++++++++------------ 1 file changed, 61 insertions(+), 29 deletions(-) diff --git a/CMake/SofaPython3Tools.cmake b/CMake/SofaPython3Tools.cmake index 257b8dd9..75ea3592 100644 --- a/CMake/SofaPython3Tools.cmake +++ b/CMake/SofaPython3Tools.cmake @@ -189,6 +189,7 @@ function(SP3_add_python_module) OUTPUT_NAME ${MODULE_NAME} LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}/${DESTINATION}" ) + get_target_property(TARGET_LIBRARY_OUTPUT_DIRECTORY ${A_TARGET} LIBRARY_OUTPUT_DIRECTORY) sofa_get_target_dependencies(DEPENDS_ALL ${A_TARGET}) @@ -201,7 +202,42 @@ function(SP3_add_python_module) # We compute its path relative to this target output file # Ex: ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/site-packages/Sofa --> $ORIGIN/../Sofa # 3. Add the relative path computed in 2 to the list of RPATHS - get_target_property(${A_TARGET}_DEPENDENCIES_RPATH ${A_TARGET} "INSTALL_RPATH") + get_target_property(TARGET_DEPENDENCIES_RPATH ${A_TARGET} "INSTALL_RPATH") + + # Get the relative path from this binding module to the install lib directory + # For example, for lib/python3/site-packages/Sofa/Core.***.so, the relative path will be + # "../../.." + file(RELATIVE_PATH from_target_to_lib "${TARGET_LIBRARY_OUTPUT_DIRECTORY}" "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") + file(TO_CMAKE_PATH "${from_target_to_lib}" from_target_to_lib) # prettify this path + + # RPATH needed to find dependencies in /lib + list(APPEND TARGET_DEPENDENCIES_RPATH + "$ORIGIN/${from_target_to_lib}/../lib" + "$$ORIGIN/${from_target_to_lib}/../lib" + "@loader_path/${from_target_to_lib}/../lib" + "@executable_path/${from_target_to_lib}/../lib" + ) + + # RPATH needed to find dependencies in /lib + list(APPEND TARGET_DEPENDENCIES_RPATH + "$ORIGIN/${from_target_to_lib}/../../../lib" + "$$ORIGIN/${from_target_to_lib}/../../../lib" + "@loader_path/${from_target_to_lib}/../../../lib" + "@executable_path/${from_target_to_lib}/../../../lib" + ) + + if (APPLE) + # In MacOS, the target dependency name is RPATH/site-packages/PackageName, so we need to add + # an RPATH to the directory that contains "site-packages" + list(APPEND TARGET_DEPENDENCIES_RPATH + "$ORIGIN/../.." + "$$ORIGIN/../.." + "@loader_path/../.." + "@executable_path/../.." + ) + endif() + + # RPATH needed to find dependencies in /lib/python3/site-packages foreach(DEPENDENCY ${DEPENDS_ALL}) if(NOT TARGET ${DEPENDENCY}) continue() @@ -211,26 +247,24 @@ function(SP3_add_python_module) set(DEPENDENCY ${aliased_dep}) endif() get_target_property(DEPENDENCY_LIBRARY_OUTPUT_DIRECTORY "${DEPENDENCY}" LIBRARY_OUTPUT_DIRECTORY) - if (DEPENDENCY_LIBRARY_OUTPUT_DIRECTORY) - file(RELATIVE_PATH dependency_path_from_packages "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}" "${DEPENDENCY_LIBRARY_OUTPUT_DIRECTORY}") - if (NOT "${dependency_path_from_packages}" STREQUAL "" AND NOT "${dependency_path_from_packages}" STREQUAL "../") - list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "$ORIGIN/../${dependency_path_from_packages}") - list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "$$ORIGIN/../${dependency_path_from_packages}") - list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "@loader_path/../${dependency_path_from_packages}") - list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "@executable_path/../${dependency_path_from_packages}") + # if dependency is also a python module + if(DEPENDENCY_LIBRARY_OUTPUT_DIRECTORY MATCHES ".*${SP3_PYTHON_PACKAGES_DIRECTORY}.*") + file(RELATIVE_PATH from_target_to_dependency "${TARGET_LIBRARY_OUTPUT_DIRECTORY}" "${DEPENDENCY_LIBRARY_OUTPUT_DIRECTORY}") + file(TO_CMAKE_PATH "${from_target_to_dependency}" from_target_to_dependency) # prettify this path + + if(from_target_to_dependency) + if(NOT "@loader_path/${from_target_to_dependency}" IN_LIST TARGET_DEPENDENCIES_RPATH) + list(APPEND TARGET_DEPENDENCIES_RPATH + "$ORIGIN/${from_target_to_dependency}" + "$$ORIGIN/${from_target_to_dependency}" + "@loader_path/${from_target_to_dependency}" + "@executable_path/${from_target_to_dependency}" + ) + endif() endif() endif() endforeach() - if (APPLE) - # In MacOS, the target dependency name is RPATH/site-packages/PackageName, so we need to add - # an RPATH to the directory that contains "site-packages" - list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "$ORIGIN/../..") - list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "$$ORIGIN/../..") - list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "@loader_path/../..") - list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "@executable_path/../..") - endif() - # Compute the installation RPATHs from the target's SOFA relocatable dependencies # 1. First, compute the relative path from the current target towards the "plugins" relocatable directory of SOFA # 2. Append to the previous computed path the RELOCATABLE_INSTALL_DIR target property of the dependency since the @@ -245,26 +279,24 @@ function(SP3_add_python_module) endif() get_target_property(DEPENDENCY_RELOCATABLE_INSTALL_DIR "${DEPENDENCY}" RELOCATABLE_INSTALL_DIR) if (DEPENDENCY_RELOCATABLE_INSTALL_DIR) - # Get the relative path from this binding module to the install lib directory - # For example, for lib/python3/site-packages/Sofa/Core.***.so, the relative path will be - # "../../.." - file(RELATIVE_PATH relative_towards_plugins_dir "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SP3_PYTHON_PACKAGES_DIRECTORY}/${DESTINATION}" "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") # Here, we assume that the SP3 plugin will be installed in the SOFA plugins directory (i.e. $SOFA_ROOT/plugins) # Hence, we need to compute the relative path from this plugins directory to the current binding # modules, for example, plugins/SofaPython3/lib/python3/site-packages/Sofa/Core.***.so # will become "../../../../../.." (three levels upper than the previous computed relative path) - set(relative_towards_plugins_dir "${relative_towards_plugins_dir}../../..") # Alright, now we have the path from the current target towards the "plugins" relocatable directory of SOFA # We can compute the relative path from the current target towards the dependency relocatable path. - set(relative_towards_dependency_dir "${relative_towards_plugins_dir}/${DEPENDENCY_RELOCATABLE_INSTALL_DIR}") - list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "$ORIGIN/${relative_towards_dependency_dir}/lib") - list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "$$ORIGIN/${relative_towards_dependency_dir}/lib") - list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "@loader_path/${relative_towards_dependency_dir}/lib") - list(APPEND ${A_TARGET}_DEPENDENCIES_RPATH "@executable_path/${relative_towards_dependency_dir}/lib") + list(APPEND TARGET_DEPENDENCIES_RPATH + "$ORIGIN/${from_target_to_lib}/../../../${DEPENDENCY_RELOCATABLE_INSTALL_DIR}/lib" + "$$ORIGIN/${from_target_to_lib}/../../../${DEPENDENCY_RELOCATABLE_INSTALL_DIR}/lib" + "@loader_path/${from_target_to_lib}/../../../${DEPENDENCY_RELOCATABLE_INSTALL_DIR}/lib" + "@executable_path/${from_target_to_lib}/../../../${DEPENDENCY_RELOCATABLE_INSTALL_DIR}/lib" + ) endif() endforeach() - + + message("${A_TARGET}: DEPENDENCIES_RPATH = ${TARGET_DEPENDENCIES_RPATH}") + set_target_properties( ${A_TARGET} PROPERTIES @@ -274,7 +306,7 @@ function(SP3_add_python_module) INSTALL_RPATH_USE_LINK_PATH TRUE # This will set the remaining RPATHs from our Bindings targets dependencies (install/lib/site-packages/*) - INSTALL_RPATH "${${A_TARGET}_DEPENDENCIES_RPATH}" + INSTALL_RPATH "${TARGET_DEPENDENCIES_RPATH}" # Don't use the installation RPATH for built files BUILD_WITH_INSTALL_RPATH FALSE From 727556efcde70cd8186a61261d293b265c71450b Mon Sep 17 00:00:00 2001 From: Jean-Nicolas Brunet Date: Fri, 22 Jan 2021 13:06:06 +0100 Subject: [PATCH 17/43] [Examples] Fix scenes before the release Signed-off-by: Jean-Nicolas Brunet --- examples/CMakeLists.txt | 12 +++-- examples/advanced_timer.py | 1 + examples/basic-addGUI.py | 4 +- examples/emptyController.py | 3 +- examples/emptyDataEngine.py | 3 +- examples/emptyForceField.py | 4 +- examples/example-forcefield.py | 7 ++- examples/example-forcefield2.py | 88 --------------------------------- examples/liver.py | 4 +- examples/loadXMLfromPython.py | 35 +++++++------ 10 files changed, 42 insertions(+), 119 deletions(-) delete mode 100644 examples/example-forcefield2.py diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 3f444712..084d5fd6 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -2,20 +2,22 @@ project(Examples) set(EXAMPLES_FILES ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/advanced_timer.py + ${CMAKE_CURRENT_SOURCE_DIR}/BaseCamera.py ${CMAKE_CURRENT_SOURCE_DIR}/basic.py ${CMAKE_CURRENT_SOURCE_DIR}/basic-addGUI.py + ${CMAKE_CURRENT_SOURCE_DIR}/easingScene.py + ${CMAKE_CURRENT_SOURCE_DIR}/easingSceneMatplotlib.py ${CMAKE_CURRENT_SOURCE_DIR}/emptyController.py ${CMAKE_CURRENT_SOURCE_DIR}/emptyDataEngine.py ${CMAKE_CURRENT_SOURCE_DIR}/emptyForceField.py - ${CMAKE_CURRENT_SOURCE_DIR}/example-forcefield2.py ${CMAKE_CURRENT_SOURCE_DIR}/example-forcefield.py ${CMAKE_CURRENT_SOURCE_DIR}/example-scriptcontroller.py - ${CMAKE_CURRENT_SOURCE_DIR}/BaseCamera.py - ${CMAKE_CURRENT_SOURCE_DIR}/easingSceneMatplotlib.py - ${CMAKE_CURRENT_SOURCE_DIR}/easingScene.py ${CMAKE_CURRENT_SOURCE_DIR}/keyEvents.py - ${CMAKE_CURRENT_SOURCE_DIR}/realTimeClockScene.py + ${CMAKE_CURRENT_SOURCE_DIR}/liver.py + ${CMAKE_CURRENT_SOURCE_DIR}/loadXMLfromPython.py ${CMAKE_CURRENT_SOURCE_DIR}/ReadTheDocs_Example.py + ${CMAKE_CURRENT_SOURCE_DIR}/realTimeClockScene.py ${CMAKE_CURRENT_SOURCE_DIR}/pygame_renderingloop/backend_pygame.py ${CMAKE_CURRENT_SOURCE_DIR}/pygame_renderingloop/pygame_test.py ${CMAKE_CURRENT_SOURCE_DIR}/additional-examples/ControllerScene.py diff --git a/examples/advanced_timer.py b/examples/advanced_timer.py index bf7904b9..701a453e 100644 --- a/examples/advanced_timer.py +++ b/examples/advanced_timer.py @@ -43,6 +43,7 @@ def createScene(root): root.dt = 0.01 # List of required plugins + root.addObject('RequiredPlugin', name='SofaBaseMechanics') root.addObject('RequiredPlugin', name='SofaSparseSolver') root.addObject('RequiredPlugin', name='SofaGraphComponent') root.addObject('RequiredPlugin', name='SofaOpenglVisual') diff --git a/examples/basic-addGUI.py b/examples/basic-addGUI.py index d53ac9be..d6d1d22e 100644 --- a/examples/basic-addGUI.py +++ b/examples/basic-addGUI.py @@ -1,7 +1,5 @@ # Required import for python import Sofa -import SofaRuntime -import Sofa.Gui # Choose in your script to activate or not the GUI @@ -9,6 +7,8 @@ def main(): + import SofaRuntime + import Sofa.Gui # Make sure to load all SOFA libraries SofaRuntime.importPlugin("SofaBaseMechanics") SofaRuntime.importPlugin("SofaOpenglVisual") diff --git a/examples/emptyController.py b/examples/emptyController.py index 488edc2c..6aacb575 100644 --- a/examples/emptyController.py +++ b/examples/emptyController.py @@ -1,5 +1,4 @@ import Sofa -import Sofa.Gui # This python script shows the functions to be implemented @@ -94,6 +93,8 @@ def createScene(root): def main(): + import SofaRuntime + import Sofa.Gui SofaRuntime.importPlugin("SofaOpenglVisual") root=Sofa.Core.Node("root") createScene(root) diff --git a/examples/emptyDataEngine.py b/examples/emptyDataEngine.py index bc492e90..6ed465f6 100644 --- a/examples/emptyDataEngine.py +++ b/examples/emptyDataEngine.py @@ -1,5 +1,4 @@ import Sofa -import Sofa.Gui from Sofa.Helper import msg_info @@ -30,6 +29,8 @@ def createScene(root): def main(): + import Sofa.Gui + import SofaRuntime SofaRuntime.importPlugin("SofaOpenglVisual") root=Sofa.Core.Node("root") createScene(root) diff --git a/examples/emptyForceField.py b/examples/emptyForceField.py index 7174041f..8df3fc76 100644 --- a/examples/emptyForceField.py +++ b/examples/emptyForceField.py @@ -1,6 +1,4 @@ import Sofa -import SofaRuntime -import Sofa.Gui from Sofa.Helper import msg_info import numpy as np @@ -53,6 +51,8 @@ def createScene(root): def main(): + import SofaRuntime + import Sofa.Gui SofaRuntime.importPlugin("SofaOpenglVisual") SofaRuntime.importPlugin("SofaImplicitOdeSolver") diff --git a/examples/example-forcefield.py b/examples/example-forcefield.py index af953a0e..7da43509 100644 --- a/examples/example-forcefield.py +++ b/examples/example-forcefield.py @@ -1,10 +1,9 @@ """Implementation of a RestShapeForceField in python""" # coding: utf8 import Sofa -import SofaRuntime -import Sofa.Gui import numpy as np + class RestShapeForceField(Sofa.Core.ForceField): """Implementation of a RestShapeForceField in python""" def __init__(self, ks=1.0, kd=1.0, *args, **kwargs): @@ -30,6 +29,7 @@ def addDForce(self, df, dx, params): #def addKToMatrix(self, a, b): # print(" Python::addKToMatrix: ", a, " ", b) + def createScene(node): node.addObject("RequiredPlugin", name="SofaOpenglVisual") node.addObject("RequiredPlugin", name="SofaSparseSolver") @@ -49,7 +49,10 @@ def createScene(node): return node + def main(): + import SofaRuntime + import Sofa.Gui SofaRuntime.importPlugin("SofaOpenglVisual") SofaRuntime.importPlugin("SofaBaseMechanics") SofaRuntime.importPlugin("SofaImplicitOdeSolver") diff --git a/examples/example-forcefield2.py b/examples/example-forcefield2.py deleted file mode 100644 index 76afbf30..00000000 --- a/examples/example-forcefield2.py +++ /dev/null @@ -1,88 +0,0 @@ -from MyRestShapeForceField import * - - -def createIntegrationScheme(node, use_implicit_scheme): - if use_implicit_scheme is True: - node.addObject('EulerImplicitSolver', name='odeImplicitSolver', - rayleighStiffness='0.1', rayleighMass='0.1') - else: - node.addObject('EulerExplicitSolver', name='odeExplicitSolver') - - -def createSolver(node, use_iterative_solver): - if use_iterative_solver is True: - node.addObject('CGLinearSolver', name='linearSolver', - iterations=30, tolerance=1.e-9, threshold=1.e-9) - else: - node.addObject('SparseLDLSolver', name='ldlSolver') - - -def createDragon(node, node_name, use_implicit_scheme, use_iterative_solver): - dragon = node.addChild(node_name) - createIntegrationScheme(dragon, use_implicit_scheme) - createSolver(dragon, use_iterative_solver) - dragon.addObject('SparseGridTopology', n=[ - 10, 5, 10], fileTopology="mesh/dragon.obj") - dofs = dragon.addObject( - 'MechanicalObject', name="DOFs") - dragon.addObject('UniformMass', totalMass=1.0) - - print (str(dofs.rest_position)) - myRSSFF = NaiveRestShapeSpringsForcefield(name="Springs", - stiffness=50, - mstate=dofs, rest_pos=dofs.rest_position, implementation="naive") - dragon.addObject(myRSSFF) - - visu = dragon.addChild("Visu") - vm = visu.addObject('OglModel', fileMesh="mesh/dragon.obj", - color=[1.0, 0.5, 1.0, 1.0]) - visu.addObject('BarycentricMapping', - input=dofs.getLinkPath(), output=vm.getLinkPath()) - - collision = dragon.addChild("Collis") - collision.addObject('MeshObjLoader', name="loader", - filename="mesh/dragon.obj") - collision.addObject('Mesh', src="@loader") - collision.addObject('MechanicalObject', src="@loader") - collision.addObject('TriangleCollisionModel', group="1") - collision.addObject('LineCollisionModel', group="1") - collision.addObject('PointCollisionModel', group="1") - collision.addObject('BarycentricMapping', input="@..", output="@.") - - -def createCube(node, node_name, use_implicit_scheme, use_iterative_solver): - cube = node.addChild(node_name) - createIntegrationScheme(cube, use_implicit_scheme) - createSolver(cube, use_iterative_solver) - cube.addObject('SparseGridTopology', n=[ - 2, 2, 2], fileTopology="mesh/smCube27.obj") - dofs = cube.addObject('MechanicalObject', name="DOFs", dy=20) - cube.addObject('UniformMass', totalMass=1.0) - - myRSSFF = NaiveRestShapeSpringsForcefield(name="Springs", - stiffness=50, - mstate=dofs, rest_pos=dofs.rest_position, implementation="naive") - cube.addObject(myRSSFF) - - visu = cube.addChild("Visu") - vm = visu.addObject( - 'OglModel', fileMesh="mesh/smCube27.obj", color=[0.5, 1.0, 0.5, 1.0]) - visu.addObject('BarycentricMapping', - input=dofs.getLinkPath(), output=vm.getLinkPath()) - - collision = cube.addChild("Collis") - collision.addObject('MeshObjLoader', name="loader", - filename="mesh/smCube27.obj", triangulate=True) - collision.addObject('Mesh', src="@loader") - collision.addObject('MechanicalObject', src="@loader") - collision.addObject('TriangleCollisionModel', group="1") - collision.addObject('LineCollisionModel', group="1") - collision.addObject('PointCollisionModel', group="1") - collision.addObject('BarycentricMapping', input="@..", output="@.") - - -def createScene(root): - root.gravity = [0, -10, 0] - createDragon(root, "Dragon", True, False) - createCube(root, "Cube", True, True) - return root diff --git a/examples/liver.py b/examples/liver.py index 38cb45cc..69a1d8f2 100644 --- a/examples/liver.py +++ b/examples/liver.py @@ -1,7 +1,5 @@ # Required import for python import Sofa -import SofaRuntime -import Sofa.Gui # Choose in your script to activate or not the GUI @@ -9,6 +7,8 @@ def main(): + import SofaRuntime + import Sofa.Gui SofaRuntime.importPlugin("SofaOpenglVisual") SofaRuntime.importPlugin("SofaImplicitOdeSolver") diff --git a/examples/loadXMLfromPython.py b/examples/loadXMLfromPython.py index 5b3ef22f..c2c72a1f 100644 --- a/examples/loadXMLfromPython.py +++ b/examples/loadXMLfromPython.py @@ -1,21 +1,13 @@ import Sofa -import Sofa.Gui -import SofaRuntime import tempfile import os - -def main(): - # Make sure to load all SOFA libraries - SofaRuntime.importPlugin("SofaOpenglVisual") - - root = Sofa.Core.Node("root") - +def createScene(root): # Call the above function to create the scene graph scene=""" - - + + @@ -31,21 +23,32 @@ def main(): tf = tempfile.NamedTemporaryFile(mode="w+t", suffix=".scn", delete=False) tf.write(scene) tf.flush() - node = Sofa.Simulation.load(tf.name) + loaded_node = Sofa.Simulation.load(tf.name) + root.addChild(loaded_node) + os.remove(tf.name) + + +def main(): + import SofaRuntime + import Sofa.Gui + + root = Sofa.Core.Node("root") + createScene(root) + Sofa.Simulation.init(root) # Find out the supported GUIs print ("Supported GUIs are: " + Sofa.Gui.GUIManager.ListSupportedGUI(",")) # Launch the GUI (qt or qglviewer) Sofa.Gui.GUIManager.Init("myscene", "qglviewer") - Sofa.Gui.GUIManager.createGUI(node, __file__) + Sofa.Gui.GUIManager.createGUI(root, __file__) Sofa.Gui.GUIManager.SetDimension(1080, 1080) # Initialization of the scene will be done here - Sofa.Gui.GUIManager.MainLoop(node) + Sofa.Gui.GUIManager.MainLoop(root) Sofa.Gui.GUIManager.closeGUI() print("GUI was closed") print("Simulation is done.") - os.remove(tf.name) + # Function used only if this script is called from a python environment if __name__ == '__main__': - main() \ No newline at end of file + main() \ No newline at end of file From f63aec7c9a3207e874e09bcbad19c47da81e4e55 Mon Sep 17 00:00:00 2001 From: Jean-Nicolas Brunet Date: Fri, 22 Jan 2021 14:25:57 +0100 Subject: [PATCH 18/43] [Examples] Remove the pygame scene as it is broken without glew bindings (#97) The pygame example is broken and would necessitate to bring back a hard dependency on glew. Signed-off-by: Jean-Nicolas Brunet --- examples/CMakeLists.txt | 4 +- .../pygame_renderingloop/backend_pygame.py | 67 ------------------- examples/pygame_renderingloop/pygame_test.py | 61 ----------------- 3 files changed, 1 insertion(+), 131 deletions(-) delete mode 100644 examples/pygame_renderingloop/backend_pygame.py delete mode 100644 examples/pygame_renderingloop/pygame_test.py diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 084d5fd6..74fc8bae 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -18,9 +18,7 @@ set(EXAMPLES_FILES ${CMAKE_CURRENT_SOURCE_DIR}/loadXMLfromPython.py ${CMAKE_CURRENT_SOURCE_DIR}/ReadTheDocs_Example.py ${CMAKE_CURRENT_SOURCE_DIR}/realTimeClockScene.py - ${CMAKE_CURRENT_SOURCE_DIR}/pygame_renderingloop/backend_pygame.py - ${CMAKE_CURRENT_SOURCE_DIR}/pygame_renderingloop/pygame_test.py - ${CMAKE_CURRENT_SOURCE_DIR}/additional-examples/ControllerScene.py + ${CMAKE_CURRENT_SOURCE_DIR}/additional-examples/ControllerScene.py ) add_custom_target(${PROJECT_NAME} SOURCES ${EXAMPLES_FILES}) diff --git a/examples/pygame_renderingloop/backend_pygame.py b/examples/pygame_renderingloop/backend_pygame.py deleted file mode 100644 index 9cf394ff..00000000 --- a/examples/pygame_renderingloop/backend_pygame.py +++ /dev/null @@ -1,67 +0,0 @@ -import pygame -import time -from OpenGL.GL import * -from OpenGL.GLU import * - -import threading -import Sofa, SofaRuntime -root = None - -def startUI(fct): - pygame.display.init() - display = (800,600) - pygame.display.set_mode(display, pygame.DOUBLEBUF|pygame.OPENGL) - - time = 0.0 - while True: - for event in pygame.event.get(): - if event.type == pygame.QUIT: - pygame.quit() - quit() - - #glRotatef(1, 3, 1, 1) - glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT) - glEnable(GL_LIGHTING) - glEnable(GL_DEPTH_TEST) - if fct != None: - fct(display, time) - time+=0.01 - - pygame.display.flip() - -def show(scene, camera): - def draw(display, t): - print("DRAW "+str(time)+ " camera> " + camera.getPathName()+" pos " + str(camera.position.array()) ) - Sofa.Simulation.glewInit() - Sofa.Simulation.initVisual(scene) - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - gluPerspective(45, (display[0]/display[1]), 0.1, 50.0) - - #cameraPM = camera.getProjectionMatrix() - #lMultMatrixd(cameraPM); - - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - - cameraMVM = camera.getOpenGLModelViewMatrix() - glMultMatrixd(cameraMVM) - - glPointSize(10.0) - glColor4d(1.0,1.0,1.0,1.0) - glBegin(GL_POINTS) - glVertex3d(0.0,0.0,0.0) - glVertex3d(1.0,0.0,0.0) - glEnd() - - Sofa.Simulation.draw(scene) - - p = threading.Thread(target=startUI, args=(draw,)) - p.start() - #def up(self): - # print("UPDATE") - # time.sleep(0.0000001) - - #setattr(p1,"update", up) - return p - diff --git a/examples/pygame_renderingloop/pygame_test.py b/examples/pygame_renderingloop/pygame_test.py deleted file mode 100644 index 8a7e9caf..00000000 --- a/examples/pygame_renderingloop/pygame_test.py +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/python3 - -import math -import time -import SofaRuntime -import Sofa.Simulation -import Sofa.Core - -class MyC(Sofa.Core.Controller): - def __init__(self, *args, **kwargs): - Sofa.Core.Controller.__init__(self, *args, **kwargs) - self.target = kwargs["target"] - self.it = 0.0 - - def onEvent(self, e): - if e["type"] == "AnimateEndEvent": - #print("SIMULATION STEP: " + str(self.target.position.getPathName())) - self.target.position.value += math.cos(self.it) - self.it += 0.1 - cameraMVM = self.target.getOpenGLModelViewMatrix() - #print("UPDATE POSITION " + str(self.target.getPathName())) - #print("SIMULATION: " + " "+ str(self.target) +" " + str(cameraMVM)) - -def createScene(root): - root.addObject("RequiredPlugin", name="SofaComponentAll") - root.addObject("RequiredPlugin", name="SofaOpenglVisual") - root.addObject("DefaultAnimationLoop") - root.addObject("DefaultVisualManagerLoop") - - root.addObject("LightManager") - root.addObject("SpotLight", position=[0,0,10], direction=[0,0,-1]) - root.addObject("InteractiveCamera", name="camera", position=[0,0,10], - lookAt=[0,0,0], distance=37, fieldOfView=45, zNear=0.63, zFar=55.69) - - root.addObject("MechanicalObject", name="dofs", template="Rigid3", - position=[[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0]], - showObject=True, showObjectScale=1) - - root.addObject("MeshObjLoader", name="loader", filename="mesh/Armadillo_simplified.obj", scale3d="0.1 0.1 0.1") - root.addObject("OglModel", name="visual", src="@loader", color="1 0 0 0.2") - - root.addObject(MyC(target=root.camera)) - return root - -if __name__ == "__main__": - import threading - from backend_pygame import show - - SofaRuntime.importPlugin("SofaComponentAll") - - scene = createScene(Sofa.Core.Node("root")) - - Sofa.Simulation.init(scene) - - p1 = show(scene, scene.camera) - for i in range(1000000): - for i in range(33): - Sofa.Simulation.animate(scene, 0.01) - time.sleep(0.0000001) - - p1.join() From 530ed031197960f41923babe55fc9fdcebd89833 Mon Sep 17 00:00:00 2001 From: Guillaume Paran Date: Fri, 22 Jan 2021 17:48:17 +0100 Subject: [PATCH 19/43] [CMake] FIX SofaPython3Tools inclusion (#99) --- CMakeLists.txt | 1 + SofaPython3Config.cmake.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 806c1b2f..c5b6df54 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -190,6 +190,7 @@ sofa_create_package( RELOCATABLE "plugins" ) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/CMake/SofaPython3Tools.cmake" "${CMAKE_BINARY_DIR}/cmake/SofaPython3Tools.cmake" COPYONLY) install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/CMake/SofaPython3Tools.cmake" DESTINATION lib/cmake/SofaPython3 diff --git a/SofaPython3Config.cmake.in b/SofaPython3Config.cmake.in index 0953100f..d32d89d9 100644 --- a/SofaPython3Config.cmake.in +++ b/SofaPython3Config.cmake.in @@ -6,7 +6,7 @@ set(SP3_WITH_SOFAEXPORTER @SP3_WITH_SOFAEXPORTER@) set(SP3_PYTHON_PACKAGES_DIRECTORY @SP3_PYTHON_PACKAGES_DIRECTORY@) -include("${CMAKE_CURRENT_LIST_DIR}/SofaPython3Tools.cmake") +include(SofaPython3Tools) # Find Python3 executable and set PYTHON_EXECUTABLE before finding pybind11 # to be sure that pybind11 relies on the right Python version From ae814a43ad60b1221aa8e622b38d64f98aa378ba Mon Sep 17 00:00:00 2001 From: Jean-Nicolas Brunet Date: Fri, 22 Jan 2021 17:48:45 +0100 Subject: [PATCH 20/43] [cmake] Remove RPATH debug message (#101) Signed-off-by: Jean-Nicolas Brunet --- CMake/SofaPython3Tools.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMake/SofaPython3Tools.cmake b/CMake/SofaPython3Tools.cmake index 75ea3592..b7af839a 100644 --- a/CMake/SofaPython3Tools.cmake +++ b/CMake/SofaPython3Tools.cmake @@ -295,8 +295,6 @@ function(SP3_add_python_module) endif() endforeach() - message("${A_TARGET}: DEPENDENCIES_RPATH = ${TARGET_DEPENDENCIES_RPATH}") - set_target_properties( ${A_TARGET} PROPERTIES From 74a8b73e5e7b6ad4963d605cba7e21c29b120fd7 Mon Sep 17 00:00:00 2001 From: Jean-Nicolas Brunet Date: Tue, 26 Jan 2021 12:47:18 +0100 Subject: [PATCH 21/43] [SofaBaseTopology] Fix binding entry point (#103) Signed-off-by: Jean-Nicolas Brunet --- .../SofaPython3/SofaBaseTopology/Module_SofaBaseTopology.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Module_SofaBaseTopology.cpp b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Module_SofaBaseTopology.cpp index b954d21c..669bb192 100644 --- a/bindings/Modules/src/SofaPython3/SofaBaseTopology/Module_SofaBaseTopology.cpp +++ b/bindings/Modules/src/SofaPython3/SofaBaseTopology/Module_SofaBaseTopology.cpp @@ -30,7 +30,7 @@ namespace py { using namespace pybind11; } namespace sofapython3 { -PYBIND11_MODULE(BaseTopology, m) +PYBIND11_MODULE(SofaBaseTopology, m) { sofa::component::initSofaBaseTopology(); From b9d1211b3aa726279098c9ca7e3f73ca0ae9b5b2 Mon Sep 17 00:00:00 2001 From: Jean-Nicolas Brunet Date: Tue, 26 Jan 2021 14:49:05 +0100 Subject: [PATCH 22/43] [Plugin] Change the initialization order of the Prefab (#105) --- Plugin/src/SofaPython3/Prefab.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugin/src/SofaPython3/Prefab.cpp b/Plugin/src/SofaPython3/Prefab.cpp index e2178bb8..f9d37a6c 100644 --- a/Plugin/src/SofaPython3/Prefab.cpp +++ b/Plugin/src/SofaPython3/Prefab.cpp @@ -43,9 +43,9 @@ using sofa::core::objectmodel::Event; void Prefab::init() { - reinit(); Inherit1::init(sofa::core::ExecParams::defaultInstance()); m_is_initialized = true; + reinit(); } void PrefabFileEventListener::fileHasChanged(const std::string &filename) From 501248253b6e8fac36bd50d3607d4c959d88bc3a Mon Sep 17 00:00:00 2001 From: Hugo Date: Wed, 27 Jan 2021 08:51:43 +0100 Subject: [PATCH 23/43] [examples] Remove warning and dep (#107) --- examples/example-forcefield.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/example-forcefield.py b/examples/example-forcefield.py index 7da43509..4a1736dd 100644 --- a/examples/example-forcefield.py +++ b/examples/example-forcefield.py @@ -24,7 +24,6 @@ def addForce(self, m, out_force, pos, vel): def addDForce(self, df, dx, params): pass - #print(" Python::addDForce: ", params) #def addKToMatrix(self, a, b): # print(" Python::addKToMatrix: ", a, " ", b) @@ -33,9 +32,10 @@ def addDForce(self, df, dx, params): def createScene(node): node.addObject("RequiredPlugin", name="SofaOpenglVisual") node.addObject("RequiredPlugin", name="SofaSparseSolver") + node.addObject("RequiredPlugin", name="SofaImplicitOdeSolver") node.addObject("OglLineAxis") node.addObject("DefaultAnimationLoop", name="loop") - node.addObject("EulerImplicit") + node.addObject("EulerImplicitSolver") node.addObject("CGLinearSolver", tolerance=1e-12, threshold=1e-12) o = node.addChild("Object") From 65d008c4ac87950babb8ccc7a023e9d577a7cc2c Mon Sep 17 00:00:00 2001 From: Jean-Nicolas Brunet Date: Thu, 21 Jan 2021 15:46:51 +0100 Subject: [PATCH 24/43] [Plugin] Remove unused files Signed-off-by: Jean-Nicolas Brunet --- Plugin/src/SofaPython3/DataFactory.cpp | 178 ------------------------ Plugin/src/SofaPython3/DataFactory.h | 35 ----- Plugin/src/SofaPython3/EventFactory.cpp | 124 ----------------- Plugin/src/SofaPython3/EventFactory.h | 45 ------ 4 files changed, 382 deletions(-) delete mode 100644 Plugin/src/SofaPython3/DataFactory.cpp delete mode 100644 Plugin/src/SofaPython3/DataFactory.h delete mode 100644 Plugin/src/SofaPython3/EventFactory.cpp delete mode 100644 Plugin/src/SofaPython3/EventFactory.h diff --git a/Plugin/src/SofaPython3/DataFactory.cpp b/Plugin/src/SofaPython3/DataFactory.cpp deleted file mode 100644 index f96c38a1..00000000 --- a/Plugin/src/SofaPython3/DataFactory.cpp +++ /dev/null @@ -1,178 +0,0 @@ -/****************************************************************************** -* SofaPython3 plugin * -* (c) 2021 CNRS, University of Lille, INRIA * -* * -* This program is free software; you can redistribute it and/or modify it * -* under the terms of the GNU Lesser General Public License as published by * -* the Free Software Foundation; either version 2.1 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 Lesser General Public License * -* for more details. * -* * -* You should have received a copy of the GNU Lesser General Public License * -* along with this program. If not, see . * -******************************************************************************* -* Contact information: contact@sofa-framework.org * -******************************************************************************/ - -#include "DataFactory.h" - -#include -#include -#include -#include -using sofa::core::objectmodel::BaseData; - -namespace sofapython3 -{ - -template -class DataCreator : public sofa::helper::BaseCreator -{ -public: - virtual sofa::core::objectmodel::BaseData* createInstance(sofa::helper::NoArgument) override { return new sofa::core::objectmodel::Data(); } - virtual const std::type_info& type() override { return typeid(sofa::core::objectmodel::BaseData);} -}; - -typedef sofa::helper::Factory< std::string, BaseData> DataFactory; - -DataFactory* getFactoryInstance() -{ - static DataFactory* s_localfactory = nullptr ; - if (s_localfactory == nullptr) - { - // helper vector style containers - std::string containers[] = {"vector"}; - - s_localfactory = new DataFactory(); - // Scalars - s_localfactory->registerCreator("string", new DataCreator()); - s_localfactory->registerCreator("float", new DataCreator()); - s_localfactory->registerCreator("double", new DataCreator()); - s_localfactory->registerCreator("bool", new DataCreator()); - s_localfactory->registerCreator("int", new DataCreator()); - - // vectors - s_localfactory->registerCreator( - "Vec2d", new DataCreator()); - s_localfactory->registerCreator( - "Vec3d", new DataCreator()); - s_localfactory->registerCreator( - "Vec4d", new DataCreator()); - s_localfactory->registerCreator( - "Vec6d", new DataCreator()); - s_localfactory->registerCreator( - "Vec2f", new DataCreator()); - s_localfactory->registerCreator( - "Vec3f", new DataCreator()); - s_localfactory->registerCreator( - "Vec4f", new DataCreator()); - s_localfactory->registerCreator( - "Vec6f", new DataCreator()); - - // Matrices - s_localfactory->registerCreator( - "Mat2x2d", new DataCreator()); - s_localfactory->registerCreator( - "Mat3x3d", new DataCreator()); - s_localfactory->registerCreator( - "Mat4x4d", new DataCreator()); - s_localfactory->registerCreator( - "Mat2x2f", new DataCreator()); - s_localfactory->registerCreator( - "Mat3x3f", new DataCreator()); - s_localfactory->registerCreator( - "Mat4x4f", new DataCreator()); - - // Topology - s_localfactory->registerCreator("Edge", new DataCreator()); - s_localfactory->registerCreator("Triangle", new DataCreator()); - s_localfactory->registerCreator("Quad", new DataCreator()); - s_localfactory->registerCreator("Tetra", new DataCreator()); - s_localfactory->registerCreator("Hexa", new DataCreator()); - s_localfactory->registerCreator("Penta", new DataCreator()); - - // State vectors - s_localfactory->registerCreator( - "Rigid3d::VecCoord", new DataCreator()); - s_localfactory->registerCreator( - "Rigid3f::VecCoord", new DataCreator()); - s_localfactory->registerCreator( - "Rigid3::VecCoord", new DataCreator()); - - // General vectors - for (const auto& container : containers) - { - // Scalars - s_localfactory->registerCreator(container + "", - new DataCreator>()); - s_localfactory->registerCreator(container + "", - new DataCreator>()); - s_localfactory->registerCreator(container + "", - new DataCreator>()); - s_localfactory->registerCreator(container + "", - new DataCreator>()); - s_localfactory->registerCreator(container + "", - new DataCreator>()); - - // vectors - s_localfactory->registerCreator( - container + "", new DataCreator>()); - s_localfactory->registerCreator( - container + "", new DataCreator>()); - s_localfactory->registerCreator( - container + "", new DataCreator>()); - s_localfactory->registerCreator( - container + "", new DataCreator>()); - s_localfactory->registerCreator( - container + "", new DataCreator>()); - s_localfactory->registerCreator( - container + "", new DataCreator>()); - s_localfactory->registerCreator( - container + "", new DataCreator>()); - s_localfactory->registerCreator( - container + "", new DataCreator>()); - - // Matrices - s_localfactory->registerCreator( - container + "", - new DataCreator>()); - s_localfactory->registerCreator( - container + "", - new DataCreator>()); - s_localfactory->registerCreator( - container + "", - new DataCreator>()); - s_localfactory->registerCreator( - container + "", - new DataCreator>()); - s_localfactory->registerCreator( - container + "", - new DataCreator>()); - s_localfactory->registerCreator( - container + "", - new DataCreator>()); - - // Topology - s_localfactory->registerCreator(container + "", - new DataCreator>()); - s_localfactory->registerCreator(container + "", - new DataCreator>()); - s_localfactory->registerCreator(container + "", - new DataCreator>()); - s_localfactory->registerCreator(container + "", - new DataCreator>()); - s_localfactory->registerCreator(container + "", - new DataCreator>()); - s_localfactory->registerCreator(container + "", - new DataCreator>()); - } - } - return s_localfactory ; -} - - -} // namespace sofapython3 diff --git a/Plugin/src/SofaPython3/DataFactory.h b/Plugin/src/SofaPython3/DataFactory.h deleted file mode 100644 index 8e365edc..00000000 --- a/Plugin/src/SofaPython3/DataFactory.h +++ /dev/null @@ -1,35 +0,0 @@ -/****************************************************************************** -* SofaPython3 plugin * -* (c) 2021 CNRS, University of Lille, INRIA * -* * -* This program is free software; you can redistribute it and/or modify it * -* under the terms of the GNU Lesser General Public License as published by * -* the Free Software Foundation; either version 2.1 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 Lesser General Public License * -* for more details. * -* * -* You should have received a copy of the GNU Lesser General Public License * -* along with this program. If not, see . * -******************************************************************************* -* Contact information: contact@sofa-framework.org * -******************************************************************************/ - -#pragma once - -#include -#include -#include -using sofa::core::objectmodel::BaseData; - -namespace sofapython3 -{ - -typedef sofa::helper::Factory< std::string, BaseData> DataFactory; - -DataFactory* getFactoryInstance(); - -} // namespace sofapython3 diff --git a/Plugin/src/SofaPython3/EventFactory.cpp b/Plugin/src/SofaPython3/EventFactory.cpp deleted file mode 100644 index 1301a675..00000000 --- a/Plugin/src/SofaPython3/EventFactory.cpp +++ /dev/null @@ -1,124 +0,0 @@ -/****************************************************************************** -* SofaPython3 plugin * -* (c) 2021 CNRS, University of Lille, INRIA * -* * -* This program is free software; you can redistribute it and/or modify it * -* under the terms of the GNU Lesser General Public License as published by * -* the Free Software Foundation; either version 2.1 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 Lesser General Public License * -* for more details. * -* * -* You should have received a copy of the GNU Lesser General Public License * -* along with this program. If not, see . * -******************************************************************************* -* Contact information: contact@sofa-framework.org * -******************************************************************************/ - -#include "EventFactory.h" - -#include "sofa/simulation/AnimateBeginEvent.h" -using sofa::simulation::AnimateBeginEvent; -#include "sofa/simulation/AnimateEndEvent.h" -using sofa::simulation::AnimateEndEvent; -//#include "sofa/simulation/CollisionBeginEvent.h" -//#include "sofa/simulation/CollisionEndEvent.h" -//#include "sofa/simulation/IntegrateBeginEvent.h" -//#include "sofa/simulation/IntegrateEndEvent.h" -//#include "sofa/simulation/PauseEvent.h" -//#include "sofa/simulation/PositionEvent.h" -//#include "sofa/simulation/UpdateMappingEndEvent.h" - -//#include "sofa/core/objectmodel/DetachNodeEvent.h" -//#include "sofa/core/objectmodel/GUIEvent.h" -//#include "sofa/core/objectmodel/HapticDeviceEvent.h" -//#include "sofa/core/objectmodel/IdleEvent.h" -//#include "sofa/core/objectmodel/JoystickEvent.h" -#include "sofa/core/objectmodel/KeypressedEvent.h" -using sofa::core::objectmodel::KeypressedEvent; -#include "sofa/core/objectmodel/KeyreleasedEvent.h" -using sofa::core::objectmodel::KeyreleasedEvent; -#include "sofa/core/objectmodel/MouseEvent.h" -using sofa::core::objectmodel::MouseEvent; -#include "sofa/core/objectmodel/ScriptEvent.h" -using sofa::core::objectmodel::ScriptEvent; -#include -using sofa::core::objectmodel::Event; - -namespace sofapython3 { - -using namespace pybind11::literals; - -std::vector > getEventDict() -{ - static std::vector > s_eventDict; - - if (s_eventDict.empty()) - { - s_eventDict.resize(sofa::core::objectmodel::Event::getEventTypeCount() + 1, nullptr); - AnimateBeginEvent abe(.0); - s_eventDict[abe.getEventTypeIndex()] = [] (Event* event) -> py::object { - auto evt = dynamic_cast(event); - return py::dict("type"_a=evt->getClassName(), - "isHandled"_a=evt->isHandled(), - "dt"_a=evt->getDt()); - }; - AnimateEndEvent aee(.0); - s_eventDict[aee.getEventTypeIndex()] = [] (Event* event) -> py::object { - auto evt = dynamic_cast(event); - return py::dict("type"_a=evt->getClassName(), - "isHandled"_a=evt->isHandled(), - "dt"_a=evt->getDt()); - }; - - KeypressedEvent kpe('\0'); - s_eventDict[kpe.getEventTypeIndex()] = [] (Event* event) -> py::object { - auto evt = dynamic_cast(event); - return py::dict("type"_a=evt->getClassName(), - "isHandled"_a=evt->isHandled(), - "key"_a=evt->getKey()); - }; - KeyreleasedEvent kre('\0'); - s_eventDict[kre.getEventTypeIndex()] = [] (Event* event) -> py::object { - auto evt = dynamic_cast(event); - return py::dict("type"_a=evt->getClassName(), - "isHandled"_a=evt->isHandled(), - "key"_a=evt->getKey()); - }; - - MouseEvent me(MouseEvent::State::Move); - s_eventDict[me.getEventTypeIndex()] = [] (Event* event) -> py::object { - auto evt = dynamic_cast(event); - - return py::dict("type"_a=evt->getClassName(), - "isHandled"_a=evt->isHandled(), - "State"_a=int(evt->getState()), - "mouseX"_a=evt->getPosX(), - "mouseY"_a=evt->getPosY(), - "wheelDelta"_a=evt->getWheelDelta()); - }; - - ScriptEvent se(nullptr, ""); - s_eventDict[se.getEventTypeIndex()] = [] (Event* event) -> py::object { - auto evt = dynamic_cast(event); - return py::dict("type"_a=evt->getClassName(), - "isHandled"_a=evt->isHandled(), - "sender"_a=(evt->getSender() ? py::cast(evt->getSender()) : py::none()), - "event_name"_a=evt->getEventName()); - }; - - // TODO: bind other events' attributes here - } - return s_eventDict; -} - -void registerEvent(std::function eventBindingFunc, Event* e) -{ - getEventDict().resize(sofa::core::objectmodel::Event::getEventTypeCount() + 1, nullptr); - getEventDict()[e->getEventTypeIndex()] = eventBindingFunc; -} - -} // namespace sofapython3 diff --git a/Plugin/src/SofaPython3/EventFactory.h b/Plugin/src/SofaPython3/EventFactory.h deleted file mode 100644 index 0d89d837..00000000 --- a/Plugin/src/SofaPython3/EventFactory.h +++ /dev/null @@ -1,45 +0,0 @@ -/****************************************************************************** -* SofaPython3 plugin * -* (c) 2021 CNRS, University of Lille, INRIA * -* * -* This program is free software; you can redistribute it and/or modify it * -* under the terms of the GNU Lesser General Public License as published by * -* the Free Software Foundation; either version 2.1 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 Lesser General Public License * -* for more details. * -* * -* You should have received a copy of the GNU Lesser General Public License * -* along with this program. If not, see . * -******************************************************************************* -* Contact information: contact@sofa-framework.org * -******************************************************************************/ - -#pragma once - -#include -#include - -#include -using sofa::core::objectmodel::Event; - -#include "config.h" - -namespace sofapython3 { - -namespace py { using namespace pybind11; } - -/// Returns the list of methods that will then be called in handleEvent to generate -/// the dictionaries from the Event's values -std::vector > SOFAPYTHON3_API getEventDict(); - -/// Registers a new event type in SofaPython3's event list. -/// \arg eventBindingFunc The (lambda) function taking an event as parameter and -/// returning a py::dict containing the valuable information from the event -/// \arg e The new event to bind -void SOFAPYTHON3_API registerEvent(std::function eventBindingFunc, Event* e); - -} // namespace sofapython3 From 289c3694019637b31ca35ff2981d7316619f1a75 Mon Sep 17 00:00:00 2001 From: Jean-Nicolas Brunet Date: Tue, 26 Jan 2021 13:43:49 +0100 Subject: [PATCH 25/43] [cmake] Fix missing module path for external projects (#104) * [cmake] Fix missing module path for external projects Signed-off-by: Jean-Nicolas Brunet * [cmake] Version add a tailing zero to 20.12.0(0) Signed-off-by: Jean-Nicolas Brunet (cherry picked from commit c89affa61ed5ca90e1826517ff0f46ba88872033) --- CMakeLists.txt | 2 +- SofaPython3Config.cmake.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c5b6df54..9e6bd342 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.12) -project(SofaPython3 VERSION 20.12.0) +project(SofaPython3 VERSION 20.12.00) find_package(SofaFramework REQUIRED) diff --git a/SofaPython3Config.cmake.in b/SofaPython3Config.cmake.in index d32d89d9..3a35dd92 100644 --- a/SofaPython3Config.cmake.in +++ b/SofaPython3Config.cmake.in @@ -6,6 +6,7 @@ set(SP3_WITH_SOFAEXPORTER @SP3_WITH_SOFAEXPORTER@) set(SP3_PYTHON_PACKAGES_DIRECTORY @SP3_PYTHON_PACKAGES_DIRECTORY@) +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") include(SofaPython3Tools) # Find Python3 executable and set PYTHON_EXECUTABLE before finding pybind11 From 018e383c43b8d5a28d873b52d5770ca04b2b5a3e Mon Sep 17 00:00:00 2001 From: Guillaume Paran Date: Thu, 4 Feb 2021 19:30:21 +0100 Subject: [PATCH 26/43] Add PluginManager callback for sys.path auto-adds --- Plugin/src/SofaPython3/PythonEnvironment.cpp | 42 +++++++++++++++++++- Plugin/src/SofaPython3/PythonEnvironment.h | 6 +++ Plugin/src/SofaPython3/initModule.cpp | 1 + 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/Plugin/src/SofaPython3/PythonEnvironment.cpp b/Plugin/src/SofaPython3/PythonEnvironment.cpp index 4959b7f5..ed7aa730 100644 --- a/Plugin/src/SofaPython3/PythonEnvironment.cpp +++ b/Plugin/src/SofaPython3/PythonEnvironment.cpp @@ -118,6 +118,8 @@ PythonEnvironmentData* PythonEnvironment::getStaticData() return m_staticdata; } +std::string PythonEnvironment::pluginLibraryPath = ""; + SOFAPYTHON3_API py::module PythonEnvironment::importFromFile(const std::string& module, const std::string& path, py::object* globals) { PythonEnvironment::gil lock; @@ -238,6 +240,17 @@ void PythonEnvironment::Init() // python modules are automatically reloaded at each scene loading //setAutomaticModuleReload( true ); + + // Initialize pluginLibraryPath by reading PluginManager's map + std::map& map = PluginManager::getInstance().getPluginMap(); + for( const auto& elem : map) + { + Plugin p = elem.second; + if ( p.getModuleName() == sofa_tostring(SOFA_TARGET) ) + { + pluginLibraryPath = elem.first; + } + } } void PythonEnvironment::executePython(std::function cb) @@ -332,7 +345,7 @@ void PythonEnvironment::addPythonModulePathsForPlugins(const std::string& plugin if(!added) { - msg_warning("PythonEnvironment") << "No python dir found in " << pluginsDirectory; + msg_info("PythonEnvironment") << "No python3 dir found in " << pluginsDirectory; } } @@ -355,6 +368,33 @@ void PythonEnvironment::addPythonModulePathsForPluginsByName(const std::string& msg_warning("PythonEnvironment") << pluginName << " not found in PluginManager's map."; } +void PythonEnvironment::addPluginManagerCallback() +{ + PluginManager::getInstance().addOnPluginLoadedCallback(pluginLibraryPath, + [](const std::string& pluginLibraryPath, const Plugin& plugin) { + // WARNING: + // Loaded plugin must be organized like plugin_name/lib/plugin_name.so + + // pluginRoot must be 2 levels above the library + std::string pluginRoot = FileSystem::getParentDirectory( + FileSystem::getParentDirectory( + pluginLibraryPath + )); + // pluginRoot basename must be pluginName + std::string pluginName = plugin.getModuleName(); + if(FileSystem::stripDirectory(pluginRoot) == pluginName) + { + PythonEnvironment::addPythonModulePathsForPlugins(pluginRoot); + } + } + ); +} + +void PythonEnvironment::removePluginManagerCallback() +{ + PluginManager::getInstance().removeOnPluginLoadedCallback(pluginLibraryPath); +} + // some basic RAII stuff to handle init/termination cleanly namespace diff --git a/Plugin/src/SofaPython3/PythonEnvironment.h b/Plugin/src/SofaPython3/PythonEnvironment.h index f74e968f..aa12fba8 100644 --- a/Plugin/src/SofaPython3/PythonEnvironment.h +++ b/Plugin/src/SofaPython3/PythonEnvironment.h @@ -57,6 +57,11 @@ class SOFAPYTHON3_API PythonEnvironment const std::string& path, pybind11::object* globals = nullptr); + /// Add a new callback in PluginManager to auto-add future + /// loaded plugins to sys.path + static void addPluginManagerCallback(); + static void removePluginManagerCallback(); + /// Add a path to sys.path, the list of search path for Python modules. static void addPythonModulePath(const std::string& path); @@ -134,6 +139,7 @@ class SOFAPYTHON3_API PythonEnvironment private: static PythonEnvironmentData* getStaticData() ; + static std::string pluginLibraryPath; }; } // namespace sofapython3 diff --git a/Plugin/src/SofaPython3/initModule.cpp b/Plugin/src/SofaPython3/initModule.cpp index 63b9857b..4c2cd7af 100644 --- a/Plugin/src/SofaPython3/initModule.cpp +++ b/Plugin/src/SofaPython3/initModule.cpp @@ -52,6 +52,7 @@ void initExternalModule() PythonEnvironment::Init(); first = false; } + PythonEnvironment::addPluginManagerCallback(); } const char* getModuleName() From 50ee47a3ea933cd8b480a7fd366d8da0bad04ba9 Mon Sep 17 00:00:00 2001 From: Guillaume Paran Date: Fri, 5 Feb 2021 18:27:40 +0100 Subject: [PATCH 27/43] [Plugin] Improve PluginManager callback for Windows install --- Plugin/src/SofaPython3/PythonEnvironment.cpp | 22 ++++++++------------ 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/Plugin/src/SofaPython3/PythonEnvironment.cpp b/Plugin/src/SofaPython3/PythonEnvironment.cpp index ed7aa730..3493b5b8 100644 --- a/Plugin/src/SofaPython3/PythonEnvironment.cpp +++ b/Plugin/src/SofaPython3/PythonEnvironment.cpp @@ -365,26 +365,22 @@ void PythonEnvironment::addPythonModulePathsForPluginsByName(const std::string& return; } } - msg_warning("PythonEnvironment") << pluginName << " not found in PluginManager's map."; + msg_info("PythonEnvironment") << pluginName << " not found in PluginManager's map."; } void PythonEnvironment::addPluginManagerCallback() { PluginManager::getInstance().addOnPluginLoadedCallback(pluginLibraryPath, [](const std::string& pluginLibraryPath, const Plugin& plugin) { - // WARNING: - // Loaded plugin must be organized like plugin_name/lib/plugin_name.so - - // pluginRoot must be 2 levels above the library - std::string pluginRoot = FileSystem::getParentDirectory( - FileSystem::getParentDirectory( - pluginLibraryPath - )); - // pluginRoot basename must be pluginName - std::string pluginName = plugin.getModuleName(); - if(FileSystem::stripDirectory(pluginRoot) == pluginName) + // WARNING: loaded plugin must be organized like plugin_name/lib/plugin_name.so + for ( auto path : sofa::helper::system::PluginRepository.getPaths() ) { - PythonEnvironment::addPythonModulePathsForPlugins(pluginRoot); + std::string pluginRoot = FileSystem::cleanPath( path + "/" + plugin.getModuleName() ); + if ( FileSystem::isDirectory(pluginRoot) ) + { + addPythonModulePathsForPlugins(pluginRoot); + return; + } } } ); From ad081cdb2a2691e8416c3c3049b12fbc72256bb4 Mon Sep 17 00:00:00 2001 From: Guillaume Paran Date: Fri, 5 Feb 2021 20:25:19 +0100 Subject: [PATCH 28/43] FIX PythonEnvironment use FileSystem::exists --- Plugin/src/SofaPython3/PythonEnvironment.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugin/src/SofaPython3/PythonEnvironment.cpp b/Plugin/src/SofaPython3/PythonEnvironment.cpp index 3493b5b8..de719e20 100644 --- a/Plugin/src/SofaPython3/PythonEnvironment.cpp +++ b/Plugin/src/SofaPython3/PythonEnvironment.cpp @@ -376,7 +376,7 @@ void PythonEnvironment::addPluginManagerCallback() for ( auto path : sofa::helper::system::PluginRepository.getPaths() ) { std::string pluginRoot = FileSystem::cleanPath( path + "/" + plugin.getModuleName() ); - if ( FileSystem::isDirectory(pluginRoot) ) + if ( FileSystem::exists(pluginRoot) && FileSystem::isDirectory(pluginRoot) ) { addPythonModulePathsForPlugins(pluginRoot); return; From e4eba7d6fa910c78df643c9e476ae6249dac34bf Mon Sep 17 00:00:00 2001 From: Guillaume Paran Date: Mon, 15 Feb 2021 18:37:22 +0100 Subject: [PATCH 29/43] [SofaGui] Use new qt.conf.h for custom qt.conf loading at runtime --- .../SofaPython3/SofaGui/Module_SofaGui.cpp | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/bindings/SofaGui/src/SofaPython3/SofaGui/Module_SofaGui.cpp b/bindings/SofaGui/src/SofaPython3/SofaGui/Module_SofaGui.cpp index 16872c1d..2493e311 100644 --- a/bindings/SofaGui/src/SofaPython3/SofaGui/Module_SofaGui.cpp +++ b/bindings/SofaGui/src/SofaPython3/SofaGui/Module_SofaGui.cpp @@ -22,6 +22,11 @@ #include #include +#include +#include +#include +using sofa::helper::system::FileSystem; +#include #include "Binding_BaseGui.h" #include "Binding_GUIManager.h" @@ -55,6 +60,18 @@ PYBIND11_MODULE(Gui, m) { :members: )doc"; + std::string sofaPrefixAbsolute = sofa::helper::Utils::getSofaPathPrefix(); + std::string inputFilepath = FileSystem::cleanPath(sofaPrefixAbsolute + "/bin/qt.conf"); + bool success = sofa::gui::qt::loadQtConfWithCustomPrefix(inputFilepath, sofaPrefixAbsolute); + if(success) + { + msg_info("Sofa.Gui") << "Loaded qt.conf from " << inputFilepath << " customized with Prefix = " << sofaPrefixAbsolute; + } + else + { + msg_warning("Sofa.Gui") << "Failed loading and/or customizing qt.conf from " << inputFilepath; + } + // This is needed to make sure the GuiMain library (libSofaGuiMain.so) is correctly // linked since the GUIs are statically created during the load of the library. sofa::gui::initMain(); @@ -63,4 +80,5 @@ PYBIND11_MODULE(Gui, m) { moduleAddBaseGui(m); moduleAddGuiManager(m); } -} \ No newline at end of file + +} // namespace sofapython3 From fc7664ea45968025c6642987ea8ca6a2ff3ba413 Mon Sep 17 00:00:00 2001 From: Guillaume Paran Date: Fri, 19 Feb 2021 09:16:48 +0100 Subject: [PATCH 30/43] [Plugin] CLEAN PythonEnvironment messages --- Plugin/src/SofaPython3/PythonEnvironment.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Plugin/src/SofaPython3/PythonEnvironment.cpp b/Plugin/src/SofaPython3/PythonEnvironment.cpp index de719e20..2a0743e3 100644 --- a/Plugin/src/SofaPython3/PythonEnvironment.cpp +++ b/Plugin/src/SofaPython3/PythonEnvironment.cpp @@ -345,7 +345,7 @@ void PythonEnvironment::addPythonModulePathsForPlugins(const std::string& plugin if(!added) { - msg_info("PythonEnvironment") << "No python3 dir found in " << pluginsDirectory; + msg_info("SofaPython3") << "No python3 dir found in " << pluginsDirectory; } } @@ -365,7 +365,7 @@ void PythonEnvironment::addPythonModulePathsForPluginsByName(const std::string& return; } } - msg_info("PythonEnvironment") << pluginName << " not found in PluginManager's map."; + msg_info("SofaPython3") << pluginName << " not found in PluginManager's map."; } void PythonEnvironment::addPluginManagerCallback() From b4f78aa5c985fab59c017d60b689104b709514d1 Mon Sep 17 00:00:00 2001 From: Guillaume Paran Date: Fri, 19 Feb 2021 09:25:27 +0100 Subject: [PATCH 31/43] [Bindings] ADD current dir to RPATH --- bindings/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt index 4257e2a0..ab23b7a3 100644 --- a/bindings/CMakeLists.txt +++ b/bindings/CMakeLists.txt @@ -8,12 +8,16 @@ endif() # This will set rpaths relative to SP3 plugin library if(UNIX) set(CMAKE_INSTALL_RPATH + "$ORIGIN" + "$$ORIGIN" "$ORIGIN/../lib" "$$ORIGIN/../lib" ) if(APPLE) set(CMAKE_MACOSX_RPATH ON) list(APPEND CMAKE_INSTALL_RPATH + "@loader_path" + "@executable_path" "@loader_path/../lib" "@executable_path/../lib" ) From 110c0628cf448d4b2a581ae613d1c78b12af9c32 Mon Sep 17 00:00:00 2001 From: Guillaume Paran Date: Fri, 19 Feb 2021 16:15:05 +0100 Subject: [PATCH 32/43] [Bindings] ADD debug log for qt.conf loading --- bindings/SofaGui/src/SofaPython3/SofaGui/Module_SofaGui.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bindings/SofaGui/src/SofaPython3/SofaGui/Module_SofaGui.cpp b/bindings/SofaGui/src/SofaPython3/SofaGui/Module_SofaGui.cpp index 2493e311..f36daff3 100644 --- a/bindings/SofaGui/src/SofaPython3/SofaGui/Module_SofaGui.cpp +++ b/bindings/SofaGui/src/SofaPython3/SofaGui/Module_SofaGui.cpp @@ -70,6 +70,12 @@ PYBIND11_MODULE(Gui, m) { else { msg_warning("Sofa.Gui") << "Failed loading and/or customizing qt.conf from " << inputFilepath; + + std::cout << "qt_resource_data:" << std::endl; + for (int i = 0 ; i < qt_resource_data.size() ; ++i) { + std::cout << qt_resource_data[i]; + } + std::cout << std::endl; } // This is needed to make sure the GuiMain library (libSofaGuiMain.so) is correctly From 47e698f6b92da98aeb594d90654661c9e38de1b4 Mon Sep 17 00:00:00 2001 From: Jean-Nicolas Brunet Date: Wed, 24 Feb 2021 09:30:32 +0100 Subject: [PATCH 33/43] [cmake] CMake config was exporting the wrong python version (#116) Signed-off-by: Jean-Nicolas Brunet --- SofaPython3Config.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SofaPython3Config.cmake.in b/SofaPython3Config.cmake.in index 3a35dd92..aa0c2be9 100644 --- a/SofaPython3Config.cmake.in +++ b/SofaPython3Config.cmake.in @@ -11,7 +11,7 @@ include(SofaPython3Tools) # Find Python3 executable and set PYTHON_EXECUTABLE before finding pybind11 # to be sure that pybind11 relies on the right Python version -set(python_version @PYBIND11_PYTHON_VERSION@) +set(python_version @PYTHON_VERSION@) set(python_version_flag @python_version_flag@) find_package(Python ${python_version} ${python_version_flag} COMPONENTS Interpreter Development REQUIRED) From 2a32ac625e0d52359b4de5b8b0c662b185230379 Mon Sep 17 00:00:00 2001 From: Guillaume Paran Date: Fri, 5 Mar 2021 12:13:54 +0100 Subject: [PATCH 34/43] [CMake] Disable PYTHON_EXECUTABLE reading --- CMakeLists.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e6bd342..7277a27f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,17 +85,17 @@ set(PYBIND11_PYTHON_VERSION 3.7) # to be sure that pybind11 relies on the right Python version set(python_version "${PYBIND11_PYTHON_VERSION}") set(python_version_flag "") -if(PYTHON_EXECUTABLE) - execute_process( - COMMAND "${PYTHON_EXECUTABLE}" "--version" - OUTPUT_VARIABLE cmd_output - ) - string(REGEX MATCH "[0-9]+\.[0-9]+" python_exec_version "${cmd_output}") - if(python_exec_version VERSION_GREATER_EQUAL PYBIND11_PYTHON_VERSION) - set(python_version "${python_exec_version}") - set(python_version_flag "EXACT") - endif() -endif() +#if(PYTHON_EXECUTABLE) +# execute_process( +# COMMAND "${PYTHON_EXECUTABLE}" "--version" +# OUTPUT_VARIABLE cmd_output +# ) +# string(REGEX MATCH "[0-9]+\.[0-9]+" python_exec_version "${cmd_output}") +# if(python_exec_version VERSION_GREATER_EQUAL PYBIND11_PYTHON_VERSION) +# set(python_version "${python_exec_version}") +# set(python_version_flag "EXACT") +# endif() +#endif() find_package(Python ${python_version} ${python_version_flag} COMPONENTS Interpreter Development REQUIRED) set(PYTHON_VERSION ${Python_VERSION}) set(PYTHON_EXECUTABLE ${Python_EXECUTABLE}) From ced247c1df4e5bebadd3909a51966fcd8cdcc804 Mon Sep 17 00:00:00 2001 From: Guillaume Paran Date: Fri, 5 Mar 2021 12:38:48 +0100 Subject: [PATCH 35/43] [CMake] Disable PYTHON_EXECUTABLE reading (2) --- CMakeLists.txt | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7277a27f..59d892dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,20 +83,7 @@ set(PYBIND11_PYTHON_VERSION 3.7) # Find Python3 executable and set PYTHON_EXECUTABLE before finding pybind11 # to be sure that pybind11 relies on the right Python version -set(python_version "${PYBIND11_PYTHON_VERSION}") -set(python_version_flag "") -#if(PYTHON_EXECUTABLE) -# execute_process( -# COMMAND "${PYTHON_EXECUTABLE}" "--version" -# OUTPUT_VARIABLE cmd_output -# ) -# string(REGEX MATCH "[0-9]+\.[0-9]+" python_exec_version "${cmd_output}") -# if(python_exec_version VERSION_GREATER_EQUAL PYBIND11_PYTHON_VERSION) -# set(python_version "${python_exec_version}") -# set(python_version_flag "EXACT") -# endif() -#endif() -find_package(Python ${python_version} ${python_version_flag} COMPONENTS Interpreter Development REQUIRED) +find_package(Python ${PYBIND11_PYTHON_VERSION} COMPONENTS Interpreter Development REQUIRED) set(PYTHON_VERSION ${Python_VERSION}) set(PYTHON_EXECUTABLE ${Python_EXECUTABLE}) set(PYTHON_LIBRARIES ${Python_LIBRARIES}) From b8487f8ad19741d15a1ba73bd7b249ee2a13fdfe Mon Sep 17 00:00:00 2001 From: Guillaume Paran Date: Fri, 5 Mar 2021 14:29:48 +0100 Subject: [PATCH 36/43] Quickfix compilation --- Plugin/src/SofaPython3/PythonTestExtractor.cpp | 2 ++ bindings/Modules/tests/main.cpp | 2 ++ .../Sofa/src/SofaPython3/Sofa/Core/Binding_BaseLink.cpp | 4 ++-- bindings/Sofa/tests/PythonModule_Sofa_test.cpp | 1 + .../src/SofaPython3/SofaRuntime/Timer/Submodule_Timer.cpp | 8 ++++---- .../SofaRuntime/tests/PythonModule_SofaRuntime_test.cpp | 1 + 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Plugin/src/SofaPython3/PythonTestExtractor.cpp b/Plugin/src/SofaPython3/PythonTestExtractor.cpp index 66de69d8..ab535aa4 100644 --- a/Plugin/src/SofaPython3/PythonTestExtractor.cpp +++ b/Plugin/src/SofaPython3/PythonTestExtractor.cpp @@ -28,6 +28,8 @@ #include using sofa::helper::system::PluginManager; +#include + using sofa::helper::system::SetDirectory; namespace py = pybind11; diff --git a/bindings/Modules/tests/main.cpp b/bindings/Modules/tests/main.cpp index 01d63bc3..3159f1f6 100644 --- a/bindings/Modules/tests/main.cpp +++ b/bindings/Modules/tests/main.cpp @@ -23,6 +23,8 @@ #include #include +#include +using sofa::helper::logging::MessageDispatcher; /// static build of the test list diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseLink.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseLink.cpp index a090d4fe..067dd692 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseLink.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseLink.cpp @@ -84,10 +84,10 @@ void moduleAddBaseLink(py::module& m) link.def("getHelp", &BaseLink::getHelp, sofapython3::doc::baseLink::getHelp); link.def("setHelp", setHelp, sofapython3::doc::baseLink::setHelp); - link.def("getOwnerData", &BaseLink::getOwnerData, sofapython3::doc::baseLink::getOwnerData); +// link.def("getOwnerData", &BaseLink::getOwnerData, sofapython3::doc::baseLink::getOwnerData); link.def("getOwnerBase", getOwnerBase, sofapython3::doc::baseLink::getOwnerBase); - link.def("getLinkedData", &BaseLink::getLinkedData, sofapython3::doc::baseLink::getLinkedData); +// link.def("getLinkedData", &BaseLink::getLinkedData, sofapython3::doc::baseLink::getLinkedData); link.def("getLinkedBase", getLinkedBase, "index"_a = 0, sofapython3::doc::baseLink::getLinkedBase); link.def("setLinkedBase", &BaseLink::setLinkedBase, sofapython3::doc::baseLink::getLinkedBase); diff --git a/bindings/Sofa/tests/PythonModule_Sofa_test.cpp b/bindings/Sofa/tests/PythonModule_Sofa_test.cpp index aff8e9f5..074c0d14 100644 --- a/bindings/Sofa/tests/PythonModule_Sofa_test.cpp +++ b/bindings/Sofa/tests/PythonModule_Sofa_test.cpp @@ -30,6 +30,7 @@ using sofapython3::PrintTo ; using std::string; #include +#include using sofa::helper::logging::MessageDispatcher; using sofa::helper::logging::MainPerComponentLoggingMessageHandler; diff --git a/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer.cpp b/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer.cpp index 96c8497f..b598742c 100644 --- a/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer.cpp +++ b/bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Timer/Submodule_Timer.cpp @@ -18,13 +18,13 @@ * Contact information: contact@sofa-framework.org * ******************************************************************************/ -#include -#include -using sofa::helper::AdvancedTimer; - #include "Submodule_Timer.h" #include "Submodule_Timer_doc.h" +#include +#include +using sofa::helper::AdvancedTimer; + #include namespace sofapython3 diff --git a/bindings/SofaRuntime/tests/PythonModule_SofaRuntime_test.cpp b/bindings/SofaRuntime/tests/PythonModule_SofaRuntime_test.cpp index fdff0f01..05c13187 100644 --- a/bindings/SofaRuntime/tests/PythonModule_SofaRuntime_test.cpp +++ b/bindings/SofaRuntime/tests/PythonModule_SofaRuntime_test.cpp @@ -30,6 +30,7 @@ using sofapython3::PrintTo ; using std::string; #include +#include using sofa::helper::logging::MessageDispatcher; using sofa::helper::logging::MainPerComponentLoggingMessageHandler; From 05bd39974363027c4ee3549f9894c3442318c018 Mon Sep 17 00:00:00 2001 From: Guillaume Paran Date: Wed, 31 Mar 2021 16:35:51 +0200 Subject: [PATCH 37/43] [GitHub] Update SOFA minimal binaries to v20.12.02 --- .github/workflows/macos.yml | 12 ++++++------ .github/workflows/ubuntu.yml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index b608b482..730cfa3e 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -27,12 +27,12 @@ jobs: brew install ccache ninja boost eigen pybind11 python3 -m pip install numpy - - name: Download SOFA nightly build + - name: Download SOFA v20.12.02 run: | curl --output sofa.zip -L \ - https://ci.inria.fr/sofa-ci-dev/job/nightly-generate-binaries-v20.12/lastSuccessfulBuild/CI_SCOPE=binaries_minimal/artifact/MacOS/*zip*/MacOS.zip + https://ci.inria.fr/sofa-ci-dev/job/nightly-generate-binaries/CI_SCOPE=binaries_minimal/309/artifact/MacOS/*zip*/MacOS.zip - - name: Install SOFA nightly build + - name: Install SOFA v20.12.02 run: | sudo unzip sofa.zip -d temp sudo unzip temp/MacOS/`ls temp/MacOS/` -d temp @@ -105,12 +105,12 @@ jobs: brew install boost python3 -m pip install numpy - - name: Download SOFA nightly build + - name: Download SOFA v20.12.02 run: | curl --output sofa.zip -L \ - https://ci.inria.fr/sofa-ci-dev/job/nightly-generate-binaries-v20.12/lastSuccessfulBuild/CI_SCOPE=binaries_minimal/artifact/MacOS/*zip*/MacOS.zip + https://ci.inria.fr/sofa-ci-dev/job/nightly-generate-binaries/CI_SCOPE=binaries_minimal/309/artifact/MacOS/*zip*/MacOS.zip - - name: Install SOFA nightly build + - name: Install SOFA v20.12.02 run: | sudo unzip sofa.zip -d temp sudo unzip temp/MacOS/`ls temp/MacOS/` -d temp diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index e158aaf9..da57197f 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -42,12 +42,12 @@ jobs: - name: Install pybind11 run: cd /tmp/pybind11 && sudo make install - - name: Download SOFA nightly build + - name: Download SOFA v20.12.02 run: | curl --output sofa.zip -L \ - https://ci.inria.fr/sofa-ci-dev/job/nightly-generate-binaries-v20.12/lastSuccessfulBuild/CI_SCOPE=binaries_minimal/artifact/Linux/*zip*/Linux.zip + https://ci.inria.fr/sofa-ci-dev/job/nightly-generate-binaries/CI_SCOPE=binaries_minimal/309/artifact/Linux/*zip*/Linux.zip - - name: Install SOFA nightly build + - name: Install SOFA v20.12.02 run: | sudo unzip sofa.zip -d temp sudo unzip temp/Linux/`ls temp/Linux/` -d temp @@ -120,12 +120,12 @@ jobs: sudo apt install -qq libboost-all-dev python3 -m pip install numpy - - name: Download SOFA nightly build + - name: Download SOFA v20.12.02 run: | curl --output sofa.zip -L \ - https://ci.inria.fr/sofa-ci-dev/job/nightly-generate-binaries-v20.12/lastSuccessfulBuild/CI_SCOPE=binaries_minimal/artifact/Linux/*zip*/Linux.zip + https://ci.inria.fr/sofa-ci-dev/job/nightly-generate-binaries/CI_SCOPE=binaries_minimal/309/artifact/Linux/*zip*/Linux.zip - - name: Install SOFA nightly build + - name: Install SOFA v20.12.02 run: | sudo unzip sofa.zip -d temp sudo unzip temp/Linux/`ls temp/Linux/` -d temp From 31dc4822311e7341c0758e5096c385d933fe5b5b Mon Sep 17 00:00:00 2001 From: Guillaume Paran Date: Wed, 31 Mar 2021 17:41:51 +0200 Subject: [PATCH 38/43] [SofaGui] FIX qt.conf.h include depends on SofaGuiQt availability --- bindings/SofaGui/src/SofaPython3/SofaGui/Module_SofaGui.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bindings/SofaGui/src/SofaPython3/SofaGui/Module_SofaGui.cpp b/bindings/SofaGui/src/SofaPython3/SofaGui/Module_SofaGui.cpp index f36daff3..78bc1a5a 100644 --- a/bindings/SofaGui/src/SofaPython3/SofaGui/Module_SofaGui.cpp +++ b/bindings/SofaGui/src/SofaPython3/SofaGui/Module_SofaGui.cpp @@ -26,7 +26,10 @@ #include #include using sofa::helper::system::FileSystem; + +#if SOFAGUI_HAVE_SOFAGUIQT #include +#endif // SOFAGUI_HAVE_SOFAGUIQT #include "Binding_BaseGui.h" #include "Binding_GUIManager.h" @@ -60,6 +63,7 @@ PYBIND11_MODULE(Gui, m) { :members: )doc"; +#if SOFAGUI_HAVE_SOFAGUIQT std::string sofaPrefixAbsolute = sofa::helper::Utils::getSofaPathPrefix(); std::string inputFilepath = FileSystem::cleanPath(sofaPrefixAbsolute + "/bin/qt.conf"); bool success = sofa::gui::qt::loadQtConfWithCustomPrefix(inputFilepath, sofaPrefixAbsolute); @@ -77,6 +81,7 @@ PYBIND11_MODULE(Gui, m) { } std::cout << std::endl; } +#endif // SOFAGUI_HAVE_SOFAGUIQT // This is needed to make sure the GuiMain library (libSofaGuiMain.so) is correctly // linked since the GUIs are statically created during the load of the library. From 5dcede7b8a0116e5cb247c8c889d90b355ec57a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Jos=C3=A9=20Casafranca?= Date: Wed, 12 May 2021 09:30:20 +0200 Subject: [PATCH 39/43] Fix _setattr__ (#145) If attribute is not a data or a link, calls the default implementation for setattr. This allows to have properties for custom types defined by a user. --- .../Sofa/src/SofaPython3/Sofa/Core/Binding_Base.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base.cpp index f8dc3021..65908db1 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base.cpp @@ -126,16 +126,8 @@ void BindingBase::SetAttr(py::object self, const std::string& s, py::object valu return; } - /// We are falling back to dynamically adding the objet into the object dict. - py::dict t = self.attr("__dict__"); - if(!t.is_none()) - { - t[s.c_str()] = value; - return; - } - - /// Well this should never happen unless there is no __dict__ - throw py::attribute_error("Unable to set attribute '"+s+"', unknow data type"); + // If it's not a data or a link, rely on object implementation of __setattr__ + py::module::import("builtins").attr("object").attr("__setattr__")(self, s, value); } void BindingBase::SetAttr(Base& self, const std::string& s, py::object value) From 3e52828c8038de0806e0cbde66f07e6619d7ce88 Mon Sep 17 00:00:00 2001 From: Guillaume Paran Date: Fri, 2 Jul 2021 16:44:53 +0200 Subject: [PATCH 40/43] [CMake] Make SP3_BUILD_TEST a dependent option --- CMakeLists.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9603e10f..9f1ac793 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,11 +34,8 @@ include(SofaPython3Tools) # OPTIONS include(CMakeDependentOption) -if (SP3_COMPILED_AS_SOFA_SUBPROJECT) - option(SP3_BUILD_TEST "Compile the automatic tests for SofaPython3, along with the gtest library." ${SOFA_BUILD_TESTS}) -else() - option(SP3_BUILD_TEST "Compile the automatic tests for SofaPython3, along with the gtest library." ON) -endif() +# If SOFA_BUILD_TESTS exists and is OFF, then this option will be auto-disabled +cmake_dependent_option(SP3_BUILD_TEST "Compile the automatic tests for SofaPython3, along with the gtest library." ON "SOFA_BUILD_TESTS OR NOT DEFINED SOFA_BUILD_TESTS" OFF) find_package(SofaExporter QUIET) CMAKE_DEPENDENT_OPTION(SP3_WITH_SOFAEXPORTER "Bind the SOFA exporter component." ON "SofaExporter_FOUND" OFF) From d82303fd40102d78199a2001d576c02c03d50bc4 Mon Sep 17 00:00:00 2001 From: Guillaume Paran Date: Sat, 3 Jul 2021 13:32:16 +0200 Subject: [PATCH 41/43] [CMake] CLEAN SofaPython3Config.cmake.in --- SofaPython3Config.cmake.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/SofaPython3Config.cmake.in b/SofaPython3Config.cmake.in index aa0c2be9..c9db0053 100644 --- a/SofaPython3Config.cmake.in +++ b/SofaPython3Config.cmake.in @@ -11,11 +11,7 @@ include(SofaPython3Tools) # Find Python3 executable and set PYTHON_EXECUTABLE before finding pybind11 # to be sure that pybind11 relies on the right Python version -set(python_version @PYTHON_VERSION@) -set(python_version_flag @python_version_flag@) - -find_package(Python ${python_version} ${python_version_flag} COMPONENTS Interpreter Development REQUIRED) - +find_package(Python @PYBIND11_PYTHON_VERSION@ COMPONENTS Interpreter Development REQUIRED) set(PYTHON_VERSION ${Python_VERSION}) set(PYTHON_EXECUTABLE ${Python_EXECUTABLE}) set(PYTHON_LIBRARIES ${Python_LIBRARIES}) From c90f984356be6713fc0b9d5e718f12f899730e09 Mon Sep 17 00:00:00 2001 From: Guillaume Paran Date: Sat, 3 Jul 2021 14:56:47 +0200 Subject: [PATCH 42/43] [Plugin] Remove noisy "No python3 dir found" message --- Plugin/src/SofaPython3/PythonEnvironment.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Plugin/src/SofaPython3/PythonEnvironment.cpp b/Plugin/src/SofaPython3/PythonEnvironment.cpp index 2a0743e3..4dc4c5d9 100644 --- a/Plugin/src/SofaPython3/PythonEnvironment.cpp +++ b/Plugin/src/SofaPython3/PythonEnvironment.cpp @@ -342,11 +342,6 @@ void PythonEnvironment::addPythonModulePathsForPlugins(const std::string& plugin added = true; } } - - if(!added) - { - msg_info("SofaPython3") << "No python3 dir found in " << pluginsDirectory; - } } void PythonEnvironment::addPythonModulePathsForPluginsByName(const std::string& pluginName) From c1d9b9274717793369ffc458b87916af07f58f5a Mon Sep 17 00:00:00 2001 From: Guillaume Paran Date: Tue, 6 Jul 2021 16:19:52 +0200 Subject: [PATCH 43/43] [GitHub] Use master version of SOFA (will be set to v21.06 after PR is merged) --- .github/workflows/macos.yml | 12 ++++++------ .github/workflows/ubuntu.yml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 730cfa3e..6862def2 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -27,12 +27,12 @@ jobs: brew install ccache ninja boost eigen pybind11 python3 -m pip install numpy - - name: Download SOFA v20.12.02 + - name: Download SOFA nightly build run: | curl --output sofa.zip -L \ - https://ci.inria.fr/sofa-ci-dev/job/nightly-generate-binaries/CI_SCOPE=binaries_minimal/309/artifact/MacOS/*zip*/MacOS.zip + https://ci.inria.fr/sofa-ci-dev/job/nightly-generate-binaries/lastSuccessfulBuild/CI_SCOPE=binaries_minimal/artifact/MacOS/*zip*/MacOS.zip - - name: Install SOFA v20.12.02 + - name: Install SOFA nightly build run: | sudo unzip sofa.zip -d temp sudo unzip temp/MacOS/`ls temp/MacOS/` -d temp @@ -105,12 +105,12 @@ jobs: brew install boost python3 -m pip install numpy - - name: Download SOFA v20.12.02 + - name: Download SOFA nightly build run: | curl --output sofa.zip -L \ - https://ci.inria.fr/sofa-ci-dev/job/nightly-generate-binaries/CI_SCOPE=binaries_minimal/309/artifact/MacOS/*zip*/MacOS.zip + https://ci.inria.fr/sofa-ci-dev/job/nightly-generate-binaries/lastSuccessfulBuild/CI_SCOPE=binaries_minimal/artifact/MacOS/*zip*/MacOS.zip - - name: Install SOFA v20.12.02 + - name: Install SOFA nightly build run: | sudo unzip sofa.zip -d temp sudo unzip temp/MacOS/`ls temp/MacOS/` -d temp diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index da57197f..41d5455e 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -42,12 +42,12 @@ jobs: - name: Install pybind11 run: cd /tmp/pybind11 && sudo make install - - name: Download SOFA v20.12.02 + - name: Download SOFA nightly build run: | curl --output sofa.zip -L \ - https://ci.inria.fr/sofa-ci-dev/job/nightly-generate-binaries/CI_SCOPE=binaries_minimal/309/artifact/Linux/*zip*/Linux.zip + https://ci.inria.fr/sofa-ci-dev/job/nightly-generate-binaries/lastSuccessfulBuild/CI_SCOPE=binaries_minimal/artifact/Linux/*zip*/Linux.zip - - name: Install SOFA v20.12.02 + - name: Install SOFA nightly build run: | sudo unzip sofa.zip -d temp sudo unzip temp/Linux/`ls temp/Linux/` -d temp @@ -120,12 +120,12 @@ jobs: sudo apt install -qq libboost-all-dev python3 -m pip install numpy - - name: Download SOFA v20.12.02 + - name: Download SOFA nightly build run: | curl --output sofa.zip -L \ - https://ci.inria.fr/sofa-ci-dev/job/nightly-generate-binaries/CI_SCOPE=binaries_minimal/309/artifact/Linux/*zip*/Linux.zip + https://ci.inria.fr/sofa-ci-dev/job/nightly-generate-binaries/lastSuccessfulBuild/CI_SCOPE=binaries_minimal/artifact/Linux/*zip*/Linux.zip - - name: Install SOFA v20.12.02 + - name: Install SOFA nightly build run: | sudo unzip sofa.zip -d temp sudo unzip temp/Linux/`ls temp/Linux/` -d temp