Commit 51ee2477 authored by Antoine Regimbeau's avatar Antoine Regimbeau

MRG: Merge branch...

MRG: Merge branch '1554-add-wrapper-qgis-to-generate-qgis-descriptors-for-processing-plugin' into develop
parents f3ce2c68 4adaa9d1
......@@ -59,9 +59,7 @@ private:
{
SetName( "BandMathX" );
SetDescription(
"This application performs mathematical operations on several multiband images.\n"
);
SetDescription("This application performs mathematical operations on several multiband images.");
SetDocName( "Band Math X" );
......
......@@ -275,8 +275,8 @@ private:
SetDefaultParameterFloat("acqui.view.azim",0.0);
//Gain & bias
AddParameter(ParameterType_InputFilename, "acqui.gainbias", "Gains | biases");
SetParameterDescription("acqui.gainbias", "Gains | biases");
AddParameter(ParameterType_InputFilename, "acqui.gainbias", "Gains or biases");
SetParameterDescription("acqui.gainbias", "Gains or biases");
MandatoryOff("acqui.gainbias");
//Solar illuminations
AddParameter(ParameterType_InputFilename, "acqui.solarilluminations", "Solar illuminations");
......
......@@ -90,12 +90,9 @@ private:
void DoInit() override
{
SetName("OrthoRectification");
std::ostringstream oss;
oss << "This application allows ortho-rectifying optical and radar images from supported sensors." << std::endl;
SetDescription(oss.str());
// Documentation
SetDescription("This application allows ortho-rectifying optical and radar images from supported sensors.");
SetDocName("Ortho-rectification");
oss.str("");
std::ostringstream oss;
oss<<"This application uses inverse sensor modelling combined with a choice of interpolation functions to resample a sensor geometry image into a ground geometry regular grid. ";
oss<<"The ground geometry regular grid is defined with respect to a map projection (see map parameter). The application offers several modes to estimate the output grid parameters (origin and ground sampling distance), including automatic estimation of image size, ground sampling distance, or both, from image metadata, user-defined ROI corners, or another ortho-image.";
oss<<"A digital Elevation Model along with a geoid file can be specified to account for terrain deformations.";
......
......@@ -63,13 +63,9 @@ private:
void DoInit() override
{
SetName("VectorDataReprojection");
std::ostringstream oss;
oss << "Reproject a vector data using support image projection reference"
", or a user specified map projection" << std::endl;
SetDescription(oss.str());
// Documentation
SetDescription("Reproject a vector data using support image projection reference, or a user specified map projection");
SetDocName("Vector Data reprojection");
oss.str("");
std::ostringstream oss;
oss <<" This application allows reprojecting a vector data using support image projection reference"
", or a user given map projection." << std::endl;
oss <<" If given, image keywordlist can be added to reprojected vectordata.";
......
......@@ -48,7 +48,7 @@ private:
void DoInit() override
{
SetName("SARCalibration");
SetDescription("Perform radiometric calibration of SAR images. Following sensors are supported: TerraSAR-X, Sentinel1 and Radarsat-2.Both Single Look Complex(SLC) and detected products are supported as input.\n");
SetDescription("Perform radiometric calibration of SAR images. Following sensors are supported: TerraSAR-X, Sentinel1 and Radarsat-2.Both Single Look Complex(SLC) and detected products are supported as input.");
// Documentation
SetDocName("SAR Radiometric calibration");
......
......@@ -47,7 +47,7 @@ private:
void DoInit() override
{
SetName("SARDeburst");
SetDescription("This application performs deburst of Sentinel1 IW SLC images by removing redundant lines.\n");
SetDescription("This application performs deburst of Sentinel1 IW SLC images by removing redundant lines.");
// Documentation
SetDocName("SAR Deburst");
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
# https://www.orfeo-toolbox.org/
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
project(OTBQgis)
otb_module_impl()
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
# https://www.orfeo-toolbox.org/
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
set(DOCUMENTATION "Required to generate descriptor files for QGIS processing plugin.")
otb_module(OTBQgis
DEPENDS
OTBITK
OTBApplicationEngine
TEST_DEPENDS
OTBTestKernel
DESCRIPTION
"${DOCUMENTATION}"
)
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
# https://www.orfeo-toolbox.org/
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
add_executable(otbQgisDescriptor otbQgisDescriptor.cxx)
target_link_libraries(otbQgisDescriptor ${OTBQgis_LIBRARIES})
otb_module_target(otbQgisDescriptor)
set(dfiles)
set(app_list ${OTB_APPLICATIONS_NAME_LIST})
list(REMOVE_ITEM app_list "TestApplication")
list(REMOVE_ITEM app_list "ApplicationExample")
list(REMOVE_DUPLICATES app_list)
foreach(otb_app ${app_list})
set(dfile "${OTB_BINARY_DIR}/descriptors/${otb_app}.txt")
add_custom_command(OUTPUT "${dfile}"
COMMAND "$<TARGET_FILE:otbQgisDescriptor>"
"${otb_app}" "${OTB_BINARY_DIR}/lib/otb/applications" "${OTB_BINARY_DIR}/descriptors/"
DEPENDS otbQgisDescriptor
WORKING_DIRECTORY ${OTB_BINARY_DIR}
COMMENT "./bin/otbQgisDescriptor ${otb_app} ./lib/otb/applications ./descriptors/"
VERBATIM)
list(APPEND dfiles "${dfile}")
endforeach()
add_custom_target(clean_algs_txt
COMMAND "${CMAKE_COMMAND}" "-E" "remove_directory" "${OTB_BINARY_DIR}/descriptors/"
COMMAND "${CMAKE_COMMAND}" "-E" "remove_directory" "${CMAKE_INSTALL_PREFIX}/descriptors/"
COMMAND "${CMAKE_COMMAND}" "-E" "make_directory" "${OTB_BINARY_DIR}/descriptors/"
COMMAND "${CMAKE_COMMAND}" "-E" "echo" "Generating descriptor files for QGIS"
DEPENDS otbQgisDescriptor
)
add_custom_target(generate_qgis_descriptor
COMMAND "${CMAKE_COMMAND}" "-E" "echo" "Installing: ${CMAKE_INSTALL_PREFIX}/descriptors/"
COMMAND "${CMAKE_COMMAND}" "-E" "copy_directory" "${OTB_BINARY_DIR}/descriptors" "${CMAKE_INSTALL_PREFIX}/descriptors"
DEPENDS clean_algs_txt ${dfiles}
)
#otb_module_target_label(generate_qgis_descriptor)
This diff is collapsed.
......@@ -141,6 +141,7 @@ include(install_include_dirs)
include(install_importlibs)
include(install_python_bindings)
include(install_java_bindings)
include(install_qgis_bindings)
include(install_share_dirs)
include(install_cmake_files)
include(install_qtdev_files)
......@@ -192,6 +193,11 @@ if(EXISTS "${SUPERBUILD_INSTALL_DIR}/lib/otb/java/org.otb.application.jar")
set(HAVE_JAVA TRUE)
endif()
set(HAVE_QGIS FALSE CACHE INTERNAL "QGIS wrappings")
if(IS_DIRECTORY "${SUPERBUILD_INSTALL_DIR}/descriptors")
set(HAVE_QGIS TRUE)
endif()
#only for *nix
if(UNIX)
file(WRITE ${CMAKE_BINARY_DIR}/make_symlinks "#!/bin/sh\n")
......@@ -217,6 +223,8 @@ install_python_bindings()
install_java_bindings()
install_qgis_bindings()
install_share_dirs()
install_cmake_files()
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
# https://www.orfeo-toolbox.org/
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
function(install_qgis_bindings)
if(HAVE_QGIS)
install(DIRECTORY ${SUPERBUILD_INSTALL_DIR}/descriptors
DESTINATION ${PKG_STAGE_DIR}
endif()
endfunction()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment