Cleanup following removal of prmJointType and prmTransformationManager

jhu-cisst · Apr 26, 2024 · 2d30088 · 2d30088
1 parent 4f1a7f2
commit 2d30088
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 325 deletions.
diff --git a/cisstParameterTypes/prmForwardDeclarations.h b/cisstParameterTypes/prmForwardDeclarations.h
@@ -2,12 +2,10 @@
 /* ex: set filetype=cpp softtabstop=4 shiftwidth=4 tabstop=4 cindent expandtab: */
 
 /*
-
   Author(s):	Rajesh Kumar, Anton Deguet
   Created on:   2008-03-03
 
-  (C) Copyright 2007-2008 Johns Hopkins University (JHU), All Rights
-  Reserved.
+  (C) Copyright 2007-2024 Johns Hopkins University (JHU), All Rights Reserved.
 
 --- begin cisst license - do not edit ---
 
@@ -18,7 +16,6 @@ no warranty.  The complete license can be found in license.txt and
 --- end cisst license ---
 */
 
-
 /*!
   \file
   \brief Forward declarations for cisstParameterTypes
@@ -28,18 +25,12 @@ no warranty.  The complete license can be found in license.txt and
 #ifndef _prmForwardDeclarations_h
 #define _prmForwardDeclarations_h
 
-// transformation manager related classes
-class prmTransformationBase;
-class prmTransformationFixed;
-class prmTransformationDynamic;
-class prmTransformationManager;
-
 // motion enums
 /*! Parameters type for command execution/completion behavior specification */
-typedef enum Blocking { 
-	NO_WAIT,      /*! non blocking */
-	WAIT_START,   /*! blocking until start, non preemptive */
-	WAIT_FINISH   /*! blocking type  */
+typedef enum Blocking {
+    NO_WAIT,      /*! non blocking */
+    WAIT_START,   /*! blocking until start, non preemptive */
+    WAIT_FINISH   /*! blocking type  */
 } prmBlocking;
 
 #include <cisstCommon/cmnDataFunctionsEnumMacros.h>
@@ -64,4 +55,3 @@ class prmVelocityJointSet;
 class prmEventButton;
 
 #endif // _prmForwardDeclarations_h
-
diff --git a/cisstParameterTypes/prmJointType.cdg b/cisstParameterTypes/prmJointType.cdg
diff --git a/cisstParameterTypes/tests/CMakeLists.txt b/cisstParameterTypes/tests/CMakeLists.txt
@@ -22,7 +22,6 @@ set (SOURCE_FILES
      prmVelocityCartesianGetTest.cpp
      prmVelocityJointGetTest.cpp
      prmForceCartesianGetTest.cpp
-     prmTransformationManagerTests.cpp
      prmOperatingStateTest.cpp
      )
 
@@ -36,7 +35,6 @@ set (HEADER_FILES
      prmVelocityCartesianGetTest.h
      prmVelocityJointGetTest.h
      prmForceCartesianGetTest.h
-     prmTransformationManagerTests.h
      prmOperatingStateTest.h
      )
 

diff --git a/cisstParameterTypes/tests/prmTransformationManagerTests.cpp b/cisstParameterTypes/tests/prmTransformationManagerTests.cpp
diff --git a/cisstParameterTypes/tests/prmTransformationManagerTests.h b/cisstParameterTypes/tests/prmTransformationManagerTests.h
diff --git a/cisstRobot/tests/robDHTest.cpp b/cisstRobot/tests/robDHTest.cpp
@@ -180,7 +180,7 @@ void robDHTest::TestReadWAM7(){
 
     // Check
     CPPUNIT_ASSERT( dh->GetConvention() == robKinematics::STANDARD_DH  );
-    CPPUNIT_ASSERT( dh->GetType()       == robJoint::HINGE  );
+    CPPUNIT_ASSERT( dh->GetType()       == cmnJointType::CMN_JOINT_REVOLUTE  );
     CPPUNIT_ASSERT( dh->GetMode()       == robJoint::ACTIVE );
 
     delete dh;
@@ -236,7 +236,7 @@ void robDHTest::TestReadPUMA560(){
 
     // Check
     CPPUNIT_ASSERT( dh->GetConvention() == robKinematics::STANDARD_DH  );
-    CPPUNIT_ASSERT( dh->GetType()       == robJoint::HINGE  );
+    CPPUNIT_ASSERT( dh->GetType()       == cmnJointType::CMN_JOINT_REVOLUTE  );
     CPPUNIT_ASSERT( dh->GetMode()       == robJoint::ACTIVE );
 
     delete dh;

diff --git a/cisstVector/examples/tutorial/ExampleDynamic.h b/cisstVector/examples/tutorial/ExampleDynamic.h
@@ -76,7 +76,7 @@ void ExampleDynamic(void) {
 
     }  // end of try block
     // catch block
-    catch (std::exception Exception) {
+    catch (std::exception & Exception) {
 	std::cerr << "Exception occured: " << Exception.what() << std::endl;
     }
 }