From cb54cb67231be37f38a8cf02895eaa470a918403 Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Wed, 27 Aug 2014 15:01:47 +0200
Subject: [PATCH] Missed files
---
.../src/IntensityDataFunctions.pypp.cpp | 28 +++++++-------
Core/PythonAPI/src/Transform3D.pypp.cpp | 37 +++++++++++++++++++
Core/Tools/inc/IntensityDataFunctions.h | 2 +-
3 files changed, 52 insertions(+), 15 deletions(-)
diff --git a/Core/PythonAPI/src/IntensityDataFunctions.pypp.cpp b/Core/PythonAPI/src/IntensityDataFunctions.pypp.cpp
index 87a40f31ec4..19e6d771c38 100644
--- a/Core/PythonAPI/src/IntensityDataFunctions.pypp.cpp
+++ b/Core/PythonAPI/src/IntensityDataFunctions.pypp.cpp
@@ -14,22 +14,12 @@ GCC_DIAG_ON(missing-field-initializers)
namespace bp = boost::python;
-void register_IntensityDataFunctions_class(){
+void register_IntensityDataFunctions_class() {
{ //::IntensityDataFunctions
typedef bp::class_< IntensityDataFunctions > IntensityDataFunctions_exposer_t;
IntensityDataFunctions_exposer_t IntensityDataFunctions_exposer = IntensityDataFunctions_exposer_t( "IntensityDataFunctions" );
bp::scope IntensityDataFunctions_scope( IntensityDataFunctions_exposer );
- { //::IntensityDataFunctions::GetRelativeDifference
-
- typedef double ( *GetRelativeDifference_function_type )( ::OutputData< double > const &,::OutputData< double > const & );
-
- IntensityDataFunctions_exposer.def(
- "GetRelativeDifference"
- , GetRelativeDifference_function_type( &::IntensityDataFunctions::GetRelativeDifference )
- , ( bp::arg("result"), bp::arg("reference") ) );
-
- }
{ //::IntensityDataFunctions::createClippedDataSet
typedef ::OutputData< double > * ( *createClippedDataSet_function_type )( ::OutputData< double > const &,double,double,double,double );
@@ -41,7 +31,17 @@ void register_IntensityDataFunctions_class(){
, bp::return_value_policy< bp::manage_new_object >() );
}
- { //::IntensityDataFunctions::setEllipticMask
+ { //::IntensityDataFunctions::getRelativeDifference
+
+ typedef double ( *getRelativeDifference_function_type )( ::OutputData< double > const &,::OutputData< double > const & );
+
+ IntensityDataFunctions_exposer.def(
+ "getRelativeDifference"
+ , getRelativeDifference_function_type( &::IntensityDataFunctions::getRelativeDifference )
+ , ( bp::arg("result"), bp::arg("reference") ) );
+
+ }
+ { //::IntensityDataFunctions::setEllipticMask
typedef void ( *setEllipticMask_function_type )( ::OutputData< double > &,double,double,double,double );
@@ -61,10 +61,10 @@ void register_IntensityDataFunctions_class(){
, ( bp::arg("data"), bp::arg("x1"), bp::arg("y1"), bp::arg("x2"), bp::arg("y2") ) );
}
- IntensityDataFunctions_exposer.staticmethod( "GetRelativeDifference" );
IntensityDataFunctions_exposer.staticmethod( "createClippedDataSet" );
+ IntensityDataFunctions_exposer.staticmethod( "getRelativeDifference" );
IntensityDataFunctions_exposer.staticmethod( "setEllipticMask" );
- IntensityDataFunctions_exposer.staticmethod( "setRectangularMask" );
+ IntensityDataFunctions_exposer.staticmethod( "setRectangularMask" );;
}
}
diff --git a/Core/PythonAPI/src/Transform3D.pypp.cpp b/Core/PythonAPI/src/Transform3D.pypp.cpp
index bb90eca4305..5491bd55425 100644
--- a/Core/PythonAPI/src/Transform3D.pypp.cpp
+++ b/Core/PythonAPI/src/Transform3D.pypp.cpp
@@ -20,6 +20,13 @@ void register_Transform3D_class(){
typedef bp::class_< Geometry::Transform3D > Transform3D_exposer_t;
Transform3D_exposer_t Transform3D_exposer = Transform3D_exposer_t( "Transform3D", bp::init< >() );
bp::scope Transform3D_scope( Transform3D_exposer );
+ bp::enum_< Geometry::Transform3D::RotationType>("RotationType")
+ .value("EULER", Geometry::Transform3D::EULER)
+ .value("XAXIS", Geometry::Transform3D::XAXIS)
+ .value("YAXIS", Geometry::Transform3D::YAXIS)
+ .value("ZAXIS", Geometry::Transform3D::ZAXIS)
+ .export_values()
+ ;
Transform3D_exposer.def( bp::init< Geometry::Transform3D const & >(( bp::arg("other") )) );
{ //::Geometry::Transform3D::clone
@@ -50,6 +57,17 @@ void register_Transform3D_class(){
, createInverse_function_type( &::Geometry::Transform3D::createInverse )
, bp::return_value_policy< bp::manage_new_object >() );
+ }
+ { //::Geometry::Transform3D::createRotateEuler
+
+ typedef ::Geometry::Transform3D ( *createRotateEuler_function_type )( double,double,double );
+
+ Transform3D_exposer.def(
+ "createRotateEuler"
+ , createRotateEuler_function_type( &::Geometry::Transform3D::createRotateEuler )
+ , ( bp::arg("alpha"), bp::arg("beta"), bp::arg("gamma") )
+ , bp::return_value_policy< bp::return_by_value >() );
+
}
{ //::Geometry::Transform3D::createRotateX
@@ -83,6 +101,24 @@ void register_Transform3D_class(){
, ( bp::arg("phi") )
, bp::return_value_policy< bp::return_by_value >() );
+ }
+ { //::Geometry::Transform3D::getRotationType
+
+ typedef ::Geometry::Transform3D::RotationType ( ::Geometry::Transform3D::*getRotationType_function_type)( ) const;
+
+ Transform3D_exposer.def(
+ "getRotationType"
+ , getRotationType_function_type( &::Geometry::Transform3D::getRotationType ) );
+
+ }
+ { //::Geometry::Transform3D::isIdentity
+
+ typedef bool ( ::Geometry::Transform3D::*isIdentity_function_type)( ) const;
+
+ Transform3D_exposer.def(
+ "isIdentity"
+ , isIdentity_function_type( &::Geometry::Transform3D::isIdentity ) );
+
}
Transform3D_exposer.def( bp::self * bp::self );
{ //::Geometry::Transform3D::print
@@ -116,6 +152,7 @@ void register_Transform3D_class(){
}
Transform3D_exposer.staticmethod( "createIdentity" );
+ Transform3D_exposer.staticmethod( "createRotateEuler" );
Transform3D_exposer.staticmethod( "createRotateX" );
Transform3D_exposer.staticmethod( "createRotateY" );
Transform3D_exposer.staticmethod( "createRotateZ" );
diff --git a/Core/Tools/inc/IntensityDataFunctions.h b/Core/Tools/inc/IntensityDataFunctions.h
index 5bf8309f805..3aff9da9496 100644
--- a/Core/Tools/inc/IntensityDataFunctions.h
+++ b/Core/Tools/inc/IntensityDataFunctions.h
@@ -23,7 +23,7 @@
//! @ingroup tools
//! @brief Class holding collection of static methods to work with intensity data.
-class BA_CORE_API_ IntensityDataFunctions
+class BA_CORE_API_ IntensityDataFunctions
{
public:
--
GitLab