Merge pull request #10 from jhu-saw/rc-2.2.0

adeguet1 · web-flow · commit a6ce022c388b · 2024-08-30T15:26:23.000-04:00
rc 2.2.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,18 @@
 Change log
 ==========
 
+2.2.0 (2024-08-30)
+==================
+
+* API changes:
+  * Now uses `cmnJointType` instead of `prmJointType`
+* Deprecated features:
+  * None
+* New features:
+  * None
+* Bug fixes:
+  * CMake Qt library: added missing library to link on Windows
+
 2.1.0 (2023-11-21)
 ==================
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# (C) Copyright 2012-2023 Johns Hopkins University (JHU), All Rights Reserved.
+# (C) Copyright 2012-2024 Johns Hopkins University (JHU), All Rights Reserved.
 #
 # --- begin cisst license - do not edit ---
 #
@@ -10,7 +10,7 @@
 # --- end cisst license ---
 
 cmake_minimum_required (VERSION 3.10)
-project (sawControllersAll VERSION 2.1.0)
+project (sawControllersAll VERSION 2.2.0)
 
 find_package (cisst REQUIRED)
 include (${CISST_USE_FILE})
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# (C) Copyright 2011-2023 Johns Hopkins University (JHU), All Rights Reserved.
+# (C) Copyright 2011-2024 Johns Hopkins University (JHU), All Rights Reserved.
 #
 # --- begin cisst license - do not edit ---
 #
@@ -10,11 +10,7 @@
 # --- end cisst license ---
 
 cmake_minimum_required (VERSION 3.10)
-project (sawControllers VERSION 2.1.0)
-
-set (CMAKE_CXX_STANDARD 14)
-set (CMAKE_CXX_STANDARD_REQUIRED ON)
-set (CMAKE_CXX_EXTENSIONS OFF)
+project (sawControllers VERSION 2.2.0)
 
 set (REQUIRED_CISST_LIBRARIES
      cisstCommon
@@ -25,7 +21,7 @@ set (REQUIRED_CISST_LIBRARIES
      cisstRobot
      cisstNumerical)
 
-find_package (cisst 1.2.0 REQUIRED ${REQUIRED_CISST_LIBRARIES})
+find_package (cisst 1.3.0 REQUIRED ${REQUIRED_CISST_LIBRARIES})
 
 if (cisst_FOUND)
 
diff --git a/components/code/Qt/CMakeLists.txt b/components/code/Qt/CMakeLists.txt
@@ -46,6 +46,8 @@ if (cisst_FOUND_AS_REQUIRED)
                          VERSION ${sawControllers_VERSION}
                          FOLDER "sawControllers")
   cisst_target_link_libraries (sawControllersQt ${REQUIRED_CISST_LIBRARIES})
+  target_link_libraries (sawControllersQt
+                         ${sawControllers_LIBRARIES})
 
   install (TARGETS sawControllersQt COMPONENT sawControllers-Qt
            RUNTIME DESTINATION bin
diff --git a/components/code/Qt/mtsPIDQtWidget.cpp b/components/code/Qt/mtsPIDQtWidget.cpp
@@ -5,7 +5,7 @@
   Author(s):  Zihan Chen, Anton Deguet
   Created on: 2013-02-20
 
-  (C) Copyright 2013-2023 Johns Hopkins University (JHU), All Rights Reserved.
+  (C) Copyright 2013-2024 Johns Hopkins University (JHU), All Rights Reserved.
 
 --- begin cisst license - do not edit ---
 
@@ -157,7 +157,7 @@ void mtsPIDQtWidget::Startup(void)
         UnitFactor.SetAll(0.0);
     } else {
         // set unitFactor;
-        prmJointTypeToFactor(PID.m_configuration_js.Type(), 1.0 / cmn_mm, cmn180_PI, UnitFactor);
+        cmnJointTypeToFactor(PID.m_configuration_js.Type(), 1.0 / cmn_mm, cmn180_PI, UnitFactor);
     }
 
     // get other configuration from PID
diff --git a/components/code/mtsPIDConfiguration.cdg b/components/code/mtsPIDConfiguration.cdg
@@ -2,7 +2,7 @@
 // ex: set filetype=cpp softtabstop=4 shiftwidth=4 tabstop=4 cindent expandtab:
 
 inline-header {
-#include <cisstParameterTypes/prmJointType.h>
+#include <cisstCommon/cmnJointType.h>
 #include <sawControllers/sawControllersExport.h>
 }
 
@@ -22,7 +22,7 @@ class {
     }
     member {
         name type;
-        type prmJointType;
+        type cmnJointType;
         visibility public;
         description 1 for prismatic or 2 for revolute;
     }
diff --git a/components/package.xml b/components/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>saw_controllers</name>
-  <version>2.1.0</version>
+  <version>2.2.0</version>
   <description>
   sawControllers
   </description>
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# (C) Copyright 2011-2023 Johns Hopkins University (JHU), All Rights Reserved.
+# (C) Copyright 2011-2024 Johns Hopkins University (JHU), All Rights Reserved.
 #
 # --- begin cisst license - do not edit ---
 #
@@ -10,7 +10,7 @@
 # --- end cisst license ---
 
 cmake_minimum_required (VERSION 3.10)
-project (sawControllersExamples VERSION 2.1.0)
+project (sawControllersExamples VERSION 2.2.0)
 
 set (REQUIRED_CISST_LIBRARIES
      cisstCommon
diff --git a/examples/package.xml b/examples/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>saw_controllers_examples</name>
-  <version>2.1.0</version>
+  <version>2.2.0</version>
   <description>
   sawControllers Examples
   </description>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# (C) Copyright 2012-2023 Johns Hopkins University (JHU), All Rights Reserved.`
	`2`	`+# (C) Copyright 2012-2024 Johns Hopkins University (JHU), All Rights Reserved.`
`3`	`3`	`#`
`4`	`4`	`# --- begin cisst license - do not edit ---`
`5`	`5`	`#`
`@@ -10,7 +10,7 @@`
`10`	`10`	`# --- end cisst license ---`
`11`	`11`
`12`	`12`	`cmake_minimum_required (VERSION 3.10)`
`13`		`-project (sawControllersAll VERSION 2.1.0)`
	`13`	`+project (sawControllersAll VERSION 2.2.0)`
`14`	`14`
`15`	`15`	`find_package (cisst REQUIRED)`
`16`	`16`	`include (${CISST_USE_FILE})`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`// ex: set filetype=cpp softtabstop=4 shiftwidth=4 tabstop=4 cindent expandtab:`
`3`	`3`
`4`	`4`	`inline-header {`
`5`		`-#include <cisstParameterTypes/prmJointType.h>`
	`5`	`+#include <cisstCommon/cmnJointType.h>`
`6`	`6`	`#include <sawControllers/sawControllersExport.h>`
`7`	`7`	`}`
`8`	`8`
`@@ -22,7 +22,7 @@ class {`
`22`	`22`	`}`
`23`	`23`	`member {`
`24`	`24`	`name type;`
`25`		`- type prmJointType;`
	`25`	`+ type cmnJointType;`
`26`	`26`	`visibility public;`
`27`	`27`	`description 1 for prismatic or 2 for revolute;`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# (C) Copyright 2011-2023 Johns Hopkins University (JHU), All Rights Reserved.`
	`2`	`+# (C) Copyright 2011-2024 Johns Hopkins University (JHU), All Rights Reserved.`
`3`	`3`	`#`
`4`	`4`	`# --- begin cisst license - do not edit ---`
`5`	`5`	`#`
`@@ -10,7 +10,7 @@`
`10`	`10`	`# --- end cisst license ---`
`11`	`11`
`12`	`12`	`cmake_minimum_required (VERSION 3.10)`
`13`		`-project (sawControllersExamples VERSION 2.1.0)`
	`13`	`+project (sawControllersExamples VERSION 2.2.0)`
`14`	`14`
`15`	`15`	`set (REQUIRED_CISST_LIBRARIES`
`16`	`16`	`cisstCommon`