r416: no message

diff --git a/doc/tex2rtf/ctsim.hpj b/doc/tex2rtf/ctsim.hpj
index d9c498995bd5842e6a618abb6706d983c1b66b60..1f0aa18cf2cffef964f62bdbaff2659a11f187ab 100644 (file)
--- a/doc/tex2rtf/ctsim.hpj
+++ b/doc/tex2rtf/ctsim.hpj
@@ -2,6 +2,7 @@
 
 [OPTIONS]
 COMPRESS=12 Hall Zeck
 
 [OPTIONS]
 COMPRESS=12 Hall Zeck

+REVISIONS=No

 LCID=0x409 0x0 0x0 ; English (United States)
 REPORT=Yes
 CONTENTS=Introduction
 LCID=0x409 0x0 0x0 ; English (United States)
 REPORT=Yes
 CONTENTS=Introduction

diff --git a/doc/tex2rtf/ctsim.tex b/doc/tex2rtf/ctsim.tex
index be33ab4fbdd32aa3b0f49dcf45a6a20ac9826b2a..b4a8005d80e02f5da1a00a9e5c1cd8e3148fd16c 100644 (file)
--- a/doc/tex2rtf/ctsim.tex
+++ b/doc/tex2rtf/ctsim.tex
@@ -5,6 +5,7 @@
 
 \newcommand{\ctsim}{{\tt CTSim}}
 \newcommand{\ctsimtext}{{\tt CTSimText}}
 
 \newcommand{\ctsim}{{\tt CTSim}}
 \newcommand{\ctsimtext}{{\tt CTSimText}}

+\newcommand{\usage}{{\bf Usage \par}}

 
 \newcommand{\commandref}[2]{\helpref{{\tt $\backslash$#1}}{#2}}%
 \newcommand{\commandrefn}[2]{\helprefn{{\tt $\backslash$#1}}{#2}\index{#1}}%
 
 \newcommand{\commandref}[2]{\helpref{{\tt $\backslash$#1}}{#2}}%
 \newcommand{\commandrefn}[2]{\helprefn{{\tt $\backslash$#1}}{#2}\index{#1}}%


@@ -53,7 +54,7 @@ WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY
 OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
 OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 

-\chapter{Introduction}%
+\chapter{Introduction}\label{introduction}%

 \pagenumbering{arabic}%
 \setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
 \setfooter{\thepage}{}{}{}{}{\thepage}%
 \pagenumbering{arabic}%
 \setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
 \setfooter{\thepage}{}{}{}{}{\thepage}%


@@ -61,8 +62,8 @@ PERFORMANCE OF THIS SOFTWARE.
 Computed Tomography is a technique for estimating the interior of an object 
 from measurement of radiation collected around the object. This radiation 
 can be either projected through or emitted from the object.
 Computed Tomography is a technique for estimating the interior of an object 
 from measurement of radiation collected around the object. This radiation 
 can be either projected through or emitted from the object.

-\ctsim simulates the process of projecting X-rays through a phantom object.
-\ctsim can then reconstruct the interior of the object from the projections
+\ctsim\ simulates the process of projecting X-rays through a phantom object.
+\ctsim\ can then reconstruct the interior of the object from the projections

 collected around the phantom object.
 
 \chapter{Installation}\index{Installation}%
 collected around the phantom object.
 
 \chapter{Installation}\index{Installation}%


@@ -88,7 +89,7 @@ It is available in Windows 95/NT/2000 and Linux GUI versions and non-GUI version
 
 See the INSTALL file included in the source distribution for instructions.
 
 
 See the INSTALL file included in the source distribution for instructions.
 

-\section{Requirements}\index{Installation,Build,Requirements}%
+\section{Requirements}\index{Installation,Requirements}%

   \begin{itemize}\itemsep=0pt
   \item zlib Library (optional)
         \par Used for PNG file export.
   \begin{itemize}\itemsep=0pt
   \item zlib Library (optional)
         \par Used for PNG file export.


@@ -110,12 +111,12 @@ See the INSTALL file included in the source distribution for instructions.
 
   \item wxWindows library (optional) 
   \par Used for platform-independent graphical interface. The graphical-shell
 
   \item wxWindows library (optional) 
   \par Used for platform-independent graphical interface. The graphical-shell

-  program \ctsim requires this library.  
+  program \ctsim\ requires this library.  

   \par www.wxwindows.org
 
 \end{itemize}
 
   \par www.wxwindows.org
 
 \end{itemize}
 

-\chapter{ctsim - the Graphical User Interface}\index{ctsim}% 
+\chapter{ctsim - the Graphical User Interface}\label{ctsim}\index{ctsim}% 

 \setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
 \setfooter{\thepage}{}{}{}{}{\thepage}%
 
 \setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
 \setfooter{\thepage}{}{}{}{}{\thepage}%
 


@@ -124,29 +125,29 @@ written using the wxLibrary for cross-platform compatibility with GTK,
 Motif, and Microsoft Windows. It includes all of the functionality of
 the command-line tool {\tt ctsimtext} as well as image processing and visualization features.
 
 Motif, and Microsoft Windows. It includes all of the functionality of
 the command-line tool {\tt ctsimtext} as well as image processing and visualization features.
 

-\section{Usage}
-ctsim [OPTIONS] [files to open...]
+\ctsim\ can open projection files, image files, phantom definition files, and plotfiles.

 
 

-\ctsim can open projection files, image files, phantom definition files, and plotfiles.
+\usage\
+ctsim [OPTIONS] [files to open...]

 
 

-\chapter{ctsimtext - The Command Line Interface}\index{ctsimtext}%
-\ctsimtext is a master shell for all of the command-line utilities. 
+\chapter{ctsimtext}\index{ctsimtext}%

 \setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
 \setfooter{\thepage}{}{}{}{}{\thepage}%
 
 \setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
 \setfooter{\thepage}{}{}{}{}{\thepage}%
 

-\section{Usage}%
+\ctsimtext\ is a master shell for all of the command-line utilities. 

 
 

-\ctsimtext can be executed without any parameters. In that case, \ctsimtext
+\usage\
+\ctsimtext\ can be executed without any parameters. In that case, \ctsimtext

 offers a command-line to enter the function-names and their parameters. The output of the command is displayed. Further commands may be given to \ctsimtext. The shell is exited by the {\tt quit} command.
 
 offers a command-line to enter the function-names and their parameters. The output of the command is displayed. Further commands may be given to \ctsimtext. The shell is exited by the {\tt quit} command.
 

-\ctsimtext can also be called to execute a single command. This is especially useful for batch files containing multiple \ctsimtext commands. This is invoked by calling {\tt ctsimtext function-name parameters...}.
+\ctsimtext\ can also be called to execute a single command. This is especially useful for batch files containing multiple \ctsimtext\ commands. This is invoked by calling {\tt ctsimtext function-name parameters...}.

 
 The following function names are available:
 
 
 The following function names are available:
 

-\subsection{if1}\label{if1}\index{Programs,ctsimtext,if1}%
+\subsection{if1}\label{if1}\index{ctsimtext,if1}%

 Perfoms math functions on a single image.
 
 Perfoms math functions on a single image.
 

-\subsubsection{Usage}%
+\usage\

 \begin{itemize}\itemsep=0pt
   \item --invert
   \item --log
 \begin{itemize}\itemsep=0pt
   \item --invert
   \item --log


@@ -155,10 +156,10 @@ Perfoms math functions on a single image.
   \item --sqrt
 \end{itemize}
 
   \item --sqrt
 \end{itemize}
 

-\subsection{if2}\index{Programs,ctsimtext,if2}%
+\subsection{if2}\index{ctsimtext,if2}%

 Perfoms math functions on a two images.
 
 Perfoms math functions on a two images.
 

-\subsubsection{Usage}%
+\usage\

 \begin{itemize}\itemsep=0pt
   \item --add
   \item --sub
 \begin{itemize}\itemsep=0pt
   \item --add
   \item --sub


@@ -168,10 +169,11 @@ Perfoms math functions on a two images.
   \item --row-plot
 \end{itemize}
 
   \item --row-plot
 \end{itemize}
 

-\subsection{ifinfo}\index{Programs,ctsimtext,ifinfo}%
+\subsection{ifinfo}\index{ctsimtext,ifinfo}%

 
 Displays information about an imagefile.
 
 Displays information about an imagefile.

-\subsubsection{Usage}%
+
+\usage\

 \begin{itemize}\itemsep=0pt
   \item --labels
   \item --no-labels
 \begin{itemize}\itemsep=0pt
   \item --labels
   \item --no-labels


@@ -180,10 +182,10 @@ Displays information about an imagefile.
   \item --help
 \end{itemize}
 
   \item --help
 \end{itemize}
 

-\subsection{ifexport}\index{Programs,ctsimtext,ifexport}%
+\subsection{ifexport}\index{ctsimtext,ifexport}%

 Export an imagefile to a standard graphics file.
 
 Export an imagefile to a standard graphics file.
 

-\subsubsection{Usage}%
+\usage\

 \begin{itemize}\itemsep=0pt
   \item --format
   \begin{itemize}\itemsep=0pt
 \begin{itemize}\itemsep=0pt
   \item --format
   \begin{itemize}\itemsep=0pt


@@ -212,10 +214,10 @@ Export an imagefile to a standard graphics file.
   \item --max
 \end{itemize}
 
   \item --max
 \end{itemize}
 

-\subsection{phm2pj}\index{Programs,ctsimtext,phm2pj}%
+\subsection{phm2pj}\index{ctsimtext,phm2pj}%

 Simulates collection of X-rays data (projections) around a phantom object.
 
 Simulates collection of X-rays data (projections) around a phantom object.
 

-\subsubsection{Usage}%
+\usage\

 phm2pj projection-file-name number-of-detectors number-of-views [options...]
 \begin{itemize}\itemsep=0pt
   \item --phantom
 phm2pj projection-file-name number-of-detectors number-of-views [options...]
 \begin{itemize}\itemsep=0pt
   \item --phantom


@@ -253,27 +255,27 @@ a rotation angle of 1 and for equilinear and equiangular geometries use a rotati
 
 The Herman phantom is taken with permission from Gabor Hermans 1980 book\cite{HERMAN80}. The Shepp-Logan phantom was published in 1974\cite{SHEPP74}.
 
 
 The Herman phantom is taken with permission from Gabor Hermans 1980 book\cite{HERMAN80}. The Shepp-Logan phantom was published in 1974\cite{SHEPP74}.
 

-\subsection{phm2if}\index{Programs,ctsimtext,phm2if}%
+\subsection{phm2if}\index{ctsimtext,phm2if}%

 Converts a geometric phantom object into an imagefile. The size of the
 imagefile in pixels must be specified as well as the number of samples
 to average per pixel.
 
 Converts a geometric phantom object into an imagefile. The size of the
 imagefile in pixels must be specified as well as the number of samples
 to average per pixel.
 

-\subsubsection{Usage}%
+\usage\

 \begin{itemize}\itemsep=0pt
   \item --nsamples
 \end{itemize}
 
 \begin{itemize}\itemsep=0pt
   \item --nsamples
 \end{itemize}
 

-\subsection{pj2if}\index{Programs,ctsimtext,pj2if}%
+\subsection{pj2if}\index{ctsimtext,pj2if}%

 Convert a projection file into an imagefile.
 
 Convert a projection file into an imagefile.
 

-\subsubsection{Usage}%
+\usage\

 \begin{itemize}\itemsep=0pt
 \end{itemize}
 
 \begin{itemize}\itemsep=0pt
 \end{itemize}
 

-\subsection{pjinfo}\index{Programs,ctsimtext,pjinfo}%
+\subsection{pjinfo}\index{ctsimtext,pjinfo}%

 Displays information about a projection file.
 
 Displays information about a projection file.
 

-\subsubsection{Usage}%
+\usage\

 \begin{itemize}\itemsep=0pt
   \item --binaryheader
   \item --binaryview
 \begin{itemize}\itemsep=0pt
   \item --binaryheader
   \item --binaryview


@@ -282,12 +284,10 @@ Displays information about a projection file.
   \item --dump
 \end{itemize}
 
   \item --dump
 \end{itemize}
 

-\subsection{pjrec}\index{Programs,ctsimtext,pjrec}%
+\subsection{pjrec}\index{ctsimtext,pjrec}%

 Reconstructs the interior of an object from a projection file.
 
 Reconstructs the interior of an object from a projection file.
 

-\subsubsection{Usage}%
-
-\subsubsection{Parameters}%
+\usage\

 \begin{itemize}\itemsep=0pt
   \item Filter 
   Selects which filter to apply to each projection. To
 \begin{itemize}\itemsep=0pt
   \item Filter 
   Selects which filter to apply to each projection. To


@@ -297,7 +297,6 @@ Reconstructs the interior of an object from a projection file.
     \item abs_bandlimit
     \item abs_cosine
     \item abs_hamming
     \item abs_bandlimit
     \item abs_cosine
     \item abs_hamming

-    \item abs_sinc

   \end{itemize}
 
   \item Filter Parameter 
   \end{itemize}
 
   \item Filter Parameter 


@@ -352,16 +351,13 @@ statistics as described by Herman\cite{HERMAN80}.
 
 \section{Requirements}\index{Web Interface,Requirements}%
 \begin{itemize}\itemsep=0pt
 
 \section{Requirements}\index{Web Interface,Requirements}%
 \begin{itemize}\itemsep=0pt

-   \item For Web Interface

    \begin{itemize}\itemsep=0pt
       \item Apache or other CGI compatible web server
 
       \item Perl (version 4.0 or higher)
 
       \item A client web browser than can display PNG files. Most
    \begin{itemize}\itemsep=0pt
       \item Apache or other CGI compatible web server
 
       \item Perl (version 4.0 or higher)
 
       \item A client web browser than can display PNG files. Most

-      current web browswer do support PNG.
-    \end{itemize}
-
+      current web browsers support PNG.

   \end{itemize}
 
 \newpage
   \end{itemize}
 
 \newpage

diff --git a/doc/tex2rtf/logo-huge.bmp b/doc/tex2rtf/logo-huge.bmp
new file mode 100644 (file)
index 0000000..a51df36
Binary files /dev/null and b/doc/tex2rtf/logo-huge.bmp differ

diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg
index 6bf410b0505cc9b1db8cb19659ee7f8a9076377e..58a1e8c267fe1d508c35996d60d18d41ea7a242d 100644 (file)
--- a/msvc/ctsim/ctsim.plg
+++ b/msvc/ctsim/ctsim.plg
@@ -6,21 +6,15 @@
 --------------------Configuration: ctsim - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>
 --------------------Configuration: ctsim - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>

-Creating command line "rc.exe /l 0x409 /fo"Debug/ctsim.res" /i "\wx2\include\wx\msw" /i "\wx2\include" /d "_DEBUG" "C:\ctsim\msvc\ctsim\ctsim.rc"" 
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP216.tmp" with contents
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP263.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 
 "C:\ctsim\src\ctsim.cpp"
 [
 /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 
 "C:\ctsim\src\ctsim.cpp"

-"C:\ctsim\src\dialogs.cpp"
-"C:\ctsim\src\dlgprojections.cpp"
-"C:\ctsim\src\dlgreconstruct.cpp"
-"C:\ctsim\src\docs.cpp"
-"C:\ctsim\src\views.cpp"

 ]
 ]

-Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP216.tmp" 
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP217.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP263.tmp" 
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP264.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" 
+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
 .\Debug\dialogs.obj
 .\Debug\dlgprojections.obj
 .\Debug\ctsim.obj
 .\Debug\dialogs.obj
 .\Debug\dlgprojections.obj


@@ -34,16 +28,10 @@ comctl32.lib winmm.lib rpcrt4.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib w
 \wx2\lib\wxd.lib
 \wx2\lib\xpmd.lib
 ]
 \wx2\lib\wxd.lib
 \wx2\lib\xpmd.lib
 ]

-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP217.tmp"
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP264.tmp"

 <h3>Output Window</h3>
 <h3>Output Window</h3>

-Compiling resources...

 Compiling...
 ctsim.cpp
 Compiling...
 ctsim.cpp

-dialogs.cpp
-dlgprojections.cpp
-dlgreconstruct.cpp
-docs.cpp
-views.cpp

 Linking...
 
 
 Linking...
 
 

diff --git a/src/ctsim-map.h b/src/ctsim-map.h
index 9444e4f6c66ac71cdb1041769c1700fe01922bef..dc999a3e724b6a2d12abcc255de1e16641d6454a 100644 (file)
--- a/src/ctsim-map.h
+++ b/src/ctsim-map.h
@@ -1,3 +1,4 @@
 #define download 1
 #define if1      2
 #define ctsim    3
 #define download 1
 #define if1      2
 #define ctsim    3

+#define introduction 4

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 6408e67b30156b15646d75d8a5b6b689eb5d5351..60f409a75929b43b0df14485357bf35969d107e9 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
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: ctsim.cpp,v 1.32 2001/01/17 13:03:24 kevin Exp $
+**  $Id: ctsim.cpp,v 1.33 2001/01/18 02:50:50 kevin Exp $

 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as


@@ -69,7 +69,7 @@
 #endif
 #endif
 
 #endif
 #endif
 

-static const char* rcsindent = "$Id: ctsim.cpp,v 1.32 2001/01/17 13:03:24 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.33 2001/01/18 02:50:50 kevin Exp $";

 
 struct option CTSimApp::ctsimOptions[] = 
 {
 
 struct option CTSimApp::ctsimOptions[] = 
 {


@@ -166,7 +166,8 @@ CTSimApp::OnInit()
   accelEntries[2].Set(wxACCEL_CTRL, (int) 'P', MAINMENU_FILE_CREATE_PHANTOM);
   accelEntries[3].Set(wxACCEL_CTRL, (int) 'F', MAINMENU_FILE_CREATE_FILTER);
   accelEntries[4].Set(wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS);
   accelEntries[2].Set(wxACCEL_CTRL, (int) 'P', MAINMENU_FILE_CREATE_PHANTOM);
   accelEntries[3].Set(wxACCEL_CTRL, (int) 'F', MAINMENU_FILE_CREATE_FILTER);
   accelEntries[4].Set(wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS);

-  wxAcceleratorTable accelTable (4, accelEntries);
+  wxAcceleratorTable accelTable (5
+    , accelEntries);

   m_pFrame->SetAcceleratorTable (accelTable);
 
   return true;
   m_pFrame->SetAcceleratorTable (accelTable);
 
   return true;


@@ -335,7 +336,7 @@ MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 }
 
 void 
 }
 
 void 

-MainFrame::OnCreatePhantom(wxCommandEvent& WXUNUSED(event))
+MainFrame::OnCreatePhantom(wxCommandEvent& event)

 {
   DialogGetPhantom dialogPhantom (this, m_iDefaultPhantomID);
   int dialogReturn = dialogPhantom.ShowModal();
 {
   DialogGetPhantom dialogPhantom (this, m_iDefaultPhantomID);
   int dialogReturn = dialogPhantom.ShowModal();


@@ -428,7 +429,7 @@ MainFrame::showHelp (int commandID)
      m_help.DisplayContents ();
      break;
   case MAINMENU_HELP_TOPICS:
      m_help.DisplayContents ();
      break;
   case MAINMENU_HELP_TOPICS:

-     m_help.DisplaySection (if1);
+     m_help.DisplaySection (introduction);

      break;
 
   default:
      break;
 
   default: