** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: docs.cpp,v 1.25 2001/02/22 11:05:38 kevin Exp $
+** $Id: docs.cpp,v 1.28 2001/02/25 06:32:12 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
// ProjectionFileDocument
IMPLEMENT_DYNAMIC_CLASS(ProjectionFileDocument, wxDocument)
+BEGIN_EVENT_TABLE(ProjectionFileDocument, wxDocument)
+EVT_MENU(BackgroundSupervisor::MSG_BACKGROUND_SUPERVISOR_ADD, ProjectionFileDocument::OnAddBackground)
+EVT_MENU(BackgroundSupervisor::MSG_BACKGROUND_SUPERVISOR_REMOVE, ProjectionFileDocument::OnRemoveBackground)
+END_EVENT_TABLE()
bool
ProjectionFileDocument::OnSaveDocument(const wxString& filename)
ProjectionFileDocument::~ProjectionFileDocument()
{
- for (int i = 0; i < m_vecpActiveReconstructors.size(); i++) {
- ThreadedReconstructor* pThreadedReconstructor = m_vecpActiveReconstructors[i];
- if (pThreadedReconstructor) {
- pThreadedReconstructor->cancel();
- }
+ m_criticalSection.Enter();
+ for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin();
+ i != m_vecpBackgroundSupervisors.end(); i++)
+ BackgroundSupervisor::cancelSupervisor(*i);
+ m_criticalSection.Leave();
+
+ while (m_vecpBackgroundSupervisors.size() > 0) {
+ ::wxUsleep(50);
+ ::wxYield();
}
- delete m_pProjectionFile;
+ delete m_pProjectionFile;
}
void
-ProjectionFileDocument::addReconstructor (ThreadedReconstructor* pRecon)
+ProjectionFileDocument::OnAddBackground (wxCommandEvent& event)
{
+ BackgroundSupervisor* pSupervisor = reinterpret_cast<BackgroundSupervisor*>(event.GetClientData());
+ wxASSERT (pSupervisor != NULL);
+
wxCriticalSectionLocker locker (m_criticalSection);
- m_vecpActiveReconstructors.push_back (pRecon);
+ if (pSupervisor)
+ m_vecpBackgroundSupervisors.push_back (pSupervisor);
}
void
-ProjectionFileDocument::removeReconstructor (ThreadedReconstructor* pRecon)
+ProjectionFileDocument::OnRemoveBackground (wxCommandEvent& event)
{
- wxCriticalSectionLocker locker (m_criticalSection);
- for (int i = 0; i < m_vecpActiveReconstructors.size(); i++) {
- if (m_vecpActiveReconstructors[i] == pRecon)
- m_vecpActiveReconstructors[i] = NULL;
- }
+ BackgroundSupervisor* pSupervisor = reinterpret_cast<BackgroundSupervisor*>(event.GetClientData());
+ wxASSERT (pSupervisor != NULL);
+
+ m_criticalSection.Enter();
+ bool bFound = false;
+ for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin();
+ i != m_vecpBackgroundSupervisors.end();
+ i++)
+ if (*i == pSupervisor) {
+ m_vecpBackgroundSupervisors.erase(i);
+ bFound = true;
+ break;
+ }
+ m_criticalSection.Leave();
+
+ if (! bFound)
+ sys_error (ERR_SEVERE, "Could not find background task [ProjectionFileDocument::removeBackgroundTask");
+
+ wxCommandEvent ackEvent (wxEVT_COMMAND_MENU_SELECTED, BackgroundSupervisor::MSG_DOCUMENT_ACK_REMOVE);
+ wxPostEvent (pSupervisor, ackEvent);
}
bool