r187: *** empty log message ***

[ctsim.git] / include / ct.h

diff --git a/include/ct.h b/include/ct.h
index ead95ad7381edd02fa98a2a25b8122ca912c974a..0653809af675d855e9fe4744de7b7074216d53b9 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.21 2000/06/22 10:17:28 kevin Exp $
+**  $Id: ct.h,v 1.32 2000/09/02 05:10:39 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


@@ -29,6 +29,7 @@
 #define CT_H
 
 #ifdef _WIN32
 #define CT_H
 
 #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>


@@ -41,6 +42,9 @@
 #ifdef HAVE_CONFIG_H
   #include <config.h>
 #endif
 #ifdef HAVE_CONFIG_H
   #include <config.h>
 #endif

+#ifdef HAVE_DMALLOC
+#include <dmalloc.h>
+#endif

 #ifdef HAVE_PNG
   #include "png.h"
 #endif
 #ifdef HAVE_PNG
   #include "png.h"
 #endif


@@ -108,6 +112,14 @@ extern "C" {
 #ifdef HAVE_STDINT_H
 #include <stdint.h>             /* Standard ints on Linux */
 #endif
 #ifdef HAVE_STDINT_H
 #include <stdint.h>             /* Standard ints on Linux */
 #endif

+#ifdef HAVE_ASSERT_H
+#include <assert.h>
+#endif
+
+#ifdef HAVE_FFTW
+#include <rfftw.h>
+#include <fftw.h>
+#endif

 
 #include <fstream>
 #include <iostream>
 
 #include <fstream>
 #include <iostream>


@@ -118,6 +130,7 @@ extern "C" {
 #include <exception>
 #include <stdexcept>
 #include <memory>
 #include <exception>
 #include <stdexcept>
 #include <memory>

+#include <complex>

 
 using namespace std;
 
 
 using namespace std;
 


@@ -135,53 +148,17 @@ using namespace std;
 #endif
 
 #include "array2d.h"
 #endif
 
 #include "array2d.h"

+#include "array2dfile.h"

 #include "fnetorderstream.h"
 #include "imagefile.h"
 #include "phantom.h"
 #include "scanner.h"
 #include "backprojectors.h"
 #include "filter.h"
 #include "fnetorderstream.h"
 #include "imagefile.h"
 #include "phantom.h"
 #include "scanner.h"
 #include "backprojectors.h"
 #include "filter.h"

+#include "procsignal.h"

 #include "projections.h"
 #include "projections.h"

-
-//----------------------------------------------------------------------//
-//                             USER SYMBOLS                            //
-//----------------------------------------------------------------------//
-
-// Trace levels
-static const char O_TRACE_NONE_STR[]=     "none";
-static const char O_TRACE_TEXT_STR[]=     "text";
-static const char O_TRACE_PHM_STR[]=      "phm";
-static const char O_TRACE_RAYS_STR[]=     "rays";
-static const char O_TRACE_PLOT_STR[]=     "plot";
-static const char O_TRACE_CLIPPING_STR[]= "clipping";
-
-enum {
-  TRACE_NONE,          /* No tracing */
-  TRACE_TEXT,          /* Minimal status */
-  TRACE_PHM,           /* Show phantom */
-  TRACE_RAYS,          /* Show all rays */
-  TRACE_PLOT,          /* Plot raysums */
-  TRACE_CLIPPING       /* Plot clipping */
-};
-
-
-/*************************************************************************
- *  FUNCTION DECLARATIONS
- ************************************************************************/
-
-// dialogs.cpp 
-bool phm_add_pelem_kb (Phantom& phm);
-const Phantom& phm_select (Phantom& phm);
-int interpolation_select (void);
-int filter_select (double *filter_param);
-
-// options.cpp 
-int opt_set_trace(const char *optarg);
-
-// imagefile.cpp 
-void image_filter_response (ImageFile& im, const char* const domainName, double bw, const char* const filterName, double filt_param, const int opt_trace);
-int image_display (const ImageFile& im);
-int image_display_scale (const ImageFile& im, const int scale, const double pmin, const double pmax);
+#include "reconstruct.h"
+#include "trace.h"

 
 
 #endif
 
 
 #endif