Merge branch 'develop' into gdal-2.0-support

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)
 

CMake/otbTestNumpy.py

+import numpy
+print numpy.get_include()

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;
+}
+
+
 }
 }
 

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;
+}
+
 }
 }
 

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;
+}
+
 }
 }