r630: no message

diff --git a/include/projections.h b/include/projections.h
index 67cae86462ad282856fdf99733c1756f5425481f..3b7e78fcf5d0c60f26b4e25e72788ea6ec059b59 100644 (file)
--- a/include/projections.h
+++ b/include/projections.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: projections.h,v 1.30 2001/03/11 06:34:37 kevin Exp $
+**  $Id: projections.h,v 1.31 2001/03/11 12:37:34 kevin Exp $
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -154,7 +154,7 @@ class Projections
   int geometry() const {return m_geometry;}
   double focalLength() const {return m_dFocalLength;}
   double sourceDetectorLength() const { return m_dSourceDetectorLength;}
-
+  double viewDiameter() const {return m_dViewDiameter; }
   double phmLen() const { return m_dViewDiameter / SQRT2; }
   void setPhmLen(double phmLen) { m_dViewDiameter = phmLen * SQRT2; }
 

diff --git a/libctsim/projections.cpp b/libctsim/projections.cpp
index c55aa37a5fcc94b6292ac9b912f93e858bbb5b7f..85933de143d64d86e7f820d2415305bc9c7ee323 100644 (file)
--- a/libctsim/projections.cpp
+++ b/libctsim/projections.cpp
@@ -8,7 +8,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: projections.cpp,v 1.57 2001/03/11 06:34:37 kevin Exp $
+**  $Id: projections.cpp,v 1.58 2001/03/11 12:37:34 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
@@ -991,7 +991,11 @@ Projections::interpolateToParallel ()
   pProjNew->m_label.setDateTime (pProjNew->m_year, pProjNew->m_month, pProjNew->m_day, pProjNew->m_hour, pProjNew->m_minute, pProjNew->m_second);
 
   pProjNew->m_rotStart = 0;
+#ifdef CONVERT_PARALLEL_PI
   pProjNew->m_rotInc = PI / nView;;
+#else
+  pProjNew->m_rotInc = TWOPI / nView;
+#endif
   pProjNew->m_detStart = -m_dViewDiameter / 2;
   pProjNew->m_detInc = m_dViewDiameter / nDet;
   if (nDet % 2 == 0) // even
@@ -1086,10 +1090,12 @@ ParallelRaysums::ParallelRaysums (Projections* pProjections)
         pC->m_dTheta = normalizeAngle (dViewAngle + dDetPos);
         pC->m_dT = dFocalLength * sin (dDetPos);        
       }
+#ifdef CONVERT_PARALLEL_PI
       if (pC->m_dTheta >= PI) {  // convert T/Theta to 0-PI interval
         pC->m_dTheta -= PI;
-        pC->m_dT = -pC->m_dT - pProjections->detInc();
+        pC->m_dT = -pC->m_dT;
       }
+#endif
       pC->m_dRaysum = detValues[iD];
       dDetPos += dDetInc;
     }

diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg
index d0e65d49e5914d472b7697cc86fe9d20aba6f7c4..cb2ca50c25f6a1a4f929fb7d46cbb653b62515ed 100644 (file)
--- a/msvc/ctsim/ctsim.plg
+++ b/msvc/ctsim/ctsim.plg
@@ -6,13 +6,13 @@
 --------------------Configuration: libctsim - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP377.tmp" with contents
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP3D5.tmp" with contents
 [
 /nologo /G6 /MTd /W3 /Gm /Gi /GR /GX /Zi /Od /Gy /I "..\..\..\wx2.2.5\src\png" /I "..\..\..\wx2.2.5\src\zlib" /I "..\..\INCLUDE" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2.2.5\include" /I "\dicom\ctn\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__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "HAVE_CTN_DICOM" /D VERSION=\"3.1.0\" /FR"Debug/" /Fp"Debug/libctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
 "C:\ctsim\libctsim\projections.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP377.tmp" 
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP378.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP3D5.tmp" 
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP3D6.tmp" with contents
 [
 /nologo /out:"Debug\libctsim.lib" 
 .\Debug\array2dfile.obj
@@ -48,7 +48,7 @@ Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP378.tmp" with conten
 .\Debug\transformmatrix.obj
 .\Debug\xform.obj
 ]
-Creating command line "link.exe -lib @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP378.tmp"
+Creating command line "link.exe -lib @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP3D6.tmp"
 <h3>Output Window</h3>
 Compiling...
 projections.cpp
@@ -57,7 +57,7 @@ Creating library...
 --------------------Configuration: ctsim - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP379.tmp" with contents
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP3D7.tmp" with contents
 [
 winmm.lib rpcrt4.lib ws2_32.lib ../libctsim/Debug/libctsim.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 comctl32.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 opengl32.lib glu32.lib htmlhelp.lib ctn_lib.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/ctsim.pdb" /debug /machine:I386 /out:"Debug/ctsim.exe" /pdbtype:sept /libpath:"\wx2.2.5\lib" /libpath:"\dicom\ctn\winctn\ctn_lib\Debug" 
 .\Debug\backgroundmgr.obj
@@ -84,7 +84,7 @@ winmm.lib rpcrt4.lib ws2_32.lib ../libctsim/Debug/libctsim.lib libcmtd.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\RSP379.tmp"
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP3D7.tmp"
 <h3>Output Window</h3>
 Linking...
 

diff --git a/src/backgroundmgr.cpp b/src/backgroundmgr.cpp
index 52ee7965cf1fc8f8af3fd3e6f501930f7f94446c..58bd9029a428f1acd6684d6b419b09039a26b341 100644 (file)
--- a/src/backgroundmgr.cpp
+++ b/src/backgroundmgr.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2001 Kevin Rosenberg
 **
-**  $Id: backgroundmgr.cpp,v 1.16 2001/03/11 06:34:37 kevin Exp $
+**  $Id: backgroundmgr.cpp,v 1.17 2001/03/11 12:37:34 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
@@ -151,9 +151,8 @@ BackgroundManager::OnAddTask (wxCommandEvent& event)
 
   resizeWindow();
   if (m_iNumTasks == 1) {
-       theApp->getMainFrame()->SetFocus();
     Show(true);  
-       theApp->getMainFrame()->SetFocus();
+       theApp->getLog()->SetFocus();
   }
 }
 

diff --git a/src/dialogs.cpp b/src/dialogs.cpp
index 9864dc0a65dd738371add771850b4b6e9fb1581c..97c68adeda4a1ca407c0a17bec81a7872e8b7f04 100644 (file)
--- a/src/dialogs.cpp
+++ b/src/dialogs.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: dialogs.cpp,v 1.48 2001/03/07 21:18:50 kevin Exp $
+**  $Id: dialogs.cpp,v 1.49 2001/03/11 12:37:34 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
@@ -682,6 +682,8 @@ DialogGetProjectionParameters::DialogGetProjectionParameters
   SetSizer (pTopSizer);
   pTopSizer->Fit (this);
   pTopSizer->SetSizeHints (this);
+
+  m_pRadioBoxGeometry->SetFocus();
 }
 
 DialogGetProjectionParameters::~DialogGetProjectionParameters ()