--------------------Configuration: ctsim - Win32 Release--------------------\r
</h3>\r
<h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPB6.tmp" with contents\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+ctsim.exe - 0 error(s), 0 warning(s)\r
+<h3>\r
+--------------------Configuration: libctsim - Win32 Debug--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPF2.tmp" with contents\r
[\r
-/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 CTSIMVERSION=\"2.1.0\" /D "NDEBUG" /D "__WXWIN__" /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 "__WXMSW__" /D "HAVE_SGP" /FR"Release/" /Fp"Release/ctsim.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c \r
-"C:\ctsim-2.0.6\src\ctsim.cpp"\r
-"C:\ctsim-2.0.6\src\docs.cpp"\r
-"C:\ctsim-2.0.6\src\views.cpp"\r
+/nologo /G6 /MTd /W3 /Gm /GR- /GX /ZI /Od /I "..\..\..\zlib" /I "..\..\INCLUDE" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2\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__" /FR"Debug/" /Fp"Debug/libctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c \r
+"C:\ctsim-2.0.6\libctsim\backprojectors.cpp"\r
]\r
-Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPB6.tmp" \r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPB7.tmp" with contents\r
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPF2.tmp" \r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPF3.tmp" with contents\r
[\r
-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 /incremental:no /pdb:"Release/ctsim.pdb" /machine:I386 /out:"Release/ctsim.exe" /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
-".\Release\ctsim.obj"\r
-".\Release\dialogs.obj"\r
-".\Release\dlgprojections.obj"\r
-".\Release\dlgreconstruct.obj"\r
-".\Release\docs.obj"\r
-".\Release\views.obj"\r
-".\Release\wx.res"\r
-"\ctsim-2.0.6\msvc\libctsim\Release\libctsim.lib"\r
-"\fftw-2.1.3\Win32\FFTW2st\Release\FFTW2st.lib"\r
-"\fftw-2.1.3\Win32\RFFTW2st\Release\RFFTW2st.lib"\r
-"\wx2\lib\wx.lib"\r
+/nologo /out:"Debug\libctsim.lib" \r
+".\Debug\array2dfile.obj"\r
+".\Debug\backprojectors.obj"\r
+".\Debug\clip.obj"\r
+".\Debug\consoleio.obj"\r
+".\Debug\ezplot.obj"\r
+".\Debug\ezset.obj"\r
+".\Debug\ezsupport.obj"\r
+".\Debug\filter.obj"\r
+".\Debug\fnetorderstream.obj"\r
+".\Debug\getopt.obj"\r
+".\Debug\getopt1.obj"\r
+".\Debug\imagefile.obj"\r
+".\Debug\mathfuncs.obj"\r
+".\Debug\phantom.obj"\r
+".\Debug\pol.obj"\r
+".\Debug\procsignal.obj"\r
+".\Debug\projections.obj"\r
+".\Debug\reconstruct.obj"\r
+".\Debug\scanner.obj"\r
+".\Debug\sgp.obj"\r
+".\Debug\strfuncs.obj"\r
+".\Debug\syserror.obj"\r
+".\Debug\trace.obj"\r
+".\Debug\transformmatrix.obj"\r
+".\Debug\xform.obj"\r
]\r
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPB7.tmp"\r
+Creating command line "link.exe -lib @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPF3.tmp"\r
<h3>Output Window</h3>\r
Compiling...\r
-ctsim.cpp\r
-docs.cpp\r
-views.cpp\r
-Linking...\r
-LINK : warning LNK4089: all references to "ADVAPI32.dll" discarded by /OPT:REF\r
-LINK : warning LNK4089: all references to "WSOCK32.dll" discarded by /OPT:REF\r
-Creating command line "bscmake.exe /nologo /o"Release/ctsim.bsc" ".\Release\ctsim.sbr" ".\Release\dialogs.sbr" ".\Release\dlgprojections.sbr" ".\Release\dlgreconstruct.sbr" ".\Release\docs.sbr" ".\Release\views.sbr""\r
-Creating browse info file...\r
-<h3>Output Window</h3>\r
-\r
-\r
-\r
-<h3>Results</h3>\r
-ctsim.exe - 0 error(s), 2 warning(s)\r
+backprojectors.cpp\r
+Creating library...\r
<h3>\r
--------------------Configuration: ctsim - Win32 Debug--------------------\r
</h3>\r
<h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPB9.tmp" with contents\r
-[\r
-/nologo /G6 /MTd /W3 /Gm /GR /GX /ZI /Od /I "\wx2\include" /I "." /I "..\..\include" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\zlib" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /D VERSION=\"2.1.0\" /D "_DEBUG" /D "__WXMSW__" /D "HAVE_SGP" /D VERSION="2.1.0" /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" /FR"Debug/" /Fp"Debug/ctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c \r
-"C:\ctsim-2.0.6\src\views.cpp"\r
-]\r
-Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPB9.tmp" \r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPBA.tmp" with contents\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPF4.tmp" with contents\r
[\r
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 /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:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
".\Debug\ctsim.obj"\r
"\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib"\r
"\wx2\lib\wxd.lib"\r
]\r
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPBA.tmp"\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPF4.tmp"\r
<h3>Output Window</h3>\r
-Compiling...\r
-views.cpp\r
Linking...\r
-Creating command line "bscmake.exe /nologo /o"Debug/ctsim.bsc" ".\Debug\ctsim.sbr" ".\Debug\dialogs.sbr" ".\Debug\dlgprojections.sbr" ".\Debug\dlgreconstruct.sbr" ".\Debug\docs.sbr" ".\Debug\views.sbr""\r
-Creating browse info file...\r
-BSCMAKE: warning BK4503 : minor error in .SBR file '.\Debug\views.sbr' ignored\r
-<h3>Output Window</h3>\r
\r
\r
\r
<h3>Results</h3>\r
-ctsim.exe - 0 error(s), 1 warning(s)\r
+ctsim.exe - 0 error(s), 0 warning(s)\r
<h3>\r
--------------------Configuration: if1 - Win32 Release--------------------\r
</h3>\r
<h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPBB.tmp" with contents\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPF6.tmp" with contents\r
[\r
wx.lib libctsim.lib zlib.lib comctl32.lib wsock32.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 libpng.lib /nologo /subsystem:console /incremental:no /pdb:"Release/if1.pdb" /machine:I386 /out:"Release/if1.exe" /libpath:"..\libctsim\Release" /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\wx2\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
".\Release\if1.obj"\r
"\ctsim-2.0.6\msvc\libctsim\Release\libctsim.lib"\r
]\r
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPBB.tmp"\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPF6.tmp"\r
<h3>Output Window</h3>\r
Linking...\r
\r
--------------------Configuration: if1 - Win32 Debug--------------------\r
</h3>\r
<h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPBD.tmp" with contents\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPF8.tmp" with contents\r
[\r
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:console /incremental:yes /pdb:"Debug/if1.pdb" /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /out:"Debug/if1.exe" /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
".\Debug\if1.obj"\r
"\ctsim-2.0.6\msvc\libctsim\Debug\libctsim.lib"\r
]\r
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPBD.tmp"\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPF8.tmp"\r
<h3>Output Window</h3>\r
Linking...\r
\r
--------------------Configuration: if2 - Win32 Release--------------------\r
</h3>\r
<h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPBE.tmp" with contents\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPF9.tmp" with contents\r
[\r
wx.lib libctsim.lib zlib.lib comctl32.lib wsock32.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 libpng.lib /nologo /subsystem:console /incremental:no /pdb:"Release/if2.pdb" /machine:I386 /out:"Release/if2.exe" /libpath:"..\libctsim\Release" /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\wx2\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
".\Release\if2.obj"\r
"\ctsim-2.0.6\msvc\libctsim\Release\libctsim.lib"\r
]\r
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPBE.tmp"\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPF9.tmp"\r
<h3>Output Window</h3>\r
Linking...\r
\r
--------------------Configuration: if2 - Win32 Debug--------------------\r
</h3>\r
<h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPC0.tmp" with contents\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPFB.tmp" with contents\r
[\r
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:console /incremental:yes /pdb:"Debug/if2.pdb" /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /out:"Debug/if2.exe" /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
".\Debug\if2.obj"\r
"\ctsim-2.0.6\msvc\libctsim\Debug\libctsim.lib"\r
]\r
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPC0.tmp"\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPFB.tmp"\r
<h3>Output Window</h3>\r
Linking...\r
\r
--------------------Configuration: ifinfo - Win32 Release--------------------\r
</h3>\r
<h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPC1.tmp" with contents\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPFC.tmp" with contents\r
[\r
wx.lib libctsim.lib zlib.lib comctl32.lib wsock32.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 libpng.lib /nologo /subsystem:console /incremental:no /pdb:"Release/ifinfo.pdb" /machine:I386 /out:"Release/ifinfo.exe" /libpath:"..\libctsim\Release" /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\wx2\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
".\Release\ifinfo.obj"\r
"\ctsim-2.0.6\msvc\libctsim\Release\libctsim.lib"\r
]\r
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPC1.tmp"\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPFC.tmp"\r
<h3>Output Window</h3>\r
Linking...\r
\r
--------------------Configuration: ifinfo - Win32 Debug--------------------\r
</h3>\r
<h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPC3.tmp" with contents\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPFE.tmp" with contents\r
[\r
rpcrt4.lib comctl32.lib wsock32.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 libcpd.lib libcd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/ifinfo.pdb" /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /nodefaultlib /out:"Debug/ifinfo.exe" /pdbtype:sept \r
".\Debug\ifinfo.obj"\r
"\ctsim-2.0.6\msvc\libctsim\Debug\libctsim.lib"\r
]\r
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPC3.tmp"\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPFE.tmp"\r
<h3>Output Window</h3>\r
Linking...\r
\r
--------------------Configuration: phm2if - Win32 Release--------------------\r
</h3>\r
<h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPC4.tmp" with contents\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPFF.tmp" with contents\r
[\r
wx.lib libctsim.lib zlib.lib comctl32.lib wsock32.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 libpng.lib /nologo /subsystem:console /incremental:no /pdb:"Release/phm2if.pdb" /machine:I386 /out:"Release/phm2if.exe" /libpath:"..\libctsim\Release" /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\wx2\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
".\Release\phm2if.obj"\r
"\ctsim-2.0.6\msvc\libctsim\Release\libctsim.lib"\r
]\r
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPC4.tmp"\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPFF.tmp"\r
<h3>Output Window</h3>\r
Linking...\r
LINK : warning LNK4089: all references to "ADVAPI32.dll" discarded by /OPT:REF\r
--------------------Configuration: phm2if - Win32 Debug--------------------\r
</h3>\r
<h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPC6.tmp" with contents\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP101.tmp" with contents\r
[\r
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:console /incremental:yes /pdb:"Debug/phm2if.pdb" /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /out:"Debug/phm2if.exe" /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
".\Debug\phm2if.obj"\r
"\ctsim-2.0.6\msvc\libctsim\Debug\libctsim.lib"\r
]\r
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPC6.tmp"\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP101.tmp"\r
<h3>Output Window</h3>\r
Linking...\r
\r
--------------------Configuration: phm2pj - Win32 Release--------------------\r
</h3>\r
<h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPC8.tmp" with contents\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP102.tmp" with contents\r
[\r
wx.lib libctsim.lib zlib.lib comctl32.lib wsock32.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 libpng.lib /nologo /subsystem:console /incremental:no /pdb:"Release/phm2pj.pdb" /machine:I386 /out:"Release/phm2pj.exe" /libpath:"..\libctsim\Release" /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\wx2\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
".\Release\phm2pj.obj"\r
"\ctsim-2.0.6\msvc\libctsim\Release\libctsim.lib"\r
]\r
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPC8.tmp"\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP102.tmp"\r
<h3>Output Window</h3>\r
Linking...\r
LINK : warning LNK4089: all references to "ADVAPI32.dll" discarded by /OPT:REF\r
--------------------Configuration: phm2pj - Win32 Debug--------------------\r
</h3>\r
<h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPCA.tmp" with contents\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP104.tmp" with contents\r
[\r
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:console /incremental:yes /pdb:"Debug/phm2pj.pdb" /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /out:"Debug/phm2pj.exe" /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
".\Debug\phm2pj.obj"\r
"\ctsim-2.0.6\msvc\libctsim\Debug\libctsim.lib"\r
]\r
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPCA.tmp"\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP104.tmp"\r
<h3>Output Window</h3>\r
Linking...\r
\r
--------------------Configuration: pj2if - Win32 Release--------------------\r
</h3>\r
<h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPCC.tmp" with contents\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP105.tmp" with contents\r
[\r
wx.lib libctsim.lib zlib.lib comctl32.lib wsock32.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 libpng.lib /nologo /subsystem:console /incremental:no /pdb:"Release/pj2if.pdb" /machine:I386 /out:"Release/pj2if.exe" /libpath:"..\libctsim\Release" /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\wx2\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
".\Release\pj2if.obj"\r
"\ctsim-2.0.6\msvc\libctsim\Release\libctsim.lib"\r
"\wx2\lib\wx.lib"\r
]\r
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPCC.tmp"\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP105.tmp"\r
<h3>Output Window</h3>\r
Linking...\r
LINK : warning LNK4089: all references to "ADVAPI32.dll" discarded by /OPT:REF\r
--------------------Configuration: pj2if - Win32 Debug--------------------\r
</h3>\r
<h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPCE.tmp" with contents\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP107.tmp" with contents\r
[\r
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:console /incremental:yes /pdb:"Debug/pj2if.pdb" /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /out:"Debug/pj2if.exe" /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
".\Debug\pj2if.obj"\r
"\ctsim-2.0.6\msvc\libctsim\Debug\libctsim.lib"\r
"\wx2\lib\wxd.lib"\r
]\r
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPCE.tmp"\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP107.tmp"\r
<h3>Output Window</h3>\r
Linking...\r
\r
--------------------Configuration: pjinfo - Win32 Release--------------------\r
</h3>\r
<h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPD0.tmp" with contents\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP108.tmp" with contents\r
[\r
wx.lib libctsim.lib zlib.lib comctl32.lib wsock32.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 libpng.lib /nologo /subsystem:console /incremental:no /pdb:"Release/pjinfo.pdb" /machine:I386 /out:"Release/pjinfo.exe" /libpath:"..\libctsim\Release" /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\wx2\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
".\Release\pjinfo.obj"\r
"\fftw-2.1.3\Win32\RFFTW2st\Release\RFFTW2st.lib"\r
"\wx2\lib\wx.lib"\r
]\r
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPD0.tmp"\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP108.tmp"\r
<h3>Output Window</h3>\r
Linking...\r
LINK : warning LNK4089: all references to "ADVAPI32.dll" discarded by /OPT:REF\r
--------------------Configuration: pjinfo - Win32 Debug--------------------\r
</h3>\r
<h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPD2.tmp" with contents\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP10A.tmp" with contents\r
[\r
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:console /incremental:yes /pdb:"Debug/pjinfo.pdb" /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /out:"Debug/pjinfo.exe" /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
".\Debug\pjinfo.obj"\r
"\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib"\r
"\wx2\lib\wxd.lib"\r
]\r
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPD2.tmp"\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP10A.tmp"\r
<h3>Output Window</h3>\r
Linking...\r
\r
--------------------Configuration: pjrec - Win32 Release--------------------\r
</h3>\r
<h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPD4.tmp" with contents\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP10B.tmp" with contents\r
[\r
wx.lib libctsim.lib zlib.lib comctl32.lib wsock32.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 libpng.lib /nologo /subsystem:console /incremental:no /pdb:"Release/pjrec.pdb" /machine:I386 /out:"Release/pjrec.exe" /libpath:"..\libctsim\Release" /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\wx2\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
".\Release\pjrec.obj"\r
"\wx2\lib\wx.lib"\r
"\ctsim-2.0.6\msvc\libctsim\Release\libctsim.lib"\r
]\r
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPD4.tmp"\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP10B.tmp"\r
<h3>Output Window</h3>\r
Linking...\r
LINK : warning LNK4089: all references to "ADVAPI32.dll" discarded by /OPT:REF\r
--------------------Configuration: pjrec - Win32 Debug--------------------\r
</h3>\r
<h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPD6.tmp" with contents\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP10D.tmp" with contents\r
[\r
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:console /incremental:yes /pdb:"Debug/pjrec.pdb" /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /out:"Debug/pjrec.exe" /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
".\Debug\pjrec.obj"\r
"\wx2\lib\wxd.lib"\r
"\ctsim-2.0.6\msvc\libctsim\Debug\libctsim.lib"\r
]\r
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPD6.tmp"\r
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP10D.tmp"\r
<h3>Output Window</h3>\r
Linking...\r
\r
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: views.cpp,v 1.29 2000/12/18 01:00:05 kevin Exp $
+** $Id: views.cpp,v 1.30 2000/12/18 09:31:26 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
// ImageFileCanvas
BEGIN_EVENT_TABLE(ImageFileCanvas, wxScrolledWindow)
- EVT_MOUSE_EVENTS(ImageFileCanvas::OnMouseEvent)
+EVT_MOUSE_EVENTS(ImageFileCanvas::OnMouseEvent)
END_EVENT_TABLE()
ImageFileCanvas::ImageFileCanvas (ImageFileView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style)
- : wxScrolledWindow(frame, -1, pos, size, style)
+: wxScrolledWindow(frame, -1, pos, size, style)
{
m_pView = v;
}
PrepareDC(dc);
wxPoint pt(event.GetLogicalPosition(dc));
-
+
if (event.LeftIsDown()) {
- const ImageFile& rIF = m_pView->GetDocument()->getImageFile();
- ImageFileArrayConst v = rIF.getArray();
- int nx = rIF.nx();
- int ny = rIF.ny();
-
- if (pt.x >= 0 && pt.x < nx && pt.y >= 0 && pt.y < ny) {
- std::ostringstream os;
- os << "Image value (" << pt.x << "," << pt.y << ") = " << v[pt.x][ny - 1 - pt.y] << "\n";
- *theApp->getLog() << os.str().c_str();
- } else
- *theApp->getLog() << "Mouse out of image range (" << pt.x << "," << pt.y << ")\n";
-
+ const ImageFile& rIF = m_pView->GetDocument()->getImageFile();
+ ImageFileArrayConst v = rIF.getArray();
+ int nx = rIF.nx();
+ int ny = rIF.ny();
+
+ if (pt.x >= 0 && pt.x < nx && pt.y >= 0 && pt.y < ny) {
+ std::ostringstream os;
+ os << "Image value (" << pt.x << "," << pt.y << ") = " << v[pt.x][ny - 1 - pt.y] << "\n";
+ *theApp->getLog() << os.str().c_str();
+ } else
+ *theApp->getLog() << "Mouse out of image range (" << pt.x << "," << pt.y << ")\n";
+
}
}
IMPLEMENT_DYNAMIC_CLASS(ImageFileView, wxView)
BEGIN_EVENT_TABLE(ImageFileView, wxView)
- EVT_MENU(IFMENU_FILE_PROPERTIES, ImageFileView::OnProperties)
- EVT_MENU(IFMENU_VIEW_SCALE_MINMAX, ImageFileView::OnScaleMinMax)
- EVT_MENU(IFMENU_VIEW_SCALE_AUTO, ImageFileView::OnScaleAuto)
+EVT_MENU(IFMENU_FILE_PROPERTIES, ImageFileView::OnProperties)
+EVT_MENU(IFMENU_VIEW_SCALE_MINMAX, ImageFileView::OnScaleMinMax)
+EVT_MENU(IFMENU_VIEW_SCALE_AUTO, ImageFileView::OnScaleAuto)
END_EVENT_TABLE()
ImageFileView::ImageFileView(void)
- : wxView(), m_canvas(NULL), m_frame(NULL), m_bMinSpecified(false), m_bMaxSpecified(false)
+: wxView(), m_canvas(NULL), m_frame(NULL), m_bMinSpecified(false), m_bMaxSpecified(false)
{
}
void
ImageFileView::OnProperties (wxCommandEvent& event)
{
- double min, max, mean, mode, median, stddev;
- const ImageFile& rIF = GetDocument()->getImageFile();
- if (rIF.nx() == 0 || rIF.ny() == 0)
- *theApp->getLog() << "Properties: empty imagefile\n";
- else {
- const std::string& rFilename = rIF.getFilename();
- rIF.statistics (min, max, mean, mode, median, stddev);
- std::ostringstream os;
- os << "file: " << rFilename << "\nmin: "<<min<<"\nmax: "<<max<<"\nmean: "<<mean<<"\nmedian: "<<median<<"\nmode: "<<mode<<"\nstddev: "<<stddev << "\n";
- *theApp->getLog() << os.str().c_str();
- wxMessageDialog dialogMsg (m_frame, os.str().c_str(), "Imagefile Properties", wxOK | wxICON_INFORMATION);
- dialogMsg.ShowModal();
- }
+ double min, max, mean, mode, median, stddev;
+ const ImageFile& rIF = GetDocument()->getImageFile();
+ if (rIF.nx() == 0 || rIF.ny() == 0)
+ *theApp->getLog() << "Properties: empty imagefile\n";
+ else {
+ const std::string& rFilename = rIF.getFilename();
+ rIF.statistics (min, max, mean, mode, median, stddev);
+ std::ostringstream os;
+ os << "file: " << rFilename << "\nmin: "<<min<<"\nmax: "<<max<<"\nmean: "<<mean<<"\nmedian: "<<median<<"\nmode: "<<mode<<"\nstddev: "<<stddev << "\n";
+ *theApp->getLog() << os.str().c_str();
+ wxMessageDialog dialogMsg (m_frame, os.str().c_str(), "Imagefile Properties", wxOK | wxICON_INFORMATION);
+ dialogMsg.ShowModal();
+ }
}
void
DialogAutoScaleParameters dialogAutoScale (m_frame, rIF, m_dAutoScaleFactor);
int iRetVal = dialogAutoScale.ShowModal();
if (iRetVal == wxID_OK) {
- m_bMinSpecified = true;
- m_bMaxSpecified = true;
- double dMin, dMax;
- dialogAutoScale.getMinMax (&dMin, &dMax);
- m_dMinPixel = dMin;
- m_dMaxPixel = dMax;
- m_dAutoScaleFactor = dialogAutoScale.getAutoScaleFactor();
- OnUpdate (this, NULL);
+ m_bMinSpecified = true;
+ m_bMaxSpecified = true;
+ double dMin, dMax;
+ dialogAutoScale.getMinMax (&dMin, &dMax);
+ m_dMinPixel = dMin;
+ m_dMaxPixel = dMax;
+ m_dAutoScaleFactor = dialogAutoScale.getAutoScaleFactor();
+ OnUpdate (this, NULL);
}
}
const ImageFile& rIF = GetDocument()->getImageFile();
double min, max;
if (! m_bMinSpecified && ! m_bMaxSpecified)
- rIF.getMinMax (min, max);
-
+ rIF.getMinMax (min, max);
+
if (m_bMinSpecified)
- min = m_dMinPixel;
+ min = m_dMinPixel;
if (m_bMaxSpecified)
- max = m_dMaxPixel;
-
+ max = m_dMaxPixel;
+
DialogGetImageMinMax dialogMinMax (m_frame, rIF, min, max);
int retVal = dialogMinMax.ShowModal();
if (retVal == wxID_OK) {
- m_bMinSpecified = true;
- m_bMaxSpecified = true;
- m_dMinPixel = dialogMinMax.getMinimum();
- m_dMaxPixel = dialogMinMax.getMaximum();
- OnUpdate (this, NULL);
+ m_bMinSpecified = true;
+ m_bMaxSpecified = true;
+ m_dMinPixel = dialogMinMax.getMinimum();
+ m_dMaxPixel = dialogMinMax.getMaximum();
+ OnUpdate (this, NULL);
}
}
file_menu->AppendSeparator();
file_menu->Append(IFMENU_FILE_PROPERTIES, "P&roperties");
-
+
file_menu->AppendSeparator();
file_menu->Append(wxID_PRINT, "&Print...");
file_menu->Append(wxID_PRINT_SETUP, "Print &Setup...");
ImageFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
{
m_frame = CreateChildFrame(doc, this);
- SetFrame(m_frame);
+ SetFrame (m_frame);
m_bMinSpecified = false;
m_bMaxSpecified = false;
m_dAutoScaleFactor = 1.;
-
+
int width, height;
- m_frame->GetClientSize(&width, &height);
+ m_frame->GetClientSize (&width, &height);
m_frame->SetTitle("ImageFileView");
- m_canvas = CreateCanvas(this, m_frame);
-
-#ifdef __X__
+ m_canvas = CreateCanvas (this, m_frame);
+
int x, y; // X requires a forced resize
m_frame->GetSize(&x, &y);
m_frame->SetSize(-1, -1, x, y);
-#endif
-
- m_frame->Show(true);
+ m_frame->SetFocus();\r
+ m_frame->Show(true);
Activate(true);
return true;
void
ImageFileView::OnDraw (wxDC* dc)
{
- if (m_bitmap.Ok())
- dc->DrawBitmap(m_bitmap, 0, 0, false);
+ if (m_bitmap.Ok())
+ dc->DrawBitmap(m_bitmap, 0, 0, false);
}
void
-ImageFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
+ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
{
const ImageFile& rIF = dynamic_cast<ImageFileDocument*>(GetDocument())->getImageFile();
ImageFileArrayConst v = rIF.getArray();
int nx = rIF.nx();
int ny = rIF.ny();
if (v != NULL && nx != 0 && ny != 0) {
- if (! m_bMinSpecified || ! m_bMaxSpecified) {
- double min, max;
- rIF.getMinMax (min, max);
- if (! m_bMinSpecified)
- m_dMinPixel = min;
- if (! m_bMaxSpecified)
- m_dMaxPixel = max;
- }
- double scaleWidth = m_dMaxPixel - m_dMinPixel;
-
- unsigned char* imageData = new unsigned char [nx * ny * 3];
- for (int ix = 0; ix < nx; ix++) {
- for (int iy = 0; iy < ny; iy++) {
- double scaleValue = ((v[ix][iy] - m_dMinPixel) / scaleWidth) * 255;
- int intensity = static_cast<int>(scaleValue + 0.5);
- intensity = clamp (intensity, 0, 255);
- int baseAddr = ((ny - 1 - iy) * nx + ix) * 3;
- imageData[baseAddr] = imageData[baseAddr+1] = imageData[baseAddr+2] = intensity;
- }
- }
- wxImage image (nx, ny, imageData, true);
- m_bitmap = image.ConvertToBitmap();
- delete imageData;
- int xSize = nx;
- int ySize = ny;
- xSize = clamp (xSize, 0, 800);
- ySize = clamp (ySize, 0, 800);
- m_frame->SetClientSize (xSize, ySize);
- m_canvas->SetScrollbars(20, 20, nx/20, ny/20);
- m_canvas->SetBackgroundColour(*wxWHITE);
+ if (! m_bMinSpecified || ! m_bMaxSpecified) {
+ double min, max;
+ rIF.getMinMax (min, max);
+ if (! m_bMinSpecified)
+ m_dMinPixel = min;
+ if (! m_bMaxSpecified)
+ m_dMaxPixel = max;
+ }
+ double scaleWidth = m_dMaxPixel - m_dMinPixel;
+
+ unsigned char* imageData = new unsigned char [nx * ny * 3];
+ for (int ix = 0; ix < nx; ix++) {
+ for (int iy = 0; iy < ny; iy++) {
+ double scaleValue = ((v[ix][iy] - m_dMinPixel) / scaleWidth) * 255;
+ int intensity = static_cast<int>(scaleValue + 0.5);
+ intensity = clamp (intensity, 0, 255);
+ int baseAddr = ((ny - 1 - iy) * nx + ix) * 3;
+ imageData[baseAddr] = imageData[baseAddr+1] = imageData[baseAddr+2] = intensity;
+ }
+ }
+ wxImage image (nx, ny, imageData, true);
+ m_bitmap = image.ConvertToBitmap();
+ delete imageData;
+ int xSize = nx;
+ int ySize = ny;
+ xSize = clamp (xSize, 0, 800);
+ ySize = clamp (ySize, 0, 800);
+ m_frame->SetClientSize (xSize, ySize);
+ m_canvas->SetScrollbars(20, 20, nx/20, ny/20);
+ m_canvas->SetBackgroundColour(*wxWHITE);
}
-
+
if (m_canvas)
- m_canvas->Refresh();
+ m_canvas->Refresh();
}
bool
{
if (!GetDocument()->Close())
return false;
-
+
m_canvas->Clear();
m_canvas->m_pView = NULL;
m_canvas = NULL;
wxString s(theApp->GetAppName());
if (m_frame)
- m_frame->SetTitle(s);
+ m_frame->SetTitle(s);
SetFrame(NULL);
-
+
Activate(false);
if (deleteWindow) {
// PhantomCanvas
PhantomCanvas::PhantomCanvas (PhantomView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style)
- : wxScrolledWindow(frame, -1, pos, size, style)
+: wxScrolledWindow(frame, -1, pos, size, style)
{
m_pView = v;
}
IMPLEMENT_DYNAMIC_CLASS(PhantomView, wxView)
BEGIN_EVENT_TABLE(PhantomView, wxView)
- EVT_MENU(PHMMENU_FILE_PROPERTIES, PhantomView::OnProperties)
- EVT_MENU(PHMMENU_PROCESS_RASTERIZE, PhantomView::OnRasterize)
- EVT_MENU(PHMMENU_PROCESS_PROJECTIONS, PhantomView::OnProjections)
+EVT_MENU(PHMMENU_FILE_PROPERTIES, PhantomView::OnProperties)
+EVT_MENU(PHMMENU_PROCESS_RASTERIZE, PhantomView::OnRasterize)
+EVT_MENU(PHMMENU_PROCESS_PROJECTIONS, PhantomView::OnProjections)
END_EVENT_TABLE()
PhantomView::PhantomView(void)
- : wxView(), m_canvas(NULL), m_frame(NULL)
+: wxView(), m_canvas(NULL), m_frame(NULL)
{
m_iDefaultNDet = 367;
m_iDefaultNView = 320;
void
PhantomView::OnProperties (wxCommandEvent& event)
{
- const int idPhantom = GetDocument()->getPhantomID();
- const wxString& namePhantom = GetDocument()->getPhantomName();
- std::ostringstream os;
- os << "Phantom " << namePhantom.c_str() << " (" << idPhantom << ")\n";
- *theApp->getLog() << os.str().c_str();
+ const int idPhantom = GetDocument()->getPhantomID();
+ const wxString& namePhantom = GetDocument()->getPhantomName();
+ std::ostringstream os;
+ os << "Phantom " << namePhantom.c_str() << " (" << idPhantom << ")\n";
+ *theApp->getLog() << os.str().c_str();
#if DEBUG
- const Phantom& rPhantom = GetDocument()->getPhantom();
- rPhantom.print();
+ const Phantom& rPhantom = GetDocument()->getPhantom();
+ rPhantom.print();
#endif
}
void
PhantomView::OnProjections (wxCommandEvent& event)
{
- DialogGetProjectionParameters dialogProjection (m_frame, m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample, m_dDefaultRotation, m_dDefaultFocalLength, m_dDefaultFieldOfView, m_iDefaultGeometry, m_iDefaultTrace);
- int retVal = dialogProjection.ShowModal();
- if (retVal == wxID_OK) {
- m_iDefaultNDet = dialogProjection.getNDet();
- m_iDefaultNView = dialogProjection.getNView();
- m_iDefaultNSample = dialogProjection.getNSamples();
- m_iDefaultTrace = dialogProjection.getTrace();
- m_dDefaultRotation = dialogProjection.getRotAngle();
- m_dDefaultFocalLength = dialogProjection.getFocalLengthRatio();
- m_dDefaultFieldOfView = dialogProjection.getFieldOfViewRatio();
- wxString sGeometry = dialogProjection.getGeometry();
- m_iDefaultGeometry = Scanner::convertGeometryNameToID (sGeometry.c_str());
-
- if (m_iDefaultNDet > 0 && m_iDefaultNView > 0 && sGeometry != "") {
- const Phantom& rPhantom = GetDocument()->getPhantom();
- ProjectionFileDocument* pProjectionDoc = dynamic_cast<ProjectionFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.pj", wxDOC_SILENT));
- Projections& rProj = pProjectionDoc->getProjections();
- Scanner theScanner (rPhantom, sGeometry.c_str(), m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample, m_dDefaultRotation, m_dDefaultFocalLength, m_dDefaultFieldOfView);
- if (theScanner.fail()) {
- *theApp->getLog() << "Failed making scanner: " << theScanner.failMessage().c_str() << "\n";
- return;
- }
- rProj.initFromScanner (theScanner);
- m_dDefaultRotation /= PI; // convert back to PI units
-
- if (m_iDefaultTrace > Trace::TRACE_CONSOLE) {
- ProjectionsDialog dialogProjections (theScanner, rProj, rPhantom, m_iDefaultTrace, dynamic_cast<wxWindow*>(m_frame));
- for (int iView = 0; iView < rProj.nView(); iView++) {
- ::wxYield();
- ::wxYield();
- if (dialogProjections.isCancelled() || ! dialogProjections.projectView (iView)) {
- pProjectionDoc->DeleteAllViews();
- return;
- }
- ::wxYield();
- ::wxYield();
- while (dialogProjections.isPaused()) {
- ::wxYield();
- ::wxUsleep(50);
- }
- }
- } else {
- wxProgressDialog dlgProgress (wxString("Projection"), wxString("Projection Progress"), rProj.nView() + 1, m_frame, wxPD_CAN_ABORT);
- for (int i = 0; i < rProj.nView(); i++) {
- theScanner.collectProjections (rProj, rPhantom, i, 1, true, m_iDefaultTrace);
- if (! dlgProgress.Update (i+1)) {
- pProjectionDoc->DeleteAllViews();
- return;
- }
- }
- }
-
- std::ostringstream os;
- os << "Projections for " << rPhantom.name() << ": nDet=" << m_iDefaultNDet << ", nView=" << m_iDefaultNView << ", nSamples=" << m_iDefaultNSample << ", RotAngle=" << m_dDefaultRotation << ", FocalLengthRatio=" << m_dDefaultFocalLength << ", FieldOfViewRatio=" << m_dDefaultFieldOfView << ", Geometry=" << sGeometry.c_str();
- rProj.setRemark (os.str());
- *theApp->getLog() << os.str().c_str() << "\n";
-
- m_frame->Lower();
- ::wxYield();
- if (wxView* pView = pProjectionDoc->GetFirstView()) {
- if (wxFrame* pFrame = pView->GetFrame()) {
- pFrame->SetFocus();
- pFrame->Raise();
+ DialogGetProjectionParameters dialogProjection (m_frame, m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample, m_dDefaultRotation, m_dDefaultFocalLength, m_dDefaultFieldOfView, m_iDefaultGeometry, m_iDefaultTrace);
+ int retVal = dialogProjection.ShowModal();
+ if (retVal == wxID_OK) {
+ m_iDefaultNDet = dialogProjection.getNDet();
+ m_iDefaultNView = dialogProjection.getNView();
+ m_iDefaultNSample = dialogProjection.getNSamples();
+ m_iDefaultTrace = dialogProjection.getTrace();
+ m_dDefaultRotation = dialogProjection.getRotAngle();
+ m_dDefaultFocalLength = dialogProjection.getFocalLengthRatio();
+ m_dDefaultFieldOfView = dialogProjection.getFieldOfViewRatio();
+ wxString sGeometry = dialogProjection.getGeometry();
+ m_iDefaultGeometry = Scanner::convertGeometryNameToID (sGeometry.c_str());
+
+ if (m_iDefaultNDet > 0 && m_iDefaultNView > 0 && sGeometry != "") {
+ const Phantom& rPhantom = GetDocument()->getPhantom();
+ ProjectionFileDocument* pProjectionDoc = dynamic_cast<ProjectionFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.pj", wxDOC_SILENT));
+ Projections& rProj = pProjectionDoc->getProjections();
+ Scanner theScanner (rPhantom, sGeometry.c_str(), m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample, m_dDefaultRotation, m_dDefaultFocalLength, m_dDefaultFieldOfView);
+ if (theScanner.fail()) {
+ *theApp->getLog() << "Failed making scanner: " << theScanner.failMessage().c_str() << "\n";
+ return;
+ }
+ rProj.initFromScanner (theScanner);
+ m_dDefaultRotation /= PI; // convert back to PI units
+
+ if (m_iDefaultTrace > Trace::TRACE_CONSOLE) {
+ ProjectionsDialog dialogProjections (theScanner, rProj, rPhantom, m_iDefaultTrace, dynamic_cast<wxWindow*>(m_frame));
+ for (int iView = 0; iView < rProj.nView(); iView++) {
+ ::wxYield();
+ ::wxYield();
+ if (dialogProjections.isCancelled() || ! dialogProjections.projectView (iView)) {
+ pProjectionDoc->DeleteAllViews();
+ return;
+ }
+ ::wxYield();
+ ::wxYield();
+ while (dialogProjections.isPaused()) {
+ ::wxYield();
+ ::wxUsleep(50);
+ }
+ }
+ } else {
+ wxProgressDialog dlgProgress (wxString("Projection"), wxString("Projection Progress"), rProj.nView() + 1, m_frame, wxPD_CAN_ABORT);
+ for (int i = 0; i < rProj.nView(); i++) {
+ theScanner.collectProjections (rProj, rPhantom, i, 1, true, m_iDefaultTrace);
+ if (! dlgProgress.Update (i+1)) {
+ pProjectionDoc->DeleteAllViews();
+ return;
+ }
+ }
+ }
+
+ std::ostringstream os;
+ os << "Projections for " << rPhantom.name() << ": nDet=" << m_iDefaultNDet << ", nView=" << m_iDefaultNView << ", nSamples=" << m_iDefaultNSample << ", RotAngle=" << m_dDefaultRotation << ", FocalLengthRatio=" << m_dDefaultFocalLength << ", FieldOfViewRatio=" << m_dDefaultFieldOfView << ", Geometry=" << sGeometry.c_str();
+ rProj.setRemark (os.str());
+ *theApp->getLog() << os.str().c_str() << "\n";
+
+ m_frame->Lower();
+ ::wxYield();
+ ProjectionFileView* projView = dynamic_cast<ProjectionFileView*>(pProjectionDoc->GetFirstView());\r
+ if (projView) {\r
+ projView->getFrame()->SetFocus();\r
+ projView->OnUpdate (projView, NULL);\r
+ }\r
+ if (wxView* pView = pProjectionDoc->GetFirstView()) {
+ if (wxFrame* pFrame = pView->GetFrame()) {
+ pFrame->SetFocus();
+ pFrame->Raise();
+ }
+ theApp->getDocManager()->ActivateView (pView, true, false);
+ }
+ ::wxYield();
+ pProjectionDoc->Modify(true);
+ pProjectionDoc->UpdateAllViews(this);
+ }
}
- theApp->getDocManager()->ActivateView (pView, true, false);
- }
- ::wxYield();
- pProjectionDoc->Modify(true);
- pProjectionDoc->UpdateAllViews(this);
- }
- }
}
void
PhantomView::OnRasterize (wxCommandEvent& event)
{
- DialogGetRasterParameters dialogRaster (m_frame, 256, 256, 1);
- int retVal = dialogRaster.ShowModal();
- if (retVal == wxID_OK) {
- int xSize = dialogRaster.getXSize();
- int ySize = dialogRaster.getYSize();
- int nSamples = dialogRaster.getNSamples();
- if (nSamples < 1)
- nSamples = 1;
- if (xSize > 0 && ySize > 0) {
- const Phantom& rPhantom = GetDocument()->getPhantom();
- ImageFileDocument* pRasterDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
- ImageFile& imageFile = pRasterDoc->getImageFile();
-
- imageFile.setArraySize (xSize, ySize);
- wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"), imageFile.nx() + 1, m_frame, wxPD_CAN_ABORT);
- for (unsigned int i = 0; i < imageFile.nx(); i++) {
- rPhantom.convertToImagefile (imageFile, nSamples, Trace::TRACE_NONE, i, 1, true);
- if (! dlgProgress.Update(i+1)) {
- pRasterDoc->DeleteAllViews();
- return;
+ DialogGetRasterParameters dialogRaster (m_frame, 256, 256, 1);
+ int retVal = dialogRaster.ShowModal();
+ if (retVal == wxID_OK) {
+ int xSize = dialogRaster.getXSize();
+ int ySize = dialogRaster.getYSize();
+ int nSamples = dialogRaster.getNSamples();
+ if (nSamples < 1)
+ nSamples = 1;
+ if (xSize > 0 && ySize > 0) {
+ const Phantom& rPhantom = GetDocument()->getPhantom();
+ ImageFileDocument* pRasterDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
+ ImageFile& imageFile = pRasterDoc->getImageFile();
+
+ imageFile.setArraySize (xSize, ySize);
+ wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"), imageFile.nx() + 1, m_frame, wxPD_CAN_ABORT);
+ for (unsigned int i = 0; i < imageFile.nx(); i++) {
+ rPhantom.convertToImagefile (imageFile, nSamples, Trace::TRACE_NONE, i, 1, true);
+ if (! dlgProgress.Update(i+1)) {
+ pRasterDoc->DeleteAllViews();
+ return;
+ }
+ }
+ pRasterDoc->Modify(true);
+ pRasterDoc->UpdateAllViews(this);
+ ImageFileView* rasterView = dynamic_cast<ImageFileView*>(pRasterDoc->GetFirstView());\r
+ if (rasterView) {\r
+ rasterView->getFrame()->SetFocus();\r
+ rasterView->OnUpdate (rasterView, NULL);\r
+ }\r
+
+ std::ostringstream os;
+ os << "Rasterize Phantom " << rPhantom.name() << ": XSize=" << xSize << ", YSize=" << ySize << ", nSamples=" << nSamples << "\n";
+ *theApp->getLog() << os.str().c_str();
+ }\r
}
- }
- pRasterDoc->Modify(true);
- pRasterDoc->UpdateAllViews(this);
-
- std::ostringstream os;
- os << "Rasterize Phantom " << rPhantom.name() << ": XSize=" << xSize << ", YSize=" << ySize << ", nSamples=" << nSamples << "\n";
- *theApp->getLog() << os.str().c_str();
- }
- }
}
file_menu->AppendSeparator();
file_menu->Append(PHMMENU_FILE_PROPERTIES, "P&roperties");
-
+
file_menu->AppendSeparator();
file_menu->Append(wxID_PRINT, "&Print...");
file_menu->Append(wxID_PRINT_SETUP, "Print &Setup...");
wxMenu *process_menu = new wxMenu;
process_menu->Append(PHMMENU_PROCESS_RASTERIZE, "&Rasterize...");
process_menu->Append(PHMMENU_PROCESS_PROJECTIONS, "&Projections...");
-
+
wxMenu *help_menu = new wxMenu;
help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents");
help_menu->Append(MAINMENU_HELP_ABOUT, "&About");
{
m_frame = CreateChildFrame(doc, this);
SetFrame(m_frame);
-
+
int width, height;
m_frame->GetClientSize(&width, &height);
m_frame->SetTitle("PhantomView");
m_canvas = CreateCanvas(this, m_frame);
-
+
#ifdef __X__
int x, y; // X requires a forced resize
m_frame->GetSize(&x, &y);
m_frame->SetSize(-1, -1, x, y);
#endif
-
+
m_frame->Show(true);
Activate(true);
-
+
return true;
}
PhantomView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
{
if (m_canvas)
- m_canvas->Refresh();
+ m_canvas->Refresh();
}
bool
{
if (!GetDocument()->Close())
return false;
-
+
m_canvas->Clear();
m_canvas->m_pView = NULL;
m_canvas = NULL;
wxString s(wxTheApp->GetAppName());
if (m_frame)
- m_frame->SetTitle(s);
+ m_frame->SetTitle(s);
SetFrame(NULL);
-
+
Activate(false);
if (deleteWindow) {
void
PhantomView::OnDraw (wxDC* dc)
{
- int xsize, ysize;
- m_canvas->GetClientSize (&xsize, &ysize);
- SGPDriver driver (dc, xsize, ysize);
- SGP sgp (driver);
- const Phantom& rPhantom = GetDocument()->getPhantom();
- sgp.setColor (C_RED);
- rPhantom.show (sgp);
+ int xsize, ysize;
+ m_canvas->GetClientSize (&xsize, &ysize);
+ SGPDriver driver (dc, xsize, ysize);
+ SGP sgp (driver);
+ const Phantom& rPhantom = GetDocument()->getPhantom();
+ sgp.setColor (C_RED);
+ rPhantom.show (sgp);
}
// ProjectionCanvas
ProjectionFileCanvas::ProjectionFileCanvas (ProjectionFileView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style)
- : wxScrolledWindow(frame, -1, pos, size, style)
+: wxScrolledWindow(frame, -1, pos, size, style)
{
m_pView = v;
}
IMPLEMENT_DYNAMIC_CLASS(ProjectionFileView, wxView)
BEGIN_EVENT_TABLE(ProjectionFileView, wxView)
- EVT_MENU(PJMENU_FILE_PROPERTIES, ProjectionFileView::OnProperties)
- EVT_MENU(PJMENU_PROCESS_RECONSTRUCT, ProjectionFileView::OnReconstruct)
+EVT_MENU(PJMENU_FILE_PROPERTIES, ProjectionFileView::OnProperties)
+EVT_MENU(PJMENU_PROCESS_RECONSTRUCT, ProjectionFileView::OnReconstruct)
END_EVENT_TABLE()
ProjectionFileView::ProjectionFileView(void)
- : wxView(), m_canvas(NULL), m_frame(NULL)
+: wxView(), m_canvas(NULL), m_frame(NULL)
{
m_iDefaultNX = 256;
m_iDefaultNY = 256;
- m_iDefaultFilter = SignalFilter::FILTER_ABS_BANDLIMIT;
- m_dDefaultFilterParam = 1.;
+ m_iDefaultFilter = SignalFilter::FILTER_ABS_BANDLIMIT;
+ m_dDefaultFilterParam = 1.;
#if HAVE_FFTW
- m_iDefaultFilterMethod = ProcessSignal::FILTER_METHOD_RFFTW;
- m_iDefaultFilterGeneration = ProcessSignal::FILTER_GENERATION_INVERSE_FOURIER;
+ m_iDefaultFilterMethod = ProcessSignal::FILTER_METHOD_RFFTW;
+ m_iDefaultFilterGeneration = ProcessSignal::FILTER_GENERATION_INVERSE_FOURIER;
#else
- m_iDefaultFilterMethod = ProcessSignal::FILTER_METHOD_CONVOLUTION;
- m_iDefaultFilterGeneration = ProcessSignal::FILTER_GENERATION_DIRECT;
+ m_iDefaultFilterMethod = ProcessSignal::FILTER_METHOD_CONVOLUTION;
+ m_iDefaultFilterGeneration = ProcessSignal::FILTER_GENERATION_DIRECT;
#endif
- m_iDefaultZeropad = 1;
- m_iDefaultBackprojector = Backprojector::BPROJ_IDIFF3;
- m_iDefaultInterpolation = Backprojector::INTERP_LINEAR;
- m_iDefaultInterpParam = 1;
- m_iDefaultTrace = Trace::TRACE_NONE;
+ m_iDefaultZeropad = 1;
+ m_iDefaultBackprojector = Backprojector::BPROJ_IDIFF3;
+ m_iDefaultInterpolation = Backprojector::INTERP_LINEAR;
+ m_iDefaultInterpParam = 1;
+ m_iDefaultTrace = Trace::TRACE_NONE;
}
ProjectionFileView::~ProjectionFileView(void)
void
ProjectionFileView::OnProperties (wxCommandEvent& event)
{
- const Projections& rProj = GetDocument()->getProjections();
- std::ostringstream os;
- rProj.printScanInfo(os);
- *theApp->getLog() << os.str().c_str();
- wxMessageDialog dialogMsg (m_frame, os.str().c_str(), "Projection File Properties", wxOK | wxICON_INFORMATION);
- dialogMsg.ShowModal();
+ const Projections& rProj = GetDocument()->getProjections();
+ std::ostringstream os;
+ rProj.printScanInfo(os);
+ *theApp->getLog() << os.str().c_str();
+ wxMessageDialog dialogMsg (m_frame, os.str().c_str(), "Projection File Properties", wxOK | wxICON_INFORMATION);
+ dialogMsg.ShowModal();
}
void
ProjectionFileView::OnReconstruct (wxCommandEvent& event)
{
- DialogGetReconstructionParameters dialogReconstruction (m_frame, m_iDefaultNX, m_iDefaultNY, m_iDefaultFilter, m_dDefaultFilterParam, m_iDefaultFilterMethod, m_iDefaultFilterGeneration, m_iDefaultZeropad, m_iDefaultInterpolation, m_iDefaultInterpParam, m_iDefaultBackprojector, m_iDefaultTrace);
-
- int retVal = dialogReconstruction.ShowModal();
- if (retVal == wxID_OK) {
- m_iDefaultNX = dialogReconstruction.getXSize();
- m_iDefaultNY = dialogReconstruction.getYSize();
- wxString optFilterName = dialogReconstruction.getFilterName();
- m_iDefaultFilter = SignalFilter::convertFilterNameToID (optFilterName.c_str());
- m_dDefaultFilterParam = dialogReconstruction.getFilterParam();
- wxString optFilterMethodName = dialogReconstruction.getFilterMethodName();
- m_iDefaultFilterMethod = ProcessSignal::convertFilterMethodNameToID(optFilterMethodName.c_str());
- m_iDefaultZeropad = dialogReconstruction.getZeropad();
- wxString optFilterGenerationName = dialogReconstruction.getFilterGenerationName();
- m_iDefaultFilterGeneration = ProcessSignal::convertFilterGenerationNameToID (optFilterGenerationName.c_str());
- wxString optInterpName = dialogReconstruction.getInterpName();
- m_iDefaultInterpolation = Backprojector::convertInterpNameToID (optInterpName.c_str());
- m_iDefaultInterpParam = dialogReconstruction.getInterpParam();
- wxString optBackprojectName = dialogReconstruction.getBackprojectName();
- m_iDefaultBackprojector = Backprojector::convertBackprojectNameToID (optBackprojectName.c_str());
- m_iDefaultTrace = dialogReconstruction.getTrace();
- if (m_iDefaultNX > 0 && m_iDefaultNY > 0) {
- ImageFileDocument* pReconDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
- ImageFile& imageFile = pReconDoc->getImageFile();
- const Projections& rProj = GetDocument()->getProjections();
- imageFile.setArraySize (m_iDefaultNX, m_iDefaultNY);
-
- if (m_iDefaultFilterMethod != ProcessSignal::FILTER_METHOD_CONVOLUTION && m_iDefaultFilterGeneration == ProcessSignal::FILTER_GENERATION_DIRECT && rProj.geometry() != Scanner::GEOMETRY_PARALLEL) {
- wxMessageBox ("Sorry!\nCurrently, frequency-based filtering with direct filter generation is not support for geometries other than parallel.\nAborting command.", "Not Supported", wxOK | wxICON_WARNING, m_frame);
- return;
- }
+ DialogGetReconstructionParameters dialogReconstruction (m_frame, m_iDefaultNX, m_iDefaultNY, m_iDefaultFilter, m_dDefaultFilterParam, m_iDefaultFilterMethod, m_iDefaultFilterGeneration, m_iDefaultZeropad, m_iDefaultInterpolation, m_iDefaultInterpParam, m_iDefaultBackprojector, m_iDefaultTrace);
+
+ int retVal = dialogReconstruction.ShowModal();
+ if (retVal == wxID_OK) {
+ m_iDefaultNX = dialogReconstruction.getXSize();
+ m_iDefaultNY = dialogReconstruction.getYSize();
+ wxString optFilterName = dialogReconstruction.getFilterName();
+ m_iDefaultFilter = SignalFilter::convertFilterNameToID (optFilterName.c_str());
+ m_dDefaultFilterParam = dialogReconstruction.getFilterParam();
+ wxString optFilterMethodName = dialogReconstruction.getFilterMethodName();
+ m_iDefaultFilterMethod = ProcessSignal::convertFilterMethodNameToID(optFilterMethodName.c_str());
+ m_iDefaultZeropad = dialogReconstruction.getZeropad();
+ wxString optFilterGenerationName = dialogReconstruction.getFilterGenerationName();
+ m_iDefaultFilterGeneration = ProcessSignal::convertFilterGenerationNameToID (optFilterGenerationName.c_str());
+ wxString optInterpName = dialogReconstruction.getInterpName();
+ m_iDefaultInterpolation = Backprojector::convertInterpNameToID (optInterpName.c_str());
+ m_iDefaultInterpParam = dialogReconstruction.getInterpParam();
+ wxString optBackprojectName = dialogReconstruction.getBackprojectName();
+ m_iDefaultBackprojector = Backprojector::convertBackprojectNameToID (optBackprojectName.c_str());
+ m_iDefaultTrace = dialogReconstruction.getTrace();
+ if (m_iDefaultNX > 0 && m_iDefaultNY > 0) {
+ ImageFileDocument* pReconDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
+ ImageFile& imageFile = pReconDoc->getImageFile();
+ const Projections& rProj = GetDocument()->getProjections();
+ imageFile.setArraySize (m_iDefaultNX, m_iDefaultNY);
+
+ if (m_iDefaultFilterMethod != ProcessSignal::FILTER_METHOD_CONVOLUTION && m_iDefaultFilterGeneration == ProcessSignal::FILTER_GENERATION_DIRECT && rProj.geometry() != Scanner::GEOMETRY_PARALLEL) {
+ wxMessageBox ("Sorry!\nCurrently, frequency-based filtering with direct filter generation is not support for geometries other than parallel.\nAborting command.", "Not Supported", wxOK | wxICON_WARNING, m_frame);
+ return;
+ }
#if 0
- SGPDriver* pSGPDriver = NULL;
- SGP* pSGP = NULL;
- wxMemoryDC* pDCPlot = NULL;
- wxBitmap bitmap;
- if (m_iDefaultTrace >= Trace::TRACE_PLOT) {
- bitmap.Create (500, 500);
- pDCPlot = new wxMemoryDC;
- pDCPlot->SelectObject (bitmap);
- pSGPDriver = new SGPDriver (dynamic_cast<wxDC*>pDCPlot, 500, 500);
- pSGP = new SGP (*pSGPDriver);
- }
- Reconstructor* pReconstruct = new Reconstructor (rProj, imageFile, optFilterName.c_str(), m_dDefaultFilterParam, optFilterMethodName.c_str(), m_iDefaultZeropad, optFilterGenerationName.c_str(), optInterpName.c_str(), m_iDefaultInterpParam, optBackprojectName.c_str(), m_iDefaultTrace, pSGP);
- delete pSGP;
+ SGPDriver* pSGPDriver = NULL;
+ SGP* pSGP = NULL;
+ wxMemoryDC* pDCPlot = NULL;
+ wxBitmap bitmap;
+ if (m_iDefaultTrace >= Trace::TRACE_PLOT) {
+ bitmap.Create (500, 500);
+ pDCPlot = new wxMemoryDC;
+ pDCPlot->SelectObject (bitmap);
+ pSGPDriver = new SGPDriver (dynamic_cast<wxDC*>pDCPlot, 500, 500);
+ pSGP = new SGP (*pSGPDriver);
+ }
+ Reconstructor* pReconstruct = new Reconstructor (rProj, imageFile, optFilterName.c_str(), m_dDefaultFilterParam, optFilterMethodName.c_str(), m_iDefaultZeropad, optFilterGenerationName.c_str(), optInterpName.c_str(), m_iDefaultInterpParam, optBackprojectName.c_str(), m_iDefaultTrace, pSGP);
+ delete pSGP;
#else
- Reconstructor* pReconstruct = new Reconstructor (rProj, imageFile, optFilterName.c_str(), m_dDefaultFilterParam, optFilterMethodName.c_str(), m_iDefaultZeropad, optFilterGenerationName.c_str(), optInterpName.c_str(), m_iDefaultInterpParam, optBackprojectName.c_str(), m_iDefaultTrace);
+ Reconstructor* pReconstruct = new Reconstructor (rProj, imageFile, optFilterName.c_str(), m_dDefaultFilterParam, optFilterMethodName.c_str(), m_iDefaultZeropad, optFilterGenerationName.c_str(), optInterpName.c_str(), m_iDefaultInterpParam, optBackprojectName.c_str(), m_iDefaultTrace);
#endif
-\r
- Timer timerRecon;
- if (m_iDefaultTrace > Trace::TRACE_CONSOLE) {
- ReconstructDialog* pDlgReconstruct = new ReconstructDialog (*pReconstruct, rProj, imageFile, m_iDefaultTrace, m_frame);
- for (int iView = 0; iView < rProj.nView(); iView++) {
- ::wxYield();
- ::wxYield();
- if (pDlgReconstruct->isCancelled() || ! pDlgReconstruct->reconstructView (iView)) {
- delete pDlgReconstruct;
- delete pReconstruct;
- pReconDoc->DeleteAllViews();
- return;
- }
- ::wxYield();
- ::wxYield();
- while (pDlgReconstruct->isPaused()) {
- ::wxYield();
- ::wxUsleep(50);
- }
- }
- delete pDlgReconstruct;
- } else {
- wxProgressDialog dlgProgress (wxString("Reconstruction"), wxString("Reconstruction Progress"), rProj.nView() + 1, m_frame, wxPD_CAN_ABORT);
- for (int i = 0; i < rProj.nView(); i++) {
- pReconstruct->reconstructView (i, 1);
- if (! dlgProgress.Update(i + 1)) {
- delete pReconstruct;
- pReconDoc->DeleteAllViews();
- return;
- }
+ \r
+ Timer timerRecon;
+ if (m_iDefaultTrace > Trace::TRACE_CONSOLE) {
+ ReconstructDialog* pDlgReconstruct = new ReconstructDialog (*pReconstruct, rProj, imageFile, m_iDefaultTrace, m_frame);
+ for (int iView = 0; iView < rProj.nView(); iView++) {
+ ::wxYield();
+ ::wxYield();
+ if (pDlgReconstruct->isCancelled() || ! pDlgReconstruct->reconstructView (iView)) {
+ delete pDlgReconstruct;
+ delete pReconstruct;
+ pReconDoc->DeleteAllViews();
+ return;
+ }
+ ::wxYield();
+ ::wxYield();
+ while (pDlgReconstruct->isPaused()) {
+ ::wxYield();
+ ::wxUsleep(50);
+ }
+ }
+ delete pDlgReconstruct;
+ } else {
+ wxProgressDialog dlgProgress (wxString("Reconstruction"), wxString("Reconstruction Progress"), rProj.nView() + 1, m_frame, wxPD_CAN_ABORT);
+ for (int i = 0; i < rProj.nView(); i++) {
+ pReconstruct->reconstructView (i, 1);
+ if (! dlgProgress.Update(i + 1)) {
+ delete pReconstruct;
+ pReconDoc->DeleteAllViews();
+ return;
+ }
+ }
+ }
+ delete pReconstruct;
+ pReconDoc->Modify(true);
+ pReconDoc->UpdateAllViews(this);
+ ImageFileView* rasterView = dynamic_cast<ImageFileView*>(pReconDoc->GetFirstView());\r
+ if (rasterView) {\r
+ rasterView->getFrame()->SetFocus();\r
+ rasterView->OnUpdate (rasterView, NULL);\r
+ }\r
+ std::ostringstream os;
+ os << "Reconstruct " << rProj.getFilename() << ": xSize=" << m_iDefaultNX << ", ySize=" << m_iDefaultNY << ", Filter=" << optFilterName.c_str() << ", FilterParam=" << m_dDefaultFilterParam << ", FilterMethod=" << optFilterMethodName.c_str() << ", FilterGeneration=" << optFilterGenerationName.c_str() << ", Zeropad=" << m_iDefaultZeropad << ", Interpolation=" << optInterpName.c_str() << ", InterpolationParam=" << m_iDefaultInterpParam << ", Backprojection=" << optBackprojectName.c_str();
+ *theApp->getLog() << os.str().c_str() << "\n";
+ imageFile.labelAdd (rProj.getLabel());
+ imageFile.labelAdd (Array2dFileLabel::L_HISTORY, os.str().c_str(), timerRecon.timerEnd());
+ }
}
- }
- delete pReconstruct;
- pReconDoc->Modify(true);
- pReconDoc->UpdateAllViews(this);
- std::ostringstream os;
- os << "Reconstruct " << rProj.getFilename() << ": xSize=" << m_iDefaultNX << ", ySize=" << m_iDefaultNY << ", Filter=" << optFilterName.c_str() << ", FilterParam=" << m_dDefaultFilterParam << ", FilterMethod=" << optFilterMethodName.c_str() << ", FilterGeneration=" << optFilterGenerationName.c_str() << ", Zeropad=" << m_iDefaultZeropad << ", Interpolation=" << optInterpName.c_str() << ", InterpolationParam=" << m_iDefaultInterpParam << ", Backprojection=" << optBackprojectName.c_str();
- *theApp->getLog() << os.str().c_str() << "\n";
- imageFile.labelAdd (rProj.getLabel());
- imageFile.labelAdd (Array2dFileLabel::L_HISTORY, os.str().c_str(), timerRecon.timerEnd());
- }
- }
}
file_menu->AppendSeparator();
file_menu->Append(PJMENU_FILE_PROPERTIES, "P&roperties");
-
+
file_menu->AppendSeparator();
file_menu->Append(wxID_PRINT, "&Print...");
file_menu->Append(wxID_PRINT_SETUP, "Print &Setup...");
wxMenu *process_menu = new wxMenu;
process_menu->Append(PJMENU_PROCESS_RECONSTRUCT, "R&econstruct...");
-
+
wxMenu *help_menu = new wxMenu;
help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents");
help_menu->AppendSeparator();
m_frame->GetClientSize(&width, &height);
m_frame->SetTitle("ProjectionFileView");
m_canvas = CreateCanvas(this, m_frame);
-
+
#ifdef __X__
int x, y; // X requires a forced resize
m_frame->GetSize(&x, &y);
m_frame->SetSize(-1, -1, x, y);
#endif
-
+
m_frame->Show(true);
Activate(true);
ProjectionFileView::OnDraw (wxDC* dc)
{
if (m_bitmap.Ok())
- dc->DrawBitmap (m_bitmap, 0, 0, false);
+ dc->DrawBitmap (m_bitmap, 0, 0, false);
}
const int nDet = rProj.nDet();
const int nView = rProj.nView();
if (nDet != 0 && nView != 0) {
- const DetectorArray& detarray = rProj.getDetectorArray(0);
- const DetectorValue* detval = detarray.detValues();
- double min = detval[0];
- double max = detval[0];
- for (int iy = 0; iy < nView; iy++) {
- const DetectorArray& detarray = rProj.getDetectorArray(iy);
- const DetectorValue* detval = detarray.detValues();
- for (int ix = 0; ix < nDet; ix++) {
- if (min > detval[ix])
- min = detval[ix];
- else if (max < detval[ix])
- max = detval[ix];
- }
- }
-
- unsigned char* imageData = new unsigned char [nDet * nView * 3];
- double scale = (max - min) / 255;
- for (int iy2 = 0; iy2 < nView; iy2++) {
- const DetectorArray& detarray = rProj.getDetectorArray (iy2);
- const DetectorValue* detval = detarray.detValues();
- for (int ix = 0; ix < nDet; ix++) {
- int intensity = static_cast<int>(((detval[ix] - min) / scale) + 0.5);
- intensity = clamp(intensity, 0, 255);
- int baseAddr = (iy2 * nDet + ix) * 3;
- imageData[baseAddr] = imageData[baseAddr+1] = imageData[baseAddr+2] = intensity;
- }
- }
- wxImage image (nDet, nView, imageData, true);
- m_bitmap = image.ConvertToBitmap();
- delete imageData;
- int xSize = nDet;
- int ySize = nView;
- xSize = clamp (xSize, 0, 800);
- ySize = clamp (ySize, 0, 800);
- m_frame->SetClientSize (xSize, ySize);
- m_canvas->SetScrollbars (20, 20, nDet/20, nView/20);
+ const DetectorArray& detarray = rProj.getDetectorArray(0);
+ const DetectorValue* detval = detarray.detValues();
+ double min = detval[0];
+ double max = detval[0];
+ for (int iy = 0; iy < nView; iy++) {
+ const DetectorArray& detarray = rProj.getDetectorArray(iy);
+ const DetectorValue* detval = detarray.detValues();
+ for (int ix = 0; ix < nDet; ix++) {
+ if (min > detval[ix])
+ min = detval[ix];
+ else if (max < detval[ix])
+ max = detval[ix];
+ }
+ }
+
+ unsigned char* imageData = new unsigned char [nDet * nView * 3];
+ double scale = (max - min) / 255;
+ for (int iy2 = 0; iy2 < nView; iy2++) {
+ const DetectorArray& detarray = rProj.getDetectorArray (iy2);
+ const DetectorValue* detval = detarray.detValues();
+ for (int ix = 0; ix < nDet; ix++) {
+ int intensity = static_cast<int>(((detval[ix] - min) / scale) + 0.5);
+ intensity = clamp(intensity, 0, 255);
+ int baseAddr = (iy2 * nDet + ix) * 3;
+ imageData[baseAddr] = imageData[baseAddr+1] = imageData[baseAddr+2] = intensity;
+ }
+ }
+ wxImage image (nDet, nView, imageData, true);
+ m_bitmap = image.ConvertToBitmap();
+ delete imageData;
+ int xSize = nDet;
+ int ySize = nView;
+ xSize = clamp (xSize, 0, 800);
+ ySize = clamp (ySize, 0, 800);
+ m_frame->SetClientSize (xSize, ySize);
+ m_canvas->SetScrollbars (20, 20, nDet/20, nView/20);
}
-
+
if (m_canvas)
- m_canvas->Refresh();
+ m_canvas->Refresh();
}
bool
{
if (!GetDocument()->Close())
return false;
-
+
m_canvas->Clear();
m_canvas->m_pView = NULL;
m_canvas = NULL;
wxString s(wxTheApp->GetAppName());
if (m_frame)
- m_frame->SetTitle(s);
+ m_frame->SetTitle(s);
SetFrame(NULL);
-
+
Activate(false);
if (deleteWindow) {
projects / ctsim.git / commitdiff