From 9727d14397360a862a407b9c35efefe35925791b Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 18 Dec 2000 02:23:43 +0000 Subject: [PATCH] r292: *** empty log message *** --- libctgraphics/sgp.cpp | 5 +++-- libctsim/scanner.cpp | 10 +-------- msvc/ctsim.dsw | 3 --- msvc/ctsim/ctsim.dsp | 6 ++--- msvc/ctsim/ctsim.plg | 51 ++++++++++++++++++++---------------------- src/dlgprojections.cpp | 6 ++--- src/dlgreconstruct.cpp | 9 ++++---- 7 files changed, 39 insertions(+), 51 deletions(-) diff --git a/libctgraphics/sgp.cpp b/libctgraphics/sgp.cpp index ad33f75..f22dd37 100644 --- a/libctgraphics/sgp.cpp +++ b/libctgraphics/sgp.cpp @@ -7,7 +7,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: sgp.cpp,v 1.18 2000/12/16 06:12:47 kevin Exp $ +** $Id: sgp.cpp,v 1.19 2000/12/18 02:23:43 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 @@ -103,7 +103,8 @@ SGP::SGP (const SGPDriver& driver) m_font.SetPointSize (iTestPointSize); m_driver.idWX()->SetFont(m_font); double dTestCharHeight = m_driver.idWX()->GetCharHeight(); - m_dPointsPerPixel = iTestPointSize / dTestCharHeight; + m_dPointsPerPixel = iTestPointSize / dTestCharHeight; + m_driver.idWX()->SetBrush (*wxWHITE_BRUSH); } #endif diff --git a/libctsim/scanner.cpp b/libctsim/scanner.cpp index 59bcf94..98eb8a8 100644 --- a/libctsim/scanner.cpp +++ b/libctsim/scanner.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: scanner.cpp,v 1.20 2000/12/16 06:12:47 kevin Exp $ +** $Id: scanner.cpp,v 1.21 2000/12/18 02:23:43 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 @@ -532,15 +532,7 @@ Scanner::traceShowParamRasterOp (int iRasterOp, const char *szLabel, const char { char szValue[256]; -#ifdef MSVC - vsprintf (szValue, fmt, args); -#else vsnprintf (szValue, sizeof(szValue), fmt, args); -#endif - - // cio_set_cpos (raysum_trace_menu_column, row); - // cio_set_text_clr (color - 8, 0); - // cio_set_text_clr (color, 0); #ifdef HAVE_SGP if (m_pSGP) { diff --git a/msvc/ctsim.dsw b/msvc/ctsim.dsw index 7423226..d1ab623 100644 --- a/msvc/ctsim.dsw +++ b/msvc/ctsim.dsw @@ -57,9 +57,6 @@ Package=<4> Project_Dep_Name libpng End Project Dependency Begin Project Dependency - Project_Dep_Name pjrec - End Project Dependency - Begin Project Dependency Project_Dep_Name RFFTW2st End Project Dependency Begin Project Dependency diff --git a/msvc/ctsim/ctsim.dsp b/msvc/ctsim/ctsim.dsp index 8c46bb0..db78b9a 100644 --- 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 "." /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" /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 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 /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" @@ -156,8 +156,8 @@ SOURCE=..\..\..\wx2\include\wx\msw\wx.rc !ELSEIF "$(CFG)" == "ctsim - Win32 Debug" # ADD BASE RSC /l 0x409 /i "\wx2\include\wx\msw" -# SUBTRACT BASE RSC /i "\wx2\include\wx\msw" -# ADD RSC /l 0x409 /i "\wx2\include" /i "\wx2\include\wx\msw" +# SUBTRACT BASE RSC /i "\wx2\include\wx\msw" /i "\wx2\include" +# ADD RSC /l 0x409 /i "\wx2\include\wx\msw" !ENDIF diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg index b07796d..2ab3ea8 100644 --- a/msvc/ctsim/ctsim.plg +++ b/msvc/ctsim/ctsim.plg @@ -3,46 +3,43 @@ 
 
Build Log

 

---------------------Configuration: ctsim - Win32 Release--------------------
+--------------------Configuration: ctsim - Win32 Debug--------------------
 

 
Command Lines

-Creating command line "rc.exe /l 0x409 /fo"Release/wx.res" /i "\wx2\include\wx\msw" /i "\wx2\include" /d "NDEBUG" "C:\wx2\include\wx\msw\wx.rc"" 
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1E6.tmp" with contents
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP219.tmp" with contents
 [
-/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" /Fp"Release/ctsim.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\ctsim-2.0.6\src\ctsim.cpp"
-"C:\ctsim-2.0.6\src\views.cpp"
+/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 
+"C:\ctsim-2.0.6\src\dlgprojections.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1E6.tmp" 
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1E7.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP219.tmp" 
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP21A.tmp" with contents
 [
-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" 
-".\Release\ctsim.obj"
-".\Release\dialogs.obj"
-".\Release\dlgprojections.obj"
-".\Release\dlgreconstruct.obj"
-".\Release\docs.obj"
-".\Release\views.obj"
-".\Release\wx.res"
-"\ctsim-2.0.6\msvc\libctsim\Release\libctsim.lib"
-"\fftw-2.1.3\Win32\FFTW2st\Release\FFTW2st.lib"
-"\fftw-2.1.3\Win32\RFFTW2st\Release\RFFTW2st.lib"
-"\wx2\lib\wx.lib"
+comctl32.lib winmm.lib rpcrt4.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ../libctsim/Debug/libctsim.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\..\lpng108\msvc\win32\libpng\lib_dbg\libpng.lib ..\..\..\lpng108\msvc\win32\zlib\lib_dbg\zlib.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib ../../../wx2/lib/wxd.lib /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" 
+".\Debug\ctsim.obj"
+".\Debug\dialogs.obj"
+".\Debug\dlgprojections.obj"
+".\Debug\dlgreconstruct.obj"
+".\Debug\docs.obj"
+".\Debug\views.obj"
+".\Debug\wx.res"
+"\ctsim-2.0.6\msvc\libctsim\Debug\libctsim.lib"
+"\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib"
+"\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib"
+"\wx2\lib\wxd.lib"
 ]
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1E7.tmp"
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP21A.tmp"
 
Output Window

-Compiling resources...
 Compiling...
-ctsim.cpp
-views.cpp
+dlgprojections.cpp
 Linking...
-LINK : warning LNK4089: all references to "ADVAPI32.dll" discarded by /OPT:REF
-LINK : warning LNK4089: all references to "WSOCK32.dll" discarded by /OPT:REF
+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""
+Creating browse info file...
+
Output Window

 
 
 
 
Results

-ctsim.exe - 0 error(s), 2 warning(s)
+ctsim.exe - 0 error(s), 0 warning(s)
diff --git a/src/dlgprojections.cpp b/src/dlgprojections.cpp index b816ae0..6ac73fd 100644 --- a/src/dlgprojections.cpp +++ b/src/dlgprojections.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: dlgprojections.cpp,v 1.8 2000/12/17 22:30:34 kevin Exp $ +** $Id: dlgprojections.cpp,v 1.9 2000/12/18 02:23:43 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 @@ -150,7 +150,7 @@ ProjectionsDialog::showView (int iViewNumber) if (m_iTrace >= Trace::TRACE_PLOT) m_pSGP->setViewport (0, 0, 0.66, 1); ::wxYield(); // update the display - m_pSGP->setTextSize (1/25.); + // m_pSGP->setTextSize (1/100.); m_rScanner.collectProjections (m_rProjections, m_rPhantom, iViewNumber, 1, true, m_iTrace, m_pSGP); ::wxYield(); // update the display if (m_iTrace >= Trace::TRACE_PLOT) { @@ -278,7 +278,7 @@ void ProjectionsDialog::OnClose(wxCloseEvent& event) void ProjectionsDialog::OnPaint (wxPaintEvent& event) { - wxPaintDC paintDC (this); + wxPaintDC paintDC (this); if (m_state == Paused) { paintDC.DrawBitmap(m_bitmap, 0, 0, false); } diff --git a/src/dlgreconstruct.cpp b/src/dlgreconstruct.cpp index 7ec1d32..35184eb 100644 --- a/src/dlgreconstruct.cpp +++ b/src/dlgreconstruct.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: dlgreconstruct.cpp,v 1.8 2000/12/17 22:30:34 kevin Exp $ +** $Id: dlgreconstruct.cpp,v 1.9 2000/12/18 02:23:43 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 @@ -324,10 +324,11 @@ void ReconstructDialog::OnClose(wxCloseEvent& event) void ReconstructDialog::OnPaint (wxPaintEvent& event) -{ +{ wxPaintDC paintDC (this); - if (m_state == Paused) - paintDC.DrawBitmap(m_bitmap, 0, 0, false); + if (m_state == Paused) { + paintDC.DrawBitmap(m_bitmap, 0, 0, false); + } } -- 2.34.1