r559: no message

diff --git a/images/logo16.bmp b/images/logo16.bmp
index 365bc87501b3ed9aa0a86fee408ecab7c5340ae4..463bd88209c7fbf5a9560c78df59e7122210b542 100644 (file)
Binary files a/images/logo16.bmp and b/images/logo16.bmp differ

diff --git a/images/logo32.bmp b/images/logo32.bmp
index a927389f378336dfd386883d8cca9771f5d33d36..a72657b42c0c88f55d7011002dbeda8aaa5f1dcb 100644 (file)
Binary files a/images/logo32.bmp and b/images/logo32.bmp differ

diff --git a/msvc/ctsim/ctsim.dsp b/msvc/ctsim/ctsim.dsp
index 6d159062db771ad15ae39e47e5431c61f8ef22f9..93155e1ad5bfcd2fb7340e7c31e9baa723fdb418 100644 (file)
--- a/msvc/ctsim/ctsim.dsp
+++ b/msvc/ctsim/ctsim.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # 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 "..\..\..\fftw-2.1.3\fftw" /I "\wx2.2.5\include" /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\rfftw" /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 CTSIMVERSION=\"3.0.0beta1\" /FR /YX /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I "..\..\..\fftw-2.1.3\fftw" /I "\wx2.2.5\include" /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\rfftw" /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 CTSIMVERSION=\"3.0.1\" /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"
@@ -69,7 +69,7 @@ LINK32=link.exe
 # 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.5\include" /I "..\..\..\fftw-2.1.3\fftw" /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\rfftw" /D VERSION=\"3.0.0beta1\" /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.0beta1\" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /Gi /GR /GX /Zi /Od /Gy /I "\wx2.2.5\include" /I "..\..\..\fftw-2.1.3\fftw" /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\rfftw" /D VERSION=\"3.0.0beta1\" /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.1\" /FR /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"
@@ -95,31 +95,36 @@ LINK32=link.exe
 
 SOURCE=..\..\src\ctsim.cpp
 # ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\"
-# SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\"
 # End Source File
 # Begin Source File
 
 SOURCE=..\..\src\dialogs.cpp
 # ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\"
-# SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\"
 # End Source File
 # Begin Source File
 
 SOURCE=..\..\src\dlgprojections.cpp
 # ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\"
-# SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\"
 # 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\"
-# SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\"
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=..\..\src\docs.cpp
 # ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\"
-# SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\"
 # End Source File
 # Begin Source File
 
@@ -129,7 +134,6 @@ SOURCE=..\..\src\graph3dview.cpp
 
 SOURCE=..\..\src\views.cpp
 # ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\"
-# SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\"
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -165,6 +169,10 @@ SOURCE=..\..\src\graph3dview.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\splash.xpm
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\views.h
 # End Source File
 # End Group
@@ -251,6 +259,26 @@ SOURCE=.\wx\msw\warning.ico
 
 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

diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg
index 687b9aff6d721212d0f131e22b046fae893baa76..f0425e3e957ddaec241ffcaade26039251eb8a4c 100644 (file)
--- a/msvc/ctsim/ctsim.plg
+++ b/msvc/ctsim/ctsim.plg
@@ -6,7 +6,8 @@
 --------------------Configuration: ctsim - Win32 Release--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP267.tmp" with contents
+Creating command line "rc.exe /l 0x409 /fo"Release/ctsim.res" /i "\wx2.2.5\include" /d "NDEBUG" "C:\ctsim\msvc\ctsim\ctsim.rc"" 
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP273.tmp" with contents
 [
 /nologo /G6 /MT /W3 /GR /GX /O2 /I "..\..\..\fftw-2.1.3\fftw" /I "\wx2.2.5\include" /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\rfftw" /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 CTSIMVERSION=\"3.0.1\" /D CTSIMVERSION=\"3.0.0alpha5\" /FR"Release/" /Fp"Release/ctsim.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c 
 "C:\ctsim\src\ctsim.cpp"
@@ -15,20 +16,20 @@ Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP267.tmp" with conten
 "C:\ctsim\src\docs.cpp"
 "C:\ctsim\src\views.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP267.tmp" 
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP268.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP273.tmp" 
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP274.tmp" with contents
 [
 /nologo /G6 /MT /W3 /GR /GX /O1 /I "..\..\..\fftw-2.1.3\fftw" /I "\wx2.2.5\include" /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\rfftw" /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 CTSIMVERSION=\"3.0.1\" /D CTSIMVERSION=\"3.0.0alpha5\" /FR"Release/" /Fp"Release/ctsim.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c 
 "C:\ctsim\src\dlgreconstruct.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP268.tmp" 
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP269.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP274.tmp" 
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP275.tmp" with contents
 [
 /nologo /G6 /MT /W3 /GR /GX /O2 /I "..\..\..\fftw-2.1.3\fftw" /I "\wx2.2.5\include" /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\rfftw" /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 CTSIMVERSION=\"3.0.1\" /FR"Release/" /Fp"Release/ctsim.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c 
 "C:\ctsim\src\graph3dview.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP269.tmp" 
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP26A.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP275.tmp" 
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP276.tmp" with contents
 [
 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 /nologo /subsystem:windows /incremental:no /pdb:"Release/ctsim.pdb" /machine:I386 /out:"Release/ctsim.exe" /libpath:"\wx2.2.5\lib" 
 .\Release\ctsim.obj
@@ -49,8 +50,9 @@ wsock32.lib tiff.lib jpeg.lib png.lib zlib.lib xpm.lib comctl32.lib kernel32.lib
 \wx2.2.5\lib\zlib.lib
 \wx2.2.5\lib\tiff.lib
 ]
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP26A.tmp"
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP276.tmp"
 <h3>Output Window</h3>
+Compiling resources...
 Compiling...
 ctsim.cpp
 dialogs.cpp

diff --git a/msvc/ctsim/logo.ico b/msvc/ctsim/logo.ico
index 7ccdc1be5c783026d6b7896ab3f7ebd856b6a909..d5e6f735133c657ddfd74d5bed4f60cba1469dd9 100644 (file)
Binary files a/msvc/ctsim/logo.ico and b/msvc/ctsim/logo.ico differ

diff --git a/msvc/ctsimtext/ctsimtext.dsp b/msvc/ctsimtext/ctsimtext.dsp
index c5e976e7ea5feac9d858686f8b55208a945164b2..d00745c770abd331ea13fc49bad0f7a673804639 100644 (file)
--- a/msvc/ctsimtext/ctsimtext.dsp
+++ b/msvc/ctsimtext/ctsimtext.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # 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.5\src\png" /I "\wx2.2.5\src\zlib" /I "../../include" /I "../../getopt" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2.2.5\include" /D VERSION=\"3.0.0beta1\" /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__" /YX /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "../../include" /I "../../getopt" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2.2.5\include" /D "NDEBUG" /D VERSION=\"3.0.1\" /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__" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -66,7 +66,7 @@ LINK32=link.exe
 # 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.5\src\png" /I "\wx2.2.5\src\zlib" /I "../../include" /I "../../getopt" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2.2.5\include" /D VERSION=\"3.0.0beta1\" /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__" /FR /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 "../../include" /I "../../getopt" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2.2.5\include" /D "_DEBUG" /D VERSION=\"3.0.1\" /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__" /FR /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

diff --git a/msvc/ctsimtext/logo.ico b/msvc/ctsimtext/logo.ico
index 7ccdc1be5c783026d6b7896ab3f7ebd856b6a909..d5e6f735133c657ddfd74d5bed4f60cba1469dd9 100644 (file)
Binary files a/msvc/ctsimtext/logo.ico and b/msvc/ctsimtext/logo.ico differ

diff --git a/msvc/libctsim/libctsim.dsp b/msvc/libctsim/libctsim.dsp
index d981c557eec0b1f6be929d4e3cad2d32d8dbf953..478ef7b0f34e5fc825e256a3235fb2a105efb334 100644 (file)
--- a/msvc/libctsim/libctsim.dsp
+++ b/msvc/libctsim/libctsim.dsp
@@ -123,6 +123,15 @@ SOURCE=..\..\libctgraphics\dlgezplot.cpp
 # 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
 
@@ -195,6 +204,15 @@ SOURCE=..\..\libctsim\projections.cpp
 # 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