X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=tools%2Fif2.cpp;h=b264046360d4437c333d0e5750da553fcc0d1efe;hp=c49b5a4e482ddd555c8483fe54ef8b256977c609;hb=fb17e4a8130583e4d7a911fdaa70782561cd6a3e;hpb=c551b53b39a7571cf52831f5e117be1cca95c420

diff --git a/tools/if2.cpp b/tools/if2.cpp
index c49b5a4..b264046 100644
--- a/tools/if2.cpp
+++ b/tools/if2.cpp
@@ -7,9 +7,7 @@
 **   Date Started:  May 2000
 **
 **  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
-**
-**  $Id: if2.cpp,v 1.4 2000/12/22 04:18:00 kevin Exp $
+**  Copyright (C) 1983-2009 Kevin Rosenberg
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -36,7 +34,7 @@ static struct option my_options[] =
   {"add", 0, 0, O_ADD},
   {"sub", 0, 0, O_SUB},
   {"multiply", 0, 0, O_MUL},
-  {"divide", 0, 0, O_DIVIDE},
+  {"divide", 0, 0, O_DIVIDE},
   {"comp", 0, 0, O_COMP},
   {"column-plot", 1, 0, O_COLUMN_PLOT},
   {"row-plot", 1, 0, O_ROW_PLOT},
@@ -46,9 +44,9 @@ static struct option my_options[] =
   {0, 0, 0, 0}
 };
 
-static const char* g_szIdStr = "$Id: if2.cpp,v 1.4 2000/12/22 04:18:00 kevin Exp $";
+static const char* g_szIdStr = "$Id$";
 
-void 
+void
 if2_usage (const char *program)
 {
   std::cout << "usage: " << fileBasename(program) << " infile1 infile2 outfile [OPTIONS]\n";
@@ -68,7 +66,7 @@ if2_usage (const char *program)
   std::cout << "     --help             Print this help message\n";
 }
 
-int 
+int
 if2_main (int argc, char *const argv[])
 {
   ImageFile* pim_in1;
@@ -80,7 +78,7 @@ if2_main (int argc, char *const argv[])
   int opt_verbose = 0;
   int opt_add = 0;
   int opt_sub = 0;
-  int opt_mul = 0;
+  int opt_mul = 0;
   bool opt_divide = false;
   int opt_comp = 0;
   bool opt_bImageOutputFile = false;
@@ -88,14 +86,15 @@ if2_main (int argc, char *const argv[])
   int opt_rowPlot = -1;
   int opt_columnPlot = -1;
   Timer timerProgram;
+  UNUSED(opt_verbose);
   
   while (1) {
     char* endptr;
     int c = getopt_long (argc, argv, "", my_options, NULL);
-    
+
     if (c == -1)
       break;
-    
+
     switch (c) {
     case O_ADD:
       opt_add = 1;
@@ -105,14 +104,14 @@ if2_main (int argc, char *const argv[])
       opt_sub = 1;
       opt_bImageOutputFile = true;
       break;
-    case O_MUL:
-      opt_mul = 1;
-      opt_bImageOutputFile = true;
-      break;
-    case O_DIVIDE:
-      opt_divide = true;
-      opt_bImageOutputFile = true;
-      break;
+    case O_MUL:
+      opt_mul = 1;
+      opt_bImageOutputFile = true;
+      break;
+    case O_DIVIDE:
+      opt_divide = true;
+      opt_bImageOutputFile = true;
+      break;
     case O_ROW_PLOT:
       opt_rowPlot = strtol(optarg, &endptr, 10);
       if (endptr != optarg + strlen(optarg)) {
@@ -149,7 +148,7 @@ if2_main (int argc, char *const argv[])
       return (1);
     }
   }
-  
+
   if ((opt_bImageOutputFile || opt_bPlotOutputFile) && (optind + 3 != argc)) {
     if2_usage(argv[0]);
     return (1);
@@ -158,22 +157,22 @@ if2_main (int argc, char *const argv[])
     if2_usage(argv[0]);
     return (1);
   }
-  
+
   in_file1 = argv[optind];
   in_file2 = argv[optind + 1];
   if (opt_bImageOutputFile || opt_bPlotOutputFile)
     strOutFile = argv[optind + 2];
-  
+
   pim_in1 = new ImageFile ();
   pim_in2 = new ImageFile ();
   ImageFile& im_in1 = *pim_in1;
   ImageFile& im_in2 = *pim_in2;
-  
+
   if (! im_in1.fileRead(in_file1) || ! im_in2.fileRead(in_file2)) {
     sys_error (ERR_WARNING, "Error reading an image");
     return (1);
   }
-  
+
   if (im_in1.nx() != im_in2.nx() || im_in1.ny() != im_in2.ny()) {
     sys_error (ERR_SEVERE, "Error: Size of image 1 (%d,%d) and image 2 (%d,%d) do not match",
       im_in1.nx(), im_in1.ny(), im_in2.nx(), im_in2.ny());
@@ -183,45 +182,47 @@ if2_main (int argc, char *const argv[])
     sys_error (ERR_SEVERE, "Error: Size of image < 0");
     return(1);
   }
-  
-  ImageFileArray v1 = im_in1.getArray();
-  ImageFileArray v2 = im_in2.getArray();
-  ImageFileArray vout = NULL;
-  
+
   if (opt_bImageOutputFile && opt_bPlotOutputFile) {
     sys_error (ERR_SEVERE, "Both Image and Plot output files can not be selected simultaneously");
     return (1);
   }
+
+  ImageFileArray v1 = im_in1.getArray();
+  ImageFileArray v2 = im_in2.getArray();
+  ImageFileArray vout = NULL;
   if (opt_bImageOutputFile) {
     pim_out = new ImageFile (im_in1.nx(), im_in1.ny());
     vout = pim_out->getArray();
   }
+  UNUSED(vout);
   
   std::string strOperation;
   int nx = im_in1.nx();
   int ny = im_in1.ny();
   int nx2 = im_in2.nx();
   int ny2 = im_in2.ny();
-  
+
   if (opt_add) {
     strOperation = "Add Images";
-    im_in1.addImages (im_in2, *pim_out);
+    im_in1.addImages (im_in2, *pim_out);
   } else if (opt_sub) {
-    strOperation = "Subtract Images";
-    im_in1.subtractImages (im_in2, *pim_out);
-  } else if (opt_mul) {
-    strOperation = "Multiply Images";
-    im_in1.multiplyImages (im_in2, *pim_out);
-  } else if (opt_divide) {
-    strOperation = "Divide Images";
-    im_in1.divideImages (im_in2, *pim_out);
-  }
+    strOperation = "Subtract Images";
+    im_in1.subtractImages (im_in2, *pim_out);
+  } else if (opt_mul) {
+    strOperation = "Multiply Images";
+    im_in1.multiplyImages (im_in2, *pim_out);
+  } else if (opt_divide) {
+    strOperation = "Divide Images";
+    im_in1.divideImages (im_in2, *pim_out);
+  }
   if (opt_comp) {
     double d, r, e;
     im_in1.comparativeStatistics (im_in2, d, r, e);
-    std::cout << "d=" << d << ", r=" << r << ", e=" << e << std::endl;
+    std::cout << std::setprecision(7) <<
+      "d=" << d << ", r=" << r << ", e=" << e << std::endl;
   }
-  
+
   int i;
   if (opt_columnPlot > 0) {
     if (opt_columnPlot >= nx || opt_columnPlot >= nx2) {
@@ -231,103 +232,85 @@ if2_main (int argc, char *const argv[])
     double* plot_xaxis = new double [nx];
     for (i = 0; i < nx; i++)
       plot_xaxis[i] = i;
-    
-    PlotFile plotFile (3, nx);
-    
-    plotFile.addColumn (0, plot_xaxis);
-    plotFile.addColumn (1, v1[opt_columnPlot]);
-    plotFile.addColumn (2, v2[opt_columnPlot]);
-    plotFile.setTitle ("Column Plot");
-    plotFile.setXLabel ("Column");
-    plotFile.setYLabel ("Pixel Value");
-    
-    plotFile.fileWrite (strOutFile.c_str());
-    
-#if HAVE_SGP
-    SGPDriver driver ("Column Plot");
-    SGP sgp (driver);
-    EZPlot ezplot (sgp);
-    ezplot.ezset ("clear.");
-    ezplot.ezset ("xticks major 5.");
-    ezplot.ezset ("xlabel Column");
-    ezplot.ezset ("title Column Plot");
-    ezplot.ezset ("ylabel Pixel");
-    ezplot.ezset ("box.");
-    ezplot.ezset ("grid.");
-    ezplot.addCurve (plot_xaxis, v1[opt_columnPlot], im_in1.ny());
-    ezplot.addCurve (plot_xaxis, v2[opt_columnPlot], im_in2.ny());
-    ezplot.plot();
-    std::cout << "Press enter to continue" << flush;
-    cio_kb_getc();
-#endif
+
+    PlotFile plotFile (3, nx);
+
+    plotFile.addColumn (0, plot_xaxis);
+    plotFile.addColumn (1, v1[opt_columnPlot]);
+    plotFile.addColumn (2, v2[opt_columnPlot]);
+    std::ostringstream os;
+    os << "Column " << opt_columnPlot << " Comparison";
+    plotFile.addDescription (os.str().c_str());
+    std::string title("title ");
+    title += os.str();
+    plotFile.addEzsetCommand (title.c_str());
+    plotFile.addEzsetCommand ("xlabel Column");
+    plotFile.addEzsetCommand ("ylabel Pixel Value");
+    plotFile.addEzsetCommand ("box");
+    plotFile.addEzsetCommand ("grid");
+    plotFile.addEzsetCommand ("xticks major 5");
+
+    plotFile.fileWrite (strOutFile.c_str());
+
     delete plot_xaxis;
   }
-  
+
   if (opt_rowPlot > 0) {
     if (opt_rowPlot >= ny || opt_rowPlot >= ny2) {
       sys_error (ERR_SEVERE, "row_plot > ny");
       return (1);
     }
     double* plot_xaxis = new double [ny];
-    double* v1Row = new double [ny];
+    double* v1Row = new double [ny];
     double* v2Row = new double [ny2];
-    
+
     for (i = 0; i < ny; i++)
       plot_xaxis[i] = i;
     for (i = 0; i < ny; i++)
       v1Row[i] = v1[i][opt_rowPlot];
     for (i = 0; i < ny2; i++)
       v2Row[i] = v2[i][opt_rowPlot];
-    
+
     PlotFile plotFile (3, ny);
-    
+
     plotFile.addColumn (0, plot_xaxis);
     plotFile.addColumn (1, v1Row);
     plotFile.addColumn (2, v2Row);
-    plotFile.setTitle ("Row Plot");
-    plotFile.setXLabel ("Row");
-    plotFile.setYLabel ("Pixel Value");
-    
+    std::ostringstream os;
+    os << "Row " << opt_rowPlot << " Comparison";
+    plotFile.addDescription (os.str().c_str());
+    std::string title("title ");
+    title += os.str();
+    plotFile.addEzsetCommand (title.c_str());
+    plotFile.addEzsetCommand ("xlabel Row");
+    plotFile.addEzsetCommand ("ylabel Pixel Value");
+    plotFile.addEzsetCommand ("box");
+    plotFile.addEzsetCommand ("grid");
+    plotFile.addEzsetCommand ("xticks major 5");
+
     plotFile.fileWrite (strOutFile.c_str());
-    
-#if HAVE_SGP
-    SGPDriver driver ("Row Plot");
-    SGP sgp (driver);
-    EZPlot ezplot (sgp);
-    ezplot.ezset ("clear.");
-    ezplot.ezset ("xticks major 5.");
-    ezplot.ezset ("title Row Plot");
-    ezplot.ezset ("xlabel Row");
-    ezplot.ezset ("ylabel Pixel");
-    ezplot.ezset ("box.");
-    ezplot.ezset ("grid.");
-    ezplot.addCurve (plot_xaxis, v1Row, im_in1.nx());
-    ezplot.addCurve (plot_xaxis, v2Row, im_in2.nx());
-    ezplot.plot();
-    std::cout << "Press enter to continue" << flush;
-    cio_kb_getc();
-#endif
-    delete plot_xaxis;
-    delete v1Row;
-    delete v2Row;
+
+    delete plot_xaxis;
+    delete v1Row;
+    delete v2Row;
   }
-  
+
   if (opt_bImageOutputFile) {
     pim_out->labelsCopy (im_in1, "if2 file 1: ");
     pim_out->labelsCopy (im_in2, "if2 file 2: ");
     pim_out->labelAdd (Array2dFileLabel::L_HISTORY, strOperation.c_str(), timerProgram.timerEnd());
     pim_out->fileWrite (strOutFile);
   }
-  
+
   return (0);
 }
 
 #ifndef NO_MAIN
-int 
+int
 main (int argc, char *const argv[])
 {
   int retval = 1;
-  
+
   try {
     retval = if2_main(argc, argv);
   } catch (exception e) {
@@ -335,7 +318,7 @@ main (int argc, char *const argv[])
   } catch (...) {
     std::cerr << "Unknown exception\n";
   }
-  
+
   return (retval);
 }
 #endif