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

diff --git a/tools/if2.cpp b/tools/if2.cpp
index db92c22..c49b5a4 100644
--- a/tools/if2.cpp
+++ b/tools/if2.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: if2.cpp,v 1.3 2000/12/19 21:37:51 kevin Exp $
+**  $Id: if2.cpp,v 1.4 2000/12/22 04:18:00 kevin Exp $
 **
 **  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
@@ -29,13 +29,14 @@
 #include "ct.h"
 #include "timer.h"
 
-enum {O_ADD, O_SUB, O_MUL, O_COMP, O_ROW_PLOT, O_COLUMN_PLOT, O_VERBOSE, O_HELP, O_VERSION};
+enum {O_ADD, O_SUB, O_MUL, O_DIVIDE, O_COMP, O_ROW_PLOT, O_COLUMN_PLOT, O_VERBOSE, O_HELP, O_VERSION};
 
 static struct option my_options[] =
 {
   {"add", 0, 0, O_ADD},
   {"sub", 0, 0, O_SUB},
-  {"mul", 0, 0, O_MUL},
+  {"multiply", 0, 0, O_MUL},
+  {"divide", 0, 0, O_DIVIDE},
   {"comp", 0, 0, O_COMP},
   {"column-plot", 1, 0, O_COLUMN_PLOT},
   {"row-plot", 1, 0, O_ROW_PLOT},
@@ -45,7 +46,7 @@ static struct option my_options[] =
   {0, 0, 0, 0}
 };
 
-static const char* g_szIdStr = "$Id: if2.cpp,v 1.3 2000/12/19 21:37:51 kevin Exp $";
+static const char* g_szIdStr = "$Id: if2.cpp,v 1.4 2000/12/22 04:18:00 kevin Exp $";
 
 void 
 if2_usage (const char *program)
@@ -79,21 +80,22 @@ 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;
   bool opt_bPlotOutputFile = false;
   int opt_rowPlot = -1;
   int opt_columnPlot = -1;
   Timer timerProgram;
-
+  
   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;
@@ -103,21 +105,25 @@ 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_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)) {
-	if2_usage(argv[0]);
+        if2_usage(argv[0]);
       }
       opt_bPlotOutputFile = true;
       break;
     case O_COLUMN_PLOT:
       opt_columnPlot = strtol(optarg, &endptr, 10);
       if (endptr != optarg + strlen(optarg)) {
-	if2_usage(argv[0]);
+        if2_usage(argv[0]);
       }
       opt_bPlotOutputFile = true;
       break;
@@ -143,7 +149,7 @@ if2_main (int argc, char *const argv[])
       return (1);
     }
   }
-
+  
   if ((opt_bImageOutputFile || opt_bPlotOutputFile) && (optind + 3 != argc)) {
     if2_usage(argv[0]);
     return (1);
@@ -157,31 +163,31 @@ if2_main (int argc, char *const argv[])
   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);
+    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());
+      im_in1.nx(), im_in1.ny(), im_in2.nx(), im_in2.ny());
     return(1);
   }
   if (im_in1.nx() < 0 || im_in1.ny() < 0) {
-      sys_error (ERR_SEVERE, "Error: Size of image < 0");
-      return(1);
+    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);
@@ -190,47 +196,32 @@ if2_main (int argc, char *const argv[])
     pim_out = new ImageFile (im_in1.nx(), im_in1.ny());
     vout = pim_out->getArray();
   }
-
+  
   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";
-    for (int ix = 0; ix < nx; ix++) {
-      ImageFileColumn in1 = v1[ix];
-      ImageFileColumn in2 = v2[ix];
-      ImageFileColumn out = vout[ix];
-      for (int iy = 0; iy < ny; iy++)
-	*out++ = *in1++ + *in2++;
-    }
+    im_in1.addImages (im_in2, *pim_out);
   } else if (opt_sub) {
-    strOperation = "Subtract Images";
-    for (int ix = 0; ix < nx; ix++) {
-      ImageFileColumn in1 = v1[ix];
-      ImageFileColumn in2 = v2[ix];
-      ImageFileColumn out = vout[ix];
-      for (int iy = 0; iy < ny; iy++)
-	  *out++ = *in1++ - *in2++;
-    }
-  } else if (opt_mul) {
-    strOperation = "Multiply Images";
-    for (int ix = 0; ix < nx; ix++) {
-      ImageFileColumn in1 = v1[ix];
-      ImageFileColumn in2 = v2[ix];
-      ImageFileColumn out = vout[ix];
-      for (int iy = 0; iy < ny; iy++)
-	*out++ = *in1++ * *in2++;
-    }
-  }
+    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;
   }
-
+  
   int i;
   if (opt_columnPlot > 0) {
     if (opt_columnPlot >= nx || opt_columnPlot >= nx2) {
@@ -240,18 +231,18 @@ 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);
@@ -271,7 +262,7 @@ if2_main (int argc, char *const argv[])
 #endif
     delete plot_xaxis;
   }
-
+  
   if (opt_rowPlot > 0) {
     if (opt_rowPlot >= ny || opt_rowPlot >= ny2) {
       sys_error (ERR_SEVERE, "row_plot > ny");
@@ -279,26 +270,26 @@ if2_main (int argc, char *const argv[])
     }
     double* plot_xaxis = new double [ny];
     double* v1Row = new double [ny];
-	double* v2Row = new double [ny2];
-
+    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");
-
+    
     plotFile.fileWrite (strOutFile.c_str());
-
+    
 #if HAVE_SGP
     SGPDriver driver ("Row Plot");
     SGP sgp (driver);
@@ -316,18 +307,18 @@ if2_main (int argc, char *const argv[])
     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);
 }
 
@@ -336,7 +327,7 @@ int
 main (int argc, char *const argv[])
 {
   int retval = 1;
-
+  
   try {
     retval = if2_main(argc, argv);
   } catch (exception e) {
@@ -344,7 +335,7 @@ main (int argc, char *const argv[])
   } catch (...) {
     std::cerr << "Unknown exception\n";
   }
-
+  
   return (retval);
 }
 #endif