From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Thu, 20 Jun 2002 08:22:48 +0000 (+0000)
Subject: r2130: *** empty log message ***
X-Git-Tag: debian-4.5.3-3~208
X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=6bcab27e89795df59defa160aff6b9831468c4d9

r2130: *** empty log message ***
---

diff --git a/libctsim/scanner.cpp b/libctsim/scanner.cpp
index 5be1b78..6747ea0 100644
--- a/libctsim/scanner.cpp
+++ b/libctsim/scanner.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: scanner.cpp,v 1.41 2002/05/05 14:22:44 kevin Exp $
+**  $Id: scanner.cpp,v 1.42 2002/06/20 08:22:48 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
@@ -354,7 +354,7 @@ Scanner::collectProjections (Projections& proj, const Phantom& phm, const int iS
       m_pSGP->setColor (C_BLUE);
 #if MSVC
       m_pSGP->setTextPointSize (9);
-else
+#else
       m_pSGP->setTextPointSize (14);
 #endif
       phm.draw (*m_pSGP);
diff --git a/libctsupport/msvc.cpp b/libctsupport/msvc.cpp
index 833c0ef..f01f40c 100644
--- a/libctsupport/msvc.cpp
+++ b/libctsupport/msvc.cpp
@@ -2,7 +2,7 @@
 **  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 $
+**  $Id: msvc.cpp,v 1.5 2002/06/20 08:22:48 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
@@ -21,8 +21,8 @@
 #include "ct.h"
 
 // Work around bug in VC6
-#ifdef MSVC
-const  fpos_t std::_Fpz = 0;
-#endif
+//#ifdef MSVC
+//const  fpos_t std::_Fpz = 0;
+//#endif
 
 
diff --git a/msvc/ctsim.dsw b/msvc/ctsim.dsw
index c1038fb..2e35b6b 100644
--- a/msvc/ctsim.dsw
+++ b/msvc/ctsim.dsw
@@ -1,221 +1,179 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "FFTW2st"="..\..\fftw-2.1.3\Win32\FFTW2st\FFTW2st.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "RFFTW2st"="..\..\fftw-2.1.3\Win32\RFFTW2st\RFFTW2st.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "Tex2RTFVC"=..\..\wx2.2.5\utils\tex2rtf\src\Tex2RTFVC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ctn_lib"=..\..\dicom\ctn\winctn\ctn_lib\ctn_lib.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ctsim"=.\ctsim\ctsim.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libctsim
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name FFTW2st
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name RFFTW2st
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ctn_lib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name jpeg
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name png
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name tiff
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxvc
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name xpm
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name zlib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ctsimtext"=.\ctsimtext\ctsimtext.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libctsim
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name RFFTW2st
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "dcm_w_disp"=..\..\dicom\ctn\winctn\ctn_apps\dcm_w_disp\dcm_w_disp.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "jpeg"=..\..\wx2.2.6\src\jpeg\JpegVC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "libctsim"=.\libctsim\libctsim.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "png"=..\..\wx2.2.6\src\png\PngVC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "tiff"=..\..\wx2.2.6\src\tiff\TiffVC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "wxvc"=..\..\wx2.2.6\src\wxvc.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "xpm"=..\..\wx2.2.6\src\xpm\XpmVC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "zlib"=..\..\wx2.2.6\src\zlib\ZlibVC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "FFTW2st"="..\..\fftw-2.1.3\Win32\FFTW2st\FFTW2st.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "RFFTW2st"="..\..\fftw-2.1.3\Win32\RFFTW2st\RFFTW2st.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "ctsim"=.\ctsim\ctsim.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libctsim
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "ctsimtext"=.\ctsimtext\ctsimtext.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libctsim
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "jpeg"=..\..\wx2\src\jpeg\JpegVC.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "libctsim"=.\libctsim\libctsim.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name png
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name tiff
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name wxvc
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name xpm
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name zlib
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name FFTW2st
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name jpeg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name RFFTW2st
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "png"=..\..\wx2\src\png\PngVC.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "tiff"=..\..\wx2\src\tiff\TiffVC.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "wxvc"=..\..\wx2\src\wxvc.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "xpm"=..\..\wx2\src\xpm\XpmVC.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "zlib"=..\..\wx2\src\zlib\ZlibVC.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/msvc/ctsim/ctsim.dsp b/msvc/ctsim/ctsim.dsp
index 1ba5274..c6a5cee 100644
--- a/msvc/ctsim/ctsim.dsp
+++ b/msvc/ctsim/ctsim.dsp
@@ -1,340 +1,202 @@
-# Microsoft Developer Studio Project File - Name="ctsim" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=ctsim - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ctsim.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ctsim.mak" CFG="ctsim - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ctsim - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "ctsim - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ctsim - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I "\wx2.2.6\include" /I "..\..\..\fftw-2.1.3\fftw" /I "\wx2.2.6\src\png" /I "\wx2.2.6\src\zlib" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\rfftw" /I "\dicom\ctn\include" /D "NDEBUG" /D "__WXWIN__" /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 "HAVE_CTN_DICOM" /D CTSIMVERSION=\"3.5.0\" /FR /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /i "\wx2.2.6\include" /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 wsock32.lib tiff.lib jpeg.lib png.lib zlib.lib xpm.lib comctl32.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 opengl32.lib glu32.lib htmlhelp.lib ctn_lib.lib /nologo /subsystem:windows /machine:I386 /libpath:"\wx2.2.6\lib" /libpath:"\dicom\ctn\winctn\ctn_lib\Release"
-
-!ELSEIF  "$(CFG)" == "ctsim - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /Gi /GR /GX /Zi /Od /Gy /I "\wx2.2.6\include" /I "..\..\..\fftw-2.1.3\fftw" /I "\wx2.2.6\src\png" /I "\wx2.2.6\src\zlib" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\rfftw" /I "\dicom\ctn\include" /D "_DEBUG" /D CTSIMVERSION=\"3.5.0\" /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 "HAVE_CTN_DICOM" /FR /YX"ctsim.h" /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /i "\wx2.2.6\include" /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 winmm.lib rpcrt4.lib ws2_32.lib ../libctsim/Debug/libctsim.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib wxd.lib xpmd.lib tiffd.lib zlibd.lib pngd.lib comctl32.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 opengl32.lib glu32.lib htmlhelp.lib ctn_lib.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"\wx2.2.6\lib" /libpath:"\dicom\ctn\winctn\ctn_lib\Debug"
-# SUBTRACT LINK32 /nodefaultlib
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ctsim - Win32 Release"
-# Name "ctsim - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\src\backgroundmgr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\backgroundsupr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\ctsim.cpp
-# ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\dialogs.cpp
-# ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\dlgezplot.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\dlgprojections.cpp
-# ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\dlgreconstruct.cpp
-
-!IF  "$(CFG)" == "ctsim - Win32 Release"
-
-# ADD CPP /O1 /D CTSIMVERSION=\"3.0.0alpha5\"
-
-!ELSEIF  "$(CFG)" == "ctsim - Win32 Debug"
-
-# ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\docs.cpp
-# ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\graph3dview.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\threadproj.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\threadraster.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\threadrecon.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\tips.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\views.cpp
-# ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\src\backgroundmgr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\backgroundsupr.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\src\ctsim-map.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\ctsim.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\dialogs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\dlgezplot.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\dlgprojections.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\dlgreconstruct.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\docs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\graph3dview.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\splash.xpm
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\threadproj.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\threadraster.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\threadrecon.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\tips.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\views.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\wx\msw\blank.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\bullseye.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\ctsim.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\error.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\hand.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\info.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\logo.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\magnif1.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\noentry.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\pbrush.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\pencil.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\pntleft.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\pntright.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\query.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\question.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\roller.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\size.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\tip.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\warning.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\watch1.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\html\msw\wbook.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\html\msw\wfolder.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\html\msw\whelp.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\html\msw\whlproot.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\html\msw\wpage.ico
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="ctsim" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=ctsim - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "ctsim.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "ctsim.mak" CFG="ctsim - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "ctsim - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "ctsim - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "ctsim - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I "..\..\getopt" /I "..\..\include" /I "\wx2\include" /I "\wx2\src\png" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\src\zlib" /D "_WINDOWS" /D "NDEBUG" /D "WIN32" /D _WI"NDOWS,_MBCS,HAVE_STRING_H,HAVE_GETOPT_H,MSVC,HAVE_FFTW,HAVE_PNG,HAVE_SGP,HAVE_WXWINDOWS,__WXMSW__,__WIN95__,__WIN32__,VERSION=3.5.4,WINVER=0x0400,STRICT /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
+
+!ELSEIF  "$(CFG)" == "ctsim - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /GR /GX /ZI /Od /I "..\..\getopt" /I "..\..\include" /I "\wx2\include" /I "\wx2\src\png" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\src\zlib" /D "_WINDOWS" /D "_DEBUG" /D "DEBUG" /D "__WXDEBUG__" /D WXDEBUG=1 /D "WIN32" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D VERSION=3.5.4 /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /i "\wx2\include" /i "\wx2\contrib\include" /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 wsock32.lib htmlhelp.lib comctl32.lib winmm.lib rpcrt4.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 wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib opengl32.lib fftw2st.lib rfftw2st.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /pdbtype:sept /libpath:"\wx2\lib" /libpath:"\fftw-2.1.3\win32\fftw2st\Debug" /libpath:"\fftw-2.1.3\win32\rfftw2st\Debug"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "ctsim - Win32 Release"
+# Name "ctsim - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\src\backgroundmgr.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\backgroundsupr.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\ctsim.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\dialogs.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\dlgezplot.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\dlgprojections.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\dlgreconstruct.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\docs.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\graph3dview.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\threadproj.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\tips.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\views.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\src\backgroundmgr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\backgroundsupr.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\src\ctsim-map.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\ctsim.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\dialogs.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\dlgezplot.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\dlgprojections.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\dlgreconstruct.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\threadraster.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\threadrecon.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\tips.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\views.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=..\ctsimtext\ctsimtext.rc
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg
index 8992618..da3bec5 100644
--- a/msvc/ctsim/ctsim.plg
+++ b/msvc/ctsim/ctsim.plg
@@ -1,56 +1,49 @@
-<html>
-<body>
-<pre>
-<h1>Build Log</h1>
-<h3>
---------------------Configuration: ctsim - Win32 Debug--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP5A.tmp" with contents
-[
-/nologo /G6 /MTd /W3 /Gm /Gi /GR /GX /Zi /Od /Gy /I "\wx2.2.6\include" /I "..\..\..\fftw-2.1.3\fftw" /I "\wx2.2.6\src\png" /I "\wx2.2.6\src\zlib" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\rfftw" /I "\dicom\ctn\include" /D "_DEBUG" /D CTSIMVERSION=\"3.5.0\" /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 "HAVE_CTN_DICOM" /D CTSIMVERSION=\"3.0.0alpha5\" /FR"Debug/" /Fp"Debug/ctsim.pch" /YX"ctsim.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
-"C:\ctsim\src\ctsim.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP5A.tmp" 
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP5B.tmp" with contents
-[
-winmm.lib rpcrt4.lib ws2_32.lib ../libctsim/Debug/libctsim.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib wxd.lib xpmd.lib tiffd.lib zlibd.lib pngd.lib comctl32.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 opengl32.lib glu32.lib htmlhelp.lib ctn_lib.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/ctsim.pdb" /debug /machine:I386 /out:"Debug/ctsim.exe" /pdbtype:sept /libpath:"\wx2.2.6\lib" /libpath:"\dicom\ctn\winctn\ctn_lib\Debug" 
-.\Debug\backgroundmgr.obj
-.\Debug\backgroundsupr.obj
-.\Debug\ctsim.obj
-.\Debug\dialogs.obj
-.\Debug\dlgezplot.obj
-.\Debug\dlgprojections.obj
-.\Debug\dlgreconstruct.obj
-.\Debug\docs.obj
-.\Debug\graph3dview.obj
-.\Debug\threadproj.obj
-.\Debug\threadraster.obj
-.\Debug\threadrecon.obj
-.\Debug\tips.obj
-.\Debug\views.obj
-.\Debug\ctsim.res
-\ctsim\msvc\libctsim\Debug\libctsim.lib
-"\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib"
-"\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib"
-\dicom\ctn\winctn\ctn_lib\Debug\ctn_lib.lib
-\wx2.2.6\lib\jpegd.lib
-\wx2.2.6\lib\pngd.lib
-\wx2.2.6\lib\tiffd.lib
-\wx2.2.6\lib\wxd.lib
-\wx2.2.6\lib\xpmd.lib
-\wx2.2.6\lib\zlibd.lib
-]
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP5B.tmp"
-<h3>Output Window</h3>
-Compiling...
-ctsim.cpp
-Linking...
-
-
-
-<h3>Results</h3>
-ctsim.exe - 0 error(s), 0 warning(s)
-</pre>
-</body>
-</html>
+<html>
+<body>
+<pre>
+<h1>Build Log</h1>
+<h3>
+--------------------Configuration: ctsim - Win32 Debug--------------------
+</h3>
+<h3>Command Lines</h3>
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1C9.tmp" with contents
+[
+/nologo /G6 /MTd /W3 /Gm /GR /GX /ZI /Od /I "..\..\getopt" /I "..\..\include" /I "\wx2\include" /I "\wx2\src\png" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\src\zlib" /I "\ctn\include" /D "_WINDOWS" /D "_DEBUG" /D "DEBUG" /D "__WXDEBUG__" /D WXDEBUG=1 /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D VERSION=\"3.5.4\" /D "WIN32" /D "HAVE_CTN_DICOM" /Fp"Debug/ctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
+"C:\ctsim\src\ctsim.cpp"
+]
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1C9.tmp" 
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1CA.tmp" with contents
+[
+wsock32.lib  comctl32.lib winmm.lib rpcrt4.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib opengl32.lib fftw2st.lib rfftw2st.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 ctn_lib.lib htmlhelp.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/ctsim.pdb" /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /out:"Debug/ctsim.exe" /pdbtype:sept /libpath:"\fftw-2.1.3\win32\fftw2st\Debug" /libpath:"\fftw-2.1.3\win32\rfftw2st\Debug" /libpath:"\wx2\lib" /libpath:"\ctn\winctn\ctn_lib\Debug" 
+.\Debug\backgroundmgr.obj
+.\Debug\backgroundsupr.obj
+.\Debug\ctsim.obj
+.\Debug\dialogs.obj
+.\Debug\dlgezplot.obj
+.\Debug\dlgprojections.obj
+.\Debug\dlgreconstruct.obj
+.\Debug\docs.obj
+.\Debug\graph3dview.obj
+.\Debug\threadproj.obj
+.\Debug\tips.obj
+.\Debug\views.obj
+.\Debug\threadraster.obj
+.\Debug\threadrecon.obj
+.\Debug\getopt1.obj
+.\Debug\getopt.obj
+.\Debug\ctsim.res
+\ctsim\msvc\libctsim\Debug\libctsim.lib
+]
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1CA.tmp"
+<h3>Output Window</h3>
+Compiling...
+ctsim.cpp
+Linking...
+
+
+
+<h3>Results</h3>
+ctsim.exe - 0 error(s), 0 warning(s)
+</pre>
+</body>
+</html>
diff --git a/msvc/ctsimtext/ctsimtext.dsp b/msvc/ctsimtext/ctsimtext.dsp
index 22cad99..61bdcf4 100644
--- a/msvc/ctsimtext/ctsimtext.dsp
+++ b/msvc/ctsimtext/ctsimtext.dsp
@@ -1,147 +1,167 @@
-# Microsoft Developer Studio Project File - Name="ctsimtext" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=ctsimtext - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ctsimtext.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ctsimtext.mak" CFG="ctsimtext - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ctsimtext - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ctsimtext - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ctsimtext - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I "\wx2.2.6\src\png" /I "\wx2.2.6\src\zlib" /I "../../include" /I "../../getopt" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "\wx2.2.6\include" /D "NDEBUG" /D "HAVE_GETOPT_H" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "MSVC" /D "HAVE_STRING_H" /D "HAVE_PNG" /D "NO_MAIN" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /D VERSION=\"3.5.0\" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 wx.lib libctsim.lib zlib.lib wsock32.lib tiff.lib jpeg.lib png.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Release\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Release\RFFTW2st.lib xpm.lib comctl32.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 ctn_lib.lib /nologo /subsystem:console /machine:I386 /libpath:"..\libctsim\Release" /libpath:"\wx2.2.5\lib" /libpath:"\dicom\ctn\winctn\ctn_lib\Release"
-
-!ELSEIF  "$(CFG)" == "ctsimtext - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /Gi /GR /GX /Zi /Od /Gy /I "\wx2.2.6\src\png" /I "\wx2.2.6\src\zlib" /I "../../include" /I "../../getopt" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "\wx2.2.6\include" /D "_DEBUG" /D "HAVE_GETOPT_H" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "MSVC" /D "HAVE_STRING_H" /D "HAVE_PNG" /D "NO_MAIN" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /D VERSION=\"3.5.0\" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 winmm.lib rpcrt4.lib ws2_32.lib pngd.lib zlibd.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib wxd.lib xpmd.lib comctl32.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 ctn_lib.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"\wx2.2.6\lib" /libpath:"\dicom\ctn\winctn\ctn_lib\Debug"
-# SUBTRACT LINK32 /verbose /incremental:no /nodefaultlib
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ctsimtext - Win32 Release"
-# Name "ctsimtext - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\tools\ctsimtext.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\tools\if1.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\tools\if2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\tools\ifexport.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\tools\ifinfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\tools\nographics.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\tools\phm2if.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\tools\phm2pj.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\tools\pj2if.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\tools\pjinfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\tools\pjrec.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\ctsimtext.rc
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="ctsimtext" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=ctsimtext - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "ctsimtext.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "ctsimtext.mak" CFG="ctsimtext - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "ctsimtext - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "ctsimtext - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "ctsimtext - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I "..\..\include" /I "..\..\getopt" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\include" /I "\wx2\src\png" /I "\wx2\src\zlib" /I "\wx2\src\tiff" /I "\wx2\src\xpm" /D "_CONSOLE" /D "NOMAIN" /D "NDEBUG" /D "WIN32" /D _WI"NDOWS,_MBCS,HAVE_STRING_H,HAVE_GETOPT_H,MSVC,HAVE_FFTW,HAVE_PNG,HAVE_SGP,HAVE_WXWINDOWS,__WXMSW__,__WIN95__,__WIN32__,VERSION=3.5.4,WINVER=0x0400,STRICT /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /machine:I386
+# ADD LINK32 wx.lib zlib.lib tiff.lib jpeg.lib png.lib libctsim.lib fftw2st.lib rfftw2st.lib wsock32.lib comctl32.lib uuid.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\libctsim\Release" /libpath:"\fftw-2.1.3\Win32\RFFTW2st\Release" /libpath:"\fftw-2.1.3\Win32\FFTW2st\Release" /libpath:"\wx2\\"
+
+!ELSEIF  "$(CFG)" == "ctsimtext - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /I "..\..\getopt" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\include" /I "\wx2\src\png" /I "\wx2\src\zlib" /I "\wx2\src\tiff" /I "\wx2\src\xpm" /D "_CONSOLE" /D "NOMAIN" /D "_DEBUG" /D "DEBUG" /D "_WINDOWS" /D "__WXDEBUG__" /D WXDEBUG=1 /D "WIN32" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D VERSION=3.5.4 /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ  /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /i "\wx2\include" /i "\wx2\contrib\include" /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 wxd.lib libctsim.lib zlibd.lib tiffd.lib jpegd.lib pngd.lib fftw2st.lib rfftw2st.lib wsock32.lib comctl32.lib winmm.lib rpcrt4.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 xpmd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\libctsim\Debug" /libpath:"\fftw-2.1.3\Win32\RFFTW2st\Debug" /libpath:"\fftw-2.1.3\Win32\FFTW2st\Debug" /libpath:"\wx2\lib" /libpath:"\fftw-2.1.3\fftw2st\Debug" /libpath:"\fftw-2.1.3\rfftw2st\Release"
+# SUBTRACT LINK32 /nodefaultlib
+
+!ENDIF 
+
+# Begin Target
+
+# Name "ctsimtext - Win32 Release"
+# Name "ctsimtext - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\tools\ctsimtext.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\getopt\getopt.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\getopt\getopt1.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\tools\if1.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\tools\if2.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\tools\ifexport.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\tools\ifinfo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\tools\nographics.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\tools\phm2helix.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\tools\phm2if.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\tools\phm2pj.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\tools\pj2if.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\tools\pjHinterp.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\tools\pjinfo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\tools\pjrec.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\getopt\getopt.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\ctsimtext.rc
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/msvc/libctsim/libctsim.dsp b/msvc/libctsim/libctsim.dsp
index 282be00..4cce0f3 100644
--- a/msvc/libctsim/libctsim.dsp
+++ b/msvc/libctsim/libctsim.dsp
@@ -1,367 +1,324 @@
-# Microsoft Developer Studio Project File - Name="libctsim" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=libctsim - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "libctsim.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libctsim.mak" CFG="libctsim - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libctsim - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "libctsim - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "libctsim - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-MTL=midl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I "\wx2.2.6\src\png" /I "\wx2.2.6\src\zlib" /I "..\..\INCLUDE" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2.2.6\include" /I "\dicom\ctn\include" /D "NDEBUG" /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 /D "HAVE_CTN_DICOM" /D VERSION=\"3.1.0\" /YX /FD /c
-# SUBTRACT CPP /X
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-MTL=midl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /Gi /GR /GX /Zi /Od /Gy /I "..\..\..\wx2.2.5\src\png" /I "..\..\..\wx2.2.5\src\zlib" /I "\wx2.2.6\src\png" /I "\wx2.2.6\src\zlib" /I "..\..\INCLUDE" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2.2.6\include" /I "\dicom\ctn\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 /D "HAVE_CTN_DICOM" /D VERSION=\"3.1.0\" /FR /YX /FD /GZ /c
-# SUBTRACT CPP /X
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libctsim - Win32 Release"
-# Name "libctsim - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\libctsim\array2dfile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctsim\backprojectors.cpp
-
-!IF  "$(CFG)" == "libctsim - Win32 Release"
-
-# ADD CPP /GR-
-# SUBTRACT CPP /X
-
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"
-
-# ADD CPP /GR
-# SUBTRACT CPP /X
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctsupport\clip.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctsupport\consoleio.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctsim\ctndicom.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctgraphics\ezplot.cpp
-
-!IF  "$(CFG)" == "libctsim - Win32 Release"
-
-# ADD CPP /O1
-
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctgraphics\ezset.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctgraphics\ezsupport.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctsim\filter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctsupport\fnetorderstream.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctsim\fourier.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\getopt\getopt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\getopt\getopt1.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctsim\globalvars.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctsupport\hashtable.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctsim\imagefile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctsupport\interpolator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctsupport\mathfuncs.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctsim\phantom.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctsupport\plotfile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctgraphics\pol.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctsim\procsignal.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctsim\projections.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctsim\reconstruct.cpp
-
-!IF  "$(CFG)" == "libctsim - Win32 Release"
-
-# ADD CPP /O1
-
-!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctsim\scanner.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctgraphics\sgp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctsupport\strfuncs.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctsupport\syserror.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctsim\trace.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctgraphics\transformmatrix.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libctsupport\xform.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\include\array2d.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\array2dfile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\backprojectors.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\ct.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\ctglobals.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\ctndicom.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\ctsupport.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\ezplot.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\filter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\fnetorderstream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\fourier.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\getopt\getopt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\hashtable.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\imagefile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\interpolator.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\mpiworld.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\msvc_compat.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\nographics.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\phantom.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\plotfile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\pol.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\procsignal.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\projections.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\reconstruct.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\scanner.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\sgp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\timer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\trace.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\transformmatrix.h
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="libctsim" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=libctsim - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "libctsim.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libctsim.mak" CFG="libctsim - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libctsim - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libctsim - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libctsim - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I "..\..\include" /I "..\..\getopt" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\include" /I "\wx2\src\png" /I "\wx2\src\zlib" /I "\wx2\src\tiff" /I "\wx2\src\xpm" /D "_LIB" /D "NDEBUG" /D "WIN32" /D _WI"NDOWS,_MBCS,HAVE_STRING_H,HAVE_GETOPT_H,MSVC,HAVE_FFTW,HAVE_PNG,HAVE_SGP,HAVE_WXWINDOWS,__WXMSW__,__WIN95__,__WIN32__,VERSION=3.5.4,WINVER=0x0400,STRICT /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "libctsim - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ  /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /Gi /GR /GX /ZI /Od /I "..\..\include" /I "..\..\getopt" /I "\fftw-2.1.3\fftw" /I "\fftw-2.1.3\rfftw" /I "\wx2\include" /I "\wx2\src\png" /I "\wx2\src\zlib" /I "\wx2\src\tiff" /I "\wx2\src\xpm" /D "_LIB" /D "_DEBUG" /D "DEBUG" /D "_WINDOWS" /D "__WXDEBUG__" /D WXDEBUG=1 /D "WIN32" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D VERSION=3.5.4 /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ  /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "libctsim - Win32 Release"
+# Name "libctsim - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\libctsim\array2dfile.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctsim\backprojectors.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctsupport\clip.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctsupport\consoleio.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctsim\ctndicom.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctgraphics\ezplot.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctgraphics\ezset.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctgraphics\ezsupport.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctsim\filter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctsupport\fnetorderstream.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctsim\fourier.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctsupport\globalvars.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctsupport\hashtable.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctsim\imagefile.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctsupport\interpolator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctsupport\mathfuncs.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctsupport\msvc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctsim\phantom.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctsupport\plotfile.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctgraphics\pol.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctsim\procsignal.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctsim\projections.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctsim\reconstruct.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctsim\scanner.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctgraphics\sgp.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctsupport\strfuncs.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctsupport\syserror.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctsim\trace.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctgraphics\transformmatrix.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libctsupport\xform.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\include\array2d.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\array2dfile.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\backprojectors.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\ct.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\ctglobals.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\ctndicom.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\ctsupport.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\ezplot.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\filter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\fnetorderstream.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\fourier.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\hashtable.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\imagefile.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\interpolator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\mpiworld.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\msvc_compat.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\nographics.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\phantom.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\plotfile.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\pol.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\procsignal.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\projections.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\reconstruct.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\scanner.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\sgp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\timer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\trace.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\transformmatrix.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index bc2a47b..5297830 100644
--- a/src/ctsim.cpp
+++ b/src/ctsim.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: ctsim.cpp,v 1.116 2002/06/09 16:20:07 kevin Exp $
+**  $Id: ctsim.cpp,v 1.117 2002/06/20 08:22:48 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.116 2002/06/09 16:20:07 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.117 2002/06/20 08:22:48 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -186,7 +186,7 @@ CTSimApp::OnInit()
     int xSize, ySize;
     m_pFrame->GetClientSize(&xSize, &ySize);
     int yLogSize = ySize / 4;
-    m_pLogDoc->getView()->getFrame()->SetClientSize (0, ySize - yLogSize, xSize, yLogSize);
+    m_pLogDoc->getView()->getFrame()->SetSize (0, ySize - yLogSize, xSize, yLogSize);
     m_pLogDoc->getView()->getFrame()->Show (true);
   } else
 #else
diff --git a/tools/pjHinterp.cpp b/tools/pjHinterp.cpp
index 4555608..db95cee 100644
--- a/tools/pjHinterp.cpp
+++ b/tools/pjHinterp.cpp
@@ -9,7 +9,7 @@
 * **  This is part of the CTSim program
 * **  Copyright (C) 1983-2000 Kevin Rosenberg
 * **
-* **  $Id: pjHinterp.cpp,v 1.3 2002/05/03 10:28:17 kevin Exp $
+* **  $Id: pjHinterp.cpp,v 1.4 2002/06/20 08:22:48 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
@@ -43,7 +43,7 @@ static struct option my_options[] =
 	{0, 0, 0, 0}
 };
 
-static const char* g_szIdStr = "$Id: pjHinterp.cpp,v 1.3 2002/05/03 10:28:17 kevin Exp $";
+static const char* g_szIdStr = "$Id: pjHinterp.cpp,v 1.4 2002/06/20 08:22:48 kevin Exp $";
 
 void pjHinterp_usage ( const char *program )
 {
@@ -137,7 +137,7 @@ pjHinterp_main(int argc, char * const argv[])
     return (1);
   }
   if (bOptVerbose) { 
-    ostringstream os;
+	  std::ostringstream os;
     projections.printScanInfo(os);
     std::cout << os.str();
   }