Merge branch 'master' into v4.3.0_ITOM_Version

Conflicts:
	docs/userDoc/source/12_contributing/git_pre_commit_hooks.rst

.pre-commit-config.yaml

@@ -1,4 +1,4 @@
-exclude: ^(gtest-1.10.0)/
+exclude: ^(gtest-1.12.1)/
 
 ci:
     autoupdate_schedule: monthly

AddInManager/CMakeLists.txt

@@ -44,9 +44,14 @@ find_package(OpenCV COMPONENTS core REQUIRED)
 add_definitions(-DADDINMGR_DLL -D_ADDINMGR_DLL)
 
 if(BUILD_WITH_PCL)
-    find_package(PCL 1.5.1 REQUIRED COMPONENTS common)
-    add_definitions(-DUSEPCL)
-endif()
+    include(Setup_PCL_Itom)
+    if(WIN32)
+        find_package(PCL 1.5.1 QUIET REQUIRED COMPONENTS common PATHS ${PCL_CMAKE_DIR} NO_DEFAULT_PATH)
+    else(WIN32)
+        find_package(PCL 1.5.1 QUIET REQUIRED COMPONENTS common)
+    endif(WIN32)
+    add_definitions(-DUSEPCL -D_USEPCL)
+endif(BUILD_WITH_PCL)
 
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}

CMakeLists.txt

@@ -103,9 +103,18 @@ add_subdirectory(plot)
 add_subdirectory(itomWidgets)
 add_subdirectory(Qitom)
 add_subdirectory(iconThemes)
+
 if(BUILD_UNITTEST)
     #put this as last, since gtest is globally changing many compiler flags
-    add_subdirectory(gtest-1.10.0)
+    if(WIN32 AND ((NOT DEFINED ${gtest_force_shared_crt}) OR (NOT ${gtest_force_shared_crt})))
+        set(gtest_force_shared_crt ON CACHE BOOL "Use shared (DLL) run-time lib even when Google Test is built as static lib." FORCE)
+        message(WARNING "For properly running the unittests, the CMAKE variable gtest_force_shared_crt has been forced to ON.")
+    endif()
+
+    message(WARNING "Start adding gtest ${gtest_force_shared_crt}")
+
+    add_subdirectory(gtest-1.12.1)
+    message(WARNING "End adding gtest ${gtest_force_shared_crt}")
     add_subdirectory(itom_unittests)
 endif()
 

Qitom/CMakeLists.txt

@@ -90,11 +90,12 @@ if(BUILD_WITH_PCL)
     else(WIN32)
         find_package(PCL 1.5.1 QUIET REQUIRED COMPONENTS common)
     endif(WIN32)
+    add_definitions(-DUSEPCL -D_USEPCL)
 
     # actually we need this only to configure the itom.bat including vtk, otherwise
     # eventually pcl-tools plugin will not be loaded
     find_package(VTK QUIET)
-endif()
+endif(BUILD_WITH_PCL)
 
 find_package(VisualLeakDetector QUIET)
 find_package(HTMLHelp)

common/param.h

@@ -1069,19 +1069,19 @@ template <typename _Tp> struct ItomParamHelper
 
             if (val)
             {
-                int len = static_cast<int>(strlen((const char*)val));
+                int str_len = static_cast<int>(strlen((const char*)val));
 
-                if (((ito::int32)len != param->d->len) || (param->d->data.ptrVal == nullptr))
+                if (((ito::uint32)str_len != param->d->len) || (param->d->data.ptrVal == nullptr))
                 {
-                    param->d->data.ptrVal = new char[len + 1];
+                    param->d->data.ptrVal = new char[str_len + 1];
                 }
                 else
                 {
                     cVal_ = nullptr;
                 }
 
-                std::copy_n((const char*)val, len + 1, (char*)param->d->data.ptrVal);
-                param->d->len = len;
+                std::copy_n((const char*)val, str_len + 1, (char*)param->d->data.ptrVal);
+                param->d->len = str_len;
             }
             else
             {
@@ -1101,7 +1101,7 @@ template <typename _Tp> struct ItomParamHelper
 
             if ((val) && (len > 0))
             {
-                if ((ito::int32)len != param->d->len)
+                if ((ito::uint32)len != param->d->len)
                 {
                     param->d->data.ptrVal = new char[len];
                     param->d->len = len;
@@ -1131,7 +1131,7 @@ template <typename _Tp> struct ItomParamHelper
 
             if ((val) && (len > 0))
             {
-                if ((ito::int32)len != param->d->len)
+                if ((ito::uint32)len != param->d->len)
                 {
                     param->d->data.ptrVal = new int32[len];
                     param->d->len = len;
@@ -1161,7 +1161,7 @@ template <typename _Tp> struct ItomParamHelper
 
             if ((val) && (len > 0))
             {
-                if ((ito::int32)len != param->d->len)
+                if ((ito::uint32)len != param->d->len)
                 {
                     param->d->data.ptrVal = new float64[len];
                     param->d->len = len;
@@ -1191,7 +1191,7 @@ template <typename _Tp> struct ItomParamHelper
 
             if ((val) && (len > 0))
             {
-                if ((ito::int32)len != param->d->len)
+                if ((ito::uint32)len != param->d->len)
                 {
                     param->d->data.ptrVal = new complex128[len];
                     param->d->len = len;

docs/userDoc/source/05_plots/generated/itom.figure.liveImage.rst

@@ -3,4 +3,4 @@ itom.figure.liveImage
 
 .. currentmodule:: itom
 
-.. automethod:: figure.liveImage
+.. automethod:: figure.liveImage

docs/userDoc/source/05_plots/generated/itom.figure.plot.rst

@@ -3,4 +3,4 @@ itom.figure.plot
 
 .. currentmodule:: itom
 
-.. automethod:: figure.plot
+.. automethod:: figure.plot

docs/userDoc/source/12_contributing/git_pre_commit_hooks.rst

@@ -3,19 +3,36 @@
 Git Pre-Commit Hooks
 ********************
 
-Itom makes use of pre-commit hooks to check for compliance with our coding guidelines.
-The pre-commit hooks are run before each commit and your commit can fail accordingly.
+Itom makes use of `pre-commit <https://pre-commit.com/>`_ hooks for
+identifying simple issues such as missing semicolons, trailing whitespace or misspellings
+before submission to git. The `pre-commit <https://pre-commit.com/>`_ hooks are run
+before each commit and your commit can fail accordingly.
 
-When a new hook is added, It's usually a good idea to run the hooks before new commit is added.
-Python offers a framework to run and apply the commit-hooks manually to your code.
+After cloning the |itom| repositories (`itomProject <https://github.com/itom-project/itomProject>`_ or
+`itom <https://github.com/itom-project/itom>`_, `plugins <https://github.com/itom-project/plugins>`_,
+`designerPlugins <https://github.com/itom-project/designerPlugins>`_) hooks must be install e.g. using pip.
 
 .. code-block:: bash
 
-    pip install pre_commit
+    python -m pip install pre_commit
 
-Then, got to the main folder of the respective itom repository (e.g. itomProject, itom, plugins or designerplugins), which includes the ``pre-commit`` configuration
-file **.pre-commit-config.yaml** and run.:
+Git hooks must be installed into the ``.git`` folder of each repo.
 
 .. code-block:: bash
 
-    pre_commit run --all-files
+    python -m pre_commit install
+
+Pre_commits can be executed manually:
+
+.. code-block:: bash
+    
+    python -m pre_commit run --all-files
+
+A practical tip is to also run pre_commits manually to reduce frustration when you want or need to create a commit.
+Failed hooks ensure that a commit cannot be set.
+
+To execute specific hooks, their names can be passed as an additional argument (e.g. codespell).
+
+.. code-block:: bash
+    
+    python -m pre_commit run --all-files codespell