Changement de la ligne de commande pour le path du fichier DEM.

Examples/IO/DEMToImageGenerator.cxx

@@ -24,8 +24,9 @@
 #endif
 
 //  Software Guide : BeginCommandLineArgs
+//  INPUTS: {DEM_srtm}
 //  OUTPUTS: {DEMToImageGenerator.tif} , {pretty_DEMToImageGenerator.png}
-//  6.5 44.5 500 500 0.002 0.002 DEM_srtm
+//  6.5 44.5 500 500 0.002 0.002
 // 
 //  Software Guide : EndCommandLineArgs
 
@@ -36,10 +37,10 @@
 //
 //
 // The following example illustrates the use of the otb::DEMToImageGenerator class.
-// The aim of this class is to generate an image from SRTM or DTED data (precising the start extraction 
+// The aim of this class is to generate an image from the srtm data (precising the start extraction 
 // latitude and longitude point). Each pixel is a geographic point and its intensity is 
 // the altitude of the point.
-// If SRTM doesn't have altitude information for a point, the altitude value is set at -32768 (value of the SRTM norm).
+// If srtm doesn't have altitude information for a point, the altitude value is set at -32768 (value of the srtm norm).
 //
 // Let's look at the minimal code required to use this algorithm. First, the following header 
 // defining the \doxygen{otb}{DEMToImageGenerator} class must be included.
@@ -59,7 +60,7 @@ int main(int argc, char * argv[])
 {
   if(argc<10)
     {
-      std::cout << argv[0] <<" output filename , pretty output filename , Longitude Output Orign point , Latitude Output Origin point , X Output Size, Y Output size , X Spacing , Y Spacing, srtmFolder"  << std::endl;
+      std::cout << argv[0] <<" DEM folder path , output filename , pretty output filename , Longitude Output Orign point , Latitude Output Origin point , X Output Size, Y Output size , X Spacing , Y Spacing"  << std::endl;
       return EXIT_FAILURE;
     }
   //  Software Guide : BeginLatex
@@ -69,8 +70,8 @@ int main(int argc, char * argv[])
   //
   // Software Guide : EndLatex 
 
-  char * folderPath = argv[8];
-  char * outputName = argv[1];
+  char * folderPath = argv[1];
+  char * outputName = argv[2];
    // Software Guide : BeginCodeSnippet
   const unsigned int Dimension = 2;
   typedef otb::Image<double , Dimension>           ImageType;
@@ -117,7 +118,7 @@ int main(int argc, char * argv[])
   //
   // Software Guide : EndLatex 
   // Software Guide : BeginCodeSnippet
-  object->SetDEMDirectoryPath("/usr/local/stok/OTB/trunk/OTB/Examples/Data/DEM_srtm");
+  object->SetDEMDirectoryPath(folderPath);
  // Software Guide : EndCodeSnippet
 
   // Software Guide : BeginLatex
@@ -127,8 +128,8 @@ int main(int argc, char * argv[])
   // Software Guide : EndLatex 
   // Software Guide : BeginCodeSnippet
   PointType origin;
-  origin[0] = ::atof(argv[3]);
-  origin[1] = ::atof(argv[4]);
+  origin[0] = ::atof(argv[4]);
+  origin[1] = ::atof(argv[5]);
 
   object->SetOutputOrigin(origin);
   // Software Guide : EndCodeSnippet
@@ -141,8 +142,8 @@ int main(int argc, char * argv[])
   // Software Guide : EndLatex 
   // Software Guide : BeginCodeSnippet
   SizeType size;
-  size[0] = ::atoi(argv[5]);
-  size[1] = ::atoi(argv[6]);
+  size[0] = ::atoi(argv[6]);
+  size[1] = ::atoi(argv[7]);
 
   object->SetOutputSize(size);
   // Software Guide : EndCodeSnippet
@@ -155,8 +156,8 @@ int main(int argc, char * argv[])
   //  Software Guide : EndLatex 
   // Software Guide : BeginCodeSnippet
  SpacingType spacing;
- spacing[0] = ::atof(argv[7]);
- spacing[1] = ::atof(argv[8]);
+ spacing[0] = ::atof(argv[8]);
+ spacing[1] = ::atof(argv[9]);
 
   object->SetOutputSpacing(spacing);
   // Software Guide : EndCodeSnippet
@@ -220,7 +221,7 @@ int main(int argc, char * argv[])
    rescaler->SetInput( thresholder->GetOutput() );
    rescaler->SetOutputMinimum(0);
    rescaler->SetOutputMaximum(255);
-   prettyWriter->SetFileName( argv[2] );
+   prettyWriter->SetFileName( argv[3] );
 
    prettyWriter->SetInput( rescaler->GetOutput() );
    try
@@ -243,14 +244,12 @@ int main(int argc, char * argv[])
    // Software Guide : BeginLatex
    //
    // Let's now run this example using as input the Srtm datas contained in 
-   // \code{DEM\_srtm} folder. Figure \ref{fig:DEMToImageGenerator}
-   // shows the result.
+   // \code{DEM_srtm} folder.
    //
    //
    // \begin{figure} \center
    // \includegraphics[width=0.24\textwidth]{pretty_DEMToImageGenerator.eps}
-   // \itkcaption[DEM Generator Example]{DEM generated as an image
-   // from SRTM data files.}
+   // \itkcaption[ARVI Example]{DEMToImageGenerator image.}
    // \label{fig:DEMToImageGenerator}
    // \end{figure}
    //