From fada6fda06c0b0127552ff8bcb169a737d1e828f Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sun, 25 Feb 2001 07:36:26 +0000 Subject: [PATCH] r579: no message --- msvc/ctsim/ctsim.plg | 12 ++++++------ src/backgroundmgr.cpp | 10 +++++----- src/backgroundmgr.h | 6 +++--- src/backgroundsupr.cpp | 6 +++--- src/threadrecon.cpp | 14 +++++++------- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg index 9af1f67..02c55ab 100644 --- a/msvc/ctsim/ctsim.plg +++ b/msvc/ctsim/ctsim.plg @@ -6,13 +6,13 @@ --------------------Configuration: ctsim - Win32 Debug--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP21E.tmp" with contents +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP247.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.4\" /FR"Debug/" /Fp"Debug/ctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c -"C:\ctsim\src\backgroundsupr.cpp" +"C:\ctsim\src\threadrecon.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP21E.tmp" -Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP21F.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP247.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP248.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 /nologo /subsystem:windows /incremental:yes /pdb:"Debug/ctsim.pdb" /debug /machine:I386 /out:"Debug/ctsim.exe" /pdbtype:sept /libpath:"\wx2.2.5\lib" .\Debug\backgroundmgr.obj @@ -37,10 +37,10 @@ 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\RSP21F.tmp" +Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP248.tmp"

Output Window

Compiling... -backgroundsupr.cpp +threadrecon.cpp Linking... diff --git a/src/backgroundmgr.cpp b/src/backgroundmgr.cpp index b6d0bd6..34f568b 100644 --- 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.6 2001/02/25 06:32:12 kevin Exp $ +** $Id: backgroundmgr.cpp,v 1.7 2001/02/25 07:36:26 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 @@ -67,7 +67,7 @@ BackgroundManager::BackgroundManager () m_sizeButton.Set (70, 20); m_sizeCell.Set (m_sizeGauge.x + m_sizeLabel.x + m_sizeCellSpacing.x + m_sizeButton.x, 25); - + Show(false); } @@ -142,7 +142,6 @@ BackgroundManager::OnAddTask (wxCommandEvent& event) resizeWindow(); if (m_iNumTasks == 1) { - theApp->getMainFrame()->SetFocus(); // necessary to keep wxWindows from crashing Show(true); theApp->getMainFrame()->SetFocus(); // necessary to keep wxWindows from crashing } @@ -232,7 +231,7 @@ BackgroundManager::resizeWindow() IMPLEMENT_DYNAMIC_CLASS(BackgroundManagerCanvas, wxPanel) BEGIN_EVENT_TABLE(BackgroundManagerCanvas, wxPanel) -EVT_PAINT(BackgroundManagerCanvas::OnPaint) +//EVT_PAINT(BackgroundManagerCanvas::OnPaint) END_EVENT_TABLE() BackgroundManagerCanvas::BackgroundManagerCanvas (BackgroundManager* pMgr) @@ -240,7 +239,7 @@ BackgroundManagerCanvas::BackgroundManagerCanvas (BackgroundManager* pMgr) { } - +#if 0 void BackgroundManagerCanvas::OnPaint (wxPaintEvent& event) { @@ -248,3 +247,4 @@ BackgroundManagerCanvas::OnPaint (wxPaintEvent& event) // dc.DrawLine (0, 0, 30, 30); // dc.DrawLine (30,0, 0, 30); } +#endif \ No newline at end of file diff --git a/src/backgroundmgr.h b/src/backgroundmgr.h index 54bcd15..0366594 100644 --- a/src/backgroundmgr.h +++ b/src/backgroundmgr.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2001 Kevin Rosenberg ** -** $Id: backgroundmgr.h,v 1.5 2001/02/23 21:58:31 kevin Exp $ +** $Id: backgroundmgr.h,v 1.6 2001/02/25 07:36:26 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,9 +112,9 @@ private: public: BackgroundManagerCanvas (BackgroundManager* pBkgdMgr = NULL); - +#if 0 void OnPaint (wxPaintEvent& event); - +#endif DECLARE_EVENT_TABLE() }; diff --git a/src/backgroundsupr.cpp b/src/backgroundsupr.cpp index c0326d6..2b8c049 100644 --- a/src/backgroundsupr.cpp +++ b/src/backgroundsupr.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2001 Kevin Rosenberg ** -** $Id: backgroundsupr.cpp,v 1.1 2001/02/25 06:32:12 kevin Exp $ +** $Id: backgroundsupr.cpp,v 1.2 2001/02/25 07:36:26 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 @@ -93,7 +93,7 @@ BackgroundSupervisor::~BackgroundSupervisor() while (m_bBackgroundTaskAdded) { Sleep(50); - ::wxYield(); + ProcessPendingEvents(); } delete m_pTimer; @@ -112,7 +112,7 @@ BackgroundSupervisor::deleteAnyWorkers() while (m_iRunning > 0) { Sleep(50); - ::wxYield(); + ProcessPendingEvents(); } } diff --git a/src/threadrecon.cpp b/src/threadrecon.cpp index 7a7b3dd..820b44b 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.8 2001/02/25 06:32:12 kevin Exp $ +** $Id: threadrecon.cpp,v 1.9 2001/02/25 07:36:26 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 @@ -86,7 +86,7 @@ ReconstructorSupervisorThread::Entry() while (reconSupervisor.anyWorkersRunning()) { Sleep(50); - Yield(); + reconSupervisor.ProcessPendingEvents (); } return reinterpret_cast(0); @@ -254,14 +254,14 @@ ReconstructorWorker::Entry () return reinterpret_cast(-1); } pReconstructor->reconstructView (iUnit + m_iStartUnit, 1); - wxPostEvent (m_pSupervisor, eventProgress); + m_pSupervisor->AddPendingEvent (eventProgress); } pReconstructor->postProcessing(); - - wxPostEvent (m_pSupervisor, eventDone); - delete pReconstructor; - return reinterpret_cast(0); + + wxPostEvent (m_pSupervisor, eventDone); + + return reinterpret_cast(0); } void -- 2.34.1