X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fdocs.cpp;h=96f7ee3c2ae793d842e34f91a0fce7abdb99b47f;hb=4d5f56994972346351a48730315a7d85924103ba;hp=460082a63ae8f3a14f1e30a1beccb1c322e21352;hpb=0730f9f3adbf326b9d4bac754634399ad688efd1;p=ctsim.git

diff --git a/src/docs.cpp b/src/docs.cpp
index 460082a..96f7ee3 100644
--- a/src/docs.cpp
+++ b/src/docs.cpp
@@ -9,7 +9,7 @@
 **  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.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
@@ -126,9 +126,69 @@ ImageFileDocument::Revert ()
   return true;
 }
 
+// BackgroundProcessingDocument - Base Class
+
+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()
+
+void
+BackgroundProcessingDocument::OnAddBackground (wxCommandEvent& event)
+{
+  BackgroundSupervisor* pSupervisor = reinterpret_cast<BackgroundSupervisor*>(event.GetClientData());
+  wxASSERT (pSupervisor != NULL);
+
+  wxCriticalSectionLocker locker (m_criticalSection);
+  if (pSupervisor)
+    m_vecpBackgroundSupervisors.push_back (pSupervisor);
+}
+
+void
+BackgroundProcessingDocument::OnRemoveBackground (wxCommandEvent& event)
+{
+  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 [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, wxDocument)
+IMPLEMENT_DYNAMIC_CLASS(ProjectionFileDocument, BackgroundProcessingTask)
 
 bool 
 ProjectionFileDocument::OnSaveDocument(const wxString& filename)
@@ -145,31 +205,9 @@ 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();
-    }
-  }
+  cancelRunningTasks();
 
-    delete m_pProjectionFile;
-}
-
-void
-ProjectionFileDocument::addReconstructor (ThreadedReconstructor* pRecon)
-{
-  wxCriticalSectionLocker locker (m_criticalSection);
-  m_vecpActiveReconstructors.push_back (pRecon);
-}
-
-void
-ProjectionFileDocument::removeReconstructor (ThreadedReconstructor* pRecon)
-{
-  wxCriticalSectionLocker locker (m_criticalSection);
-  for (int i = 0; i < m_vecpActiveReconstructors.size(); i++) {
-    if (m_vecpActiveReconstructors[i] == pRecon)
-      m_vecpActiveReconstructors[i] = NULL;
-  }
+  delete m_pProjectionFile;
 }
 
 bool 
@@ -215,7 +253,12 @@ ProjectionFileDocument::getView() const
 
 // PhantomFileDocument
 
-IMPLEMENT_DYNAMIC_CLASS(PhantomFileDocument, wxDocument)
+IMPLEMENT_DYNAMIC_CLASS(PhantomFileDocument, BackgroundProcessingTask)
+
+PhantomFileDocument::~PhantomFileDocument()
+{
+  cancelRunningTasks();
+}
 
 bool 
 PhantomFileDocument::OnOpenDocument(const wxString& filename)