Merge branch 'master' into v4.3.0_ITOM_Version

itom-project · May 11, 2024 · 193dc1b · 193dc1b
2 parents 66e504a + 485f7bc
commit 193dc1b
Show file tree

Hide file tree

Showing 669 changed files with 690 additions and 684 deletions.
diff --git a/.gitignore b/.gitignore
@@ -379,3 +379,4 @@ Makefile*
 .clang-tid
 *.bak
 /docs/userDoc/source/sg_execution_times.rst
+/.vscode
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "*.in": "c"
+    }
+}
diff --git a/AddInManager/CMakeLists.txt b/AddInManager/CMakeLists.txt
@@ -1,7 +1,7 @@
 # - itom software
 # URL: http://www.uni-stuttgart.de/ito
 # Copyright (C) 2022, Institut für Technische Optik (ITO),
-# Universitaet Stuttgart, Germany
+# Universität Stuttgart, Germany
 #
 # This file is part of itom and its software development toolkit (SDK).
 #

diff --git a/AddInManager/addInManager.cpp b/AddInManager/addInManager.cpp
@@ -2,7 +2,7 @@
 itom software
 URL: http://www.uni-stuttgart.de/ito
 Copyright (C) 2020, Institut für Technische Optik (ITO),
-Universitaet Stuttgart, Germany
+Universität Stuttgart, Germany
 
 This file is part of itom.
 

diff --git a/AddInManager/addInManager.h b/AddInManager/addInManager.h
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2020, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom.
 

diff --git a/AddInManager/addInManagerPrivate.cpp b/AddInManager/addInManagerPrivate.cpp
@@ -2,7 +2,7 @@
 itom software
 URL: http://www.uni-stuttgart.de/ito
 Copyright (C) 2020, Institut für Technische Optik (ITO),
-Universitaet Stuttgart, Germany
+Universität Stuttgart, Germany
 
 This file is part of itom.
 

diff --git a/AddInManager/addInManagerPrivate.h b/AddInManager/addInManagerPrivate.h
@@ -2,7 +2,7 @@
 itom software
 URL: http://www.uni-stuttgart.de/ito
 Copyright (C) 2020, Institut für Technische Optik (ITO),
-Universitaet Stuttgart, Germany
+Universität Stuttgart, Germany
 
 This file is part of itom.
 

diff --git a/AddInManager/addInManagerVersion.h b/AddInManager/addInManagerVersion.h
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2022, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom and its software development toolkit (SDK).
 

diff --git a/AddInManager/algoInterfaceValidator.cpp b/AddInManager/algoInterfaceValidator.cpp
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2020, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom.
 

diff --git a/AddInManager/algoInterfaceValidator.h b/AddInManager/algoInterfaceValidator.h
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2020, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom.
 

diff --git a/AddInManager/apiFunctions.cpp b/AddInManager/apiFunctions.cpp
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2020, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom.
 

diff --git a/AddInManager/apiFunctions.h b/AddInManager/apiFunctions.h
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2020, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom.
 

diff --git a/AddInManager/paramHelper.cpp b/AddInManager/paramHelper.cpp
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2022, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom.
 

diff --git a/AddInManager/paramHelper.h b/AddInManager/paramHelper.h
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2022, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom.
 

diff --git a/AddInManager/pluginModel.cpp b/AddInManager/pluginModel.cpp
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2020, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom.
 

diff --git a/AddInManager/pluginModel.h b/AddInManager/pluginModel.h
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2020, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom.
 

diff --git a/AddInManager/sharedPointerHelper.h b/AddInManager/sharedPointerHelper.h
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2018, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom.
 

diff --git a/AddInManager/version.rc b/AddInManager/version.rc
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2020, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom and its software development toolkit (SDK).
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 # - itom software -
 # URL: http://www.uni-stuttgart.de/ito
 # Copyright (C) 2024, Institut für Technische Optik (ITO),
-# Universitaet Stuttgart, Germany
+# Universität Stuttgart, Germany
 #
 # This file is part of itom and its software development toolkit (SDK).
 #

diff --git a/DataObject/CMakeLists.txt b/DataObject/CMakeLists.txt
@@ -1,7 +1,7 @@
 # - itom software
 # URL: http://www.uni-stuttgart.de/ito
 # Copyright (C) 2020, Institut für Technische Optik (ITO),
-# Universitaet Stuttgart, Germany
+# Universität Stuttgart, Germany
 #
 # This file is part of itom and its software development toolkit (SDK).
 #

diff --git a/DataObject/dataObjectFuncs.cpp b/DataObject/dataObjectFuncs.cpp
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2022, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom and its software development toolkit (SDK).
 

diff --git a/DataObject/dataObjectFuncs.h b/DataObject/dataObjectFuncs.h
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2020, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom and its software development toolkit (SDK).
 

diff --git a/DataObject/dataobj.cpp b/DataObject/dataobj.cpp
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2020, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom and its software development toolkit (SDK).
 

diff --git a/DataObject/dataobj.h b/DataObject/dataobj.h
@@ -2,7 +2,7 @@
  itom software
  URL: http://www.uni-stuttgart.de/ito
  Copyright (C) 2020, Institut für Technische Optik (ITO),
- Universitaet Stuttgart, Germany
+ Universität Stuttgart, Germany
 
  This file is part of itom and its software development toolkit (SDK).
 

diff --git a/DataObject/dataobjVersion.h b/DataObject/dataobjVersion.h
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2022, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom and its software development toolkit (SDK).
 

diff --git a/DataObject/defines.h b/DataObject/defines.h
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2020, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom and its software development toolkit (SDK).
 

diff --git a/DataObject/version.rc b/DataObject/version.rc
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2020, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom and its software development toolkit (SDK).
 

diff --git a/PointCloud/CMakeLists.txt b/PointCloud/CMakeLists.txt
@@ -1,7 +1,7 @@
 # - itom software
 # URL: http://www.uni-stuttgart.de/ito
 # Copyright (C) 2020, Institut für Technische Optik (ITO),
-# Universitaet Stuttgart, Germany
+# Universität Stuttgart, Germany
 #
 # This file is part of itom and its software development toolkit (SDK).
 #

diff --git a/PointCloud/impl/pclFunctionsImpl.h b/PointCloud/impl/pclFunctionsImpl.h
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2020, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom and its software development toolkit (SDK).
 

diff --git a/PointCloud/pclDefines.h b/PointCloud/pclDefines.h
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2020, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom and its software development toolkit (SDK).
 

diff --git a/PointCloud/pclFunctions.cpp b/PointCloud/pclFunctions.cpp
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2020, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom and its software development toolkit (SDK).
 

diff --git a/PointCloud/pclFunctions.h b/PointCloud/pclFunctions.h
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2020, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom and its software development toolkit (SDK).
 

diff --git a/PointCloud/pclStructures.cpp b/PointCloud/pclStructures.cpp
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2020, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom and its software development toolkit (SDK).
 

diff --git a/PointCloud/pclStructures.h b/PointCloud/pclStructures.h
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2020, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom and its software development toolkit (SDK).
 

diff --git a/PointCloud/pclVersion.h b/PointCloud/pclVersion.h
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2020, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom and its software development toolkit (SDK).
 

diff --git a/PointCloud/version.rc b/PointCloud/version.rc
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2020, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom and its software development toolkit (SDK).
 

diff --git a/QPropertyEditor/CMakeLists.txt b/QPropertyEditor/CMakeLists.txt
@@ -1,7 +1,7 @@
 # - itom software
 # URL: http://www.uni-stuttgart.de/ito
 # Copyright (C) 2022, Institut für Technische Optik (ITO),
-# Universitaet Stuttgart, Germany
+# Universität Stuttgart, Germany
 #
 # This file is part of itom and its software development toolkit (SDK).
 #

diff --git a/QPropertyEditor/autoIntervalProperty.cpp b/QPropertyEditor/autoIntervalProperty.cpp
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2021, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom and its software development toolkit (SDK).
 

diff --git a/QPropertyEditor/autoIntervalProperty.h b/QPropertyEditor/autoIntervalProperty.h
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2021, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom and its software development toolkit (SDK).
 

diff --git a/QPropertyEditor/defines.h b/QPropertyEditor/defines.h
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2021, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom and its software development toolkit (SDK).
 

diff --git a/QPropertyEditor/itomCustomTypes.cpp b/QPropertyEditor/itomCustomTypes.cpp
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2021, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom and its software development toolkit (SDK).
 

diff --git a/QPropertyEditor/itomCustomTypes.h b/QPropertyEditor/itomCustomTypes.h
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2021, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom and its software development toolkit (SDK).
 

diff --git a/QPropertyEditor/propertyEditorVersion.h b/QPropertyEditor/propertyEditorVersion.h
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2023, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom and its software development toolkit (SDK).
 

diff --git a/QPropertyEditor/qVector2DProperty.cpp b/QPropertyEditor/qVector2DProperty.cpp
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2021, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom and its software development toolkit (SDK).
 

diff --git a/QPropertyEditor/qVector2DProperty.h b/QPropertyEditor/qVector2DProperty.h
@@ -2,7 +2,7 @@
     itom software
     URL: http://www.uni-stuttgart.de/ito
     Copyright (C) 2021, Institut für Technische Optik (ITO),
-    Universitaet Stuttgart, Germany
+    Universität Stuttgart, Germany
 
     This file is part of itom and its software development toolkit (SDK).