From c8ec665dde5df59539daf63e0a6a44f27550258b Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 17 Jan 2001 06:38:06 +0000 Subject: [PATCH] r411: no message --- libctsim/scanner.cpp | 6 +-- msvc/ctsim/ctsim.plg | 85 +++++++++++------------------------------- src/ctsim.cpp | 10 ++--- src/dlgprojections.cpp | 4 +- 4 files changed, 31 insertions(+), 74 deletions(-) diff --git a/libctsim/scanner.cpp b/libctsim/scanner.cpp index e10446f..465523a 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.23 2001/01/04 21:28:41 kevin Exp $ +** $Id: scanner.cpp,v 1.24 2001/01/17 06:38:06 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 @@ -538,10 +538,10 @@ Scanner::traceShowParamRasterOp (int iRasterOp, const char *szLabel, const char double dYPos = m_dYMaxWin - (row * m_dTextHeight); m_pSGP->moveAbs (m_dXMinWin, dYPos); m_pSGP->setTextColor (color, -1); - m_pSGP->drawText (szLabel); +// m_pSGP->drawText (szLabel); double dValueOffset = (m_dXMaxWin - m_dXMinWin) / 4; m_pSGP->moveAbs (m_dXMinWin + dValueOffset, dYPos); - m_pSGP->drawText (szValue); +// m_pSGP->drawText (szValue); } else #endif { diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg index 28caf90..2811e14 100644 --- a/msvc/ctsim/ctsim.plg +++ b/msvc/ctsim/ctsim.plg @@ -3,83 +3,40 @@ 
 
Build Log

 

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

 
Command Lines

-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPA.tmp" with contents
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP88.tmp" with contents
 [
-/nologo /G6 /MT /W3 /GR /GX /O2 /I "..\..\..\zlib" /I "..\..\INCLUDE" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2\include" /D "NDEBUG" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "WIN32" /D "_MBCS" /D "_LIB" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /Fp"Release/libctsim.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\ctsim\libctsim\projections.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.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.0alpha5\" /FR"Debug/" /Fp"Debug/ctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
+"C:\ctsim\src\ctsim.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPA.tmp" 
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPB.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP88.tmp" 
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP89.tmp" with contents
 [
-/nologo /out:"Release\libctsim.lib" 
-.\Release\array2dfile.obj
-.\Release\backprojectors.obj
-.\Release\clip.obj
-.\Release\consoleio.obj
-.\Release\dlgezplot.obj
-.\Release\ezplot.obj
-.\Release\ezset.obj
-.\Release\ezsupport.obj
-.\Release\filter.obj
-.\Release\fnetorderstream.obj
-.\Release\fourier.obj
-.\Release\getopt.obj
-.\Release\getopt1.obj
-.\Release\globalvars.obj
-.\Release\hashtable.obj
-.\Release\imagefile.obj
-.\Release\mathfuncs.obj
-.\Release\phantom.obj
-.\Release\plotfile.obj
-.\Release\pol.obj
-.\Release\procsignal.obj
-.\Release\projections.obj
-.\Release\reconstruct.obj
-.\Release\scanner.obj
-.\Release\sgp.obj
-.\Release\strfuncs.obj
-.\Release\syserror.obj
-.\Release\trace.obj
-.\Release\transformmatrix.obj
-.\Release\xform.obj
+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  xpmd.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" /libpath:"..\..\..\wx2\lib" 
+.\Debug\ctsim.obj
+.\Debug\dialogs.obj
+.\Debug\dlgprojections.obj
+.\Debug\dlgreconstruct.obj
+.\Debug\docs.obj
+.\Debug\views.obj
+.\Debug\ctsim.res
+\ctsim\msvc\libctsim\Debug\libctsim.lib
+"\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib"
+"\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib"
+\wx2\lib\wxd.lib
 ]
-Creating command line "link.exe -lib @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPB.tmp"
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP89.tmp"
 
Output Window

 Compiling...
-projections.cpp
-Creating library...
-

---------------------Configuration: ctsim - Win32 Release--------------------
-

-
Command Lines

-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPC.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\ctsim.res
-\ctsim\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
-]
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPC.tmp"
-
Output Window

+ctsim.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
 
 
 
 
Results

-ctsim.exe - 0 error(s), 2 warning(s)
+ctsim.exe - 0 error(s), 0 warning(s)
diff --git a/src/ctsim.cpp b/src/ctsim.cpp index 2595e76..781e9c0 100644 --- a/src/ctsim.cpp +++ b/src/ctsim.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ctsim.cpp,v 1.29 2001/01/13 10:14:06 kevin Exp $ +** $Id: ctsim.cpp,v 1.30 2001/01/17 06:38:06 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 @@ -61,7 +61,7 @@ #endif #endif -static const char* rcsindent = "$Id: ctsim.cpp,v 1.29 2001/01/13 10:14:06 kevin Exp $"; +static const char* rcsindent = "$Id: ctsim.cpp,v 1.30 2001/01/17 06:38:06 kevin Exp $"; struct option CTSimApp::ctsimOptions[] = { @@ -144,14 +144,14 @@ CTSimApp::OnInit() return true; } +#include "./ctsim.xpm" void CTSimApp::setIconForFrame(wxFrame* pFrame) { -#if defined(__WXMSW__) - wxIcon iconApp (wxString("ICON_APP"), wxBITMAP_TYPE_ICO_RESOURCE); + wxIcon iconApp (ctsim16_xpm); + if (iconApp.Ok()) pFrame->SetIcon (iconApp); -#endif } void diff --git a/src/dlgprojections.cpp b/src/dlgprojections.cpp index 1d8c5bf..d340914 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.16 2001/01/04 21:28:41 kevin Exp $ +** $Id: dlgprojections.cpp,v 1.17 2001/01/17 06:38:06 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 @@ -107,7 +107,7 @@ ProjectionsDialog::ProjectionsDialog (Scanner& rScanner, Projections& rProj, con SetAutoLayout(TRUE); Layout(); - wxSize sizeDlg (500,500); + wxSize sizeDlg (250,250); if (sizeDlg.x != sizeDlg.y) { sizeDlg.x = max(sizeDlg.x,sizeDlg.y); sizeDlg.y = max(sizeDlg.x,sizeDlg.y); -- 2.34.1