From f313cfc038d176c3db704dbcf3c01fdd6f33d807 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Thu, 18 Jan 2001 02:50:50 +0000 Subject: [PATCH] r416: no message --- doc/tex2rtf/ctsim.hpj | 1 + doc/tex2rtf/ctsim.tex | 74 ++++++++++++++++++-------------------- doc/tex2rtf/logo-huge.bmp | Bin 0 -> 67856 bytes msvc/ctsim/ctsim.plg | 22 +++--------- src/ctsim-map.h | 1 + src/ctsim.cpp | 11 +++--- 6 files changed, 48 insertions(+), 61 deletions(-) create mode 100644 doc/tex2rtf/logo-huge.bmp diff --git a/doc/tex2rtf/ctsim.hpj b/doc/tex2rtf/ctsim.hpj index d9c4989..1f0aa18 100644 --- a/doc/tex2rtf/ctsim.hpj +++ b/doc/tex2rtf/ctsim.hpj @@ -2,6 +2,7 @@ [OPTIONS] COMPRESS=12 Hall Zeck +REVISIONS=No LCID=0x409 0x0 0x0 ; English (United States) REPORT=Yes CONTENTS=Introduction diff --git a/doc/tex2rtf/ctsim.tex b/doc/tex2rtf/ctsim.tex index be33ab4..b4a8005 100644 --- a/doc/tex2rtf/ctsim.tex +++ b/doc/tex2rtf/ctsim.tex @@ -5,6 +5,7 @@ \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}}% @@ -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. -\chapter{Introduction}% +\chapter{Introduction}\label{introduction}% \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. -\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}% @@ -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. -\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. @@ -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 - program \ctsim requires this library. + program \ctsim\ requires this library. \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}% @@ -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. -\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}% -\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. -\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: -\subsection{if1}\label{if1}\index{Programs,ctsimtext,if1}% +\subsection{if1}\label{if1}\index{ctsimtext,if1}% Perfoms math functions on a single image. -\subsubsection{Usage}% +\usage\ \begin{itemize}\itemsep=0pt \item --invert \item --log @@ -155,10 +156,10 @@ Perfoms math functions on a single image. \item --sqrt \end{itemize} -\subsection{if2}\index{Programs,ctsimtext,if2}% +\subsection{if2}\index{ctsimtext,if2}% Perfoms math functions on a two images. -\subsubsection{Usage}% +\usage\ \begin{itemize}\itemsep=0pt \item --add \item --sub @@ -168,10 +169,11 @@ Perfoms math functions on a two images. \item --row-plot \end{itemize} -\subsection{ifinfo}\index{Programs,ctsimtext,ifinfo}% +\subsection{ifinfo}\index{ctsimtext,ifinfo}% Displays information about an imagefile. -\subsubsection{Usage}% + +\usage\ \begin{itemize}\itemsep=0pt \item --labels \item --no-labels @@ -180,10 +182,10 @@ Displays information about an imagefile. \item --help \end{itemize} -\subsection{ifexport}\index{Programs,ctsimtext,ifexport}% +\subsection{ifexport}\index{ctsimtext,ifexport}% Export an imagefile to a standard graphics file. -\subsubsection{Usage}% +\usage\ \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} -\subsection{phm2pj}\index{Programs,ctsimtext,phm2pj}% +\subsection{phm2pj}\index{ctsimtext,phm2pj}% 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 @@ -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}. -\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. -\subsubsection{Usage}% +\usage\ \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. -\subsubsection{Usage}% +\usage\ \begin{itemize}\itemsep=0pt \end{itemize} -\subsection{pjinfo}\index{Programs,ctsimtext,pjinfo}% +\subsection{pjinfo}\index{ctsimtext,pjinfo}% Displays information about a projection file. -\subsubsection{Usage}% +\usage\ \begin{itemize}\itemsep=0pt \item --binaryheader \item --binaryview @@ -282,12 +284,10 @@ Displays information about a projection file. \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. -\subsubsection{Usage}% - -\subsubsection{Parameters}% +\usage\ \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_sinc \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 - \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 - current web browswer do support PNG. - \end{itemize} - + current web browsers support PNG. \end{itemize} \newpage diff --git a/doc/tex2rtf/logo-huge.bmp b/doc/tex2rtf/logo-huge.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a51df36e4b512364ee1cde4f7767a825f53486b1 GIT binary patch literal 67856 zcmeI5d2|-l-N&!BQmrqw)zZH9wD#E3bKdu~_Vl!;ww(8mipvqYsI^7KrFB82SPD@< zL|me5VKbtDEGnBQNJPRKWZ#kisRD*20g{k~tb~w22ua|1Kl2P3CNp>DnVIK#Ci4WJ zGlV;L?!9yG?>oPHf6HBNyX)ImT_%*@Z~6DX{F`>+-(}*z38}wpuNFf2*Y*n~?C)ev z4cEHWtH%x-#x-j2;Ct@6>rW3p7~y*0f&LFYq-G(nT1Z1(UBZ$fBt#ZlTbonSX6i-ebvU~)YM)NKYUH^-r|pc6wf>(UU)&2mWt|XapDBu zp~s87l)$xYnSyHX-d*pz?|Zl1HasO|i-MnvK)zm3F zri|J0e=GKgf&x)iCR$oN!sQU>)>hHbpuB72M)C5?qG!);-~Fz_q9aCBmX(FhpAR6O z!Nahrspa_b#?`A2jUK&a;>7I*hmS+H8yq4K^JM4Gi{;A|7VX}>>kog}t7p%Qg$tV+ z8Ulr6kT5JPJh5_R{?erfH*YTb;*0WzhO;WEGD4v%Vh)an0xK%SC!dHBBW}9omM8DK zZ}+ZU0YNet7@j(HcEyUkl z|F)wsJaOU--DYy~ru6iK($+VHLcQV&i08s#%fW-iwb%B0Z+)jvpWeNDcN9-{1cr5WXO=C?n=m2sz=3Kj z=(P9^q0nVMKoR9DkY+#l0G_0G-Me$AR(XE{{$hCeaP78j#dGHD{`AuW=gv8j(?5!m zx_)M-cYXf(t~cL2b=0W+Uw-KifV{;o4AB^nInfp9LLH)~(%^MJL5Rt_YHP*Nq2Idt z>hzEJ{`~mGAH(M6)|#5eRjUrAr{}qC5u7?aCUo_`kQFP$&wqY*j~*vVOWn5GZTk3Q zxM@?-#*KwXj?}uX8tIXAzVAQzWA#StJ(DNj*t_@2g$q5j-FcRHVpv<-n3|fEpRX8N zy#3Y$Tqt#d_TIhXnrrU9_14DIr@av&Vy?JhSXz2=`t+RK+{%bmut|`p9jO6ZWS!sr z?&${}2%S4;(^$`s;(%d&{aHr8wQG-@Jc)wt{nr=@{n9{;#Jz29{@N?A^t$b~)#>Tp zDPoZ`))>-%PMnx&WpuHqgghD!zAAA+lh%Cx{4QVnTK?X>@&Aa)oYJ61n!+OEpVQ|*B8dP6UKrwt_%`cYb1*DJ1= zHEEJp+8Fc22*bw4mc@(rRaC^xu|`2xCNxm?mB%Of>t8RMJ=+L}r~6o72y_5gT^&o= zIk$6T2*Q<>m)~(mzuvtY8>1b1qQ;Oebjp++{Ppw+S!T+x|BgGy(=%t_#(wwTZ%GAb z52C{`=3S^(>GwMaN)cPp*m%VqcPxAFJ+0v$0#RTXk1kYg0cO&n5nJDB5>!+uo$CGf zH#awX0FW$RF+>kU3XOResy2cF;(MJ2A}0+weOlan^Nf@fA2GxLgC2-C!rMC|=Gxu) zwEKuio;r0^j~>fE{x~9W%n97{A=Ay?cq21bdZ4*R#EgyD;!c^Myu8adzq$I8Poy-l ziFA)4Q<%7Hij49R+I`PX36YaV&7a?+M-R6Ibcta_#i{k{3*5fMRr)iXUNf`>^BXf~ zvZTiq#oS;>|2bnu4$_RPH@HoVX4si6G`0XL%McnHQ5w_d&2vsS#~8M@o}WB9J3l|} z3rJpw*vd|yVC~v2mtVd2lq5d3*NQ(>4-@xaMDf zeY4Ga2>asQJ`LOwC!awxzi!^VIkRTjlQ9y8Oic4jq`l0IxWr=`8*fiaYOq~T zZi^x8_rV8yTurUF|6=T)R(#cwNw@3xK23+NX=}-B$vQ(>`e6K(>c8fMLRry(;KP&-*FPghDKF`Y-(lck+y=jp90aRy4GT zvmw!{yIMk`fxXyT#EB?Mu5A=&;=Ey;o(|@4QPG_bK4|bswa4(xnHF}esH%$1x);Oe zVsqP0yI;Idtj-fzC0?$b$HboFV$)&qai)0j9r4s_7q9-K#iC4+mM!+yiku3OUFxO$ ztYWeDNXNqXok^3b^7Hk?Y>#1W?HQlNQR-sU?#FKz#dS{m7Q>g?dRDAoBSt2RA}+3E3hIKX zyWPeKsac|+)-{n>FTHlH7&1iJ*L2=I@$S2Vy=IGxFJ5f2wq=W$K3%;3zIg00F?X)W z&lk$K#ef0g)G52f=5jh5L%zG;|9*|mH>|_3zP@Sv_-$;0XP|Ms zZ<7sla*H9G#s1+BV!{O18w#@skX?y~4NEW#A=iiz&prC6hKmlv%*^5i3u3%fTzijI zpvmkrbcJDFo_PIrF=dLNFExA%PHx!(IyqUaT&Zxclk}wNa6Y6CWo6xd_OsdwoOQ~t z4MUuS>?Px~TFCn)+afy0aQk-g^wT0M%PIM#D6xn8v(JjrqeWAbqjG|PAq`1N+PHXe z7(xw0JWVMnTYXjwslrCH&(I-;?A_D7yLjUbr?i&>s79_|FP?l-%$%7>7%p8pYsQTB z81CI$!H!&NoS%Q0Dq^IZ6AbI>#H+8eai}q`RvLl}BIu`|ie0V$(No{`nwgwVFdRQ#kt)r3wHOdiN)k^z zA%5}`al;Mb#v7GAf9-qAg$tEa7mgpdD>gV79zWh|@ZhF;WeI)Tc$k${f`acehApAc z;~LeqfIWui&M6%Ax4(((Y&&9a+9ck2N9i6x8?^BR+tFBBrjy8zJ`&TWDP1%c zgCj>QUl9;Kq(ze_Ki;QL%h|KxzO0| z7SVIhiH9Dt92J9uVNDIEjd5;V7{hok&z622MxUWZT`LT+f+B4`^;Bd-_0gkZ;zUK7 zL4VhZbrPU_@}gw?>Q{n+SDGa_7*&5(Q#o`CD>%n|X^$cX7;HfvnHF^f5l3n}4-ST>PhZ)y=Q_-V z3WiwOjvVoCDyjNiJYhvqD-1yfp^>h`DkJe9ekjt@FDAgdG`j-L_3|-~{mm4jfRFk_8JC=b<^J8p9BZ8)Mu!@!Q|Z(*z2` zp+iTZX>|;SScKY5g3?n|iXr0SBaeu}LOET@4ueUh5Of6L0lNZGp zh&SqA|58kKoMfr5m>LcghDAm9Jp6D6VTg8rrI|cxj1)si``5n;=2J*>F-W3zNX?;N zetF^OQo2wTOiDob95l#MYF)QZ`Cc%YW41BBE>IX&R{pV1AHmmKk6h|!Uuvn{+hEAS zy%?>TLt!Q=F^rS@_DLRrJibA=Zs$&cuS&y^EI2BV=%l5ok;pVJy(CExC=AQXIfPs= zljulX_wF)(9mYve20}{taQ}Ww8z~(uD!J4VkDhVstzyp}McUN&rM!{!*utf(tJY`H zBJs*A5)mqh7{2*tme0zeaT1gh3`dPpWD!G3^%emIc}4n&K@xT3z4sJG#g|xF*)AET zQT$EPj6}k>V93lkLxLb;$U4J<0$-QMBpaw=xRvrD-5Q;nAtkr?iC{LQR`VlbFbMSO zC0=_?Nx*n$NJjVj{PXgRdylp10XVhrX} zlobr5((D)n5~eSmIWs3Ok12va{UUF+F6~R1TL0#o5-}3iLQ9Z>fCh-3jz)rHgRvaB zhv5;%)3YLqA|*&|+psqn8pI%86vV!ijT1Pa!Y2enp+8IMt&fyq2;uL)-^fMeN==np zQ&@6w&piSK|A7Y-?}h3)Msufk1vl+=6pNPvl?k9aN5CB87*g*&To8MeeIGFzpXsRBF1bgkZ#sLuZpD|NktQy9xFP+98 zC=BcBdh(I_YA;2*kGw6S6hmYe`ci|D6TyG#R3rJ(=;=aXJcA~oB7)nhAHJ^c6537$UDSx?(<^Ge_=+V)i~(9H}KP zP#6vzI9Bl=`nFnz1>(Py($x?t#Ss2M$iUoYQ0EvA^*tUsA#-9hACsYE^%k=o2cLiO zga*UK+)a7RE&Ob6gng#4%2S*(=qfVt6?VG*vtpu1ECzoUZxG0^AZy%4Ey#^ zP8t-R69s_rRuLok4E5Bq!jLq~IE2j%0w*#J6DVLpl|NxiX&T>6?a@!M9wJvzJXd+w>B8k4fgM^?3ZAbmw1Lp zslKOX!OsDY*?`PoNRMr0fTNJWV0dlmiRVYI2DLDTthC_x3O1*SAB?$9vF9;`Mnq6k?0Q4_6(^$T-r5 zA^-2%RTir=(WM^(eqT$<86MeVn47Br$iQe&GW3PuFl1EJ$Eaa=4As%9lOzp7FVe4c zT8CCz2Vsb91kDUGYQIS-+gN15ZI}=FKi=yP-`8jmF<_4&H~=7&MsBn!3M&iCGDx7Y z6AXq)j>y@wEpx%5=%36%4HAam2)kRyghJICcHsaEoLJ_>ywdg<*45#kjmr;#CbGLi z1H>Lfk}*pHQyQi>w0OSWY9y&KtO?cylpU~z8#ex4#ado7cH%i zAu@Itb`6hpvqK>dOU~HDgsn{4W60gxZ|^v8Aod4yF&GXrkiq`eA%+x!lN}gQ@bUN_ zKI{kq{j2#3@H8@|3e%{5wUj=MIUEZNyM;o@;aywZa)X*4foAO3tvD-87^)8am^(1& z9Gq(RD#4s%NP4t&x>JP7&6^c3l8pgIj|LJ9(@jwY(Nqv(>;+MMM#52Gh-x=7++jvJ z71V%KTVD#I26VlBBIaC-(2;$HdOEqnkc@~m2%m^J1W*ou)I2FvD<4xDDY1DoQ6E_c z*OhY)R10yBAws4>wKG%6Rg9s>)L}?5`d-#msWypU(CFtd;1)xQRrj-i6_G#b7#Sf^ zCJ zv0%Q)-Y#->xJFN{|Bh1oJ!n;f3g$2?)y^9kwOqS*mm79vYmXt)>84FZTJq=v2sEzG zh8?{{Y&@cDCG74xAxch(vPSWFp?GV)cy6Q^JW>o9eeoJRN+i9e#DBI+9IY3nr$u3% z%U6V}v@B2A)m`>IGTfOBD$&!>Py%Wptfr4_k0C?ihaY~)`4;*l(S#9b_%5X_wv60V zBqnW9v_x;$$PfZWnABfBs^Nz7y6D zu&FTY`|#rkwPni=HZ(xji@)|55?@=}$oUrf?)GA0_aWB;ja$GwF1^ZivDd|HiM(o6 zK9?bh2}7Q9zD2AQ#pI5ou_d2JS0z-t*b12jK8I?89M7j5uDxPKo>_sHVMskV0~q-y$_in(yD~vgGUKMkfL^~S z3@T9)P@kRA&FXM%3k(|?nxj9g#OWlc;NgsFhyMT}6Kj1yetY&*Y}imJt&9bR%*$Yp z{b-Ihbt>RI)--#{%lxOI~HL*>6dCJCBKtM zbV7j8ycFgv))!Sh{zyRMNs-2!VuEHE|Z{H!>VhDPe-mJP| z`-=1p9){|0M+cEWzow?vh=PeNhO~9xzAE$#53I1D%F9pX z41W*++4bz|_wmbLj3ISIOTl;( zv9gE}=wLSeUNnz@j`BTB$c$L+;3PnTM3iZ6Zgp5CHyBbRJ@o$l5&WLXaR3ni!DE3p zs5m6KeKLITGiKztGLN~$u(|o%nl*<{p0t$Lc@Qhj5Zq8u`UK2>V2?obPtnHRE_`u` zA$7z6XS1&q%VVyLnhy~&VP^b3mY+)Wv^L#*mV8t0hS)F=L0J z1`bvnw%9PNk<*@D%7OIsgA*rade#H2NEZhTdDX##H5nO)_U;YNRClZP`xK9tfb;EE ztvXa+k9#%7zxZHCCD{arm2#hcdf@C?r+%;)H!U#5<>ppSpPm!H!|mdRp-MsKx2C1- zk8SrK7;GF>giX}md^0=d{ipujamJ8W;SifMXE*yY+ISuHHR?2BrsmRrVup!#i{g(V zEns#XW>uCK)2w(mC>>t$#RhH8V52H0#2wF)FZ|GeDKgNkh^O7Fl?Jb=dh z`6WvZV0W=e?Ej;HVW<)S$pHKQx^+j!jM;(&i&oiDeQZ%t-FxqSo|3Xn-I{<}MO;bt z6^14Xu!IXQ2;D4HWCAosEA&kM#)FoOY+Cu4m)Ithbr0~K&$@z%1`#3x$%p1T!-t0s z)gT0BW)|}|E9)pSZE7l9x|3e6pr96pG3T<6VPqp?LBVk(DvILB58%qmQp+#G=@O8h z+`bh&O%M#t?WnJBg8bnV<94Q|ZiivQSEl+`!#0c(KxtShtkrg9hcj*kLyGe76_{() wAu$Pyp_y96#V0vCN4;1SGIQpCrcK+y);w)j7NSy75gdCVjk$ybjS>9*AAWt#xc~qF literal 0 HcmV?d00001 diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg index 6bf410b..58a1e8c 100644 --- a/msvc/ctsim/ctsim.plg +++ b/msvc/ctsim/ctsim.plg @@ -6,21 +6,15 @@ --------------------Configuration: ctsim - Win32 Debug--------------------

Command Lines

-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" -"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 @@ -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 ] -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"

Output Window

-Compiling resources... Compiling... ctsim.cpp -dialogs.cpp -dlgprojections.cpp -dlgreconstruct.cpp -docs.cpp -views.cpp Linking... diff --git a/src/ctsim-map.h b/src/ctsim-map.h index 9444e4f..dc999a3 100644 --- a/src/ctsim-map.h +++ b/src/ctsim-map.h @@ -1,3 +1,4 @@ #define download 1 #define if1 2 #define ctsim 3 +#define introduction 4 diff --git a/src/ctsim.cpp b/src/ctsim.cpp index 6408e67..60f409a 100644 --- a/src/ctsim.cpp +++ b/src/ctsim.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ctsim.cpp,v 1.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 @@ -69,7 +69,7 @@ #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[] = { @@ -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); - wxAcceleratorTable accelTable (4, accelEntries); + wxAcceleratorTable accelTable (5 + , accelEntries); m_pFrame->SetAcceleratorTable (accelTable); return true; @@ -335,7 +336,7 @@ MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) } void -MainFrame::OnCreatePhantom(wxCommandEvent& WXUNUSED(event)) +MainFrame::OnCreatePhantom(wxCommandEvent& event) { 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.DisplaySection (if1); + m_help.DisplaySection (introduction); break; default: -- 2.34.1