Changeset 984 for trunk/thirds

Timestamp:

Mar 3, 2021, 3:41:55 PM (3 years ago)

Author:

djay

Message:

Take into account building ZOO-Project on ubuntu focal (cf. ​https://trac.osgeo.org/osgeolive/ticket/2282). Add the OTB and SAGA support to the Dockerfile to make the corresponding demos using docker WPS server. Add OGC API - Processes demo to the demos list.

File:

• trunk/thirds/otb2zcfg/otb2zcfg.cxx (modified) (5 diffs)

trunk/thirds/otb2zcfg/otb2zcfg.cxx

@@ -222 +222 @@
           if(type == ParameterType_StringList || type == ParameterType_String || type == ParameterType_Float
              || type == ParameterType_Int || type == ParameterType_Choice || type == ParameterType_ListView
-             || type == ParameterType_RAM || type == ParameterType_Empty || type == ParameterType_Directory){
+             || type == ParameterType_RAM || type == ParameterType_Directory){
             std::cout << "   <LiteralData>" << std::endl;
             std::string lt;
@@ -233 +233 @@
                || type == ParameterType_ListView)
               lt="string";
-            if(type == ParameterType_Empty)
-              lt="boolean";
             std::cout << "    dataType = " << lt << std::endl;
             if(type == ParameterType_Choice || type == ParameterType_ListView){
@@ -281 +279 @@
             }
             else{
-              if(type == ParameterType_ComplexOutputImage){
-                printOutputComplexImage(m_Application->GetParameterComplexOutputImagePixelType(paramKey));
-              }else{
+              {
                 std::cout << "   <ComplexData>" << std::endl;
-                if(type == ParameterType_InputImage || type == ParameterType_InputImageList || type == ParameterType_ComplexInputImage){
+                if(type == ParameterType_InputImage || type == ParameterType_InputImageList){
                   printImages();
                 }
@@ -338 +334 @@
         if(paramKey!="inxml" && paramKey!="outxml" &&
            ((type == ParameterType_OutputVectorData || type == ParameterType_OutputImage
-             || type == ParameterType_OutputImage || type == ParameterType_ComplexOutputImage
+             || type == ParameterType_OutputImage
              || type == ParameterType_OutputFilename) || role==1) && type != ParameterType_Group){
           hasOutput=1;
@@ -356 +352 @@
           }
 
-          if(type == ParameterType_OutputImage || type == ParameterType_ComplexOutputImage){
+          if(type == ParameterType_OutputImage){
             std::cout << "   <ComplexData>" << std::endl;
             printImages();