-
Notifications
You must be signed in to change notification settings - Fork 48
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* moved prmJointType to cmnJointType, removed prmTransformations, updated cisstRobot to use cmnJointType * Fixed circular checks that prevented use of $<TARGET_FILE:cisstDataGenerator> in cisstCommon
- Loading branch information
Showing
34 changed files
with
359 additions
and
1,916 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| // -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- | ||
| // ex: set filetype=cpp softtabstop=4 shiftwidth=4 tabstop=4 cindent expandtab: | ||
|
|
||
| inline-header { | ||
|
|
||
| #include <cisstCommon/cmnUnits.h> | ||
|
|
||
| // Always include last | ||
| #include <cisstCommon/cmnExport.h> | ||
| } | ||
|
|
||
| enum { | ||
| name cmnJointType; | ||
| attribute CISST_EXPORT; | ||
| prefix CMN_JOINT_; | ||
|
|
||
| enum-value { | ||
| name UNDEFINED; | ||
| description undefined; | ||
| } | ||
| enum-value { | ||
| name PRISMATIC; | ||
| description prismatic joint; | ||
| } | ||
| enum-value { | ||
| name REVOLUTE; | ||
| description revolute joint; | ||
| } | ||
| enum-value { | ||
| name UNIVERSAL; | ||
| description universal joint; | ||
| } | ||
| enum-value { | ||
| name BALL_SOCKET; | ||
| description ball and socket; | ||
| } | ||
| enum-value { | ||
| name INACTIVE; | ||
| description inactive; | ||
| } | ||
| } | ||
|
|
||
|
|
||
| inline-header { | ||
|
|
||
| template <template<class> class _vector_type> | ||
| void cmnJointTypeToFactor(const _vector_type<cmnJointType> & types, | ||
| const double prismaticFactor, | ||
| const double revoluteFactor, | ||
| _vector_type<double> & factors) | ||
| { | ||
| // set unitFactor; | ||
| for (size_t i = 0; i < types.size(); i++) { | ||
| switch (types.at(i)) { | ||
| case CMN_JOINT_PRISMATIC: | ||
| factors.at(i) = prismaticFactor; | ||
| break; | ||
| case CMN_JOINT_REVOLUTE: | ||
| factors.at(i) = revoluteFactor; | ||
| break; | ||
| default: | ||
| factors.at(i) = 1.0; | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| } // inline-header |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,84 +1,78 @@ | ||
| /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ | ||
| /* ex: set filetype=cpp softtabstop=4 shiftwidth=4 tabstop=4 cindent expandtab: */ | ||
|
|
||
| /* | ||
| Author(s): Anton Deguet | ||
| Created on: 2009-01-26 | ||
| (C) Copyright 2006-2024 Johns Hopkins University (JHU), All Rights Reserved. | ||
| --- begin cisst license - do not edit --- | ||
| This software is provided "as is" under an open source license, with | ||
| no warranty. The complete license can be found in license.txt and | ||
| http://www.cisst.org/cisst/license.txt. | ||
| --- end cisst license --- | ||
| */ | ||
|
|
||
|
|
||
| %module cisstParameterTypesPython | ||
|
|
||
|
|
||
| %include "std_string.i" | ||
| %include "std_vector.i" | ||
| %include "std_map.i" | ||
| %include "std_pair.i" | ||
| %include "std_streambuf.i" | ||
| %include "std_iostream.i" | ||
|
|
||
| %include "swigrun.i" | ||
|
|
||
| %import "cisstConfig.h" | ||
|
|
||
| %import "cisstCommon/cisstCommon.i" | ||
| %import "cisstVector/cisstVector.i" | ||
| %import "cisstMultiTask/cisstMultiTask.i" | ||
|
|
||
| %init %{ | ||
| import_array() // numpy initialization | ||
| %} | ||
|
|
||
| %header %{ | ||
| #include <cisstParameterTypes/prmPython.h> | ||
| %} | ||
|
|
||
| // Generate parameter documentation for IRE | ||
| %feature("autodoc", "1"); | ||
|
|
||
| #define CISST_EXPORT | ||
| #define CISST_DEPRECATED | ||
|
|
||
| // Import file with macros and typedefs | ||
| %import "cisstMultiTask/mtsMacros.h" | ||
|
|
||
| // Wrap base type | ||
| %include "cisstParameterTypes/prmMotionBase.h" | ||
|
|
||
| // Wrap all others | ||
| %include "cisstParameterTypes/prmEventButton.h" | ||
|
|
||
| %include "cisstParameterTypes/prmPositionCartesianGet.h" | ||
| %include "cisstParameterTypes/prmPositionCartesianSet.h" | ||
| %include "cisstParameterTypes/prmVelocityCartesianGet.h" | ||
| %include "cisstParameterTypes/prmVelocityCartesianSet.h" | ||
| %include "cisstParameterTypes/prmForceCartesianGet.h" | ||
| %include "cisstParameterTypes/prmForceCartesianSet.h" | ||
|
|
||
| %include "cisstParameterTypes/prmPositionJointGet.h" | ||
| %include "cisstParameterTypes/prmPositionJointSet.h" | ||
| %include "cisstParameterTypes/prmVelocityJointGet.h" | ||
| %include "cisstParameterTypes/prmVelocityJointSet.h" | ||
|
|
||
| %include "cisstParameterTypes/prmTransformationBase.h" | ||
| %include "cisstParameterTypes/prmTransformationManager.h" | ||
| %include "cisstParameterTypes/prmTransformationDynamic.h" | ||
| %include "cisstParameterTypes/prmTransformationFixed.h" | ||
|
|
||
| %include "cisstParameterTypes/prmRobotState.h" | ||
|
|
||
| %include "cisstParameterTypes/prmStateJoint.h" | ||
| %include "cisstParameterTypes/prmConfigurationJoint.h" | ||
| %include "cisstParameterTypes/prmOperatingState.h" | ||
| %include "cisstParameterTypes/prmActuatorState.h" | ||
| /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ | ||
| /* ex: set filetype=cpp softtabstop=4 shiftwidth=4 tabstop=4 cindent expandtab: */ | ||
|
|
||
| /* | ||
| Author(s): Anton Deguet | ||
| Created on: 2009-01-26 | ||
| (C) Copyright 2006-2024 Johns Hopkins University (JHU), All Rights Reserved. | ||
| --- begin cisst license - do not edit --- | ||
| This software is provided "as is" under an open source license, with | ||
| no warranty. The complete license can be found in license.txt and | ||
| http://www.cisst.org/cisst/license.txt. | ||
| --- end cisst license --- | ||
| */ | ||
|
|
||
|
|
||
| %module cisstParameterTypesPython | ||
|
|
||
|
|
||
| %include "std_string.i" | ||
| %include "std_vector.i" | ||
| %include "std_map.i" | ||
| %include "std_pair.i" | ||
| %include "std_streambuf.i" | ||
| %include "std_iostream.i" | ||
|
|
||
| %include "swigrun.i" | ||
|
|
||
| %import "cisstConfig.h" | ||
|
|
||
| %import "cisstCommon/cisstCommon.i" | ||
| %import "cisstVector/cisstVector.i" | ||
| %import "cisstMultiTask/cisstMultiTask.i" | ||
|
|
||
| %init %{ | ||
| import_array() // numpy initialization | ||
| %} | ||
|
|
||
| %header %{ | ||
| #include <cisstParameterTypes/prmPython.h> | ||
| %} | ||
|
|
||
| // Generate parameter documentation for IRE | ||
| %feature("autodoc", "1"); | ||
|
|
||
| #define CISST_EXPORT | ||
| #define CISST_DEPRECATED | ||
|
|
||
| // Import file with macros and typedefs | ||
| %import "cisstMultiTask/mtsMacros.h" | ||
|
|
||
| // Wrap base type | ||
| %include "cisstParameterTypes/prmMotionBase.h" | ||
|
|
||
| // Wrap all others | ||
| %include "cisstParameterTypes/prmEventButton.h" | ||
|
|
||
| %include "cisstParameterTypes/prmPositionCartesianGet.h" | ||
| %include "cisstParameterTypes/prmPositionCartesianSet.h" | ||
| %include "cisstParameterTypes/prmVelocityCartesianGet.h" | ||
| %include "cisstParameterTypes/prmVelocityCartesianSet.h" | ||
| %include "cisstParameterTypes/prmForceCartesianGet.h" | ||
| %include "cisstParameterTypes/prmForceCartesianSet.h" | ||
|
|
||
| %include "cisstParameterTypes/prmPositionJointGet.h" | ||
| %include "cisstParameterTypes/prmPositionJointSet.h" | ||
| %include "cisstParameterTypes/prmVelocityJointGet.h" | ||
| %include "cisstParameterTypes/prmVelocityJointSet.h" | ||
|
|
||
| %include "cisstParameterTypes/prmRobotState.h" | ||
|
|
||
| %include "cisstParameterTypes/prmStateJoint.h" | ||
| %include "cisstParameterTypes/prmConfigurationJoint.h" | ||
| %include "cisstParameterTypes/prmOperatingState.h" | ||
| %include "cisstParameterTypes/prmActuatorState.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.