** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: docs.cpp,v 1.26 2001/02/23 18:56:56 kevin Exp $
+** $Id: docs.cpp,v 1.33 2001/03/05 17:26:46 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
return true;
}
-// ProjectionFileDocument
+// BackgroundProcessingDocument - Base Class
-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)
+IMPLEMENT_DYNAMIC_CLASS(BackgroundProcessingDocument, wxDocument)
+BEGIN_EVENT_TABLE(BackgroundProcessingDocument, wxDocument)
END_EVENT_TABLE()
-bool
-ProjectionFileDocument::OnSaveDocument(const wxString& filename)
+#ifdef HAVE_WXTHREADS
+void
+BackgroundProcessingDocument::addBackgroundSupervisor (BackgroundSupervisor* pSupervisor)
{
- if (! m_pProjectionFile->write (filename.c_str())) {
- *theApp->getLog() << "Unable to write projection file " << filename << "\n";
- return false;
- }
- if (theApp->getVerboseLogging())
- *theApp->getLog() << "Wrote projection file " << filename << "\n";
- Modify(false);
- return true;
+ wxCriticalSectionLocker locker (m_criticalSection);
+ if (pSupervisor)
+ m_vecpBackgroundSupervisors.push_back (pSupervisor);
}
-ProjectionFileDocument::~ProjectionFileDocument()
+void
+BackgroundProcessingDocument::removeBackgroundSupervisor (BackgroundSupervisor* pSupervisor)
{
+ m_criticalSection.Enter();
+ bool bFound = false;
for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin();
- i != m_vecpBackgroundSupervisors.end(); i++) {
- (*i)->cancel();
- }
-
- m_vecpBackgroundSupervisors.clear();
- delete m_pProjectionFile;
-}
+ i != m_vecpBackgroundSupervisors.end();
+ i++)
+ if (*i == pSupervisor) {
+ m_vecpBackgroundSupervisors.erase(i);
+ bFound = true;
+ break;
+ }
+ m_criticalSection.Leave();
-void
-ProjectionFileDocument::OnAddBackground (wxCommandEvent& event)
-{
+ if (! bFound)
+ sys_error (ERR_SEVERE, "Could not find background task [OnRemoveBackground]");
}
+#endif
void
-ProjectionFileDocument::OnRemoveBackground (wxCommandEvent& event)
+BackgroundProcessingDocument::cancelRunningTasks()
{
+#ifdef HAVE_WXTHREADS
+ m_criticalSection.Enter();
+ for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin();
+ i != m_vecpBackgroundSupervisors.end(); i++)
+ (*i)->onCancel();
+ m_criticalSection.Leave();
+
+ while (m_vecpBackgroundSupervisors.size() > 0) {
+ ::wxYield();
+ ::wxUsleep(50);
+ }
+#endif
}
-void
-ProjectionFileDocument::addReconstructor (BackgroundSupervisor* pRecon)
+
+// ProjectionFileDocument
+
+IMPLEMENT_DYNAMIC_CLASS(ProjectionFileDocument, BackgroundProcessingTask)
+
+bool
+ProjectionFileDocument::OnSaveDocument(const wxString& filename)
{
- wxCriticalSectionLocker locker (m_criticalSection);
- m_vecpBackgroundSupervisors.push_back (pRecon);
+ if (! m_pProjectionFile->write (filename.c_str())) {
+ *theApp->getLog() << "Unable to write projection file " << filename << "\n";
+ return false;
+ }
+ if (theApp->getVerboseLogging())
+ *theApp->getLog() << "Wrote projection file " << filename << "\n";
+ Modify(false);
+ return true;
}
-void
-ProjectionFileDocument::removeReconstructor (BackgroundSupervisor* pRecon)
+ProjectionFileDocument::~ProjectionFileDocument()
{
- wxCriticalSectionLocker locker (m_criticalSection);
- bool bFound = false;
- for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin();
- i != m_vecpBackgroundSupervisors.end();
- i++)
- if (*i == pRecon) {
- m_vecpBackgroundSupervisors.erase(i);
- bFound = true;
- break;
- }
- if (! bFound)
- sys_error (ERR_SEVERE, "Could not find background task [ProjectionFileDocument::removeBackgroundTask");
+ cancelRunningTasks();
+
+ delete m_pProjectionFile;
}
bool
// PhantomFileDocument
-IMPLEMENT_DYNAMIC_CLASS(PhantomFileDocument, wxDocument)
+IMPLEMENT_DYNAMIC_CLASS(PhantomFileDocument, BackgroundProcessingTask)
+
+PhantomFileDocument::~PhantomFileDocument()
+{
+ cancelRunningTasks();
+}
bool
PhantomFileDocument::OnOpenDocument(const wxString& filename)