** 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
** 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
** 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
** 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
/*****************************************************************************
** 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
** 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
** 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
** 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
** 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
** 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
-/*****************************************************************************
+y/*****************************************************************************
** FILE IDENTIFICATION
**
** Name: fourier.h
** 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
** 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
** 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
** 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
+/*****************************************************************************
+** 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
** 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
** 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
/*****************************************************************************
+** 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
** 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
** 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
** 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
** 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
+/*****************************************************************************
+** 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
+/*****************************************************************************
+** 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
** 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
** 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
** 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
/*****************************************************************************
+** 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
** 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
** 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
** 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
** 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
** 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
/*****************************************************************************
** 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
** 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
** 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
** 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
** 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
** 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
** 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
+/*****************************************************************************
+** 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
** 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
/*****************************************************************************
** 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
+/*****************************************************************************
+** 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
** 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
/*****************************************************************************
** 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
/*****************************************************************************
** 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
/*****************************************************************************
** 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
<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
\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...
** 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
#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[] =
{
#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;
}
** 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
** 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
** 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
** 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
** 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
** 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
** 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
** 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
** 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
** 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
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);
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);
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();
return false;
if (m_pCanvas) {
+ m_pCanvas->Show(false);
m_pCanvas->setView(NULL);
m_pCanvas = NULL;
}
if (deleteWindow) {
m_pFrame->Show(false);
+ ::wxYield();
m_pFrame->Destroy();
m_pFrame = NULL;
}
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();
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();
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();
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();
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();
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();
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);
}
}
<< 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);
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();
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
return false;
if (m_pCanvas) {
+ m_pCanvas->Show(false);
m_pCanvas->setView(NULL);
m_pCanvas = NULL;
}
Activate(false);
if (deleteWindow) {
- m_pFrame->Show(false);
+ m_pFrame->Show(false);
+ ::wxYield();
m_pFrame->Destroy();
m_pFrame = NULL;
}
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();
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);
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
return false;
if (m_pCanvas) {
+ m_pCanvas->Show(false);
m_pCanvas->setView(NULL);
m_pCanvas = NULL;
}
if (deleteWindow) {
m_pFrame->Show(false);
+ ::wxYield();
m_pFrame->Destroy();
m_pFrame = NULL;
}
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();
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
return false;
if (m_pCanvas) {
+ m_pCanvas->Show(false);
m_pCanvas->setView (NULL);
m_pCanvas = NULL;
}
SetFrame(NULL);
if (deleteWindow) {
m_pFrame->Show(false);
+ ::wxYield();
m_pFrame->Destroy();
m_pFrame = NULL;
}
m_pFrame->SetView(NULL);
if (deleteWindow) {
m_pFrame->Show(false);
+ ::wxYield();
m_pFrame->Destroy();
m_pFrame = NULL;
** 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
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);
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);
#else
wxDocChildFrame* getFrame() { return m_pFrame; }
#endif
+ ProjectionFileCanvas* getCanvas() { return m_pCanvas; }
+
wxMenu* getFileMenu() { return m_pFileMenu; }
ProjectionFileDocument* GetDocument()
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);
double m_dMaxPixel;
double m_dAutoScaleFactor;
- PlotFileCanvas *CreateCanvas(wxView *view, wxFrame *parent);
+ PlotFileCanvas *CreateCanvas (wxFrame* parent);
wxWindow* getFrameForChild()
#if CTSIM_MDI
{ return theApp->getMainFrame(); }