r392: *** empty log message ***

diff --git a/libctgraphics/dlgezplot.cpp b/libctgraphics/dlgezplot.cpp
index d59f11f9452dac00086816fb2594baa323438d83..ebfab04a961e679b97f58fdbe00360e89c16b9b5 100644 (file)
--- a/libctgraphics/dlgezplot.cpp
+++ b/libctgraphics/dlgezplot.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2001 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2001 Kevin Rosenberg
 **

-**  $Id: dlgezplot.cpp,v 1.1 2001/01/13 04:47:50 kevin Exp $
+**  $Id: dlgezplot.cpp,v 1.2 2001/01/13 05:01:15 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


@@ -25,6 +25,10 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+

 #ifdef HAVE_WXWINDOWS
 
 #ifdef __GNUG__
 #ifdef HAVE_WXWINDOWS
 
 #ifdef __GNUG__

diff --git a/libctsim/Makefile.am b/libctsim/Makefile.am
index 4c392875c3af0a18ff00ab5bdedf1973cfa51eff..6666cdc021edf295e88a3c0cbfa61ef26e51bbc5 100644 (file)
--- a/libctsim/Makefile.am
+++ b/libctsim/Makefile.am
@@ -1,5 +1,5 @@
 noinst_LIBRARIES = libctsim.a 
 noinst_LIBRARIES = libctsim.a 

-libctsim_a_SOURCES = filter.cpp scanner.cpp projections.cpp phantom.cpp imagefile.cpp backprojectors.cpp array2dfile.cpp trace.cpp procsignal.cpp reconstruct.cpp fourier.cpp globalvars.cpp  dlgezplot.cpp
+libctsim_a_SOURCES = filter.cpp scanner.cpp projections.cpp phantom.cpp imagefile.cpp backprojectors.cpp array2dfile.cpp trace.cpp procsignal.cpp reconstruct.cpp fourier.cpp globalvars.cpp 

 
 
 INCLUDES=@my_includes@
 
 
 INCLUDES=@my_includes@

diff --git a/libctsim/Makefile.in b/libctsim/Makefile.in
index 4ebc7ca0fd50cc05471cc49e158be8eccd5c3cbd..07f00b990079b7ea0b8309043d1e2b6372f4f5e3 100644 (file)
--- a/libctsim/Makefile.in
+++ b/libctsim/Makefile.in
@@ -91,7 +91,7 @@ wxconfig = @wxconfig@
 wxlibs = @wxlibs@
 
 noinst_LIBRARIES = libctsim.a 
 wxlibs = @wxlibs@
 
 noinst_LIBRARIES = libctsim.a 

-libctsim_a_SOURCES = filter.cpp scanner.cpp projections.cpp phantom.cpp imagefile.cpp backprojectors.cpp array2dfile.cpp trace.cpp procsignal.cpp reconstruct.cpp fourier.cpp globalvars.cpp 
+libctsim_a_SOURCES = filter.cpp scanner.cpp projections.cpp phantom.cpp imagefile.cpp backprojectors.cpp array2dfile.cpp trace.cpp procsignal.cpp reconstruct.cpp fourier.cpp globalvars.cpp  dlgezplot.cpp

 
 INCLUDES = @my_includes@
 EXTRA_DIST = Makefile.nt
 
 INCLUDES = @my_includes@
 EXTRA_DIST = Makefile.nt


@@ -108,7 +108,7 @@ LIBS = @LIBS@
 libctsim_a_LIBADD = 
 libctsim_a_OBJECTS =  filter.o scanner.o projections.o phantom.o \
 imagefile.o backprojectors.o array2dfile.o trace.o procsignal.o \
 libctsim_a_LIBADD = 
 libctsim_a_OBJECTS =  filter.o scanner.o projections.o phantom.o \
 imagefile.o backprojectors.o array2dfile.o trace.o procsignal.o \

-reconstruct.o fourier.o globalvars.o
+reconstruct.o fourier.o globalvars.o dlgezplot.o

 AR = ar
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 AR = ar
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)


@@ -121,10 +121,10 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = gtar
 GZIP_ENV = --best
 
 TAR = gtar
 GZIP_ENV = --best

-DEP_FILES =  .deps/array2dfile.P .deps/backprojectors.P .deps/filter.P \
-.deps/fourier.P .deps/globalvars.P .deps/imagefile.P .deps/phantom.P \
-.deps/procsignal.P .deps/projections.P .deps/reconstruct.P \
-.deps/scanner.P .deps/trace.P
+DEP_FILES =  .deps/array2dfile.P .deps/backprojectors.P \
+.deps/dlgezplot.P .deps/filter.P .deps/fourier.P .deps/globalvars.P \
+.deps/imagefile.P .deps/phantom.P .deps/procsignal.P \
+.deps/projections.P .deps/reconstruct.P .deps/scanner.P .deps/trace.P

 SOURCES = $(libctsim_a_SOURCES)
 OBJECTS = $(libctsim_a_OBJECTS)
 
 SOURCES = $(libctsim_a_SOURCES)
 OBJECTS = $(libctsim_a_OBJECTS)
 

diff --git a/tools/ctsimtext.cpp b/tools/ctsimtext.cpp
index 994fea0aa422f69f1689bafa3d3c8480019bd327..a6f6966b309bbce75e3fc4ee731c6986e0f97cdc 100644 (file)
--- a/tools/ctsimtext.cpp
+++ b/tools/ctsimtext.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: ctsimtext.cpp,v 1.11 2001/01/13 04:44:47 kevin Exp $
+**  $Id: ctsimtext.cpp,v 1.12 2001/01/13 05:02:20 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 @@ extern "C" {
 // If linked to ctsimtext, but executed as another name, eg pjrec, then program will use that
 // linked name as name of function.
 
 // If linked to ctsimtext, but executed as another name, eg pjrec, then program will use that
 // linked name as name of function.
 

-static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.11 2001/01/13 04:44:47 kevin Exp $";
+static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.12 2001/01/13 05:02:20 kevin Exp $";

 static const char* const s_szProgramName = "ctsimtext";
 static const char* const s_szProgramName2 = "ctsimtext.exe";
 
 static const char* const s_szProgramName = "ctsimtext";
 static const char* const s_szProgramName2 = "ctsimtext.exe";
 


@@ -105,11 +105,8 @@ ctsimtext_main (int argc, char * argv[])
   int iReturn = 0;  
   
   if (argc > 1 && (strcmp(argv[0], fileBasename (s_szProgramName)) == 0 || strcmp(argv[0], fileBasename (s_szProgramName2)) == 0)) {
   int iReturn = 0;  
   
   if (argc > 1 && (strcmp(argv[0], fileBasename (s_szProgramName)) == 0 || strcmp(argv[0], fileBasename (s_szProgramName2)) == 0)) {

-    argv = &argv[1];
+    argv++;

     argc--;
     argc--;

-    if (argc > 1 && (strcmp(argv[0], fileBasename (s_szProgramName)) == 0 || strcmp(argv[0], fileBasename (s_szProgramName2)) == 0)) {
-      argv = &argv[2];
-      argc--;

     }
     iReturn = processCommand (argc, argv);
   } else if (argc > 1){
     }
     iReturn = processCommand (argc, argv);
   } else if (argc > 1){