[Phission-cvs] phission/examples/cpp/MedianBlurTest/src MedianBlurTest.cpp,1.4,1.5

[Philip T. <pt...@us...>]

Update of /cvsroot/phission/phission/examples/cpp/MedianBlurTest/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22193/MedianBlurTest/src

Modified Files:
	MedianBlurTest.cpp 
Log Message:

Added support for mpatrol debugging:
    parameter arguments to permit the exclusion of user interaction; user isn't required to close the display; a timeout is supplied or a loop count limit is used to run the program for a limited amount of time and then stop
    Added mpatrol script to pass these arguments
    added main mpatrol script to call all the sub mpatrol scripts



Index: MedianBlurTest.cpp
===================================================================
RCS file: /cvsroot/phission/phission/examples/cpp/MedianBlurTest/src/MedianBlurTest.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MedianBlurTest.cpp	16 Aug 2004 00:08:13 -0000	1.4
--- MedianBlurTest.cpp	24 Aug 2004 23:16:40 -0000	1.5
***************
*** 27,30 ****
--- 27,33 ----
  
  /* ------------------------------------------------------------------------ */
+ int glbl_disable_displays = 0;
+ 
+ /* ------------------------------------------------------------------------ */
  /* ------------------------------------------------------------------------ */
  int main(int argc, char *argv[] )
***************
*** 38,42 ****
      int                 displaysOpen= 1;
      char                title[255];
!     X11Display          *display[nDisplays];
      
  #ifdef WIN32
--- 41,45 ----
      int                 displaysOpen= 1;
      char                title[255];
!     phDisplayInterface  **display   = NULL;
      
  #ifdef WIN32
***************
*** 53,56 ****
--- 56,96 ----
       * pipelines */
      phSystem            system;
+    
+     /* Remove the code below when using this code as an example.
+      * 
+      * This just checks whether "--test" has been specified with
+      * a time value argument. It's for testing all the examples
+      * without the need for human intervention. */
+     int             test = 0;
+ 
+     if (argc >= 2)
+     {
+         for (int k = 1; k < argc; k++ )
+         {
+             if (strcmp(argv[k],"--test") == 0)
+             {
+                 k++;
+                 if (k < argc)
+                 {
+                     test = atoi(argv[k]);
+                 }
+             }
+             else if (strcmp(argv[k],"--disable-display") == 0)
+             {
+                 glbl_disable_displays = 1;
+             }
+             else if (strcmp(argv[k],"--help") == 0)
+             {
+                 printf("\n\n%s\n\tUsage:\n",argv[0]);
+                 printf("\t\t\t--help\t\t\tdisplay usage\n");
+                 printf("\t\t\t--disable-display\tdisable the allocation, opening or any use of a display.\n");
+                 printf("\t\t\t--test <value>\tsleep 'value' seconds and then close test\n");
+                 printf("\n\n");
+                 goto error; /* close program, free memory */
+             }
+         }
+     }
+     
+     if (glbl_disable_displays) nDisplays = 0;
      
  
***************
*** 63,66 ****
--- 103,109 ----
      PRINT_RC(rc,NULL,"system.addCapture(capture)");
      
+     display = new (phDisplayInterface *)[nDisplays];
+     CHECK_NULLPTR(display,"new","new (phDisplayInterface *)[nDisplays];");
+     
      for (i = 0; i < nDisplays; i++ )
      {
***************
*** 132,135 ****
--- 175,186 ----
              }
          }
+         
+         /* Remove this if block when using this code as an example */
+         /* Set the loop control value to end the loop when testing */
+         if (test > 0)
+         { 
+             displaysOpen = 0;
+             sleep(test); /* test's value should be a time (in secs) value > 0*/
+         }
      }
  
***************
*** 138,147 ****
      PRINT_RC(rc,NULL,"system.shutdown()");
  
! 
!     for (i = 0; i < nDisplays; i++)
      {
          phDELETE(display[i]);
      }
    
      phDELETE(capture);
      phDELETE(median);
--- 189,200 ----
      PRINT_RC(rc,NULL,"system.shutdown()");
  
! error:
!     for (i = 0; (i < nDisplays) && (display != NULL); i++)
      {
          phDELETE(display[i]);
      }
    
+     phDELETE(display);
+ 
      phDELETE(capture);
      phDELETE(median);