From 7ae47cb0ff0a16d1c36797576155263434cc73ff Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Fri, 29 Dec 2000 20:18:59 +0000 Subject: [PATCH] r322: *** empty log message *** --- include/pol.h | 4 +- libctsim/imagefile.cpp | 64 +++--- libctsupport/plotfile.cpp | 5 +- libctsupport/syserror.cpp | 4 +- msvc/ctsim/ctsim.plg | 402 ++++++++++++++++++++++++++++++++++++++ src/ctsim.cpp | 8 +- src/views.cpp | 5 +- src/views.h | 4 +- 8 files changed, 448 insertions(+), 48 deletions(-) diff --git a/include/pol.h b/include/pol.h index 808b380..1d14989 100644 --- a/include/pol.h +++ b/include/pol.h @@ -2,7 +2,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: pol.h,v 1.9 2000/12/29 15:45:06 kevin Exp $ +** $Id: pol.h,v 1.10 2000/12/29 20:11:42 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 @@ -38,7 +38,7 @@ class POL { ~POL(); void init (); - void addSkipWord (const char const *w); + void addSkipWord (const char* const w); void addSkipChar (int c); void addKeyword (const char* const str, int code); bool readWord (char *search, int nlet); diff --git a/libctsim/imagefile.cpp b/libctsim/imagefile.cpp index 84c6674..b6525e1 100644 --- a/libctsim/imagefile.cpp +++ b/libctsim/imagefile.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: imagefile.cpp,v 1.26 2000/12/29 19:30:08 kevin Exp $ +** $Id: imagefile.cpp,v 1.27 2000/12/29 20:15:37 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 @@ -298,9 +298,9 @@ ImageFile::convertRealToComplex () return false; ImageFileArray vImag = getImaginaryArray(); - for (int ix = 0; ix < m_nx; ix++) { + for (unsigned int ix = 0; ix < m_nx; ix++) { ImageFileColumn vCol = vImag[ix]; - for (int iy = 0; iy < m_ny; iy++) + for (unsigned int iy = 0; iy < m_ny; iy++) *vCol++ = 0; } @@ -315,10 +315,10 @@ ImageFile::convertComplexToReal () ImageFileArray vReal = getArray(); ImageFileArray vImag = getImaginaryArray(); - for (int ix = 0; ix < m_nx; ix++) { + for (unsigned int ix = 0; ix < m_nx; ix++) { ImageFileColumn vRealCol = vReal[ix]; ImageFileColumn vImagCol = vImag[ix]; - for (int iy = 0; iy < m_ny; iy++) { + for (unsigned int iy = 0; iy < m_ny; iy++) { std::complex c (*vRealCol, *vImagCol); *vRealCol++ = std::abs (c); vImagCol++; @@ -340,11 +340,11 @@ ImageFile::subtractImages (const ImageFile& rRHS, ImageFile& result) const ImageFileArrayConst vRHS = rRHS.getArray(); ImageFileArray vResult = result.getArray(); - for (int ix = 0; ix < m_nx; ix++) { + for (unsigned int ix = 0; ix < m_nx; ix++) { ImageFileColumnConst in1 = vLHS[ix]; ImageFileColumnConst in2 = vRHS[ix]; ImageFileColumn out = vResult[ix]; - for (int iy = 0; iy < m_ny; iy++) + for (unsigned int iy = 0; iy < m_ny; iy++) *out++ = *in1++ - *in2++; } @@ -363,11 +363,11 @@ ImageFile::addImages (const ImageFile& rRHS, ImageFile& result) const ImageFileArrayConst vRHS = rRHS.getArray(); ImageFileArray vResult = result.getArray(); - for (int ix = 0; ix < m_nx; ix++) { + for (unsigned int ix = 0; ix < m_nx; ix++) { ImageFileColumnConst in1 = vLHS[ix]; ImageFileColumnConst in2 = vRHS[ix]; ImageFileColumn out = vResult[ix]; - for (int iy = 0; iy < m_ny; iy++) + for (unsigned int iy = 0; iy < m_ny; iy++) *out++ = *in1++ + *in2++; } @@ -386,11 +386,11 @@ ImageFile::multiplyImages (const ImageFile& rRHS, ImageFile& result) const ImageFileArrayConst vRHS = rRHS.getArray(); ImageFileArray vResult = result.getArray(); - for (int ix = 0; ix < m_nx; ix++) { + for (unsigned int ix = 0; ix < m_nx; ix++) { ImageFileColumnConst in1 = vLHS[ix]; ImageFileColumnConst in2 = vRHS[ix]; ImageFileColumn out = vResult[ix]; - for (int iy = 0; iy < m_ny; iy++) + for (unsigned int iy = 0; iy < m_ny; iy++) *out++ = *in1++ * *in2++; } @@ -409,11 +409,11 @@ ImageFile::divideImages (const ImageFile& rRHS, ImageFile& result) const ImageFileArrayConst vRHS = rRHS.getArray(); ImageFileArray vResult = result.getArray(); - for (int ix = 0; ix < m_nx; ix++) { + for (unsigned int ix = 0; ix < m_nx; ix++) { ImageFileColumnConst in1 = vLHS[ix]; ImageFileColumnConst in2 = vRHS[ix]; ImageFileColumn out = vResult[ix]; - for (int iy = 0; iy < m_ny; iy++) { + for (unsigned int iy = 0; iy < m_ny; iy++) { if (*in2 != 0.) *out++ = *in1++ / *in2++; else @@ -436,10 +436,10 @@ ImageFile::invertPixelValues (ImageFile& result) const ImageFileArrayConst vLHS = getArray(); ImageFileArray vResult = result.getArray(); - for (int ix = 0; ix < m_nx; ix++) { + for (unsigned int ix = 0; ix < m_nx; ix++) { ImageFileColumnConst in = vLHS[ix]; ImageFileColumn out = vResult[ix]; - for (int iy = 0; iy < m_ny; iy++) + for (unsigned int iy = 0; iy < m_ny; iy++) *out++ = - *in++; } @@ -457,10 +457,10 @@ ImageFile::sqrt (ImageFile& result) const ImageFileArrayConst vLHS = getArray(); ImageFileArray vResult = result.getArray(); - for (int ix = 0; ix < m_nx; ix++) { + for (unsigned int ix = 0; ix < m_nx; ix++) { ImageFileColumnConst in = vLHS[ix]; ImageFileColumn out = vResult[ix]; - for (int iy = 0; iy < m_ny; iy++) + for (unsigned int iy = 0; iy < m_ny; iy++) if (*in < 0) *out++ = -::sqrt(-*in++); else @@ -481,10 +481,10 @@ ImageFile::log (ImageFile& result) const ImageFileArrayConst vLHS = getArray(); ImageFileArray vResult = result.getArray(); - for (int ix = 0; ix < m_nx; ix++) { + for (unsigned int ix = 0; ix < m_nx; ix++) { ImageFileColumnConst in = vLHS[ix]; ImageFileColumn out = vResult[ix]; - for (int iy = 0; iy < m_ny; iy++) + for (unsigned int iy = 0; iy < m_ny; iy++) if (*in <= 0) *out++ = 0; else @@ -505,10 +505,10 @@ ImageFile::exp (ImageFile& result) const ImageFileArrayConst vLHS = getArray(); ImageFileArray vResult = result.getArray(); - for (int ix = 0; ix < m_nx; ix++) { + for (unsigned int ix = 0; ix < m_nx; ix++) { ImageFileColumnConst in = vLHS[ix]; ImageFileColumn out = vResult[ix]; - for (int iy = 0; iy < m_ny; iy++) + for (unsigned int iy = 0; iy < m_ny; iy++) *out++ = ::exp (*in++); } @@ -543,7 +543,7 @@ ImageFile::fourier (ImageFile& result) const ImageFileArray vRealResult = result.getArray(); ImageFileArray vImagResult = result.getImaginaryArray(); - int ix, iy; + unsigned int ix, iy; double* pY = new double [m_ny]; std::complex** complexOut = new std::complex* [m_nx]; for (ix = 0; ix < m_nx; ix++) @@ -611,13 +611,13 @@ ImageFile::magnitude (ImageFile& result) const ImageFileArray vRealResult = result.getArray(); if (result.dataType() == Array2dFile::DATA_TYPE_COMPLEX) { ImageFileArray vImagResult = result.getImaginaryArray(); - for (int ix = 0; ix < m_nx; ix++) - for (int iy = 0; iy < m_ny; iy++) + for (unsigned int ix = 0; ix < m_nx; ix++) + for (unsigned int iy = 0; iy < m_ny; iy++) vImagResult[ix][iy] = 0; } - for (int ix = 0; ix < m_nx; ix++) - for (int iy = 0; iy < m_ny; iy++) { + for (unsigned int ix = 0; ix < m_nx; ix++) + for (unsigned int iy = 0; iy < m_ny; iy++) { if (dataType() == Array2dFile::DATA_TYPE_COMPLEX) vRealResult[ix][iy] = ::sqrt (vReal[ix][iy] * vReal[ix][iy] + vImag[ix][iy] * vImag[ix][iy]); else @@ -643,13 +643,13 @@ ImageFile::phase (ImageFile& result) const ImageFileArray vRealResult = result.getArray(); if (result.dataType() == Array2dFile::DATA_TYPE_COMPLEX) { ImageFileArray vImagResult = result.getImaginaryArray(); - for (int ix = 0; ix < m_nx; ix++) - for (int iy = 0; iy < m_ny; iy++) + for (unsigned int ix = 0; ix < m_nx; ix++) + for (unsigned int iy = 0; iy < m_ny; iy++) vImagResult[ix][iy] = 0; } - for (int ix = 0; ix < m_nx; ix++) - for (int iy = 0; iy < m_ny; iy++) { + for (unsigned int ix = 0; ix < m_nx; ix++) + for (unsigned int iy = 0; iy < m_ny; iy++) { if (dataType() == Array2dFile::DATA_TYPE_COMPLEX) vRealResult[ix][iy] = ::atan (vImag[ix][iy] / vReal[ix][iy]); else @@ -670,10 +670,10 @@ ImageFile::square (ImageFile& result) const ImageFileArrayConst vLHS = getArray(); ImageFileArray vResult = result.getArray(); - for (int ix = 0; ix < m_nx; ix++) { + for (unsigned int ix = 0; ix < m_nx; ix++) { ImageFileColumnConst in = vLHS[ix]; ImageFileColumn out = vResult[ix]; - for (int iy = 0; iy < m_ny; iy++) { + for (unsigned int iy = 0; iy < m_ny; iy++) { *out++ = *in * *in; in++; } diff --git a/libctsupport/plotfile.cpp b/libctsupport/plotfile.cpp index 706fce1..16336ef 100644 --- a/libctsupport/plotfile.cpp +++ b/libctsupport/plotfile.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: plotfile.cpp,v 1.6 2000/12/27 03:16:02 kevin Exp $ +** $Id: plotfile.cpp,v 1.7 2000/12/29 20:09:46 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 @@ -148,8 +148,7 @@ PlotFile::statistics (int iStartingCol, double& min, double& max, double& mean, sys_error (ERR_WARNING, "iStartingCol >= iNumColumns"); return false; } - - int iOffset = iStartingCol * m_iNumRecords; + int iNPoints = (m_iNumColumns - iStartingCol) * m_iNumRecords; std::vector vec; vec.resize (iNPoints); diff --git a/libctsupport/syserror.cpp b/libctsupport/syserror.cpp index 8468f82..679ecb4 100644 --- a/libctsupport/syserror.cpp +++ b/libctsupport/syserror.cpp @@ -2,7 +2,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: syserror.cpp,v 1.10 2000/12/29 15:45:06 kevin Exp $ +** $Id: syserror.cpp,v 1.11 2000/12/29 20:11:42 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 @@ -112,7 +112,7 @@ void sys_verror (std::string& strOutput, int severity, const char *msg, va_list strncpy (errStr, sizeof(errStr), "Error message not available on this platform."); #endif - os << errStr << std::endl; + os << errStr << "\n"; strOutput = os.str(); if (severity == ERR_FATAL) diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg index a51b06b..6816dff 100644 --- a/msvc/ctsim/ctsim.plg +++ b/msvc/ctsim/ctsim.plg @@ -119,3 +119,405 @@ ezset.cpp ezsupport.cpp filter.cpp fnetorderstream.cpp +hashtable.cpp +imagefile.cpp +mathfuncs.cpp +phantom.cpp +plotfile.cpp +pol.cpp +procsignal.cpp +projections.cpp +reconstruct.cpp +scanner.cpp +sgp.cpp +strfuncs.cpp +syserror.cpp +trace.cpp +transformmatrix.cpp +xform.cpp +Compiling... +backprojectors.cpp +Creating library... +

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

+

Command Lines

+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP7.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.5.0\" /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" /FR"Release/" /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\dialogs.cpp" +"C:\ctsim-2.0.6\src\dlgprojections.cpp" +"C:\ctsim-2.0.6\src\dlgreconstruct.cpp" +"C:\ctsim-2.0.6\src\docs.cpp" +"C:\ctsim-2.0.6\src\views.cpp" +] +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP7.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP8.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" +] +Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP8.tmp" +

Output Window

+Compiling... +ctsim.cpp +dialogs.cpp +dlgprojections.cpp +dlgreconstruct.cpp +docs.cpp +views.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"Release/ctsim.bsc" ".\Release\ctsim.sbr" ".\Release\dialogs.sbr" ".\Release\dlgprojections.sbr" ".\Release\dlgreconstruct.sbr" ".\Release\docs.sbr" ".\Release\views.sbr"" +Creating browse info file... +

Output Window

+ + + +

Results

+ctsim.exe - 0 error(s), 2 warning(s) +

+--------------------Configuration: libctsim - Win32 Debug-------------------- +

+

Command Lines

+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPB.tmp" with contents +[ +/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 +"C:\ctsim-2.0.6\libctsim\array2dfile.cpp" +"C:\ctsim-2.0.6\libctsim\backprojectors.cpp" +"C:\ctsim-2.0.6\libctsupport\clip.cpp" +"C:\ctsim-2.0.6\libctsupport\consoleio.cpp" +"C:\ctsim-2.0.6\libctgraphics\ezplot.cpp" +"C:\ctsim-2.0.6\libctgraphics\ezset.cpp" +"C:\ctsim-2.0.6\libctgraphics\ezsupport.cpp" +"C:\ctsim-2.0.6\libctsim\filter.cpp" +"C:\ctsim-2.0.6\libctsupport\fnetorderstream.cpp" +"C:\ctsim-2.0.6\libctsupport\hashtable.cpp" +"C:\ctsim-2.0.6\libctsim\imagefile.cpp" +"C:\ctsim-2.0.6\libctsupport\mathfuncs.cpp" +"C:\ctsim-2.0.6\libctsim\phantom.cpp" +"C:\ctsim-2.0.6\libctsupport\plotfile.cpp" +"C:\ctsim-2.0.6\libctgraphics\pol.cpp" +"C:\ctsim-2.0.6\libctsim\procsignal.cpp" +"C:\ctsim-2.0.6\libctsim\projections.cpp" +"C:\ctsim-2.0.6\libctsim\reconstruct.cpp" +"C:\ctsim-2.0.6\libctsim\scanner.cpp" +"C:\ctsim-2.0.6\libctgraphics\sgp.cpp" +"C:\ctsim-2.0.6\libctsupport\strfuncs.cpp" +"C:\ctsim-2.0.6\libctsupport\syserror.cpp" +"C:\ctsim-2.0.6\libctsim\trace.cpp" +"C:\ctsim-2.0.6\libctgraphics\transformmatrix.cpp" +"C:\ctsim-2.0.6\libctsupport\xform.cpp" +] +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPB.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPC.tmp" with contents +[ +/nologo /out:"Debug\libctsim.lib" +".\Debug\array2dfile.obj" +".\Debug\backprojectors.obj" +".\Debug\clip.obj" +".\Debug\consoleio.obj" +".\Debug\ezplot.obj" +".\Debug\ezset.obj" +".\Debug\ezsupport.obj" +".\Debug\filter.obj" +".\Debug\fnetorderstream.obj" +".\Debug\getopt.obj" +".\Debug\getopt1.obj" +".\Debug\hashtable.obj" +".\Debug\imagefile.obj" +".\Debug\mathfuncs.obj" +".\Debug\phantom.obj" +".\Debug\plotfile.obj" +".\Debug\pol.obj" +".\Debug\procsignal.obj" +".\Debug\projections.obj" +".\Debug\reconstruct.obj" +".\Debug\scanner.obj" +".\Debug\sgp.obj" +".\Debug\strfuncs.obj" +".\Debug\syserror.obj" +".\Debug\trace.obj" +".\Debug\transformmatrix.obj" +".\Debug\xform.obj" +] +Creating command line "link.exe -lib @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPC.tmp" +

Output Window

+Compiling... +array2dfile.cpp +imagefile.cpp +pol.cpp +backprojectors.cpp +clip.cpp +consoleio.cpp +ezplot.cpp +ezset.cpp +ezsupport.cpp +filter.cpp +fnetorderstream.cpp +hashtable.cpp +mathfuncs.cpp +phantom.cpp +plotfile.cpp +procsignal.cpp +projections.cpp +reconstruct.cpp +scanner.cpp +sgp.cpp +strfuncs.cpp +syserror.cpp +trace.cpp +transformmatrix.cpp +xform.cpp +Creating library... +

+--------------------Configuration: FFTW2st - Win32 Debug-------------------- +

+

Command Lines

+

+--------------------Configuration: RFFTW2st - Win32 Debug-------------------- +

+

Command Lines

+

+--------------------Configuration: wxvc - Win32 Debug-------------------- +

+

Command Lines

+

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

+

Command Lines

+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPD.tmp" with contents +[ +/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=\"2.5.0\" /FR"Debug/" /Fp"Debug/ctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c +"C:\ctsim-2.0.6\src\ctsim.cpp" +"C:\ctsim-2.0.6\src\dialogs.cpp" +"C:\ctsim-2.0.6\src\dlgprojections.cpp" +"C:\ctsim-2.0.6\src\dlgreconstruct.cpp" +"C:\ctsim-2.0.6\src\docs.cpp" +"C:\ctsim-2.0.6\src\views.cpp" +] +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPD.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPE.tmp" with contents +[ +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\RSPE.tmp" +

Output Window

+Compiling... +views.cpp +ctsim.cpp +dialogs.cpp +dlgprojections.cpp +dlgreconstruct.cpp +docs.cpp +Linking... +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), 0 warning(s) +

+--------------------Configuration: if1 - Win32 Release-------------------- +

+

Command Lines

+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP11.tmp" with contents +[ +/nologo /G6 /MT /W3 /GX /O2 /I "../../include" /I "../../getopt" /I "..\..\..\lpng108" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\zlib" /D "NDEBUG" /D "HAVE_GETOPT_H" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "MSVC" /D "HAVE_STRING_H" /D "HAVE_PNG" /Fp"Release/if1.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c +"C:\ctsim-2.0.6\tools\if1.cpp" +] +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP11.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP12.tmp" with contents +[ +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" +".\Release\if1.obj" +"\ctsim-2.0.6\msvc\libctsim\Release\libctsim.lib" +] +Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP12.tmp" +

Output Window

+Compiling... +if1.cpp +Linking... +libctsim.lib(procsignal.obj) : error LNK2001: unresolved external symbol _fftw_create_plan +libctsim.lib(procsignal.obj) : error LNK2001: unresolved external symbol _rfftw_create_plan +libctsim.lib(procsignal.obj) : error LNK2001: unresolved external symbol _rfftw_destroy_plan +libctsim.lib(procsignal.obj) : error LNK2001: unresolved external symbol _fftw_destroy_plan +libctsim.lib(procsignal.obj) : error LNK2001: unresolved external symbol _fftw_one +libctsim.lib(procsignal.obj) : error LNK2001: unresolved external symbol _rfftw_one +Release/if1.exe : fatal error LNK1120: 6 unresolved externals +Error executing link.exe. + + + +

Results

+if1.exe - 7 error(s), 0 warning(s) +

+--------------------Configuration: if1 - Win32 Debug-------------------- +

+

Command Lines

+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP14.tmp" with contents +[ +/nologo /G6 /MTd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /I "../../getopt" /I "..\..\..\lpng108" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\zlib" /D "_DEBUG" /D "HAVE_GETOPT_H" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "MSVC" /D "HAVE_STRING_H" /D "HAVE_PNG" /FR"Debug/" /Fp"Debug/if1.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c +"C:\ctsim-2.0.6\tools\if1.cpp" +] +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP14.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP15.tmp" with contents +[ +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" +".\Debug\if1.obj" +"\ctsim-2.0.6\msvc\libctsim\Debug\libctsim.lib" +] +Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP15.tmp" +

Output Window

+Compiling... +if1.cpp +Linking... + + + +

Results

+if1.exe - 0 error(s), 0 warning(s) +

+--------------------Configuration: if2 - Win32 Release-------------------- +

+

Command Lines

+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP17.tmp" with contents +[ +/nologo /G6 /MT /W3 /GX /O2 /I "../../include" /I "../../getopt" /I "..\..\..\lpng108" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\zlib" /D "NDEBUG" /D "HAVE_GETOPT_H" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "MSVC" /D "HAVE_STRING_H" /D "HAVE_PNG" /Fp"Release/if2.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c +"C:\ctsim-2.0.6\tools\if2.cpp" +] +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP17.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP18.tmp" with contents +[ +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" +".\Release\if2.obj" +"\ctsim-2.0.6\msvc\libctsim\Release\libctsim.lib" +] +Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP18.tmp" +

Output Window

+Compiling... +if2.cpp +Linking... +libctsim.lib(procsignal.obj) : error LNK2001: unresolved external symbol _fftw_create_plan +libctsim.lib(procsignal.obj) : error LNK2001: unresolved external symbol _rfftw_create_plan +libctsim.lib(procsignal.obj) : error LNK2001: unresolved external symbol _rfftw_destroy_plan +libctsim.lib(procsignal.obj) : error LNK2001: unresolved external symbol _fftw_destroy_plan +libctsim.lib(procsignal.obj) : error LNK2001: unresolved external symbol _fftw_one +libctsim.lib(procsignal.obj) : error LNK2001: unresolved external symbol _rfftw_one +Release/if2.exe : fatal error LNK1120: 6 unresolved externals +Error executing link.exe. + + + +

Results

+if2.exe - 7 error(s), 0 warning(s) +

+--------------------Configuration: if2 - Win32 Debug-------------------- +

+

Command Lines

+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1A.tmp" with contents +[ +/nologo /G6 /MTd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /I "../../getopt" /I "..\..\..\lpng108" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\zlib" /D "_DEBUG" /D "HAVE_GETOPT_H" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "MSVC" /D "HAVE_STRING_H" /D "HAVE_PNG" /FR"Debug/" /Fp"Debug/if2.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c +"C:\ctsim-2.0.6\tools\if2.cpp" +] +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1A.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1B.tmp" with contents +[ +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" +".\Debug\if2.obj" +"\ctsim-2.0.6\msvc\libctsim\Debug\libctsim.lib" +] +Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1B.tmp" +

Output Window

+Compiling... +if2.cpp +Linking... + + + +

Results

+if2.exe - 0 error(s), 0 warning(s) +

+--------------------Configuration: ifexport - Win32 Release-------------------- +

+

Command Lines

+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1D.tmp" with contents +[ +/nologo /G6 /MT /W3 /GX /O2 /I "..\..\..\zlib113" /I "../../include" /I "../../getopt" /I "..\..\..\lpng108" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\zlib" /D "NDEBUG" /D "HAVE_GETOPT_H" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "MSVC" /D "HAVE_STRING_H" /D "HAVE_PNG" /Fp"Release/ifexport.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c +"C:\ctsim-2.0.6\tools\ifexport.cpp" +] +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1D.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1E.tmp" with contents +[ +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/ifexport.pdb" /machine:I386 /out:"Release/ifexport.exe" /libpath:"..\libctsim\Release" /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\wx2\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" +".\Release\ifexport.obj" +"\ctsim-2.0.6\msvc\libctsim\Release\libctsim.lib" +] +Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1E.tmp" +

Output Window

+Compiling... +ifexport.cpp +Linking... +libctsim.lib(procsignal.obj) : error LNK2001: unresolved external symbol _fftw_create_plan +libctsim.lib(procsignal.obj) : error LNK2001: unresolved external symbol _rfftw_create_plan +libctsim.lib(procsignal.obj) : error LNK2001: unresolved external symbol _rfftw_destroy_plan +libctsim.lib(procsignal.obj) : error LNK2001: unresolved external symbol _fftw_destroy_plan +libctsim.lib(procsignal.obj) : error LNK2001: unresolved external symbol _fftw_one +libctsim.lib(procsignal.obj) : error LNK2001: unresolved external symbol _rfftw_one +Release/ifexport.exe : fatal error LNK1120: 6 unresolved externals +Error executing link.exe. + + + +

Results

+ifexport.exe - 7 error(s), 0 warning(s) +

+--------------------Configuration: ifexport - Win32 Debug-------------------- +

+

Command Lines

+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP20.tmp" with contents +[ +/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" /D "_DEBUG" /D "HAVE_GETOPT_H" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "MSVC" /D "HAVE_STRING_H" /D "HAVE_PNG" /FR"Debug/" /Fp"Debug/ifexport.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c +"C:\ctsim-2.0.6\tools\ifexport.cpp" +] +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP20.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP21.tmp" with contents +[ +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/ifexport.pdb" /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /nodefaultlib /out:"Debug/ifexport.exe" /pdbtype:sept +".\Debug\ifexport.obj" +"\ctsim-2.0.6\msvc\libctsim\Debug\libctsim.lib" +] +Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP21.tmp" +

Output Window

+Compiling... +ifexport.cpp +cl.exe terminated at user request. + + + + diff --git a/src/ctsim.cpp b/src/ctsim.cpp index 06c91ea..8dc7e22 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.21 2000/12/27 03:16:02 kevin Exp $ +** $Id: ctsim.cpp,v 1.22 2000/12/29 20:18:59 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.21 2000/12/27 03:16:02 kevin Exp $"; +static const char* rcsindent = "$Id: ctsim.cpp,v 1.22 2000/12/29 20:18:59 kevin Exp $"; class CTSimApp* theApp = NULL; @@ -289,8 +289,8 @@ void CTSimApp::getCompatibleImages (const ImageFileDocument* pIFDoc, std::vector& vecIF) { const ImageFile& rIF = pIFDoc->getImageFile(); - int nx = rIF.nx(); - int ny = rIF.ny(); + unsigned int nx = rIF.nx(); + unsigned int ny = rIF.ny(); wxList& rListDocs = m_docManager->GetDocuments(); for (wxNode* pNode = rListDocs.GetFirst(); pNode != NULL; pNode = pNode->GetNext()) { wxDocument* pDoc = reinterpret_cast(pNode->GetData()); diff --git a/src/views.cpp b/src/views.cpp index 307d6c0..86e0cf5 100644 --- a/src/views.cpp +++ b/src/views.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: views.cpp,v 1.41 2000/12/29 19:30:08 kevin Exp $ +** $Id: views.cpp,v 1.42 2000/12/29 20:18:59 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 @@ -87,7 +87,6 @@ void ImageFileCanvas::DrawRubberBandCursor (wxDC& dc, int x, int y) { const ImageFile& rIF = m_pView->GetDocument()->getImageFile(); - ImageFileArrayConst v = rIF.getArray(); int nx = rIF.nx(); int ny = rIF.ny(); @@ -1696,7 +1695,7 @@ PlotFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) delete m_pEZPlot; m_pEZPlot = new EZPlot; - for (int iEzset = 0; iEzset < rPlotFile.getNumEzsetCommands(); iEzset++) + for (unsigned int iEzset = 0; iEzset < rPlotFile.getNumEzsetCommands(); iEzset++) m_pEZPlot->ezset (rPlotFile.getEzsetCommand (iEzset)); if (m_bMinSpecified) { diff --git a/src/views.h b/src/views.h index 79b154c..3512fac 100644 --- a/src/views.h +++ b/src/views.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: views.h,v 1.18 2000/12/29 19:30:08 kevin Exp $ +** $Id: views.h,v 1.19 2000/12/29 20:18:59 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 @@ -226,9 +226,9 @@ private: PlotFileCanvas *CreateCanvas(wxView *view, wxFrame *parent); wxFrame *CreateChildFrame(wxDocument *doc, wxView *view); - EZPlot* m_pEZPlot; PlotFileCanvas *m_canvas; wxFrame *m_frame; + EZPlot* m_pEZPlot; bool m_bMinSpecified; bool m_bMaxSpecified; double m_dMinPixel; -- 2.34.1