diff --git a/CMake/FindNumpy.cmake b/CMake/FindNumpy.cmake index 764f57497c1dfbf43dda09118bc8e538fb513047..b53aa7c18a7d8bc7e3f1a1ef39ef4c400b7ca9cb 100644 --- a/CMake/FindNumpy.cmake +++ b/CMake/FindNumpy.cmake @@ -5,7 +5,7 @@ # NUMPY_INCLUDE_DIR - where to find numpy/arrayobject.h, etc. EXEC_PROGRAM ("${PYTHON_EXECUTABLE}" - ARGS "-c 'import numpy; print numpy.get_include()'" + ARGS "${CMAKE_SOURCE_DIR}/CMake/otbTestNumpy.py" OUTPUT_VARIABLE NUMPY_INCLUDE_DIR RETURN_VALUE NUMPY_NOT_FOUND) diff --git a/CMake/otbTestNumpy.py b/CMake/otbTestNumpy.py new file mode 100644 index 0000000000000000000000000000000000000000..6b9a80111c4a895d0069dc9639c9701628c32e49 --- /dev/null +++ b/CMake/otbTestNumpy.py @@ -0,0 +1,2 @@ +import numpy +print numpy.get_include() diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputFilenameParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputFilenameParameter.h index 31641899e080989c3f1680b84eb228b81a6a705e..d2c4370b7f8a98c6305cbb606e61d3c90dd4ccea 100644 --- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputFilenameParameter.h +++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputFilenameParameter.h @@ -42,6 +42,9 @@ public: QtWidgetOutputFilenameParameter(OutputFilenameParameter*, QtWidgetModel*); virtual ~QtWidgetOutputFilenameParameter(); + inline const QLineEdit* GetInput() const; + inline QLineEdit* GetInput(); + protected slots: void SetFileName( const QString& value ); void SelectFile(); @@ -63,6 +66,23 @@ private: }; +inline +const QLineEdit* +QtWidgetOutputFilenameParameter +::GetInput() const +{ + return m_Input; +} + +inline +QLineEdit* +QtWidgetOutputFilenameParameter +::GetInput() +{ + return m_Input; +} + + } } diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputImageParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputImageParameter.h index 4d9e2b59a035c3c10a4029633f0eb0ef2e2b1f26..d0906049e1be304af383749692a695db8d015466 100644 --- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputImageParameter.h +++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputImageParameter.h @@ -42,6 +42,9 @@ public: QtWidgetOutputImageParameter(OutputImageParameter*, QtWidgetModel*); virtual ~QtWidgetOutputImageParameter(); + inline const QLineEdit* GetInput() const; + inline QLineEdit* GetInput(); + /** Get the PixelType*/ //itkGetMacro(PixelType, int); @@ -72,6 +75,22 @@ private: }; +inline +const QLineEdit* +QtWidgetOutputImageParameter +::GetInput() const +{ + return m_Input; +} + +inline +QLineEdit* +QtWidgetOutputImageParameter +::GetInput() +{ + return m_Input; +} + } } diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputVectorDataParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputVectorDataParameter.h index 140d7666e460daf7536d814d437f0f4c34edf4ba..43af269455983142d5a50b7b532f9facb827c95a 100644 --- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputVectorDataParameter.h +++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputVectorDataParameter.h @@ -42,6 +42,9 @@ public: QtWidgetOutputVectorDataParameter(OutputVectorDataParameter*, QtWidgetModel*); virtual ~QtWidgetOutputVectorDataParameter(); + inline const QLineEdit* GetInput() const; + inline QLineEdit* GetInput(); + /** Get the PixelType*/ //itkGetMacro(PixelType, int); @@ -69,6 +72,23 @@ private: }; + +inline +const QLineEdit* +QtWidgetOutputVectorDataParameter +::GetInput() const +{ + return m_Input; +} + +inline +QLineEdit* +QtWidgetOutputVectorDataParameter +::GetInput() +{ + return m_Input; +} + } }