From: Kevin M. Rosenberg Date: Sun, 28 Jan 2001 19:10:18 +0000 (+0000) Subject: r460: no message X-Git-Tag: debian-4.5.3-3~557 X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=9f29c8b32c972db1178d6f8551d5cd57ceb67083 r460: no message --- diff --git a/include/array2d.h b/include/array2d.h index 8c323f4..6f2f5cd 100644 --- a/include/array2d.h +++ b/include/array2d.h @@ -7,9 +7,9 @@ ** Date Started: June 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: array2d.h,v 1.8 2000/09/02 05:10:39 kevin Exp $ +** $Id: array2d.h,v 1.9 2001/01/28 19:10:18 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 diff --git a/include/array2dfile.h b/include/array2dfile.h index a63b45d..f35c592 100644 --- a/include/array2dfile.h +++ b/include/array2dfile.h @@ -7,9 +7,9 @@ ** Date Started: June 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: array2dfile.h,v 1.19 2001/01/12 16:41:56 kevin Exp $ +** $Id: array2dfile.h,v 1.20 2001/01/28 19:10:18 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 diff --git a/include/backprojectors.h b/include/backprojectors.h index 4ee4ebb..73dabe5 100644 --- a/include/backprojectors.h +++ b/include/backprojectors.h @@ -7,9 +7,9 @@ ** Date Started: June 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: backprojectors.h,v 1.18 2000/12/16 06:12:47 kevin Exp $ +** $Id: backprojectors.h,v 1.19 2001/01/28 19:10:18 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 diff --git a/include/ct.h b/include/ct.h index de8548e..c935caf 100644 --- a/include/ct.h +++ b/include/ct.h @@ -7,9 +7,9 @@ ** Date Started: Aug 1984 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: ct.h,v 1.54 2001/01/28 03:48:55 kevin Exp $ +** $Id: ct.h,v 1.55 2001/01/28 19:10:18 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 diff --git a/include/ctglobals.h b/include/ctglobals.h index 4ba0fd8..6e9d88f 100644 --- a/include/ctglobals.h +++ b/include/ctglobals.h @@ -1,15 +1,15 @@ /***************************************************************************** ** FILE IDENTIFICATION ** -** Name: ctglobals.h -** Purpose: Global variables for CTSim +** Name: ctglobals.h +** Purpose: Global variables for CTSim ** Programmer: Kevin Rosenberg ** Date Started: Jan 20001 ** ** This is part of the CTSim program -** Copyright (C) 1983-2001 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: ctglobals.h,v 1.3 2001/01/18 21:30:22 kevin Exp $ +** $Id: ctglobals.h,v 1.4 2001/01/28 19:10:18 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 diff --git a/include/ctsupport.h b/include/ctsupport.h index d843a08..d52c083 100644 --- a/include/ctsupport.h +++ b/include/ctsupport.h @@ -7,9 +7,9 @@ ** Date Started: Dec. 83 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: ctsupport.h,v 1.22 2001/01/02 16:02:12 kevin Exp $ +** $Id: ctsupport.h,v 1.23 2001/01/28 19:10:18 kevin Exp $ ** ** ** This program is free software; you can redistribute it and/or modify diff --git a/include/dlgezplot.h b/include/dlgezplot.h index 28cdbd5..959c648 100644 --- a/include/dlgezplot.h +++ b/include/dlgezplot.h @@ -7,9 +7,9 @@ ** Date Started: Jan 2001 ** ** This is part of the CTSim program -** Copyright (C) 1983-2001 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: dlgezplot.h,v 1.2 2001/01/27 21:02:20 kevin Exp $ +** $Id: dlgezplot.h,v 1.3 2001/01/28 19:10:18 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 diff --git a/include/ezplot.h b/include/ezplot.h index 6a8de84..d605f92 100644 --- a/include/ezplot.h +++ b/include/ezplot.h @@ -5,9 +5,9 @@ ** Purpose: Header file for EZplot library ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: ezplot.h,v 1.24 2001/01/02 16:02:12 kevin Exp $ +** $Id: ezplot.h,v 1.25 2001/01/28 19:10:18 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 diff --git a/include/filter.h b/include/filter.h index 7b696b2..0a610d6 100644 --- a/include/filter.h +++ b/include/filter.h @@ -7,9 +7,9 @@ ** Date Started: June 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: filter.h,v 1.23 2001/01/12 21:53:27 kevin Exp $ +** $Id: filter.h,v 1.24 2001/01/28 19:10:18 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 diff --git a/include/fnetorderstream.h b/include/fnetorderstream.h index 9528004..70b857e 100644 --- a/include/fnetorderstream.h +++ b/include/fnetorderstream.h @@ -7,9 +7,9 @@ ** Date Started: Sep 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: fnetorderstream.h,v 1.7 2001/01/02 16:02:12 kevin Exp $ +** $Id: fnetorderstream.h,v 1.8 2001/01/28 19:10:18 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 diff --git a/include/fourier.h b/include/fourier.h index 5145cae..8a78620 100644 --- a/include/fourier.h +++ b/include/fourier.h @@ -1,4 +1,4 @@ -/***************************************************************************** +y/***************************************************************************** ** FILE IDENTIFICATION ** ** Name: fourier.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2001 Kevin Rosenberg ** -** $Id: fourier.h,v 1.2 2001/01/02 16:02:12 kevin Exp $ +** $Id: fourier.h,v 1.3 2001/01/28 19:10:18 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 diff --git a/include/hashtable.h b/include/hashtable.h index ea5dc43..5c84b01 100644 --- a/include/hashtable.h +++ b/include/hashtable.h @@ -6,9 +6,9 @@ ** Date Started: Dec. 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: hashtable.h,v 1.2 2001/01/02 16:02:12 kevin Exp $ +** $Id: hashtable.h,v 1.3 2001/01/28 19:10:18 kevin Exp $ ** ** ** This program is free software; you can redistribute it and/or modify diff --git a/include/imagefile.h b/include/imagefile.h index a31b04e..1062828 100644 --- a/include/imagefile.h +++ b/include/imagefile.h @@ -7,9 +7,9 @@ ** Date Started: June 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: imagefile.h,v 1.30 2001/01/06 15:33:15 kevin Exp $ +** $Id: imagefile.h,v 1.31 2001/01/28 19:10:18 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 diff --git a/include/mpiworld.h b/include/mpiworld.h index 5f2568f..a791f17 100644 --- a/include/mpiworld.h +++ b/include/mpiworld.h @@ -7,9 +7,9 @@ ** Date Started: June 6, 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $id$ +** $Id: mpiworld.h,v 1.5 2001/01/28 19:10:18 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 diff --git a/include/msvc_compat.h b/include/msvc_compat.h index 494e362..dccc8ec 100644 --- a/include/msvc_compat.h +++ b/include/msvc_compat.h @@ -1,3 +1,30 @@ +/***************************************************************************** +** FILE IDENTIFICATION +** +** Name: msvc_compat.h +** Purpose: Microsoft Visual C compatibility header +** Author: Kevin Rosenberg +** Date Started: Dec 2000 +** +** This is part of the CTSim program +** Copyright (c) 1983-2001 Kevin Rosenberg +** +** $Id: msvc_compat.h,v 1.4 2001/01/28 19:10:18 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 +** published by the Free Software Foundation. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +******************************************************************************/ + #ifndef __MSVC_COMPAT_H #define __MSVC_COMPAT_H diff --git a/include/phantom.h b/include/phantom.h index 286f3ed..f67679c 100644 --- a/include/phantom.h +++ b/include/phantom.h @@ -7,9 +7,9 @@ ** Date Started: July 1, 1984 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: phantom.h,v 1.20 2001/01/02 16:02:12 kevin Exp $ +** $Id: phantom.h,v 1.21 2001/01/28 19:10:18 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 diff --git a/include/plotfile.h b/include/plotfile.h index 42ddf55..a11c330 100644 --- a/include/plotfile.h +++ b/include/plotfile.h @@ -7,9 +7,9 @@ ** Date Started: Dec 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: plotfile.h,v 1.7 2001/01/07 22:53:36 kevin Exp $ +** $Id: plotfile.h,v 1.8 2001/01/28 19:10:18 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 diff --git a/include/pol.h b/include/pol.h index f8f44e5..4894425 100644 --- a/include/pol.h +++ b/include/pol.h @@ -1,8 +1,13 @@ /***************************************************************************** +** Name: pol.h +** Purpose: Header file for Problem Oriented Language Class +** Programmer: Kevin Rosenberg +** Date Started: 1984 +** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: pol.h,v 1.11 2001/01/02 16:02:12 kevin Exp $ +** $Id: pol.h,v 1.12 2001/01/28 19:10:18 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 diff --git a/include/procsignal.h b/include/procsignal.h index a3b7440..798bfc9 100644 --- a/include/procsignal.h +++ b/include/procsignal.h @@ -7,9 +7,9 @@ ** Date Started: June 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: procsignal.h,v 1.12 2001/01/02 16:02:12 kevin Exp $ +** $Id: procsignal.h,v 1.13 2001/01/28 19:10:18 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 diff --git a/include/projections.h b/include/projections.h index 4c93304..a09f481 100644 --- a/include/projections.h +++ b/include/projections.h @@ -7,9 +7,9 @@ ** Date Started: July 1, 1984 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: projections.h,v 1.20 2001/01/04 21:28:41 kevin Exp $ +** $Id: projections.h,v 1.21 2001/01/28 19:10:18 kevin Exp $ ** ** ** This program is free software; you can redistribute it and/or modify diff --git a/include/reconstruct.h b/include/reconstruct.h index ad93c31..5ab448a 100644 --- a/include/reconstruct.h +++ b/include/reconstruct.h @@ -6,9 +6,9 @@ ** Date Started: Aug 84 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: reconstruct.h,v 1.3 2000/12/17 22:30:34 kevin Exp $ +** $Id: reconstruct.h,v 1.4 2001/01/28 19:10:18 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 diff --git a/include/sgp.h b/include/sgp.h index 611654e..67f1b7c 100644 --- a/include/sgp.h +++ b/include/sgp.h @@ -7,9 +7,9 @@ ** Date Started: 1984 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: sgp.h,v 1.25 2001/01/04 21:28:41 kevin Exp $ +** $Id: sgp.h,v 1.26 2001/01/28 19:10:18 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 diff --git a/include/timer.h b/include/timer.h index 2200685..e938ae9 100644 --- a/include/timer.h +++ b/include/timer.h @@ -1,3 +1,30 @@ +/***************************************************************************** +** FILE IDENTIFICATION +** +** Name: timer.h +** Purpose: Header file for Timer class +** Author: Kevin Rosenberg +** Date Started: Sep 2000 +** +** This is part of the CTSim program +** Copyright (c) 1983-2001 Kevin Rosenberg +** +** $Id: timer.h,v 1.6 2001/01/28 19:10:18 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 +** published by the Free Software Foundation. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +******************************************************************************/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/include/trace.h b/include/trace.h index 4924d7a..fd2d1d1 100644 --- a/include/trace.h +++ b/include/trace.h @@ -1,3 +1,30 @@ +/***************************************************************************** +** FILE IDENTIFICATION +** +** Name: trace.h +** Purpose: Header file for Trace class +** Author: Kevin Rosenberg +** Date Started: Oct 2000 +** +** This is part of the CTSim program +** Copyright (c) 1983-2001 Kevin Rosenberg +** +** $Id: trace.h,v 1.8 2001/01/28 19:10:18 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 +** published by the Free Software Foundation. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +******************************************************************************/ + #ifndef TRACE_H #define TRACE_H diff --git a/include/transformmatrix.h b/include/transformmatrix.h index bdae6cf..c1f3640 100644 --- a/include/transformmatrix.h +++ b/include/transformmatrix.h @@ -7,9 +7,9 @@ ** Date Started: 1984 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: transformmatrix.h,v 1.3 2000/12/15 23:48:25 kevin Exp $ +** $Id: transformmatrix.h,v 1.4 2001/01/28 19:10:18 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 diff --git a/libctgraphics/ezplot.cpp b/libctgraphics/ezplot.cpp index be1c5d2..b59d92d 100644 --- a/libctgraphics/ezplot.cpp +++ b/libctgraphics/ezplot.cpp @@ -4,9 +4,9 @@ ** EZPLOT ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: ezplot.cpp,v 1.29 2001/01/12 16:41:56 kevin Exp $ +** $Id: ezplot.cpp,v 1.30 2001/01/28 19:10:18 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 diff --git a/libctgraphics/ezset.cpp b/libctgraphics/ezset.cpp index e70620f..f041787 100644 --- a/libctgraphics/ezset.cpp +++ b/libctgraphics/ezset.cpp @@ -4,9 +4,9 @@ ** EZSET - Parameter control for EZPLOT ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: ezset.cpp,v 1.16 2001/01/02 16:02:13 kevin Exp $ +** $Id: ezset.cpp,v 1.17 2001/01/28 19:10:18 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 diff --git a/libctgraphics/ezsupport.cpp b/libctgraphics/ezsupport.cpp index a6a2cd5..0ff6d53 100644 --- a/libctgraphics/ezsupport.cpp +++ b/libctgraphics/ezsupport.cpp @@ -1,8 +1,13 @@ /***************************************************************************** +** Name: ezsupport.h +** Function: Support routines for EZPlot library +** Programmer: Kevin Rosenberg +** Date Started: 1-22-85 +** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: ezsupport.cpp,v 1.5 2000/07/28 08:28:08 kevin Exp $ +** $Id: ezsupport.cpp,v 1.6 2001/01/28 19:10:18 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 diff --git a/libctgraphics/pol.cpp b/libctgraphics/pol.cpp index 22741e3..57c2ec0 100644 --- a/libctgraphics/pol.cpp +++ b/libctgraphics/pol.cpp @@ -4,9 +4,9 @@ ** POL - Problem Oriented Language ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: pol.cpp,v 1.9 2001/01/02 16:02:13 kevin Exp $ +** $Id: pol.cpp,v 1.10 2001/01/28 19:10:18 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 diff --git a/libctgraphics/sgp.cpp b/libctgraphics/sgp.cpp index 1bd9a1c..275a955 100644 --- a/libctgraphics/sgp.cpp +++ b/libctgraphics/sgp.cpp @@ -5,9 +5,9 @@ ** Programmer: Kevin Rosenberg ** ** This is part of the CTSim program -** Copyright (C) 1983-2001 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: sgp.cpp,v 1.28 2001/01/27 21:02:20 kevin Exp $ +** $Id: sgp.cpp,v 1.29 2001/01/28 19:10:18 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 diff --git a/libctgraphics/transformmatrix.cpp b/libctgraphics/transformmatrix.cpp index ce27a3e..5146ad1 100644 --- a/libctgraphics/transformmatrix.cpp +++ b/libctgraphics/transformmatrix.cpp @@ -7,9 +7,9 @@ ** Date Started: 1-22-85 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: transformmatrix.cpp,v 1.4 2001/01/02 16:02:13 kevin Exp $ +** $Id: transformmatrix.cpp,v 1.5 2001/01/28 19:10:18 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 diff --git a/libctsim/filter.cpp b/libctsim/filter.cpp index 26c1c0e..4ac9017 100644 --- a/libctsim/filter.cpp +++ b/libctsim/filter.cpp @@ -7,9 +7,9 @@ ** Date Started: Aug 1984 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2000 Kevin Rosenberg ** -** $Id: filter.cpp,v 1.34 2001/01/12 03:49:07 kevin Exp $ +** $Id: filter.cpp,v 1.35 2001/01/28 19:10:18 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 diff --git a/libctsim/fourier.cpp b/libctsim/fourier.cpp index eb2c58d..06145a3 100644 --- a/libctsim/fourier.cpp +++ b/libctsim/fourier.cpp @@ -7,9 +7,9 @@ ** Date Started: Dec 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2001 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: fourier.cpp,v 1.3 2001/01/13 10:14:06 kevin Exp $ +** $Id: fourier.cpp,v 1.4 2001/01/28 19:10:18 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 diff --git a/libctsim/globalvars.cpp b/libctsim/globalvars.cpp index e3923ed..57ea7fc 100644 --- a/libctsim/globalvars.cpp +++ b/libctsim/globalvars.cpp @@ -1,15 +1,15 @@ /***************************************************************************** ** FILE IDENTIFICATION ** -** Name: globalvars.cpp -** Purpose: Global variables +** Name: globalvars.cpp +** Purpose: Global variables ** Programmer: Kevin Rosenberg ** Date Started: Jan 2001 ** ** This is part of the CTSim program -** Copyright (C) 1983-2001 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: globalvars.cpp,v 1.1 2001/01/13 03:56:23 kevin Exp $ +** $Id: globalvars.cpp,v 1.2 2001/01/28 19:10:18 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 diff --git a/libctsim/imagefile.cpp b/libctsim/imagefile.cpp index b456432..3186cb5 100644 --- a/libctsim/imagefile.cpp +++ b/libctsim/imagefile.cpp @@ -7,9 +7,9 @@ ** Date Started: June 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: imagefile.cpp,v 1.36 2001/01/12 16:41:56 kevin Exp $ +** $Id: imagefile.cpp,v 1.37 2001/01/28 19:10:18 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 diff --git a/libctsim/phantom.cpp b/libctsim/phantom.cpp index 467c8e9..0a9f53e 100644 --- a/libctsim/phantom.cpp +++ b/libctsim/phantom.cpp @@ -7,9 +7,9 @@ ** Date Started: Aug 1984 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: phantom.cpp,v 1.26 2001/01/02 16:02:13 kevin Exp $ +** $Id: phantom.cpp,v 1.27 2001/01/28 19:10:18 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 diff --git a/libctsim/procsignal.cpp b/libctsim/procsignal.cpp index 456e01a..32af552 100644 --- a/libctsim/procsignal.cpp +++ b/libctsim/procsignal.cpp @@ -7,9 +7,9 @@ ** Date Started: Aug 1984 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: procsignal.cpp,v 1.23 2001/01/13 04:52:01 kevin Exp $ +** $Id: procsignal.cpp,v 1.24 2001/01/28 19:10:18 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 diff --git a/libctsim/projections.cpp b/libctsim/projections.cpp index f5f9c6a..f6b8cb1 100644 --- a/libctsim/projections.cpp +++ b/libctsim/projections.cpp @@ -6,9 +6,9 @@ ** Date Started: Aug 84 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: projections.cpp,v 1.45 2001/01/16 20:55:29 kevin Exp $ +** $Id: projections.cpp,v 1.46 2001/01/28 19:10:18 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 diff --git a/libctsim/reconstruct.cpp b/libctsim/reconstruct.cpp index 245a36e..4b1b4a8 100644 --- a/libctsim/reconstruct.cpp +++ b/libctsim/reconstruct.cpp @@ -6,9 +6,9 @@ ** Date Started: Aug 84 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: reconstruct.cpp,v 1.8 2001/01/27 21:02:20 kevin Exp $ +** $Id: reconstruct.cpp,v 1.9 2001/01/28 19:10:18 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 diff --git a/libctsim/scanner.cpp b/libctsim/scanner.cpp index d577ebb..30b75d2 100644 --- a/libctsim/scanner.cpp +++ b/libctsim/scanner.cpp @@ -7,9 +7,9 @@ ** Date Started: 1984 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: scanner.cpp,v 1.26 2001/01/27 21:02:20 kevin Exp $ +** $Id: scanner.cpp,v 1.27 2001/01/28 19:10:18 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 diff --git a/libctsupport/fnetorderstream.cpp b/libctsupport/fnetorderstream.cpp index 41d1ead..9f0e0f0 100644 --- a/libctsupport/fnetorderstream.cpp +++ b/libctsupport/fnetorderstream.cpp @@ -1,3 +1,23 @@ +/***************************************************************************** +** This is part of the CTSim program +** Copyright (c) 1983-2001 Kevin Rosenberg +** +** $Id: fnetorderstream.cpp,v 1.5 2001/01/28 19:10:18 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 +** published by the Free Software Foundation. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +******************************************************************************/ + #if HAVE_CONFIG_H #include "config.h" #endif diff --git a/libctsupport/hashtable.cpp b/libctsupport/hashtable.cpp index d5e1e11..df2a047 100644 --- a/libctsupport/hashtable.cpp +++ b/libctsupport/hashtable.cpp @@ -4,9 +4,9 @@ ** Hash Table Class ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: hashtable.cpp,v 1.2 2001/01/02 16:02:13 kevin Exp $ +** $Id: hashtable.cpp,v 1.3 2001/01/28 19:10:18 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 diff --git a/libctsupport/mathfuncs.cpp b/libctsupport/mathfuncs.cpp index c6dd98d..2ff4e0b 100644 --- a/libctsupport/mathfuncs.cpp +++ b/libctsupport/mathfuncs.cpp @@ -1,8 +1,8 @@ /***************************************************************************** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: mathfuncs.cpp,v 1.7 2001/01/02 16:02:13 kevin Exp $ +** $Id: mathfuncs.cpp,v 1.8 2001/01/28 19:10:18 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 diff --git a/libctsupport/msvc.cpp b/libctsupport/msvc.cpp index 3cdfabd..833c0ef 100644 --- a/libctsupport/msvc.cpp +++ b/libctsupport/msvc.cpp @@ -1,3 +1,23 @@ +/***************************************************************************** +** This is part of the CTSim program +** Copyright (c) 1983-2001 Kevin Rosenberg +** +** $Id: msvc.cpp,v 1.4 2001/01/28 19:10:18 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 +** published by the Free Software Foundation. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +******************************************************************************/ + #include "ct.h" // Work around bug in VC6 diff --git a/libctsupport/plotfile.cpp b/libctsupport/plotfile.cpp index ef492d6..81682b9 100644 --- a/libctsupport/plotfile.cpp +++ b/libctsupport/plotfile.cpp @@ -7,9 +7,9 @@ ** Date Started: Dec 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: plotfile.cpp,v 1.11 2001/01/07 22:53:36 kevin Exp $ +** $Id: plotfile.cpp,v 1.12 2001/01/28 19:10:18 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 diff --git a/libctsupport/strfuncs.cpp b/libctsupport/strfuncs.cpp index 414faea..aa03d7e 100644 --- a/libctsupport/strfuncs.cpp +++ b/libctsupport/strfuncs.cpp @@ -1,8 +1,8 @@ /***************************************************************************** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: strfuncs.cpp,v 1.3 2000/06/19 19:04:05 kevin Exp $ +** $Id: strfuncs.cpp,v 1.4 2001/01/28 19:10:18 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 diff --git a/libctsupport/syserror.cpp b/libctsupport/syserror.cpp index dfce528..a4f8eda 100644 --- a/libctsupport/syserror.cpp +++ b/libctsupport/syserror.cpp @@ -1,8 +1,8 @@ /***************************************************************************** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: syserror.cpp,v 1.18 2001/01/20 08:10:33 kevin Exp $ +** $Id: syserror.cpp,v 1.19 2001/01/28 19:10:18 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 diff --git a/libctsupport/xform.cpp b/libctsupport/xform.cpp index f50832e..1f9d546 100644 --- a/libctsupport/xform.cpp +++ b/libctsupport/xform.cpp @@ -1,8 +1,8 @@ /***************************************************************************** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: xform.cpp,v 1.5 2001/01/02 16:02:13 kevin Exp $ +** $Id: xform.cpp,v 1.6 2001/01/28 19:10:18 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 diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg index 52c7dd0..3bfb1f0 100644 --- a/msvc/ctsim/ctsim.plg +++ b/msvc/ctsim/ctsim.plg @@ -3,16 +3,74 @@
 

Build Log

+--------------------Configuration: libctsim - Win32 Debug-------------------- +

+

Command Lines

+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1470.tmp" with contents +[ +/nologo /G6 /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\zlib" /I "..\..\INCLUDE" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2\include" /D "_DEBUG" /D "HAVE_WXWIN" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "WIN32" /D "_MBCS" /D "_LIB" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /FR"Debug/" /Fp"Debug/libctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c +"D:\ctsim\libctgraphics\dlgezplot.cpp" +"D:\ctsim\libctsim\globalvars.cpp" +"D:\ctsim\libctsupport\syserror.cpp" +] +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1470.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1471.tmp" with contents +[ +/nologo /out:"Debug\libctsim.lib" +.\Debug\array2dfile.obj +.\Debug\backprojectors.obj +.\Debug\clip.obj +.\Debug\consoleio.obj +.\Debug\dlgezplot.obj +.\Debug\ezplot.obj +.\Debug\ezset.obj +.\Debug\ezsupport.obj +.\Debug\filter.obj +.\Debug\fnetorderstream.obj +.\Debug\fourier.obj +.\Debug\getopt.obj +.\Debug\getopt1.obj +.\Debug\globalvars.obj +.\Debug\hashtable.obj +.\Debug\imagefile.obj +.\Debug\mathfuncs.obj +.\Debug\phantom.obj +.\Debug\plotfile.obj +.\Debug\pol.obj +.\Debug\procsignal.obj +.\Debug\projections.obj +.\Debug\reconstruct.obj +.\Debug\scanner.obj +.\Debug\sgp.obj +.\Debug\strfuncs.obj +.\Debug\syserror.obj +.\Debug\trace.obj +.\Debug\transformmatrix.obj +.\Debug\xform.obj +] +Creating command line "link.exe -lib @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1471.tmp" +

Output Window

+Compiling... +dlgezplot.cpp +globalvars.cpp +syserror.cpp +Creating library... +

--------------------Configuration: ctsim - Win32 Debug--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP142A.tmp" with contents +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1472.tmp" with contents [ /nologo /G6 /MTd /W3 /Gm /GR /GX /Zi /Od /I "\wx2\include" /I "." /I "..\..\include" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\zlib" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /D VERSION=\"2.5.0\" /D "_DEBUG" /D "__WXMSW__" /D "HAVE_SGP" /D "HAVE_PNG" /D "HAVE_WXWINDOWS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_FFTW" /D "HAVE_RFFTW" /D "HAVE_GETOPT_H" /D "MSVC" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D CTSIMVERSION=\"3.0.0alpha5\" /FR"Debug/" /Fp"Debug/ctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c "D:\ctsim\src\ctsim.cpp" +"D:\ctsim\src\dialogs.cpp" +"D:\ctsim\src\dlgprojections.cpp" +"D:\ctsim\src\dlgreconstruct.cpp" +"D:\ctsim\src\docs.cpp" +"D:\ctsim\src\views.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP142A.tmp" -Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP142B.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1472.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1473.tmp" with contents [ comctl32.lib winmm.lib rpcrt4.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ../libctsim/Debug/libctsim.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\..\lpng108\msvc\win32\libpng\lib_dbg\libpng.lib ..\..\..\lpng108\msvc\win32\zlib\lib_dbg\zlib.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib ../../../wx2/lib/wxd.lib xpmd.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/ctsim.pdb" /debug /machine:I386 /out:"Debug/ctsim.exe" /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" /libpath:"..\..\..\wx2\lib" .\Debug\ctsim.obj @@ -28,9 +86,14 @@ comctl32.lib winmm.lib rpcrt4.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib w \wx2\lib\wxd.lib \wx2\lib\xpmd.lib ] -Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP142B.tmp" +Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1473.tmp"

Output Window

Compiling... +dialogs.cpp +dlgprojections.cpp +dlgreconstruct.cpp +docs.cpp +views.cpp ctsim.cpp Linking... diff --git a/src/ctsim.cpp b/src/ctsim.cpp index 7a8d505..fe95867 100644 --- a/src/ctsim.cpp +++ b/src/ctsim.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ctsim.cpp,v 1.53 2001/01/28 04:24:03 kevin Exp $ +** $Id: ctsim.cpp,v 1.54 2001/01/28 19:10:18 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 @@ -70,7 +70,7 @@ #endif #endif -static const char* rcsindent = "$Id: ctsim.cpp,v 1.53 2001/01/28 04:24:03 kevin Exp $"; +static const char* rcsindent = "$Id: ctsim.cpp,v 1.54 2001/01/28 19:10:18 kevin Exp $"; struct option CTSimApp::ctsimOptions[] = { @@ -186,10 +186,10 @@ CTSimApp::OnInit() #ifdef CTSIM_WINHELP if (! m_pFrame->getWinHelpController().Initialize("ctsim")) - *m_pLog << "Cannot initialize the Windows Help system\n"; + *m_pLog << "Cannot initialize the Windows Help system" << "\n"; #endif if (! m_pFrame->getHtmlHelpController().Initialize(::wxGetCwd() + "/ctsim")) - *m_pLog << "Cannot initialize the HTML Help system\n"; + *m_pLog << "Cannot initialize the HTML Help system" << "\n"; return true; } diff --git a/src/ctsim.h b/src/ctsim.h index 57ac4ad..ee2ccbd 100644 --- a/src/ctsim.h +++ b/src/ctsim.h @@ -7,9 +7,9 @@ ** Date Started: July 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: ctsim.h,v 1.32 2001/01/26 23:23:00 kevin Exp $ +** $Id: ctsim.h,v 1.33 2001/01/28 19:10:18 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 diff --git a/src/dialogs.cpp b/src/dialogs.cpp index bfa3010..d1526e7 100644 --- a/src/dialogs.cpp +++ b/src/dialogs.cpp @@ -7,9 +7,9 @@ ** Date Started: July 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: dialogs.cpp,v 1.26 2001/01/20 17:43:41 kevin Exp $ +** $Id: dialogs.cpp,v 1.27 2001/01/28 19:10:18 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 diff --git a/src/dialogs.h b/src/dialogs.h index 2eae3dc..8bdada0 100644 --- a/src/dialogs.h +++ b/src/dialogs.h @@ -7,9 +7,9 @@ ** Date Started: July 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: dialogs.h,v 1.21 2001/01/20 17:43:41 kevin Exp $ +** $Id: dialogs.h,v 1.22 2001/01/28 19:10:18 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 diff --git a/src/dlgprojections.cpp b/src/dlgprojections.cpp index c5888c2..fdeea3f 100644 --- a/src/dlgprojections.cpp +++ b/src/dlgprojections.cpp @@ -7,9 +7,9 @@ ** Date Started: August 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: dlgprojections.cpp,v 1.19 2001/01/27 21:02:20 kevin Exp $ +** $Id: dlgprojections.cpp,v 1.20 2001/01/28 19:10:18 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 diff --git a/src/dlgprojections.h b/src/dlgprojections.h index deb76de..89e7523 100644 --- a/src/dlgprojections.h +++ b/src/dlgprojections.h @@ -7,9 +7,9 @@ ** Date Started: August 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2001 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: dlgprojections.h,v 1.6 2001/01/27 21:02:20 kevin Exp $ +** $Id: dlgprojections.h,v 1.7 2001/01/28 19:10:18 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 diff --git a/src/dlgreconstruct.cpp b/src/dlgreconstruct.cpp index 6f4cff4..d0be191 100644 --- a/src/dlgreconstruct.cpp +++ b/src/dlgreconstruct.cpp @@ -7,9 +7,9 @@ ** Date Started: August 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: dlgreconstruct.cpp,v 1.14 2001/01/27 21:02:20 kevin Exp $ +** $Id: dlgreconstruct.cpp,v 1.15 2001/01/28 19:10:18 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 diff --git a/src/dlgreconstruct.h b/src/dlgreconstruct.h index 7797df3..6cf6ba3 100644 --- a/src/dlgreconstruct.h +++ b/src/dlgreconstruct.h @@ -7,9 +7,9 @@ ** Date Started: August 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: dlgreconstruct.h,v 1.7 2001/01/03 22:01:50 kevin Exp $ +** $Id: dlgreconstruct.h,v 1.8 2001/01/28 19:10:18 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 diff --git a/src/docs.cpp b/src/docs.cpp index cf20b31..daef2f4 100644 --- a/src/docs.cpp +++ b/src/docs.cpp @@ -7,9 +7,9 @@ ** Date Started: July 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: docs.cpp,v 1.15 2001/01/26 05:37:24 kevin Exp $ +** $Id: docs.cpp,v 1.16 2001/01/28 19:10:18 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 diff --git a/src/docs.h b/src/docs.h index 133a1ad..6db9568 100644 --- a/src/docs.h +++ b/src/docs.h @@ -7,9 +7,9 @@ ** Date Started: July 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: docs.h,v 1.14 2001/01/26 05:37:24 kevin Exp $ +** $Id: docs.h,v 1.15 2001/01/28 19:10:18 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 diff --git a/src/views.cpp b/src/views.cpp index 8b28fef..4b79333 100644 --- a/src/views.cpp +++ b/src/views.cpp @@ -7,9 +7,9 @@ ** Date Started: July 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: views.cpp,v 1.83 2001/01/28 04:24:03 kevin Exp $ +** $Id: views.cpp,v 1.84 2001/01/28 19:10:18 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 @@ -769,13 +769,13 @@ ImageFileView::OnPhase (wxCommandEvent& event) ImageFileCanvas* -ImageFileView::CreateCanvas (wxView *view, wxFrame *parent) +ImageFileView::CreateCanvas (wxFrame* parent) { ImageFileCanvas* pCanvas; int width, height; parent->GetClientSize(&width, &height); - pCanvas = new ImageFileCanvas (dynamic_cast(view), parent, wxPoint(0, 0), wxSize(width, height), 0); + pCanvas = new ImageFileCanvas (this, parent, wxPoint(0, 0), wxSize(width, height), 0); pCanvas->SetScrollbars(20, 20, 50, 50); pCanvas->SetBackgroundColour(*wxWHITE); @@ -921,7 +921,7 @@ ImageFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) ) int width, height; m_pFrame->GetClientSize (&width, &height); m_pFrame->SetTitle("ImageFileView"); - m_pCanvas = CreateCanvas (this, m_pFrame); + m_pCanvas = CreateCanvas (m_pFrame); int x, y; // X requires a forced resize m_pFrame->GetSize(&x, &y); @@ -953,7 +953,7 @@ ImageFileView::OnDraw (wxDC* dc) void ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) { - const ImageFile& rIF = dynamic_cast(GetDocument())->getImageFile(); + const ImageFile& rIF = GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); int nx = rIF.nx(); int ny = rIF.ny(); @@ -1000,6 +1000,7 @@ ImageFileView::OnClose (bool deleteWindow) return false; if (m_pCanvas) { + m_pCanvas->Show(false); m_pCanvas->setView(NULL); m_pCanvas = NULL; } @@ -1012,6 +1013,7 @@ ImageFileView::OnClose (bool deleteWindow) if (deleteWindow) { m_pFrame->Show(false); + ::wxYield(); m_pFrame->Destroy(); m_pFrame = NULL; } @@ -1021,7 +1023,7 @@ ImageFileView::OnClose (bool deleteWindow) void ImageFileView::OnExport (wxCommandEvent& event) { - ImageFile& rIF = dynamic_cast(GetDocument())->getImageFile(); + ImageFile& rIF = GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); int nx = rIF.nx(); int ny = rIF.ny(); @@ -1104,7 +1106,7 @@ ImageFileView::OnPlotRow (wxCommandEvent& event) return; } - const ImageFile& rIF = dynamic_cast(GetDocument())->getImageFile(); + const ImageFile& rIF = GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); ImageFileArrayConst vImag = rIF.getImaginaryArray(); int nx = rIF.nx(); @@ -1188,7 +1190,7 @@ ImageFileView::OnPlotCol (wxCommandEvent& event) return; } - const ImageFile& rIF = dynamic_cast(GetDocument())->getImageFile(); + const ImageFile& rIF = GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); ImageFileArrayConst vImag = rIF.getImaginaryArray(); int nx = rIF.nx(); @@ -1273,7 +1275,7 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event) return; } - const ImageFile& rIF = dynamic_cast(GetDocument())->getImageFile(); + const ImageFile& rIF = GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); ImageFileArrayConst vImag = rIF.getImaginaryArray(); int nx = rIF.nx(); @@ -1365,7 +1367,7 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event) return; } - const ImageFile& rIF = dynamic_cast(GetDocument())->getImageFile(); + const ImageFile& rIF = GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); ImageFileArrayConst vImag = rIF.getImaginaryArray(); int nx = rIF.nx(); @@ -1640,7 +1642,7 @@ static int NUMBER_HISTOGRAM_BINS = 256; void ImageFileView::OnPlotHistogram (wxCommandEvent& event) { - const ImageFile& rIF = dynamic_cast(GetDocument())->getImageFile(); + const ImageFile& rIF = GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); int nx = rIF.nx(); int ny = rIF.ny(); @@ -1848,22 +1850,21 @@ PhantomFileView::OnProjections (wxCommandEvent& event) m_pFrame->Lower(); ::wxYield(); - ProjectionFileView* projView = dynamic_cast(pProjectionDoc->GetFirstView()); + ProjectionFileView* projView = pProjectionDoc->getView(); if (projView) { - projView->getFrame()->SetFocus(); projView->OnUpdate (projView, NULL); - } - if (wxView* pView = pProjectionDoc->GetFirstView()) { - if (wxFrame* pFrame = pView->GetFrame()) { + if (projView->getCanvas()) + projView->getCanvas()->SetClientSize (m_iDefaultNDet, m_iDefaultNView); + if (wxFrame* pFrame = projView->getFrame()) { + pFrame->Show(true); pFrame->SetFocus(); pFrame->Raise(); } - GetDocumentManager()->ActivateView (pView, true, false); + GetDocumentManager()->ActivateView (projView, true, false); } ::wxYield(); if (theApp->getSetModifyNewDocs()) pProjectionDoc->Modify(true); - pProjectionDoc->getView()->getFrame()->Show(true); pProjectionDoc->UpdateAllViews(this); } } @@ -1910,7 +1911,7 @@ PhantomFileView::OnRasterize (wxCommandEvent& event) << m_iDefaultRasterNY << ", nSamples=" << m_iDefaultRasterNSamples; *theApp->getLog() << os.str().c_str() << "\n"; imageFile.labelAdd (os.str().c_str(), timer.timerEnd()); - ImageFileView* rasterView = dynamic_cast(pRasterDoc->GetFirstView()); + ImageFileView* rasterView = pRasterDoc->getView(); if (rasterView) { rasterView->getFrame()->SetFocus(); rasterView->OnUpdate (rasterView, NULL); @@ -1922,13 +1923,13 @@ PhantomFileView::OnRasterize (wxCommandEvent& event) PhantomCanvas* -PhantomFileView::CreateCanvas (wxView *view, wxFrame *parent) +PhantomFileView::CreateCanvas (wxFrame *parent) { PhantomCanvas* pCanvas; int width, height; parent->GetClientSize(&width, &height); - pCanvas = new PhantomCanvas (dynamic_cast(view), parent, wxPoint(0, 0), wxSize(width, height), 0); + pCanvas = new PhantomCanvas (this, parent, wxPoint(0, 0), wxSize(width, height), 0); pCanvas->SetBackgroundColour(*wxWHITE); pCanvas->Clear(); @@ -2015,7 +2016,7 @@ PhantomFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) int width, height; m_pFrame->GetClientSize(&width, &height); m_pFrame->SetTitle("PhantomFileView"); - m_pCanvas = CreateCanvas (this, m_pFrame); + m_pCanvas = CreateCanvas (m_pFrame); #ifdef __X__ int x, y; // X requires a forced resize @@ -2043,6 +2044,7 @@ PhantomFileView::OnClose (bool deleteWindow) return false; if (m_pCanvas) { + m_pCanvas->Show(false); m_pCanvas->setView(NULL); m_pCanvas = NULL; } @@ -2054,7 +2056,8 @@ PhantomFileView::OnClose (bool deleteWindow) Activate(false); if (deleteWindow) { - m_pFrame->Show(false); + m_pFrame->Show(false); + ::wxYield(); m_pFrame->Destroy(); m_pFrame = NULL; } @@ -2313,11 +2316,10 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) if (theApp->getSetModifyNewDocs()) pReconDoc->Modify(true); pReconDoc->UpdateAllViews(this); - pReconDoc->getView()->getFrame()->Show(true); - ImageFileView* rasterView = dynamic_cast(pReconDoc->GetFirstView()); - if (rasterView) { - rasterView->getFrame()->SetFocus(); + if (ImageFileView* rasterView = pReconDoc->getView()) { rasterView->OnUpdate (rasterView, NULL); + rasterView->getFrame()->SetFocus(); + rasterView->getFrame()->Show(true); } std::ostringstream os; os << "Reconstruct " << rProj.getFilename() << ": xSize=" << m_iDefaultNX << ", ySize=" << m_iDefaultNY << ", Filter=" << optFilterName.c_str() << ", FilterParam=" << m_dDefaultFilterParam << ", FilterMethod=" << optFilterMethodName.c_str() << ", FilterGeneration=" << optFilterGenerationName.c_str() << ", Zeropad=" << m_iDefaultZeropad << ", Interpolation=" << optInterpName.c_str() << ", InterpolationParam=" << m_iDefaultInterpParam << ", Backprojection=" << optBackprojectName.c_str(); @@ -2330,13 +2332,13 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) ProjectionFileCanvas* -ProjectionFileView::CreateCanvas (wxView *view, wxFrame *parent) +ProjectionFileView::CreateCanvas (wxFrame *parent) { ProjectionFileCanvas* pCanvas; int width, height; parent->GetClientSize(&width, &height); - pCanvas = new ProjectionFileCanvas (dynamic_cast(view), parent, wxPoint(0, 0), wxSize(width, height), 0); + pCanvas = new ProjectionFileCanvas (this, parent, wxPoint(0, 0), wxSize(width, height), 0); pCanvas->SetScrollbars(20, 20, 50, 50); pCanvas->SetBackgroundColour(*wxWHITE); @@ -2431,9 +2433,9 @@ ProjectionFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) SetFrame(m_pFrame); int width, height; - m_pFrame->GetClientSize(&width, &height); - m_pFrame->SetTitle("ProjectionFileView"); - m_pCanvas = CreateCanvas(this, m_pFrame); + m_pFrame->GetClientSize (&width, &height); + m_pFrame->SetTitle ("ProjectionFileView"); + m_pCanvas = CreateCanvas (m_pFrame); #ifdef __X__ int x, y; // X requires a forced resize @@ -2517,6 +2519,7 @@ ProjectionFileView::OnClose (bool deleteWindow) return false; if (m_pCanvas) { + m_pCanvas->Show(false); m_pCanvas->setView(NULL); m_pCanvas = NULL; } @@ -2529,6 +2532,7 @@ ProjectionFileView::OnClose (bool deleteWindow) if (deleteWindow) { m_pFrame->Show(false); + ::wxYield(); m_pFrame->Destroy(); m_pFrame = NULL; } @@ -2657,13 +2661,13 @@ PlotFileView::OnScaleFull (wxCommandEvent& event) PlotFileCanvas* -PlotFileView::CreateCanvas (wxView *view, wxFrame *parent) +PlotFileView::CreateCanvas (wxFrame* parent) { PlotFileCanvas* pCanvas; int width, height; parent->GetClientSize(&width, &height); - pCanvas = new PlotFileCanvas (dynamic_cast(view), parent, wxPoint(0, 0), wxSize(width, height), 0); + pCanvas = new PlotFileCanvas (this, parent, wxPoint(0, 0), wxSize(width, height), 0); pCanvas->SetBackgroundColour(*wxWHITE); pCanvas->Clear(); @@ -2758,7 +2762,7 @@ PlotFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) ) int width, height; m_pFrame->GetClientSize(&width, &height); m_pFrame->SetTitle ("Plot File"); - m_pCanvas = CreateCanvas (this, m_pFrame); + m_pCanvas = CreateCanvas (m_pFrame); #ifdef __X__ int x, y; // X requires a forced resize @@ -2844,6 +2848,7 @@ PlotFileView::OnClose (bool deleteWindow) return false; if (m_pCanvas) { + m_pCanvas->Show(false); m_pCanvas->setView (NULL); m_pCanvas = NULL; } @@ -2857,6 +2862,7 @@ PlotFileView::OnClose (bool deleteWindow) SetFrame(NULL); if (deleteWindow) { m_pFrame->Show(false); + ::wxYield(); m_pFrame->Destroy(); m_pFrame = NULL; } @@ -2924,6 +2930,7 @@ TextFileView::OnClose (bool deleteWindow) m_pFrame->SetView(NULL); if (deleteWindow) { m_pFrame->Show(false); + ::wxYield(); m_pFrame->Destroy(); m_pFrame = NULL; diff --git a/src/views.h b/src/views.h index 0bec2e6..5f82149 100644 --- a/src/views.h +++ b/src/views.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: views.h,v 1.36 2001/01/28 03:48:55 kevin Exp $ +** $Id: views.h,v 1.37 2001/01/28 19:10:18 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 @@ -45,7 +45,7 @@ private: wxMemoryDC m_memoryDC; wxBitmap m_bitmap; - ImageFileCanvas *CreateCanvas(wxView *view, wxFrame *parent); + ImageFileCanvas *CreateCanvas (wxFrame* parent); #if CTSIM_MDI wxDocMDIChildFrame* m_pFrame; wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); @@ -176,7 +176,7 @@ class ProjectionFileView : public wxView wxBitmap m_bitmap; private: - ProjectionFileCanvas *CreateCanvas(wxView *view, wxFrame *parent); + ProjectionFileCanvas *CreateCanvas (wxFrame* parent); #if CTSIM_MDI wxDocMDIChildFrame* m_pFrame; wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); @@ -233,6 +233,8 @@ public: #else wxDocChildFrame* getFrame() { return m_pFrame; } #endif + ProjectionFileCanvas* getCanvas() { return m_pCanvas; } + wxMenu* getFileMenu() { return m_pFileMenu; } ProjectionFileDocument* GetDocument() @@ -263,7 +265,7 @@ private: DECLARE_DYNAMIC_CLASS(PhantomFileView) DECLARE_EVENT_TABLE() - PhantomCanvas *CreateCanvas(wxView *view, wxFrame *parent); + PhantomCanvas *CreateCanvas (wxFrame* parent); #if CTSIM_MDI wxDocMDIChildFrame* m_pFrame; wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); @@ -358,7 +360,7 @@ private: double m_dMaxPixel; double m_dAutoScaleFactor; - PlotFileCanvas *CreateCanvas(wxView *view, wxFrame *parent); + PlotFileCanvas *CreateCanvas (wxFrame* parent); wxWindow* getFrameForChild() #if CTSIM_MDI { return theApp->getMainFrame(); }