projects / ctsim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5e2332e)
r514: no message
authorKevin M. Rosenberg <kevin@rosenberg.net>
Fri, 9 Feb 2001 21:27:51 +0000 (21:27 +0000)
committerKevin M. Rosenberg <kevin@rosenberg.net>
Fri, 9 Feb 2001 21:27:51 +0000 (21:27 +0000)
libctsupport/cubicinterp.cpp patch | blob | history
msvc/ctsim/ctsim.plg patch | blob | history
src/ctsim.cpp patch | blob | history

diff --git a/libctsupport/cubicinterp.cpp b/libctsupport/cubicinterp.cpp
index fa51f7b47fd52f15ee6a5dcf6c48925922c943cf..8d0c62cbc9dd28bbac59a5d43db85ba9c8d94d9b 100644 (file)
--- a/libctsupport/cubicinterp.cpp
+++ b/libctsupport/cubicinterp.cpp
@@ -2,7 +2,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: cubicinterp.cpp,v 1.3 2001/02/09 14:34:16 kevin Exp $
+**  $Id: cubicinterp.cpp,v 1.4 2001/02/09 21:27:51 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
@@ -37,7 +37,8 @@ CubicInterpolator::CubicInterpolator (const double* const y, const int n)
 
   double* temp = new double [n - 1];
   temp[0] = 0;
-  for (int i = 1; i < n - 1; i++) { 
+  int i;
+  for (i = 1; i < n - 1; i++) { 
     double t = 2 + (0.5 * m_pdY2[i-1]);
     temp[i] = y[i+1] + y[i-1] - y[i] - y[i];
     temp[i] = (3 * temp[i] - 0.5 * temp[i-1]) / t;
diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg
index ffee90bef1d0341277d7a5a671f8d9c0d1156c33..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/msvc/ctsim/ctsim.plg
+++ b/msvc/ctsim/ctsim.plg
@@ -1,68 +0,0 @@
-<html>
-<body>
-<pre>
-<h1>Build Log</h1>
-<h3>
---------------------Configuration: ctsim - Win32 Debug--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x409 /fo"Debug/ctsim.res" /i "\wx2.2.5\include" /d "_DEBUG" "D:\ctsim\msvc\ctsim\ctsim.rc"" 
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP32.tmp" with contents
-[
-/nologo /G6 /MTd /W3 /Gm /Gi /GR /GX /Zi /Od /Gy /I "\wx2.2.5\include" /I "..\..\..\fftw-2.1.3\fftw" /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\rfftw" /D VERSION=\"3.0.0beta1\" /D "_DEBUG" /D "__WXMSW__" /D "HAVE_SGP" /D "HAVE_PNG" /D "HAVE_WXWINDOWS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_FFTW" /D "HAVE_RFFTW" /D "HAVE_GETOPT_H" /D "MSVC" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D CTSIMVERSION=\"3.0.0alpha5\" /FR"Debug/" /Fp"Debug/ctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
-"D:\ctsim\src\ctsim.cpp"
-"D:\ctsim\src\dialogs.cpp"
-"D:\ctsim\src\dlgprojections.cpp"
-"D:\ctsim\src\dlgreconstruct.cpp"
-"D:\ctsim\src\docs.cpp"
-"D:\ctsim\src\views.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP32.tmp" 
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP33.tmp" with contents
-[
-/nologo /G6 /MTd /W3 /Gm /Gi /GR /GX /Zi /Od /Gy /I "\wx2.2.5\include" /I "..\..\..\fftw-2.1.3\fftw" /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\rfftw" /D VERSION=\"3.0.0beta1\" /D "_DEBUG" /D "__WXMSW__" /D "HAVE_SGP" /D "HAVE_PNG" /D "HAVE_WXWINDOWS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_FFTW" /D "HAVE_RFFTW" /D "HAVE_GETOPT_H" /D "MSVC" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D CTSIMVERSION=\"3.0.0beta1\" /FR"Debug/" /Fp"Debug/ctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
-"D:\ctsim\src\graph3dview.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP33.tmp" 
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP34.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 libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib wxd.lib xpmd.lib tiffd.lib zlibd.lib pngd.lib opengl32.lib glu32.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/ctsim.pdb" /debug /machine:I386 /out:"Debug/ctsim.exe" /pdbtype:sept /libpath:"\wx2.2.5\lib" 
-.\Debug\ctsim.obj
-.\Debug\dialogs.obj
-.\Debug\dlgprojections.obj
-.\Debug\dlgreconstruct.obj
-.\Debug\docs.obj
-.\Debug\graph3dview.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.2.5\lib\jpegd.lib
-\wx2.2.5\lib\pngd.lib
-\wx2.2.5\lib\wxd.lib
-\wx2.2.5\lib\xpmd.lib
-\wx2.2.5\lib\zlibd.lib
-\wx2.2.5\lib\tiffd.lib
-]
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP34.tmp"
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-ctsim.cpp
-dialogs.cpp
-dlgprojections.cpp
-dlgreconstruct.cpp
-docs.cpp
-views.cpp
-Compiling...
-graph3dview.cpp
-Linking...
-
-
-
-<h3>Results</h3>
-ctsim.exe - 0 error(s), 0 warning(s)
-</pre>
-</body>
-</html>
diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 17ebe7055a03e821147ad40e5df63cc1e9a8824b..b591cfa9e6443cb835401b338f8596a6743e7790 100644 (file)
--- 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.69 2001/02/09 21:24:27 kevin Exp $
+**  $Id: ctsim.cpp,v 1.70 2001/02/09 21:27:51 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
@@ -70,7 +70,7 @@
 #endif
 #endif
 
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.69 2001/02/09 21:24:27 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.70 2001/02/09 21:27:51 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -102,7 +102,7 @@ CTSimApp::OnInit()
        setpriority (PRIO_PROCESS, 0, 15);  // set to low scheduling priority
 #endif
        
-       m_pConfig = new wxConfig("ctsim", _T(""), ".ctsim", "", wxCONFIG_USE_LOCAL_FILE);
+       m_pConfig = new wxConfig("ctsim", _T(""), "~/.ctsim", "", wxCONFIG_USE_LOCAL_FILE);
        wxConfigBase::Set(m_pConfig);
        
        g_bRunningWXWindows = true;
Computed Tomography simulator and reconstructor