r460: no message

diff --git a/include/array2d.h b/include/array2d.h
index 8c323f4034ca45f3b1449b3ba3f2b50c7db3c2ed..6f2f5cd572af4cdac050afcd77a174b6bda735e7 100644 (file)
--- 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 a63b45d036e52c4a3f42b074eb7db4a52f0f50ed..f35c592185474c9b4078594d996e1512b2ca46f7 100644 (file)
--- 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 4ee4ebbbe09ddb947c7da086491173d77c8b2148..73dabe579cfe799e4c77e48ac6f339dba5c0796e 100644 (file)
--- 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 de8548ea280ee87d95c4f883713278e8fd7f94d8..c935caf9ada68040924c5aa702fe5fd956751708 100644 (file)
--- 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 4ba0fd8ce492803c2e21dd5b88d70f441d9cd592..6e9d88f1fe03cda0c3ecb1049bedec4c770b2e13 100644 (file)
--- 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 d843a085b9cb899eb3936e42c1711f7c2d9fb723..d52c0830be799ba27329a63b9c2d890b6886a392 100644 (file)
--- 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 28cdbd5bb7123b5f2a4f57ab3e739e23794b8fbc..959c6484930986b0d2920000bf0850108fc58985 100644 (file)
--- 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 6a8de8489a23939afe25dc062cb8027dc56a44b4..d605f92583e84d974ea416e2e4762d94f95e50bf 100644 (file)
--- 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 7b696b29e8553fd89e99d2b7dd67fa53a72a1a47..0a610d6843370cb28443c5b582188715da046c24 100644 (file)
--- 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 9528004142059f734ec814e032a04e4be8062dbe..70b857e1d4748a5958659c7a799d8dd33b4193d2 100644 (file)
--- 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 5145cae37faebdd2902aa0971a38ca6472dc0351..8a78620be0797c80cef813b47eb1adba02fde2c7 100644 (file)
--- 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 ea5dc43729a40fa254aea1a974ac783807866915..5c84b01700d4da13e8d727995935dbd239e69707 100644 (file)
--- 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 a31b04e4696ebf0880e24d98d5a36dd4fb3c4388..1062828f7445e0e17f59b199f38123cac10b55a2 100644 (file)
--- 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 5f2568f6ca43fb5eaf3eeb1de5d75f602b84ca49..a791f17380e18e97b395d3f7ab51258dcc2123de 100644 (file)
--- 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 494e3624335380780d57da8ccc4ac3731baf88e5..dccc8ec7bfef2c039b4a99050ed8694fb787e867 100644 (file)
--- 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 286f3ed0e94e68603d37051a989cac8f6803a415..f67679c6f1ee1315685353b9f28836c58edf7972 100644 (file)
--- 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 42ddf5530430fe760a7289551428912f0e800102..a11c330b25e865f5ba441dc1d14fa0d98fa74b30 100644 (file)
--- 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 f8f44e5f263636375b472bb9ddf6990bc49a6ef8..4894425d02b9b3d4f2995caac76a8512d182b2a1 100644 (file)
--- 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 a3b74402c9c6a62fcd3ffad605d2eacb991c6f78..798bfc9cb97fbd8c9cc9d65a44b15137bc71bb01 100644 (file)
--- 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 4c93304f33040dbe5ffca502021f769b7e8d1179..a09f481c351db0006168b1743b6a83a2b1ad89ce 100644 (file)
--- 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 ad93c310e77c0b78e474f362ebcc1686a2ca00ea..5ab448ac40562a045847b9a13c3cef15bffc55ff 100644 (file)
--- 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 611654ef81b530562ccd8d6c6786758841c8f6b6..67f1b7c81ed9af6df9d3295ccb56c87fac85cc9b 100644 (file)
--- 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 2200685db7cf338e698b891ae944824938d6db47..e938ae91936411919f34ce030a9b47c93bec1577 100644 (file)
--- 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 4924d7a163ba70df486b9f9151c830d1338b9d32..fd2d1d134612b5de6f63d0a642f1bdf1855b40a8 100644 (file)
--- 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 bdae6cfcafba9ad37d8a7b4090a320072c013507..c1f3640198c3f1e6cf72d23c50d0e896b33956c6 100644 (file)
--- 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 be1c5d257309c0033e482dd5cfa1d530966035dd..b59d92dde5a8f5723aae5f338253761a7400c017 100644 (file)
--- 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 e70620f7188021221bea3d1904f201a90eae8324..f04178728a2dff94027a883f063e14490349071e 100644 (file)
--- 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 a6a2cd5c38e1147451288b44bfa7e0e5d082947a..0ff6d53534167a09c3c8c065153e0a51330319f3 100644 (file)
--- 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 22741e3938df85c0de739eabe38460ea2d40e402..57c2ec065c022af4485567a0c931ba08688fe1d3 100644 (file)
--- 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 1bd9a1cdfeef534459f878e7b3ed09e76ec88647..275a955bfbf031b24891351eb25e6e9830d57695 100644 (file)
--- 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 ce27a3e598e3963757465578d17aba11c4c8cc64..5146ad1b653f81ce4122d494896f46cf7f6deadb 100644 (file)
--- 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 26c1c0eda20c5ddd42a29d450817732c2f5d80d1..4ac901786c29a9b274cf75d589491dfd24c2046a 100644 (file)
--- 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 eb2c58d30310c49068320946f3a5bd34d6164173..06145a3c628495a3736ea7c3bda724beedff2020 100644 (file)
--- 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 e3923edf8390382bc9e2ca1352f7df0df7079a36..57ea7fcfc791a60291e6b404534a561d767d3095 100644 (file)
--- 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 b4564322c6f32745c75734a64efd559f04f3332d..3186cb517b77b4eded30ded054aa47a0fbba81e9 100644 (file)
--- 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 467c8e90d5f4eab03f48533433240384ebda42f2..0a9f53ecce76d2456079aeb9a100763894552ed0 100644 (file)
--- 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 456e01aefd48686dfb224b931542c42996ad93c3..32af552ca5f63d7398e71641d9583d349ab8d1e6 100644 (file)
--- 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 f5f9c6af9761f4fb7816420584a1a5d9a32e55d2..f6b8cb15a48fd3b3362d79b89505de4740b96271 100644 (file)
--- 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 245a36e951e1900de860a0d593a6d9ecd58a49b1..4b1b4a81b4b0a40b0f16ed786a0a107180feb3db 100644 (file)
--- 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 d577ebb293cd45f11646e7241dd5a90af106c815..30b75d25535a2b0ac4e472c7604f59ed63002f0d 100644 (file)
--- 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 41d1ead4e27c29e8f251a16b7f7429767dc600de..9f0e0f056c00eaf3460c72c357c9916d710a4007 100644 (file)
--- 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 d5e1e11c34b4272193b57e3168d0b5d088b70420..df2a047adb1874669cc1a7025182e67eafbd04de 100644 (file)
--- 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 c6dd98dafc0c3188eccda386b43e5eb7a81a3f03..2ff4e0bcff85645ddb6c375b9dccb0bd57f78202 100644 (file)
--- 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 3cdfabdf17c6a76f22ad25dfa8319e8d43e09690..833c0ef2912981d26d7da5f23c2c6add1e11a210 100644 (file)
--- 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 ef492d64d47a06f7b6761cbff812d093ad772ef9..81682b9187488e1e41dd5bc91ce323a7e7c023bd 100644 (file)
--- 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 414faea91ddd541dce972495867418359e163aac..aa03d7e9ed453c369f9389abc58bcf84caeb9f9c 100644 (file)
--- 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 dfce52808afbad9e34b0d0eb9455f26e8d53102d..a4f8edae99413543deddff0e2192d0cc2c1f101c 100644 (file)
--- 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 f50832ec6d37f99f69c858d3dd2a87817a03089e..1f9d546a6f2582a65099a991334c6ca0d8ea4fa9 100644 (file)
--- 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 52c7dd042b46f5fe4684bfac7ebd2fd00a64f048..3bfb1f049d9ae68cd04da39614993d2714f180d1 100644 (file)
--- a/msvc/ctsim/ctsim.plg
+++ b/msvc/ctsim/ctsim.plg
@@ -3,16 +3,74 @@
 <pre>
 <h1>Build Log</h1>
 <h3>
+--------------------Configuration: libctsim - Win32 Debug--------------------
+</h3>
+<h3>Command Lines</h3>
+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"
+<h3>Output Window</h3>
+Compiling...
+dlgezplot.cpp
+globalvars.cpp
+syserror.cpp
+Creating library...
+<h3>
 --------------------Configuration: ctsim - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-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"
 <h3>Output Window</h3>
 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 7a8d50551002855df42b55be9821f134358ee976..fe9586754b741a0fcaaf3da6e77db9b817f28b13 100644 (file)
--- 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 57ac4ad121df42a97e3b7cda1c9e59277672feed..ee2ccbdbf811dc7bd845003fcdf2756dc32b17ef 100644 (file)
--- 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 bfa301067bf6f090e01902286485ee77283781b1..d1526e7ce1d219b2fa1ddb5ac96b9529054ac5d4 100644 (file)
--- 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 2eae3dcd12a61b295aca86ae3f1ae5d3897aa9a3..8bdada08368d8c990afdd59f6bb898742c1330cc 100644 (file)
--- 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 c5888c2ad92d7e01cffcdf179a10bd3792f6db0f..fdeea3fc67e629806693132dcbffc63da9667068 100644 (file)
--- 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 deb76deb5e7c63fea4bf443601da838d9b3bf670..89e75238a38581093a84c8328098a72bc994e494 100644 (file)
--- 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 6f4cff46f05f6fc78ea477fd3a59e2ad220cc920..d0be191674e6315011cdd02a9058bc22c91c39c5 100644 (file)
--- 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 7797df35f6d8e6bfcdbbc5e9242707199948c041..6cf6ba3f3aabcb03d64dc2188941807c06188134 100644 (file)
--- 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 cf20b310993aaa9c02d3cc6b856b58852c4d0571..daef2f4dfc897f89e26047e6457a846083b4a0f3 100644 (file)
--- 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 133a1ad69d6fa5d97637f9456a1c8405a5db7ef7..6db956883128ae8b115b89de9a7c9d9408e2d2ff 100644 (file)
--- 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 8b28fef1bbeda806d2e3616d3b4609e9341de0ba..4b7933351df230179b7400ab496cc264b251be96 100644 (file)
--- 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<ImageFileView*>(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<ImageFileDocument*>(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<ImageFileDocument*>(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<ImageFileDocument*>(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<ImageFileDocument*>(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<ImageFileDocument*>(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<ImageFileDocument*>(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<ImageFileDocument*>(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<ProjectionFileView*>(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<ImageFileView*>(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<PhantomFileView*>(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<ImageFileView*>(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<ProjectionFileView*>(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<PlotFileView*>(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 0bec2e6bf2660832ba6d95413e6abad18e730ada..5f8214998616e7a048076ca8f8047aef272ed0c1 100644 (file)
--- 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(); }