From 6a03e0119795c077abdeff74404bf8b5151acda0 Mon Sep 17 00:00:00 2001 From: Leonardo Florez-Valencia Date: Fri, 26 Dec 2014 16:09:09 +0100 Subject: [PATCH] Some indentation --- .../Visualization/ImageInteractorStyle.cxx | 2 +- lib/cpPlugins/Interface/Object.h | 28 +++++------ lib/third_party/Pluma/Config.hpp | 50 +++++++++---------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lib/cpPlugins/Extensions/Visualization/ImageInteractorStyle.cxx b/lib/cpPlugins/Extensions/Visualization/ImageInteractorStyle.cxx index 1ff0739..d69d1e3 100644 --- a/lib/cpPlugins/Extensions/Visualization/ImageInteractorStyle.cxx +++ b/lib/cpPlugins/Extensions/Visualization/ImageInteractorStyle.cxx @@ -180,7 +180,7 @@ OnLeftButtonDown( ) // TODO: check this code // Manage double-click - static const long epsilon_time = 250; + static const long epsilon_time = 800; static long last_click_time = -( epsilon_time << 1 ); long click_time = static_cast< long >( std::clock( ) ); if( ( click_time - last_click_time ) < epsilon_time ) diff --git a/lib/cpPlugins/Interface/Object.h b/lib/cpPlugins/Interface/Object.h index a51f657..b15d1f0 100644 --- a/lib/cpPlugins/Interface/Object.h +++ b/lib/cpPlugins/Interface/Object.h @@ -7,21 +7,21 @@ #include #include - // ------------------------------------------------------------------------- -#define PLUMA_PROVIDER_HEADER_BEGIN_CPPLUGINS( TYPE )\ -class cpPlugins_Interface_EXPORT TYPE##Provider\ -: public pluma::Provider{\ -private:\ - friend class pluma::Pluma;\ - static const unsigned int PLUMA_INTERFACE_VERSION;\ - static const unsigned int PLUMA_INTERFACE_LOWEST_VERSION;\ - static const std::string PLUMA_PROVIDER_TYPE;\ - std::string plumaGetType( ) const\ -{ return( PLUMA_PROVIDER_TYPE ); }\ -public:\ - unsigned int getVersion( ) const\ -{ return( PLUMA_INTERFACE_VERSION ); } +#define PLUMA_PROVIDER_HEADER_BEGIN_CPPLUGINS( TYPE ) \ + class cpPlugins_Interface_EXPORT TYPE##Provider \ + : public pluma::Provider \ + { \ + private: \ + friend class pluma::Pluma; \ + static const unsigned int PLUMA_INTERFACE_VERSION; \ + static const unsigned int PLUMA_INTERFACE_LOWEST_VERSION; \ + static const std::string PLUMA_PROVIDER_TYPE; \ + std::string plumaGetType( ) const \ + { return( PLUMA_PROVIDER_TYPE ); } \ + public: \ + unsigned int getVersion( ) const \ + { return( PLUMA_INTERFACE_VERSION ); } // ------------------------------------------------------------------------- #define PLUMA_PROVIDER_HEADER_END_CPPLUGINS }; diff --git a/lib/third_party/Pluma/Config.hpp b/lib/third_party/Pluma/Config.hpp index 23c1635..2fa7df5 100644 --- a/lib/third_party/Pluma/Config.hpp +++ b/lib/third_party/Pluma/Config.hpp @@ -101,46 +101,46 @@ /* =================================================================== * florez-l@javeriana.edu.co: use dll macro defined from cmake instead - * =================================================================== -#if defined(PLUMA_SYS_WINDOWS) + * =================================================================== + #if defined(PLUMA_SYS_WINDOWS) - #ifndef PLUMA_STATIC + #ifndef PLUMA_STATIC - // Windows platforms - #ifdef PLUMA_EXPORTS + // Windows platforms + #ifdef PLUMA_EXPORTS - // From DLL side, we must export - #define PLUMA_API __declspec(dllexport) + // From DLL side, we must export + #define PLUMA_API __declspec(dllexport) - #else + #else - // From client application side, we must import - #define PLUMA_API __declspec(dllimport) + // From client application side, we must import + #define PLUMA_API __declspec(dllimport) - #endif + #endif - // For Visual C++ compilers, we also need to turn off this annoying C4251 warning. - // You can read lots ot different things about it, but the point is the code will - // just work fine, and so the simplest way to get rid of this warning is to disable it - #ifdef _MSC_VER + // For Visual C++ compilers, we also need to turn off this annoying C4251 warning. + // You can read lots ot different things about it, but the point is the code will + // just work fine, and so the simplest way to get rid of this warning is to disable it + #ifdef _MSC_VER - #pragma warning(disable : 4251) + #pragma warning(disable : 4251) - #endif + #endif - #else + #else - // No specific directive needed for static build - #define PLUMA_API + // No specific directive needed for static build + #define PLUMA_API - #endif + #endif -#else + #else - // Other platforms don't need to define anything - #define PLUMA_API + // Other platforms don't need to define anything + #define PLUMA_API -#endif + #endif */ #endif // PLUMA_CONFIG_HPP -- 2.45.1