projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r636: Optimized Rebinning, Added Reconstruct with Rebinning option
[ctsim.git]
/
msvc
/
ctsim
/
ctsim.dsp
diff --git
a/msvc/ctsim/ctsim.dsp
b/msvc/ctsim/ctsim.dsp
index c5c3ddf7aea81b491139c4c852332d75f6cdc937..1ff360a9a1e879bbb0ef7c92a6dfa5c4ad34798a 100644
(file)
--- a/
msvc/ctsim/ctsim.dsp
+++ b/
msvc/ctsim/ctsim.dsp
@@
-43,17
+43,17
@@
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
# 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 "
." /I "..\..\include" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\zlib" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2\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 CTSIMVERSION=\"3.0.0beta1\
" /FR /YX /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /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" /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 CTSIMVERSION=\"3.1.0\" /D "HAVE_CTN_DICOM
" /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 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
\include\wx\msw" /i "\wx2
\include" /d "NDEBUG"
+# ADD RSC /l 0x409 /i "\wx2
.2.5
\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
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 wsock32.lib comctl32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libpng.lib zlib.lib /nologo /subsystem:windows /machine:I386 /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib
"
+# 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.5\lib" /libpath:"\dicom\ctn\winctn\ctn_lib\Release
"
!ELSEIF "$(CFG)" == "ctsim - Win32 Debug"
!ELSEIF "$(CFG)" == "ctsim - Win32 Debug"
@@
-69,17
+69,17
@@
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
# 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 /G
R /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.0beta1\" /FR /YX
/FD /GZ /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /G
i /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" /I "\dicom\ctn\include" /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.1.0\" /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 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\wx\msw" /i "\wx2
\include" /d "_DEBUG"
+# ADD RSC /l 0x409 /i "\wx2
.2.5
\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
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
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 /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib
"
+# 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.5\lib" /libpath:"\dicom\ctn\winctn\ctn_lib\Debug
"
# SUBTRACT LINK32 /nodefaultlib
!ENDIF
# SUBTRACT LINK32 /nodefaultlib
!ENDIF
@@
-93,168
+93,199
@@
LINK32=link.exe
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
# 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
SOURCE=..\..\src\ctsim.cpp
+# ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\"
# End Source File
# Begin Source File
SOURCE=..\..\src\dialogs.cpp
# 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\dlgprojections.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
# 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
# End Source File
# Begin Source File
SOURCE=..\..\src\docs.cpp
+# ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\"
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=..\..\src\
views
.cpp
+SOURCE=..\..\src\
graph3dview
.cpp
# End Source File
# End Source File
-# End Group
-# Begin Group "Header Files"
+# Begin Source File
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
+SOURCE=..\..\src\threadproj.cpp
+# End Source File
# Begin Source File
# Begin Source File
-SOURCE=..\..\src\
ctsim.h
+SOURCE=..\..\src\
threadraster.cpp
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=..\..\src\
dialogs.h
+SOURCE=..\..\src\
threadrecon.cpp
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=..\..\src\
dlgprojections.h
+SOURCE=..\..\src\
tips.cpp
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=..\..\src\dlgreconstruct.h
+SOURCE=..\..\src\views.cpp
+# ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\"
# End Source File
# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
# Begin Source File
-SOURCE=..\..\src\
docs
.h
+SOURCE=..\..\src\
backgroundmgr
.h
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=..\..\src\
views
.h
+SOURCE=..\..\src\
backgroundsupr
.h
# End Source File
# End Source File
-# End Group
-# Begin Group "Resource Files"
+# Begin Source File
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+SOURCE="..\..\src\ctsim-map.h"
+# End Source File
# Begin Source File
# Begin Source File
-SOURCE=.
\wx\msw\blank.cur
+SOURCE=.
.\..\src\ctsim.h
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=..\..\
..\wx2\include\wx\msw\wx\msw\blank.cur
+SOURCE=..\..\
src\dialogs.h
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.
\wx\msw\bullseye.cur
+SOURCE=.
.\..\src\dlgprojections.h
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=..\..\
..\wx2\include\wx\msw\wx\msw\bullseye.cur
+SOURCE=..\..\
src\dlgreconstruct.h
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.\ctsim.rc
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\docs.h
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.
\wx\msw\error.ico
+SOURCE=.
.\..\src\graph3dview.h
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=..\..\
..\wx2\include\wx\msw\wx\msw\error.ico
+SOURCE=..\..\
src\splash.xpm
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.
\wx\msw\hand.cur
+SOURCE=.
.\..\src\threadproj.h
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=..\..\
..\wx2\include\wx\msw\wx\msw\hand.cur
+SOURCE=..\..\
src\threadraster.h
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.
\wx\msw\info.ico
+SOURCE=.
.\..\src\threadrecon.h
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=..\..\
..\wx2\include\wx\msw\wx\msw\info.ico
+SOURCE=..\..\
src\tips.h
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.
\wx\msw\magnif1.cur
+SOURCE=.
.\..\src\views.h
# End Source File
# 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
# Begin Source File
-SOURCE=.
.\..\..\wx2\include\wx\msw\wx\msw\magnif1
.cur
+SOURCE=.
\wx\msw\blank
.cur
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.\wx\msw\
noentry
.cur
+SOURCE=.\wx\msw\
bullseye
.cur
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.
.\..\..\wx2\include\wx\msw\wx\msw\noentry.cur
+SOURCE=.
\ctsim.rc
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.\wx\msw\
pbrush.cur
+SOURCE=.\wx\msw\
error.ico
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.
.\..\..\wx2\include\wx\msw\wx\msw\pbrush
.cur
+SOURCE=.
\wx\msw\hand
.cur
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.\wx\msw\
pencil.cur
+SOURCE=.\wx\msw\
info.ico
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.
.\..\..\wx2\include\wx\msw\wx\msw\pencil.cur
+SOURCE=.
\logo.ico
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.\wx\msw\
pntleft
.cur
+SOURCE=.\wx\msw\
magnif1
.cur
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.
.\..\..\wx2\include\wx\msw\wx\msw\pntleft
.cur
+SOURCE=.
\wx\msw\noentry
.cur
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.\wx\msw\p
ntright
.cur
+SOURCE=.\wx\msw\p
brush
.cur
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.
.\..\..\wx2\include\wx\msw\wx\msw\pntright
.cur
+SOURCE=.
\wx\msw\pencil
.cur
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.\wx\msw\
query
.cur
+SOURCE=.\wx\msw\
pntleft
.cur
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.
.\..\..\wx2\include\wx\msw\wx\msw\query
.cur
+SOURCE=.
\wx\msw\pntright
.cur
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.\wx\msw\que
stion.ico
+SOURCE=.\wx\msw\que
ry.cur
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.
.\..\..\wx2\include\wx\msw
\wx\msw\question.ico
+SOURCE=.\wx\msw\question.ico
# End Source File
# Begin Source File
# End Source File
# Begin Source File
@@
-262,39
+293,39
@@
SOURCE=.\wx\msw\roller.cur
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.
.\..\..\wx2\include\wx\msw\wx\msw\roller
.cur
+SOURCE=.
\wx\msw\size
.cur
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.\wx\msw\
size.cur
+SOURCE=.\wx\msw\
tip.ico
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.
.\..\..\wx2\include\wx\msw\wx\msw\size.cur
+SOURCE=.
\wx\msw\warning.ico
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.\wx\msw\
tip.ico
+SOURCE=.\wx\msw\
watch1.cur
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.
.\..\..\wx2\include\wx\msw\wx\msw\tip
.ico
+SOURCE=.
\wx\html\msw\wbook
.ico
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.\wx\
msw\warning
.ico
+SOURCE=.\wx\
html\msw\wfolder
.ico
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.
.\..\..\wx2\include\wx\msw\wx\msw\warning
.ico
+SOURCE=.
\wx\html\msw\whelp
.ico
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.\wx\
msw\watch1.cur
+SOURCE=.\wx\
html\msw\whlproot.ico
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.
.\..\..\wx2\include\wx\msw\wx\msw\watch1.cur
+SOURCE=.
\wx\html\msw\wpage.ico
# End Source File
# End Group
# End Target
# End Source File
# End Group
# End Target