Merge pull request #37 from itom-project/v4.3.0_ITOM_Version

V4.3.0 itom version
itom-project · Jun 2, 2024 · d1a5a3e · d1a5a3e
2 parents d521d8c + 0842610
commit d1a5a3e
Show file tree

Hide file tree

Showing 375 changed files with 4,238 additions and 3,816 deletions.
diff --git a/AVTVimba/CMakeLists.txt b/AVTVimba/CMakeLists.txt
@@ -59,7 +59,7 @@ if(AVT_VIMBA_HEADER_FILE)
         ${CMAKE_CURRENT_SOURCE_DIR}/dialogAvtVimba.h
         ${CMAKE_CURRENT_SOURCE_DIR}/dockWidgetAvtVimba.h
         ${CMAKE_CURRENT_SOURCE_DIR}/avtEnums.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/pluginVersion.h
+        ${CMAKE_CURRENT_BINARY_DIR}/pluginVersion.h
         ${CMAKE_CURRENT_BINARY_DIR}/gitVersion.h
         #add further header files (absolute paths e.g. using CMAKE_CURRENT_SOURCE_DIR)
     )
@@ -71,6 +71,9 @@ if(AVT_VIMBA_HEADER_FILE)
         #add further source files here
     )
 
+	#Define Version in pluginVersion.h
+	configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/pluginVersion.h.in ${CMAKE_CURRENT_BINARY_DIR}/pluginVersion.h)
+
     if(MSVC)
         list(APPEND PLUGIN_SOURCES ${ITOM_SDK_INCLUDE_DIR}/../pluginLibraryVersion.rc)
     endif()

diff --git a/AVTVimba/avtVimba.cpp b/AVTVimba/avtVimba.cpp
@@ -63,11 +63,11 @@ The plugin was tested with AVT Vimba 1.3.0, 1.4.0, 2.5.0. \n\
 In order to run your camera, please install the Vimba SDK in the right version such that the necessary drivers are installed. \n\
 Color formats are not supported.");
 
-    m_author = "J. Nitsche (IPROM Uni Braunschweig), M. Gronle (ITO Uni Stuttgart)";
-    m_version = (PLUGIN_VERSION_MAJOR << 16) + (PLUGIN_VERSION_MINOR << 8) + PLUGIN_VERSION_PATCH;
-    m_minItomVer = MINVERSION;
-    m_maxItomVer = MAXVERSION;
-    m_license = QObject::tr("Licensed under LGPL");
+    m_author = PLUGIN_AUTHOR;
+    m_version = PLUGIN_VERSION;
+    m_minItomVer = PLUGIN_MIN_ITOM_VERSION;
+    m_maxItomVer = PLUGIN_MAX_ITOM_VERSION;
+    m_license = QObject::tr(PLUGIN_LICENCE);
     m_aboutThis = QObject::tr(GITVERSION);
 
     //add mandatory and optional parameters for the initialization here.

diff --git a/AVTVimba/pluginVersion.h b/AVTVimba/pluginVersion.h
diff --git a/BasicGPLFilters/pluginVersion.h → AVTVimba/pluginVersion.h.in b/BasicGPLFilters/pluginVersion.h → AVTVimba/pluginVersion.h.in
@@ -30,16 +30,14 @@
 
 #include "itom_sdk.h"
 
-#define PLUGIN_VERSION_MAJOR 0
-#define PLUGIN_VERSION_MINOR 1
-#define PLUGIN_VERSION_PATCH 0
-#define PLUGIN_VERSION_REVISION 0
-#define PLUGIN_VERSION        CREATE_VERSION(PLUGIN_VERSION_MAJOR,PLUGIN_VERSION_MINOR,PLUGIN_VERSION_PATCH)
-#define PLUGIN_VERSION_STRING CREATE_VERSION_STRING(PLUGIN_VERSION_MAJOR,PLUGIN_VERSION_MINOR,PLUGIN_VERSION_PATCH)
-#define PLUGIN_COMPANY        "twip optical solutions GmbH, Stuttgart"
-#define PLUGIN_COPYRIGHT      "(C) 2014, under GPL 3.0"
-#define PLUGIN_NAME           "BasicGPLFilters"
-
-//----------------------------------------------------------------------------------------------------------------------------------
+#define PLUGIN_VERSION              CREATE_VERSION(6, 0, 0)
+#define PLUGIN_MIN_ITOM_VERSION     CREATE_VERSION(1, 3, 0)
+#define PLUGIN_MAX_ITOM_VERSION     CREATE_VERSION(${itom_plugins_VERSION_MAJOR},${itom_plugins_VERSION_MINOR},${itom_plugins_VERSION_PATCH})
+#define PLUGIN_LICENCE              "Licensed under LGPL."
+#define PLUGIN_COMPANY              "IPROM, TU Braunschweig; ITO, Universität Stuttgart"
+#define PLUGIN_AUTHOR               "J. Nitsche (IPROM Uni Braunschweig), M. Gronle (ITO Uni Stuttgart)"
+#define PLUGIN_COPYRIGHT            "(C) 2018, IPROM + ITO"
+#define PLUGIN_NAME                 "AVTVimba"
+
 
 #endif // PLUGINVERSION_H
diff --git a/AerotechA3200/CMakeLists.txt b/AerotechA3200/CMakeLists.txt
@@ -48,7 +48,7 @@ else(BUILD_TARGET64)
         ${CMAKE_CURRENT_SOURCE_DIR}/aerotechA3200.h
         ${CMAKE_CURRENT_SOURCE_DIR}/dockWidgetAerotechA3200.h
         ${CMAKE_CURRENT_SOURCE_DIR}/dialogAerotechA3200.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/pluginVersion.h
+        ${CMAKE_CURRENT_BINARY_DIR}/pluginVersion.h
         ${CMAKE_CURRENT_BINARY_DIR}/gitVersion.h
     )
 
@@ -67,6 +67,9 @@ else(BUILD_TARGET64)
         ${CMAKE_CURRENT_SOURCE_DIR}/dialogAerotechA3200.cpp
     )
 
+    #Define Version in global.h
+    configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/pluginVersion.h.in ${CMAKE_CURRENT_BINARY_DIR}/pluginVersion.h)
+
     #Add version information to the plugIn-dll under MSVC
     if(MSVC)
         list(APPEND PLUGIN_SOURCES ${ITOM_SDK_INCLUDE_DIR}/../pluginLibraryVersion.rc)

diff --git a/AerotechA3200/aerotechA3200.cpp b/AerotechA3200/aerotechA3200.cpp
@@ -72,11 +72,12 @@ For details please check C:\\A3200\\MANUAL.";*/
     m_detaildescription = QObject::tr(
 "This plugin allows communicating with controllers of type A3200 of company Aerotech. \n\
 For details please check C:\\A3200\\MANUAL.");
-    m_author = "Simon Chen, Christof Pruss, ITO, Universität Stuttgart";
-    m_version = (PLUGIN_VERSION_MAJOR << 16) + (PLUGIN_VERSION_MINOR << 8) + PLUGIN_VERSION_PATCH;
-    m_minItomVer = MINVERSION;
-    m_maxItomVer = MAXVERSION;
-    m_license = QObject::tr("Licensed under LGPL, The Aerotech A3200 library belongs to Aerotech under their specific license (accessible by their free FTP server).");
+
+    m_author = PLUGIN_AUTHOR;
+    m_version = PLUGIN_VERSION;
+    m_minItomVer = PLUGIN_MIN_ITOM_VERSION;
+    m_maxItomVer = PLUGIN_MAX_ITOM_VERSION;
+    m_license = QObject::tr(PLUGIN_LICENCE);
     m_aboutThis = QObject::tr(GITVERSION);
 
     m_autoLoadPolicy = ito::autoLoadNever;

diff --git a/SerialIO/pluginVersion.h → AerotechA3200/pluginVersion.h.in b/SerialIO/pluginVersion.h → AerotechA3200/pluginVersion.h.in
@@ -30,17 +30,16 @@
 
 #include "itom_sdk.h"
 
-#define PLUGIN_VERSION_MAJOR 1
-#define PLUGIN_VERSION_MINOR 1
-#define PLUGIN_VERSION_PATCH 1
-#define PLUGIN_VERSION_REVISION 0
-#define PLUGIN_VERSION                                                                             \
-    CREATE_VERSION(PLUGIN_VERSION_MAJOR, PLUGIN_VERSION_MINOR, PLUGIN_VERSION_PATCH)
-#define PLUGIN_VERSION_STRING                                                                      \
-    CREATE_VERSION_STRING(PLUGIN_VERSION_MAJOR, PLUGIN_VERSION_MINOR, PLUGIN_VERSION_PATCH)
-#define PLUGIN_COMPANY "Institut für Technische Optik, Universität Stuttgart"
-#define PLUGIN_COPYRIGHT "(C) 2017, ITO, Universität Stuttgart"
-#define PLUGIN_NAME "SerialIO"
+#define PLUGIN_VERSION              CREATE_VERSION(2, 19, 0)
+#define PLUGIN_MIN_ITOM_VERSION     CREATE_VERSION(1, 3, 0)
+#define PLUGIN_MAX_ITOM_VERSION     CREATE_VERSION(${itom_plugins_VERSION_MAJOR},${itom_plugins_VERSION_MINOR},${itom_plugins_VERSION_PATCH})
+#define PLUGIN_LICENCE              "Licensed under LGPL, The Aerotech A3200 library belongs to Aerotech under their specific license (accessible by their free FTP server)."
+#define PLUGIN_COMPANY              "Institut für Technische Optik, Universität Stuttgart"
+#define PLUGIN_AUTHOR               "Simon Chen, Christof Pruss, ITO, Universität Stuttgart"
+#define PLUGIN_COPYRIGHT            "(C) 2013, ITO, Universität Stuttgart"
+#define PLUGIN_NAME                 "AerotechA3200"
+
+
 
 //----------------------------------------------------------------------------------------------------------------------------------
 

diff --git a/AerotechEnsemble/CMakeLists.txt b/AerotechEnsemble/CMakeLists.txt
@@ -51,7 +51,7 @@ set(PLUGIN_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/aerotechEnsemble.h
     ${CMAKE_CURRENT_SOURCE_DIR}/dockWidgetAerotechEnsemble.h
     ${CMAKE_CURRENT_SOURCE_DIR}/dialogAerotechEnsemble.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/pluginVersion.h
+    ${CMAKE_CURRENT_BINARY_DIR}/pluginVersion.h
     ${CMAKE_CURRENT_BINARY_DIR}/gitVersion.h
 )
 
@@ -69,6 +69,9 @@ set(PLUGIN_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/dialogAerotechEnsemble.cpp
 )
 
+#Define Version in pluginVersion.h
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/pluginVersion.h.in ${CMAKE_CURRENT_BINARY_DIR}/pluginVersion.h)
+
 #Add version information to the plugIn-dll under MSVC
 if(MSVC)
     list(APPEND PLUGIN_SOURCES ${ITOM_SDK_INCLUDE_DIR}/../pluginLibraryVersion.rc)

diff --git a/AerotechEnsemble/aerotechEnsemble.cpp b/AerotechEnsemble/aerotechEnsemble.cpp
@@ -86,11 +86,11 @@ license information of Aerotech see their documentation. \n\
 \n\
 For loading the Ensemble library you need the Visual C++ 2008 SP1 Redistributable Package provided by Microsoft (see Ensemble Programming Help).");
 
-    m_author = "A. Bielke, M. Gronle, ITO, Universität Stuttgart, Juergen Ortmann, Ortmann Digitaltechnik";
-    m_version = (PLUGIN_VERSION_MAJOR << 16) + (PLUGIN_VERSION_MINOR << 8) + PLUGIN_VERSION_PATCH;
-    m_minItomVer = MINVERSION;
-    m_maxItomVer = MAXVERSION;
-    m_license = QObject::tr("Licensed under LGPL, The Aerotech Ensemble library belongs to Aerotech under their specific license.");
+    m_author = PLUGIN_AUTHOR;
+    m_version = PLUGIN_VERSION;
+    m_minItomVer = PLUGIN_MIN_ITOM_VERSION;
+    m_maxItomVer = PLUGIN_MAX_ITOM_VERSION;
+    m_license = QObject::tr(PLUGIN_LICENCE);
     m_aboutThis = QObject::tr(GITVERSION);
 
     m_autoLoadPolicy = ito::autoLoadNever;

diff --git a/AerotechEnsemble/pluginVersion.h → AerotechEnsemble/pluginVersion.h.in b/AerotechEnsemble/pluginVersion.h → AerotechEnsemble/pluginVersion.h.in
@@ -30,16 +30,13 @@
 
 #include "itom_sdk.h"
 
-#define PLUGIN_VERSION_MAJOR 0
-#define PLUGIN_VERSION_MINOR 1
-#define PLUGIN_VERSION_PATCH 0
-#define PLUGIN_VERSION_REVISION 0
-#define PLUGIN_VERSION        CREATE_VERSION(PLUGIN_VERSION_MAJOR,PLUGIN_VERSION_MINOR,PLUGIN_VERSION_PATCH)
-#define PLUGIN_VERSION_STRING CREATE_VERSION_STRING(PLUGIN_VERSION_MAJOR,PLUGIN_VERSION_MINOR,PLUGIN_VERSION_PATCH)
-#define PLUGIN_COMPANY        "Institut für Technische Optik, Universität Stuttgart"
-#define PLUGIN_COPYRIGHT      "(C) 2013, ITO, Universität Stuttgart"
-#define PLUGIN_NAME           "AerotechEnsemble"
-
-//----------------------------------------------------------------------------------------------------------------------------------
+#define PLUGIN_VERSION              CREATE_VERSION(4, 6, 1)
+#define PLUGIN_MIN_ITOM_VERSION     CREATE_VERSION(1, 1, 0)
+#define PLUGIN_MAX_ITOM_VERSION     CREATE_VERSION(${itom_plugins_VERSION_MAJOR},${itom_plugins_VERSION_MINOR},${itom_plugins_VERSION_PATCH})
+#define PLUGIN_LICENCE              "Licensed under LGPL, The Aerotech Ensemble library belongs to Aerotech under their specific license."
+#define PLUGIN_COMPANY              "Institut für Technische Optik, Universität Stuttgart"
+#define PLUGIN_AUTHOR               "A. Bielke, M. Gronle, ITO, Universität Stuttgart, Juergen Ortmann, Ortmann Digitaltechnik"
+#define PLUGIN_COPYRIGHT            "(C) 2013, ITO, Universität Stuttgart"
+#define PLUGIN_NAME                 "AerotechEnsemble"
 
 #endif // PLUGINVERSION_H
diff --git a/AndorSDK3/AndorSDK3Interface.cpp b/AndorSDK3/AndorSDK3Interface.cpp
@@ -75,10 +75,10 @@ by the Windows path environment variable (e.g. append \"C:/Program Files/Andor S
 
     m_author = PLUGIN_AUTHOR;
     m_version = PLUGIN_VERSION;
-    m_minItomVer = MINVERSION;
-    m_maxItomVer = MAXVERSION;
-    m_license = tr("Licensed under LGPL");
-    m_aboutThis = tr(GITVERSION);
+    m_minItomVer = PLUGIN_MIN_ITOM_VERSION;
+    m_maxItomVer = PLUGIN_MAX_ITOM_VERSION;
+    m_license = QObject::tr(PLUGIN_LICENCE);
+    m_aboutThis = QObject::tr(GITVERSION);
 
     ito::Param param( "camera_idx", ito::ParamBase::Int | ito::ParamBase::In, 0, 31, 0, tr("camera index that should be opened. The first camera is 0, the second 1...").toLatin1().data());
     m_initParamsMand.append(param);

diff --git a/AndorSDK3/CMakeLists.txt b/AndorSDK3/CMakeLists.txt
@@ -76,7 +76,7 @@ if(ANDOR_SDK3_DIR)
         ${CMAKE_CURRENT_SOURCE_DIR}/DockWidgetAndorSDK3.h
         ${CMAKE_CURRENT_SOURCE_DIR}/AndorSDK3.h
         ${CMAKE_CURRENT_SOURCE_DIR}/AndorSDK3Interface.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/pluginVersion.h
+        ${CMAKE_CURRENT_BINARY_DIR}/pluginVersion.h
         ${CMAKE_CURRENT_BINARY_DIR}/gitVersion.h
         #add further header files (absolute paths e.g. using CMAKE_CURRENT_SOURCE_DIR)
     )
@@ -98,6 +98,9 @@ if(ANDOR_SDK3_DIR)
         ${CMAKE_CURRENT_SOURCE_DIR}/DockWidgetAndorSDK3.ui
     )
 
+	#Define Version in pluginVersion.h
+	configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/pluginVersion.h.in ${CMAKE_CURRENT_BINARY_DIR}/pluginVersion.h)
+
     set(PLUGIN_RCC
         #add absolute paths to any *.qrc resource files here
     )

diff --git a/AndorSDK3/pluginVersion.h.in b/AndorSDK3/pluginVersion.h.in
@@ -0,0 +1,42 @@
+/* ********************************************************************
+    itom software
+    URL: http://www.uni-stuttgart.de/ito
+    Copyright (C) 2018, Institut für Technische Optik (ITO),
+    Universität Stuttgart, Germany
+
+    This file is part of itom and its software development toolkit (SDK).
+
+    itom is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public Licence as published by
+    the Free Software Foundation; either version 2 of the Licence, or (at
+    your option) any later version.
+
+    In addition, as a special exception, the Institut für Technische
+    Optik (ITO) gives you certain additional rights.
+    These rights are described in the ITO LGPL Exception version 1.0,
+    which can be found in the file LGPL_EXCEPTION.txt in this package.
+
+    itom is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library
+    General Public Licence for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with itom. If not, see <http://www.gnu.org/licenses/>.
+*********************************************************************** */
+
+#ifndef PLUGINVERSION_H
+#define PLUGINVERSION_H
+
+#include "itom_sdk.h"
+
+#define PLUGIN_VERSION              CREATE_VERSION(3, 15, 3)
+#define PLUGIN_MIN_ITOM_VERSION     CREATE_VERSION(1, 4, 0)
+#define PLUGIN_MAX_ITOM_VERSION     CREATE_VERSION(${itom_plugins_VERSION_MAJOR},${itom_plugins_VERSION_MINOR},${itom_plugins_VERSION_PATCH})
+#define PLUGIN_LICENCE              "Licensed under LGPL."
+#define PLUGIN_COMPANY              "Institut für Technische Optik, Universität Stuttgart"
+#define PLUGIN_AUTHOR               "M. Gronle (ITO Uni Stuttgart)"
+#define PLUGIN_COPYRIGHT            "(C) 2014, ITO, Universität Stuttgart"
+#define PLUGIN_NAME                 "AndorSDK3"
+
+#endif // PLUGINVERSION_H
diff --git a/AvantesAvaSpec/CMakeLists.txt b/AvantesAvaSpec/CMakeLists.txt
@@ -36,7 +36,7 @@ set(PLUGIN_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/avantesDefines.h
     ${CMAKE_CURRENT_SOURCE_DIR}/dialogAvantesAvaSpec.h
     ${CMAKE_CURRENT_SOURCE_DIR}/dockWidgetAvantesAvaSpec.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/pluginVersion.h
+    ${CMAKE_CURRENT_BINARY_DIR}/pluginVersion.h
     ${CMAKE_CURRENT_BINARY_DIR}/gitVersion.h
 )
 
@@ -51,6 +51,9 @@ set(PLUGIN_UI
     ${CMAKE_CURRENT_SOURCE_DIR}/dockWidgetAvantesAvaSpec.ui
 )
 
+#Define Version in pluginVersion.h
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/pluginVersion.h.in ${CMAKE_CURRENT_BINARY_DIR}/pluginVersion.h)
+
 set(PLUGIN_RCC
     #add absolute paths to any *.qrc resource files here
 )

diff --git a/AvantesAvaSpec/avantesAvaSpec.cpp b/AvantesAvaSpec/avantesAvaSpec.cpp
@@ -133,12 +133,12 @@ tested with the following spectrometers: \
 * AvaSpec 3468 USB-Spectrometer \
 * AvaSpec 2048 USB-Spectrometer \
 * AvaSpec-ULS2048CL-EVO USB3-Spectrometer.");
-    m_author = "M. Gronle, R. Hahn, W. Lyda, ITO, Universität Stuttgart";
-    m_license = QObject::tr("LGPL");
-    m_version           = (PLUGIN_VERSION_MAJOR << 16) + (PLUGIN_VERSION_MINOR << 8) + PLUGIN_VERSION_PATCH;
-    m_minItomVer        = MINVERSION;
-    m_maxItomVer        = MAXVERSION;
-    m_aboutThis         = tr(GITVERSION);
+    m_author = PLUGIN_AUTHOR;
+    m_version = PLUGIN_VERSION;
+    m_minItomVer = PLUGIN_MIN_ITOM_VERSION;
+    m_maxItomVer = PLUGIN_MAX_ITOM_VERSION;
+    m_license = QObject::tr(PLUGIN_LICENCE);
+    m_aboutThis = QObject::tr(GITVERSION);
 
     m_autoLoadPolicy = ito::autoLoadNever;
     m_autoSavePolicy = ito::autoSaveNever;

diff --git a/AvantesAvaSpec/pluginVersion.h.in b/AvantesAvaSpec/pluginVersion.h.in
@@ -0,0 +1,42 @@
+/* ********************************************************************
+    itom software
+    URL: http://www.uni-stuttgart.de/ito
+    Copyright (C) 2018, Institut für Technische Optik (ITO),
+    Universität Stuttgart, Germany
+
+    This file is part of itom and its software development toolkit (SDK).
+
+    itom is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public Licence as published by
+    the Free Software Foundation; either version 2 of the Licence, or (at
+    your option) any later version.
+
+    In addition, as a special exception, the Institut für Technische
+    Optik (ITO) gives you certain additional rights.
+    These rights are described in the ITO LGPL Exception version 1.0,
+    which can be found in the file LGPL_EXCEPTION.txt in this package.
+
+    itom is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library
+    General Public Licence for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with itom. If not, see <http://www.gnu.org/licenses/>.
+*********************************************************************** */
+
+#ifndef PLUGINVERSION_H
+#define PLUGINVERSION_H
+
+#include "itom_sdk.h"
+
+#define PLUGIN_VERSION              CREATE_VERSION(1, 3, 1)
+#define PLUGIN_MIN_ITOM_VERSION     CREATE_VERSION(2, 0, 0)
+#define PLUGIN_MAX_ITOM_VERSION     CREATE_VERSION(${itom_plugins_VERSION_MAJOR},${itom_plugins_VERSION_MINOR},${itom_plugins_VERSION_PATCH})
+#define PLUGIN_LICENCE              "Licensed under LGPL."
+#define PLUGIN_COMPANY              "Institut für Technische Optik, Universität Stuttgart"
+#define PLUGIN_AUTHOR               "M. Gronle, R. Hahn, W. Lyda, ITO, Universität Stuttgart"
+#define PLUGIN_COPYRIGHT            "(C) 2016, ITO, Universität Stuttgart"
+#define PLUGIN_NAME                 "AvantesAvaSpec"
+
+#endif // PLUGINVERSION_H