From 7af7f4eb207891a4c0bfc60233b90847fd9b96cf Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Fri, 2 Mar 2001 21:32:34 +0000 Subject: [PATCH] r599: no message --- msvc/ctsim/ctsim.plg | 38 ++++++++++++++++---------------------- src/threadproj.cpp | 8 +++++--- src/threadraster.cpp | 8 +++++--- src/threadrecon.cpp | 8 +++++--- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg index ba3cdb4..1b01c5c 100644 --- a/msvc/ctsim/ctsim.plg +++ b/msvc/ctsim/ctsim.plg @@ -6,18 +6,7 @@ --------------------Configuration: ctsim - Win32 Debug--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPA9D.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" /I "\dicom\ctn\include" /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.1.0\" /D "HAVE_CTN_DICOM" /FR"Debug/" /Fp"Debug/ctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c -"D:\ctsim\src\backgroundmgr.cpp" -"D:\ctsim\src\backgroundsupr.cpp" -"D:\ctsim\src\graph3dview.cpp" -"D:\ctsim\src\threadproj.cpp" -"D:\ctsim\src\threadraster.cpp" -"D:\ctsim\src\threadrecon.cpp" -] -Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPA9D.tmp" -Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPA9E.tmp" with contents +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPAAD.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" /I "\dicom\ctn\include" /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.1.0\" /D "HAVE_CTN_DICOM" /D CTSIMVERSION=\"3.0.0alpha5\" /FR"Debug/" /Fp"Debug/ctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c "D:\ctsim\src\ctsim.cpp" @@ -25,8 +14,16 @@ Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPA9E.tmp" with conten "D:\ctsim\src\docs.cpp" "D:\ctsim\src\views.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPA9E.tmp" -Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPA9F.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPAAD.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPAAE.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" /I "\dicom\ctn\include" /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.1.0\" /D "HAVE_CTN_DICOM" /FR"Debug/" /Fp"Debug/ctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c +"D:\ctsim\src\threadproj.cpp" +"D:\ctsim\src\threadraster.cpp" +"D:\ctsim\src\threadrecon.cpp" +] +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPAAE.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPAAF.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 @@ -53,20 +50,17 @@ 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\RSPA9F.tmp" +Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPAAF.tmp"

Output Window

Compiling... -backgroundsupr.cpp -threadproj.cpp -threadraster.cpp -threadrecon.cpp -backgroundmgr.cpp -graph3dview.cpp -Compiling... ctsim.cpp dialogs.cpp docs.cpp views.cpp +Compiling... +threadproj.cpp +threadraster.cpp +threadrecon.cpp Linking... diff --git a/src/threadproj.cpp b/src/threadproj.cpp index 6421656..daf21d4 100644 --- a/src/threadproj.cpp +++ b/src/threadproj.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2001 Kevin Rosenberg ** -** $Id: threadproj.cpp,v 1.7 2001/03/02 21:11:50 kevin Exp $ +** $Id: threadproj.cpp,v 1.8 2001/03/02 21:32: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 @@ -155,7 +155,8 @@ ProjectorSupervisor::onDone() Projections* pProjections = getProjections(); - wxMutexGuiEnter(); + if (! wxThread::IsMain()) + wxMutexGuiEnter(); ProjectionFileDocument* pProjDoc = theApp->newProjectionDoc(); if (! pProjDoc) { sys_error (ERR_SEVERE, "Unable to create projection file"); @@ -169,7 +170,8 @@ ProjectorSupervisor::onDone() projView->getFrame()->Show(true); } *theApp->getLog() << m_pszLabel << "\n"; - wxMutexGuiLeave(); + if (! wxThread::IsMain()) + wxMutexGuiLeave(); if (theApp->getAskDeleteNewDocs()) pProjDoc->Modify (true); diff --git a/src/threadraster.cpp b/src/threadraster.cpp index 252d6c5..6602cce 100644 --- a/src/threadraster.cpp +++ b/src/threadraster.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2001 Kevin Rosenberg ** -** $Id: threadraster.cpp,v 1.2 2001/03/02 21:11:50 kevin Exp $ +** $Id: threadraster.cpp,v 1.3 2001/03/02 21:32: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 @@ -142,7 +142,8 @@ RasterizerSupervisor::onDone() ImageFile* pImageFile = getImageFile(); - wxMutexGuiEnter(); + if (! wxThread::IsMain()) + wxMutexGuiEnter(); ImageFileDocument* pImageDoc = theApp->newImageDoc(); if (! pImageDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); @@ -156,7 +157,8 @@ RasterizerSupervisor::onDone() imageView->getFrame()->Show(true); } *theApp->getLog() << m_pszLabel << "\n"; - wxMutexGuiLeave(); + if (! wxThread::IsMain()) + wxMutexGuiLeave(); pImageFile->labelAdd (m_pszLabel, getTimerEnd()); if (theApp->getAskDeleteNewDocs()) pImageDoc->Modify (true); diff --git a/src/threadrecon.cpp b/src/threadrecon.cpp index c075fb4..3c0b223 100644 --- a/src/threadrecon.cpp +++ b/src/threadrecon.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2001 Kevin Rosenberg ** -** $Id: threadrecon.cpp,v 1.15 2001/03/02 21:11:50 kevin Exp $ +** $Id: threadrecon.cpp,v 1.16 2001/03/02 21:32: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 @@ -149,7 +149,8 @@ ReconstructorSupervisor::onDone() ImageFile* pImageFile = getImageFile(); - wxMutexGuiEnter(); + if (! wxThread::IsMain()) + wxMutexGuiEnter(); ImageFileDocument* pReconDoc = theApp->newImageDoc(); if (! pReconDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); @@ -163,7 +164,8 @@ ReconstructorSupervisor::onDone() rasterView->getFrame()->Show(true); } *theApp->getLog() << m_pszLabel << "\n"; - wxMutexGuiLeave(); + if (! wxThread::IsMain()) + wxMutexGuiLeave(); if (theApp->getAskDeleteNewDocs()) pReconDoc->Modify (true); -- 2.34.1