r175: *** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 73bbeb890e5ccde4148a79b64d9d5be9603c44d1..a8c2be1030aa2eec7944f728e6d15bf573c27439 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2.0.0-b9 - 8/5/00
    Added RPM Spec file for RPM package creation
    Added loading of ASCII phanthom definitions from files
 2.0.0-b9 - 8/5/00
    Added RPM Spec file for RPM package creation
    Added loading of ASCII phanthom definitions from files

+   Added frequency_filter option to reconstruction

        
 2.0.0-b8 - 8/1/00
    Added line color support to SGP
        
 2.0.0-b8 - 8/1/00
    Added line color support to SGP

diff --git a/include/ct.h b/include/ct.h
index 674aba936264a7c063b6d55479109eb6464db1dd..2cc4b554f0ef39ca070cd159eacf0281870b5645 100644 (file)
--- a/include/ct.h
+++ b/include/ct.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: ct.h,v 1.29 2000/08/03 09:21:12 kevin Exp $
+**  $Id: ct.h,v 1.30 2000/08/03 09:57:33 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
 **
 **  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


@@ -28,9 +28,8 @@
 #ifndef CT_H
 #define CT_H
 
 #ifndef CT_H
 #define CT_H
 

-extern "C" {int strcasecmp(const char*, const char*);}
-

 #ifdef _WIN32
 #ifdef _WIN32

+  extern "C" {int strcasecmp(const char*, const char*);}

   typedef long off_t;
   #define HAVE_STRING_H 1
   #include <fcntl.h>
   typedef long off_t;
   #define HAVE_STRING_H 1
   #include <fcntl.h>

diff --git a/include/filter.h b/include/filter.h
index d898103367830b034858d322748f44554b6b0a56..a0c4b4b15c57a7e627a51f4b15aec63026c06bb1 100644 (file)
--- a/include/filter.h
+++ b/include/filter.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: filter.h,v 1.17 2000/07/22 16:14:49 kevin Exp $
+**  $Id: filter.h,v 1.18 2000/08/03 09:57:33 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
 **
 **  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


@@ -69,10 +69,13 @@ class SignalFilter {
     static const int DOMAIN_FREQUENCY;
     static const int DOMAIN_SPATIAL;
     
     static const int DOMAIN_FREQUENCY;
     static const int DOMAIN_SPATIAL;
     

+    static const int FREQUENCY_FILTER_INVALID;
+    static const int FREQUENCY_FILTER_DIRECT_FREQUENCY;
+    static const int FREQUENCY_FILTER_INVERSE_SPATIAL;

 
 

-    SignalFilter (const char* filterName, const char* filterMethodName,double bw, double signalIncrement, int n, double param, const char* domainName, const int zeropad = 0, const int preinterpolationFactor = 1);
+    SignalFilter (const char* filterName, const char* filterMethodName,double bw, double signalIncrement, int n, double param, const char* domainName, const char* frequencyFilterName, const int zeropad = 0, const int preinterpolationFactor = 1);

 
 

-    SignalFilter (const int filt_type, int filterMethodID, double bw, double signalIncrement, int n, double param, const int domain, const int zeropad = 0, const int preinterpolationFactor = 1);
+    SignalFilter (const int filt_type, int filterMethodID, double bw, double signalIncrement, int n, double param, const int domain, int filterFilterID, const int zeropad = 0, const int preinterpolationFactor = 1);

 
     SignalFilter (const char* filterName, const char* domainName, double bw, double param);
 
 
     SignalFilter (const char* filterName, const char* domainName, double bw, double param);
 


@@ -108,6 +111,7 @@ class SignalFilter {
     const string& nameDomain(void) const       { return m_nameDomain;}
     const int idFilter(void) const     { return m_idFilter;}
     const int idDomain(void) const     { return m_idDomain;}
     const string& nameDomain(void) const       { return m_nameDomain;}
     const int idFilter(void) const     { return m_idFilter;}
     const int idDomain(void) const     { return m_idDomain;}

+    const int idFrequencyFilter() const { return m_idFrequencyFilter;}

     const double getFilterMin(void) const {return m_filterMin;}
     const double getFilterMax(void) const {return m_filterMax;}
     const double getFilterIncrement(void) const {return m_filterInc;}
     const double getFilterMin(void) const {return m_filterMin;}
     const double getFilterMax(void) const {return m_filterMax;}
     const double getFilterIncrement(void) const {return m_filterInc;}


@@ -144,8 +148,9 @@ class SignalFilter {
   static int convertDomainNameToID (const char* const domainName);
   static const char* convertDomainIDToName (const int idDomain);
   static const char* convertDomainIDToTitle (const int idDomain);
   static int convertDomainNameToID (const char* const domainName);
   static const char* convertDomainIDToName (const int idDomain);
   static const char* convertDomainIDToTitle (const int idDomain);

-  
-  
+  static int convertFrequencyFilterNameToID (const char* const ffName);
+  static const char* convertFrequencyFilterIDToName (const int idFF);
+  static const char* convertFrequencyFilterIDToTitle (const int idFF);

   
  private:
     double m_bw;
   
  private:
     double m_bw;


@@ -171,8 +176,10 @@ class SignalFilter {
     string m_nameFilter;
     string m_nameFilterMethod;
     string m_nameDomain;
     string m_nameFilter;
     string m_nameFilterMethod;
     string m_nameDomain;

+    string m_nameFrequencyFilter;

     int m_idFilter;
     int m_idFilterMethod;
     int m_idFilter;
     int m_idFilterMethod;

+    int m_idFrequencyFilter;

     int m_idDomain;
     double m_filterParam;
     int m_traceLevel;
     int m_idDomain;
     double m_filterParam;
     int m_traceLevel;


@@ -189,12 +196,15 @@ class SignalFilter {
     static const char* s_aszDomainName[];
     static const char* s_aszDomainTitle[];
     static const int s_iDomainCount;
     static const char* s_aszDomainName[];
     static const char* s_aszDomainTitle[];
     static const int s_iDomainCount;

+    static const char* s_aszFrequencyFilterName[];
+    static const char* s_aszFrequencyFilterTitle[];
+    static const int s_iFrequencyFilterCount;

 
     static int N_INTEGRAL;
 
     static const bool haveAnalyticSpatial (const int filterID);
 
 
     static int N_INTEGRAL;
 
     static const bool haveAnalyticSpatial (const int filterID);
 

-    void init (const int filt_type, const int filterMethod, double bw, double signalIncrement, int n, double param, const int domain, const int zeropad, const int preInterpScale);
+    void init (const int filt_type, const int filterMethod, double bw, double signalIncrement, int n, double param, const int domain, const int frequencyFilter, const int zeropad, const int preInterpScale);

 
     double spatialResponseCalc (double x, double param) const;
 
 
     double spatialResponseCalc (double x, double param) const;
 

diff --git a/include/projections.h b/include/projections.h
index 095095bb409df889498953ac2e855ce0710101e9..cb08fb401fea57510f3f621c4227fc64d93f837b 100644 (file)
--- a/include/projections.h
+++ b/include/projections.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: projections.h,v 1.10 2000/07/15 08:36:13 kevin Exp $
+**  $Id: projections.h,v 1.11 2000/08/03 09:57:33 kevin Exp $

 **
 **
 **  This program is free software; you can redistribute it and/or modify
 **
 **
 **  This program is free software; you can redistribute it and/or modify


@@ -53,7 +53,7 @@ class Projections
   bool detarrayRead (fnetorderstream& fs, DetectorArray& darray, const int view_num);
   bool detarrayWrite (fnetorderstream& fs, const DetectorArray& darray, const int view_num);
 
   bool detarrayRead (fnetorderstream& fs, DetectorArray& darray, const int view_num);
   bool detarrayWrite (fnetorderstream& fs, const DetectorArray& darray, const int view_num);
 

-  bool reconstruct (ImageFile& im, const char* const filterName, double filt_param, const char* const filterMethodName, const int zeropad, const char* const interpName, int interp_param, const char* const backprojName, const int trace) const;
+  bool reconstruct (ImageFile& im, const char* const filterName, double filt_param, const char* const filterMethodName, const int zeropad, const char* frequencyFilterName, const char* const interpName, int interp_param, const char* const backprojName, const int trace) const;

 
   void setNView (int nView);  // used in MPI to restrict # of views
   void setRotInc (double rotInc) { m_rotInc = rotInc;}
 
   void setNView (int nView);  // used in MPI to restrict # of views
   void setRotInc (double rotInc) { m_rotInc = rotInc;}

diff --git a/libctsim/filter.cpp b/libctsim/filter.cpp
index 84d2e7b4e080f877d9d162973d548e70131be084..d7d8b973c61a41f233d5a03a7c1dd3b894a5f8fc 100644 (file)
--- a/libctsim/filter.cpp
+++ b/libctsim/filter.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: filter.cpp,v 1.23 2000/07/31 14:48:35 kevin Exp $
+**  $Id: filter.cpp,v 1.24 2000/08/03 09:57:33 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
 **
 **  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


@@ -121,6 +121,23 @@ const char* SignalFilter::s_aszDomainTitle[] = {
 const int SignalFilter::s_iDomainCount = sizeof(s_aszDomainName) / sizeof(const char*);
 
 
 const int SignalFilter::s_iDomainCount = sizeof(s_aszDomainName) / sizeof(const char*);
 
 

+const int SignalFilter::FREQUENCY_FILTER_INVALID = -1;
+const int SignalFilter::FREQUENCY_FILTER_DIRECT_FREQUENCY = 0;
+const int SignalFilter::FREQUENCY_FILTER_INVERSE_SPATIAL = 1;
+    
+const char* SignalFilter::s_aszFrequencyFilterName[] = {
+  {"direct_frequency"},
+  {"inverse_spatial"},
+};
+
+const char* SignalFilter::s_aszFrequencyFilterTitle[] = {
+  {"Direct Frequency"},
+  {"Inverse Spatial"},
+};
+
+const int SignalFilter::s_iFrequencyFilterCount = sizeof(s_aszFrequencyFilterName) / sizeof(const char*);
+
+

 /* NAME
  *   SignalFilter::SignalFilter     Construct a signal
  *
 /* NAME
  *   SignalFilter::SignalFilter     Construct a signal
  *


@@ -135,7 +152,7 @@ const int SignalFilter::s_iDomainCount = sizeof(s_aszDomainName) / sizeof(const
  *   int domain                FREQUENCY or SPATIAL domain wanted
  */
 
  *   int domain                FREQUENCY or SPATIAL domain wanted
  */
 

-SignalFilter::SignalFilter (const char* filterName, const char* filterMethodName, double bw, double signalIncrement, int nSignalPoints, double param, const char* domainName, int zeropad = 0, int preinterpolationFactor = 1)
+SignalFilter::SignalFilter (const char* filterName, const char* filterMethodName, double bw, double signalIncrement, int nSignalPoints, double param, const char* domainName, const char* frequencyFilterName, int zeropad = 0, int preinterpolationFactor = 1)

   : m_vecFilter(NULL), m_vecFourierCosTable(NULL), m_vecFourierSinTable(NULL), m_fail(false)
 {
   m_idFilter = convertFilterNameToID (filterName);
   : m_vecFilter(NULL), m_vecFourierCosTable(NULL), m_vecFourierSinTable(NULL), m_fail(false)
 {
   m_idFilter = convertFilterNameToID (filterName);


@@ -159,13 +176,20 @@ SignalFilter::SignalFilter (const char* filterName, const char* filterMethodName
     m_failMessage += domainName;
     return;
   }
     m_failMessage += domainName;
     return;
   }

-  init (m_idFilter, m_idFilterMethod, bw, signalIncrement, nSignalPoints, param, m_idDomain, zeropad, preinterpolationFactor);
+  m_idFrequencyFilter = convertFrequencyFilterNameToID (frequencyFilterName);
+  if (m_idFrequencyFilter == FREQUENCY_FILTER_INVALID) {
+    m_fail = true;
+    m_failMessage = "Invalid frequency filter name ";
+    m_failMessage += frequencyFilterName;
+    return;
+  }
+  init (m_idFilter, m_idFilterMethod, bw, signalIncrement, nSignalPoints, param, m_idDomain, m_idFrequencyFilter, zeropad, preinterpolationFactor);

 }
 
 }
 

-SignalFilter::SignalFilter (const int filterID, const int filterMethodID, double bw, double signalIncrement, int nSignalPoints, double param, const int domainID, int zeropad = 0, int preinterpolationFactor = 1)
+SignalFilter::SignalFilter (const int filterID, const int filterMethodID, double bw, double signalIncrement, int nSignalPoints, double param, const int domainID, int frequencyFilterID, int zeropad = 0, int preinterpolationFactor = 1)

   : m_vecFilter(NULL), m_vecFourierCosTable(NULL), m_vecFourierSinTable(NULL), m_fail(false)
 {
   : m_vecFilter(NULL), m_vecFourierCosTable(NULL), m_vecFourierSinTable(NULL), m_fail(false)
 {

-  init (filterID, filterMethodID, bw, signalIncrement, nSignalPoints, param, domainID, zeropad, preinterpolationFactor);
+  init (filterID, filterMethodID, bw, signalIncrement, nSignalPoints, param, domainID, frequencyFilterID, zeropad, preinterpolationFactor);

 }
 
 SignalFilter::SignalFilter (const char* filterName, const char* domainName, double bw, double param)
 }
 
 SignalFilter::SignalFilter (const char* filterName, const char* domainName, double bw, double param)


@@ -192,13 +216,14 @@ SignalFilter::SignalFilter (const char* filterName, const char* domainName, doub
 }
 
 void
 }
 
 void

-SignalFilter::init (const int filterID, const int filterMethodID, double bw, double signalIncrement, int nSignalPoints, double filterParam, const int domainID, int zeropad, int preinterpolationFactor)
+SignalFilter::init (const int filterID, const int filterMethodID, double bw, double signalIncrement, int nSignalPoints, double filterParam, const int domainID, const int frequencyFilterID, int zeropad, int preinterpolationFactor)

 {
   m_bw = bw;
   m_idFilter = filterID;
   m_idDomain = domainID;
   m_idFilterMethod = filterMethodID;
 {
   m_bw = bw;
   m_idFilter = filterID;
   m_idDomain = domainID;
   m_idFilterMethod = filterMethodID;

-  if (m_idFilter == FILTER_INVALID || m_idDomain == DOMAIN_INVALID || m_idFilterMethod == FILTER_METHOD_INVALID) {
+  m_idFrequencyFilter = frequencyFilterID;
+  if (m_idFilter == FILTER_INVALID || m_idDomain == DOMAIN_INVALID || m_idFilterMethod == FILTER_METHOD_INVALID || m_idFrequencyFilter == FREQUENCY_FILTER_INVALID) {

     m_fail = true;
     return;
   }
     m_fail = true;
     return;
   }


@@ -206,6 +231,7 @@ SignalFilter::init (const int filterID, const int filterMethodID, double bw, dou
   m_nameFilter = convertFilterIDToName (m_idFilter);
   m_nameDomain = convertDomainIDToName (m_idDomain);
   m_nameFilterMethod = convertFilterMethodIDToName (m_idFilterMethod);
   m_nameFilter = convertFilterIDToName (m_idFilter);
   m_nameDomain = convertDomainIDToName (m_idDomain);
   m_nameFilterMethod = convertFilterMethodIDToName (m_idFilterMethod);

+  m_nameFrequencyFilter = convertFrequencyFilterIDToName (m_idFrequencyFilter);

   m_nSignalPoints = nSignalPoints;
   m_signalInc = signalIncrement;
   m_filterParam = filterParam;  
   m_nSignalPoints = nSignalPoints;
   m_signalInc = signalIncrement;
   m_filterParam = filterParam;  


@@ -466,6 +492,42 @@ SignalFilter::convertDomainIDToTitle (const int domainID)
   return (title);
 }
 
   return (title);
 }
 

+int
+SignalFilter::convertFrequencyFilterNameToID (const char* const ffName)
+{
+  int ffID = FREQUENCY_FILTER_INVALID;
+
+  for (int i = 0; i < s_iFrequencyFilterCount; i++)
+   if (strcasecmp (ffName, s_aszFrequencyFilterName[i]) == 0) {
+      ffID = i;
+      break;
+    }
+
+  return (ffID);
+}
+
+const char *
+SignalFilter::convertFrequencyFilterIDToName (const int ffID)
+{
+  static const char *name = "";
+
+  if (ffID >= 0 && ffID < s_iFrequencyFilterCount)
+      return (s_aszFrequencyFilterName [ffID]);
+
+  return (name);
+}
+
+const char *
+SignalFilter::convertFrequencyFilterIDToTitle (const int ffID)
+{
+  static const char *name = "";
+
+  if (ffID >= 0 && ffID < s_iFrequencyFilterCount)
+      return (s_aszFrequencyFilterTitle [ffID]);
+
+  return (name);
+}
+

 void
 SignalFilter::filterSignal (const float input[], double output[]) const
 {
 void
 SignalFilter::filterSignal (const float input[], double output[]) const
 {

diff --git a/libctsim/projections.cpp b/libctsim/projections.cpp
index 7d3e814967394d885dd3b494ea0c626f351157df..73e471e65f5287c8cf73b2f47ff2841f614879e0 100644 (file)
--- a/libctsim/projections.cpp
+++ b/libctsim/projections.cpp
@@ -8,7 +8,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: projections.cpp,v 1.18 2000/07/29 19:50:08 kevin Exp $
+**  $Id: projections.cpp,v 1.19 2000/08/03 09:57:33 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
 **
 **  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


@@ -486,7 +486,7 @@ Projections::printScanInfo (void) const
  */
 
 bool
  */
 
 bool

-Projections::reconstruct (ImageFile& im, const char* const filterName, double filt_param, const char* const filterMethodName, const int zeropad, const char* const interpName, int interpFactor, const char* const backprojectName, const int trace) const
+Projections::reconstruct (ImageFile& im, const char* const filterName, double filt_param, const char* const filterMethodName, const int zeropad, const char* frequencyFilterName, const char* const interpName, int interpFactor, const char* const backprojectName, const int trace) const

 {
   double detInc = m_detInc;
   int n_filteredProj = m_nDet * interpFactor;
 {
   double detInc = m_detInc;
   int n_filteredProj = m_nDet * interpFactor;


@@ -503,7 +503,7 @@ Projections::reconstruct (ImageFile& im, const char* const filterName, double fi
 #endif
 
   double filterBW = 1. / detInc;
 #endif
 
   double filterBW = 1. / detInc;

-  SignalFilter filter (filterName, filterMethodName, filterBW, m_detInc, m_nDet, filt_param, "spatial", zeropad, interpFactor);
+  SignalFilter filter (filterName, filterMethodName, filterBW, m_detInc, m_nDet, filt_param, "spatial", frequencyFilterName, zeropad, interpFactor);

   filter.setTraceLevel(trace);
 
   if (filter.fail()) {
   filter.setTraceLevel(trace);
 
   if (filter.fail()) {

diff --git a/tools/if-1.cpp b/tools/if-1.cpp
index d23cf89c92bcaeefec883d7cd35b568e568bdfb7..cd61c388a599d23133688f8462dcfb9e8f0da99a 100644 (file)
--- a/tools/if-1.cpp
+++ b/tools/if-1.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: if-1.cpp,v 1.2 2000/08/02 18:09:11 kevin Exp $
+**  $Id: if-1.cpp,v 1.3 2000/08/03 09:57:29 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
 **
 **  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


@@ -46,7 +46,7 @@ static struct option my_options[] =
   {0, 0, 0, 0}
 };
 
   {0, 0, 0, 0}
 };
 

-static const char* g_szIdStr = "$id$";
+static const char* g_szIdStr = "$Id: if-1.cpp,v 1.3 2000/08/03 09:57:29 kevin Exp $";

 
 void 
 if1_usage (const char *program)
 
 void 
 if1_usage (const char *program)


@@ -107,7 +107,7 @@ if1_main (int argc, char *const argv[])
          break;
         case O_VERSION:
 #ifdef VERSION
          break;
         case O_VERSION:
 #ifdef VERSION

-         cout << "Version " <<  VERSION << endl;
+         cout << "Version " << VERSION << endl << g_szIdStr << endl;

 #else
           cout << "Unknown version number" << endl;
 #endif
 #else
           cout << "Unknown version number" << endl;
 #endif

diff --git a/tools/if-2.cpp b/tools/if-2.cpp
index 9ab720bfebb908e9eeb20eaffcdea972400c16c9..dfea498540fc2f028aa11b05ce2ed8d00babe943 100644 (file)
--- a/tools/if-2.cpp
+++ b/tools/if-2.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: if-2.cpp,v 1.4 2000/08/02 18:09:11 kevin Exp $
+**  $Id: if-2.cpp,v 1.5 2000/08/03 09:57:29 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
 **
 **  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


@@ -45,7 +45,7 @@ static struct option my_options[] =
   {0, 0, 0, 0}
 };
 
   {0, 0, 0, 0}
 };
 

-static const char* g_szIdStr = "$id$";
+static const char* g_szIdStr = "$Id: if-2.cpp,v 1.5 2000/08/03 09:57:29 kevin Exp $";

 
 void 
 if2_usage (const char *program)
 
 void 
 if2_usage (const char *program)


@@ -126,7 +126,7 @@ if2_main (int argc, char *const argv[])
       break;
     case O_VERSION:
 #ifdef VERSION
       break;
     case O_VERSION:
 #ifdef VERSION

-      cout << "Version " << VERSION << endl;
+      cout << "Version " << VERSION << endl << g_szIdStr << endl;

 #else
       cout << "Unknown version number" << endl;
 #endif
 #else
       cout << "Unknown version number" << endl;
 #endif

diff --git a/tools/if2img.cpp b/tools/if2img.cpp
index 0dbc0f4ca0fc5de8b2bff3838e7c7d774cd9762f..8e6444c686bb0b0bc388d544de0622760a36405b 100644 (file)
--- a/tools/if2img.cpp
+++ b/tools/if2img.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: if2img.cpp,v 1.3 2000/08/02 18:09:11 kevin Exp $
+**  $Id: if2img.cpp,v 1.4 2000/08/03 09:57:29 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
 **
 **  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


@@ -48,7 +48,7 @@ static struct option my_options[] =
   {0, 0, 0, 0}
 };
 
   {0, 0, 0, 0}
 };
 

-static const char* g_szIdStr = "$id$";
+static const char* g_szIdStr = "$Id: if2img.cpp,v 1.4 2000/08/03 09:57:29 kevin Exp $";

 
 enum { O_AUTO_FULL, O_AUTO_STD0_1, O_AUTO_STD0_5, O_AUTO_STD1, O_AUTO_STD2, O_AUTO_STD3 };
 static const char O_AUTO_FULL_STR[]="full";
 
 enum { O_AUTO_FULL, O_AUTO_STD0_1, O_AUTO_STD0_5, O_AUTO_STD1, O_AUTO_STD2, O_AUTO_STD3 };
 static const char O_AUTO_FULL_STR[]="full";


@@ -240,7 +240,7 @@ if2img_main (int argc, char *const argv[])
          break;
         case O_VERSION:
 #ifdef VERSION
          break;
         case O_VERSION:
 #ifdef VERSION

-         cout << "Version " << VERSION;
+         cout << "Version " << VERSION << endl << g_szIdStr << endl;

 #else
           cout << "Unknown version number" << endl;
 #endif
 #else
           cout << "Unknown version number" << endl;
 #endif

diff --git a/tools/ifinfo.cpp b/tools/ifinfo.cpp
index 5ef4a7449ea8073d35d56cd4625fbffd4f7cad25..e553be78e260fab612ef5b539782564438c760ac 100644 (file)
--- a/tools/ifinfo.cpp
+++ b/tools/ifinfo.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: ifinfo.cpp,v 1.2 2000/08/02 18:09:11 kevin Exp $
+**  $Id: ifinfo.cpp,v 1.3 2000/08/03 09:57:29 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
 **
 **  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


@@ -46,7 +46,7 @@ static struct option my_options[] =
   {0, 0, 0, 0}
 };
 
   {0, 0, 0, 0}
 };
 

-static const char* g_szIdStr = "$id$";
+static const char* g_szIdStr = "$Id: ifinfo.cpp,v 1.3 2000/08/03 09:57:29 kevin Exp $";

 
 
 void 
 
 
 void 


@@ -106,7 +106,7 @@ ifinfo_main (int argc, char *const argv[])
          break;
         case O_VERSION:
 #ifdef VERSION
          break;
         case O_VERSION:
 #ifdef VERSION

-          cout << "Version " <<  VERSION << endl;
+         cout << "Version " << VERSION << endl << g_szIdStr << endl;

 #else
           cout << "Unknown version number" << endl;
 #endif
 #else
           cout << "Unknown version number" << endl;
 #endif

diff --git a/tools/phm2if.cpp b/tools/phm2if.cpp
index 00cc692deefe16ca3f8f935f0f3f76c6e231c1d8..b4338c966a54d5a56e4b79d9fb1f78be0ab6e76c 100644 (file)
--- a/tools/phm2if.cpp
+++ b/tools/phm2if.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: phm2if.cpp,v 1.8 2000/08/02 19:55:45 kevin Exp $
+**  $Id: phm2if.cpp,v 1.9 2000/08/03 09:57:29 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
 **
 **  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


@@ -50,7 +50,7 @@ static struct option my_options[] =
   {0, 0, 0, 0}
 };
 
   {0, 0, 0, 0}
 };
 

-static const char* g_szIdStr = "$Id: phm2if.cpp,v 1.8 2000/08/02 19:55:45 kevin Exp $";
+static const char* g_szIdStr = "$Id: phm2if.cpp,v 1.9 2000/08/03 09:57:29 kevin Exp $";

 
 void 
 phm2if_usage (const char *program)
 
 void 
 phm2if_usage (const char *program)


@@ -193,7 +193,7 @@ phm2if_main (int argc, char* argv[])
        break;
         case O_VERSION:
 #ifdef VERSION
        break;
         case O_VERSION:
 #ifdef VERSION

-         cout <<  "Version " << VERSION << endl;
+         cout << "Version " << VERSION << endl << g_szIdStr << endl;

 #else
           cerr << "Unknown version number" << endl;
 #endif
 #else
           cerr << "Unknown version number" << endl;
 #endif

diff --git a/tools/phm2pj.cpp b/tools/phm2pj.cpp
index d0636f062e014a7de077b18c244e1b68a950313c..82cad2f5ab8d92b69e97280a04336c233ed909ac 100644 (file)
--- a/tools/phm2pj.cpp
+++ b/tools/phm2pj.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: phm2pj.cpp,v 1.8 2000/08/03 09:21:12 kevin Exp $
+**  $Id: phm2pj.cpp,v 1.9 2000/08/03 09:57:29 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
 **
 **  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


@@ -47,7 +47,7 @@ static struct option phm2pj_options[] =
   {0, 0, 0, 0}
 };
 
   {0, 0, 0, 0}
 };
 

-static const char* g_szIdStr = "$id$";
+static const char* g_szIdStr = "$Id: phm2pj.cpp,v 1.9 2000/08/03 09:57:29 kevin Exp $";

 
 
 void 
 
 
 void 


@@ -163,7 +163,7 @@ phm2pj_main (int argc, char* argv[])
        break;
         case O_VERSION:
 #ifdef VERSION
        break;
         case O_VERSION:
 #ifdef VERSION

-         cout << "Version: " << VERSION << endl;
+         cout << "Version: " << VERSION << endl << g_szIdStr << endl;

 #else
           cout << "Unknown version number" << endl;
 #endif
 #else
           cout << "Unknown version number" << endl;
 #endif

diff --git a/tools/pj2if.cpp b/tools/pj2if.cpp
index daf4028645935582082f623c2e097a1b79ba9302..f65d55d12e9d6aa57e285e29ab2251bc54bec0b1 100644 (file)
--- a/tools/pj2if.cpp
+++ b/tools/pj2if.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: pj2if.cpp,v 1.2 2000/08/02 18:09:11 kevin Exp $
+**  $Id: pj2if.cpp,v 1.3 2000/08/03 09:57:29 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
 **
 **  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


@@ -46,7 +46,7 @@ static struct option my_options[] =
   {0, 0, 0, 0}
 };
 
   {0, 0, 0, 0}
 };
 

-static const char* g_szIdStr = "$id$";
+static const char* g_szIdStr = "$Id: pj2if.cpp,v 1.3 2000/08/03 09:57:29 kevin Exp $";

 
 void 
 pj2if_usage (const char *program)
 
 void 
 pj2if_usage (const char *program)


@@ -82,7 +82,7 @@ pj2if_main (const int argc, char *const argv[])
          break;
         case O_VERSION:
 #ifdef VERSION
          break;
         case O_VERSION:
 #ifdef VERSION

-          cout << "Version " << VERSION << endl;
+         cout << "Version " << VERSION << endl << g_szIdStr << endl;

 #else
           cout << "Unknown version number" << endl;
 #endif
 #else
           cout << "Unknown version number" << endl;
 #endif

diff --git a/tools/pjrec.cpp b/tools/pjrec.cpp
index 272c9225d00f5a31cb7846128b0abce5ae6e3e6f..bab43e7a36ac1c947cca57c31b4467aa3ffc7fec 100644 (file)
--- a/tools/pjrec.cpp
+++ b/tools/pjrec.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: pjrec.cpp,v 1.9 2000/08/03 09:53:41 kevin Exp $
+**  $Id: pjrec.cpp,v 1.10 2000/08/03 09:57:29 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
 **
 **  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


@@ -49,7 +49,7 @@ static struct option my_options[] =
   {0, 0, 0, 0}
 };
 
   {0, 0, 0, 0}
 };
 

-static const char* g_szIdStr = "$Id: pjrec.cpp,v 1.9 2000/08/03 09:53:41 kevin Exp $";
+static const char* g_szIdStr = "$Id: pjrec.cpp,v 1.10 2000/08/03 09:57:29 kevin Exp $";

 
 void 
 pjrec_usage (const char *program)
 
 void 
 pjrec_usage (const char *program)


@@ -214,7 +214,7 @@ pjrec_main (int argc, char * argv[])
          break;
         case O_VERSION:
 #ifdef VERSION
          break;
         case O_VERSION:
 #ifdef VERSION

-         cout <<  "Version " <<  VERSION << endl << "Id " << g_szIdStr << endl;
+         cout <<  "Version " <<  VERSION << endl << g_szIdStr << endl;

 #else
           cout << "Unknown version number" << endl;
 #endif
 #else
           cout << "Unknown version number" << endl;
 #endif