** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: docs.cpp,v 1.27 2001/02/23 21:58:31 kevin Exp $
+** $Id: docs.cpp,v 1.30 2001/02/25 16:21:36 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)
+EVT_MENU(BackgroundSupervisor::MSG_BACKGROUND_SUPERVISOR_ADD, BackgroundProcessingDocument::OnAddBackground)
+EVT_MENU(BackgroundSupervisor::MSG_BACKGROUND_SUPERVISOR_REMOVE, BackgroundProcessingDocument::OnRemoveBackground)
END_EVENT_TABLE()
-bool
-ProjectionFileDocument::OnSaveDocument(const wxString& filename)
-{
- 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;
-}
-
-ProjectionFileDocument::~ProjectionFileDocument()
-{
- for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin();
- i != m_vecpBackgroundSupervisors.end(); i++) {
- BackgroundSupervisor::cancelSupervisor(*i);
- }
-
- while (m_vecpBackgroundSupervisors.size() > 0)
- ::wxYield();
-
- delete m_pProjectionFile;
-}
-
void
-ProjectionFileDocument::OnAddBackground (wxCommandEvent& event)
+BackgroundProcessingDocument::OnAddBackground (wxCommandEvent& event)
{
BackgroundSupervisor* pSupervisor = reinterpret_cast<BackgroundSupervisor*>(event.GetClientData());
wxASSERT (pSupervisor != NULL);
}
void
-ProjectionFileDocument::OnRemoveBackground (wxCommandEvent& event)
+BackgroundProcessingDocument::OnRemoveBackground (wxCommandEvent& event)
{
BackgroundSupervisor* pSupervisor = reinterpret_cast<BackgroundSupervisor*>(event.GetClientData());
wxASSERT (pSupervisor != NULL);
- wxCriticalSectionLocker locker (m_criticalSection);
+ m_criticalSection.Enter();
bool bFound = false;
for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin();
i != m_vecpBackgroundSupervisors.end();
bFound = true;
break;
}
- if (! bFound)
- sys_error (ERR_SEVERE, "Could not find background task [ProjectionFileDocument::removeBackgroundTask");
+ m_criticalSection.Leave();
+
+ if (! bFound)
+ sys_error (ERR_SEVERE, "Could not find background task [OnRemoveBackground]");
+
+ wxCommandEvent ackEvent (wxEVT_COMMAND_MENU_SELECTED, BackgroundSupervisor::MSG_DOCUMENT_ACK_REMOVE);
+ wxPostEvent (pSupervisor, ackEvent);
+}
+
+void
+BackgroundProcessingDocument::cancelRunningTasks()
+{
+ 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) {
+ ::wxYield();
+ ::wxUsleep(50);
+ }
+}
+
+
+// ProjectionFileDocument
+
+IMPLEMENT_DYNAMIC_CLASS(ProjectionFileDocument, BackgroundProcessingTask)
+
+bool
+ProjectionFileDocument::OnSaveDocument(const wxString& filename)
+{
+ 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;
+}
+
+ProjectionFileDocument::~ProjectionFileDocument()
+{
+ 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)