X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fbackgroundsupr.cpp;h=7ec34080bed745d297c99197554e8a16497c4ad1;hb=fbe99ce7041eb409981b1fd8e269827daf4ed168;hp=3b2f36245f154f46802f3883da355b809ca4f378;hpb=432ba2c487a5320352f14bdd2cce008fccef6902;p=ctsim.git

diff --git a/src/backgroundsupr.cpp b/src/backgroundsupr.cpp
index 3b2f362..7ec3408 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.9 2001/02/27 03:59:30 kevin Exp $
+**  $Id: backgroundsupr.cpp,v 1.14 2001/03/05 19:14:40 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
@@ -38,10 +38,9 @@
 #include "backgroundsupr.h"
 #include "backgroundmgr.h"
 
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif
+#ifdef HAVE_WXTHREADS
 
+#define USE_BKGMGR 1
 
 ////////////////////////////////////////////////////////////////////////////
 //
@@ -51,30 +50,17 @@
 
 IMPLEMENT_DYNAMIC_CLASS(BackgroundSupervisor, wxEvtHandler)
 BEGIN_EVENT_TABLE(BackgroundSupervisor, BackgroundSupervisor)
-EVT_MENU(MSG_BACKGROUND_SUPERVISOR_CANCEL, BackgroundSupervisor::OnCancel)
-EVT_MENU(MSG_WORKER_THREAD_FAIL, BackgroundSupervisor::OnWorkerFail)
-EVT_MENU(MSG_WORKER_THREAD_DONE, BackgroundSupervisor::OnWorkerDone)
-EVT_MENU(MSG_WORKER_THREAD_UNIT_TICK, BackgroundSupervisor::OnWorkerUnitTick)
-EVT_MENU(MSG_DOCUMENT_ACK_REMOVE, BackgroundSupervisor::OnAckDocumentRemove)
 END_EVENT_TABLE()
 
-// Static function
-void 
-BackgroundSupervisor::cancelSupervisor (BackgroundSupervisor* pSupervisor)
-{
-  wxCommandEvent cancelEvent (wxEVT_COMMAND_MENU_SELECTED, MSG_BACKGROUND_SUPERVISOR_CANCEL);
-  wxPostEvent (pSupervisor, cancelEvent);
-}
 
 
-BackgroundSupervisor::BackgroundSupervisor (SupervisorThread* pMyThread, wxFrame* pParentFrame, wxDocument* pDocument, const char* const pszProcessTitle, int iTotalUnits)
-    : m_pMyThread(pMyThread), m_pParentFrame(pParentFrame), m_pDocument(pDocument), m_pDialogProgress(NULL), m_strProcessTitle(pszProcessTitle), 
-    m_iTotalUnits(iTotalUnits), m_iNumThreads(0), m_bDone(false), m_bFail(false), m_bCancelled(false), 
-    m_pTimer(NULL), m_bBackgroundTaskAdded(false), m_bWorkersDeleted(false),
-    wxEvtHandler()
+BackgroundSupervisor::BackgroundSupervisor (SupervisorThread* pMyThread, wxFrame* pParentFrame, BackgroundProcessingDocument* pDocument, const char* const pszProcessTitle, int iTotalUnits)
+    : wxEvtHandler(), m_pMyThread(pMyThread), m_pParentFrame(pParentFrame), m_pDocument(pDocument), m_strProcessTitle(pszProcessTitle), 
+    m_iTotalUnits(iTotalUnits), m_iNumThreads(0), m_bDone(false), m_bFail(false), m_bCancelled(false), m_iRunning(0),
+    m_pTimer(NULL), m_bWorkersDeleted(false)
 {
   m_iNumThreads = theApp->getNumberCPU();
-    ++m_iNumThreads;
+  //   ++m_iNumThreads;
 
   m_vecpThreads.reserve (m_iNumThreads);
   for (int iThread = 0; iThread < m_iNumThreads; iThread++)
@@ -84,20 +70,15 @@ BackgroundSupervisor::BackgroundSupervisor (SupervisorThread* pMyThread, wxFrame
 
 BackgroundSupervisor::~BackgroundSupervisor()
 {
-  if (m_bBackgroundTaskAdded) {
-    wxCommandEvent doneEvent (wxEVT_COMMAND_MENU_SELECTED, MSG_BACKGROUND_SUPERVISOR_REMOVE);
-    doneEvent.SetClientData (this);
-    wxPostEvent (theApp->getBackgroundManager(), doneEvent);
-    wxPostEvent (m_pDocument, doneEvent);
-  }
+#ifdef USE_BKGMGR
+  wxCommandEvent doneEvent (wxEVT_COMMAND_MENU_SELECTED, MSG_BACKGROUND_SUPERVISOR_REMOVE);
+  doneEvent.SetClientData (this);
+  wxPostEvent (theApp->getBackgroundManager(), doneEvent);
+#endif
 
-  while (m_bBackgroundTaskAdded) {
-    m_pMyThread->Sleep(50);
-    ProcessPendingEvents();
-  }
+  m_pDocument->removeBackgroundSupervisor (this);
 
   delete m_pTimer;
-  delete m_pDialogProgress;
 }
 
 void
@@ -114,7 +95,6 @@ BackgroundSupervisor::deleteWorkers()
 
   while (m_iRunning > 0) {
     m_pMyThread->Sleep(50);
-    ProcessPendingEvents();
   }
   m_iRunning = 0;
   m_bWorkersDeleted = true;
@@ -149,21 +129,19 @@ BackgroundSupervisor::start()
 
   m_pTimer = new Timer;
   
-  if (! theApp->getUseBackgroundTasks())
-    m_pDialogProgress = new wxProgressDialog (_T("Filtered Backprojection"), _T("Reconstruction Progress"), 
-    m_iTotalUnits, m_pParentFrame, wxPD_CAN_ABORT | wxPD_AUTO_HIDE);
-  else {
-    std::string strLabel (m_strProcessTitle);
-    strLabel += " ";
-    strLabel += m_pParentFrame->GetTitle();
-    wxCommandEvent addTaskEvent (wxEVT_COMMAND_MENU_SELECTED, MSG_BACKGROUND_SUPERVISOR_ADD);
-    addTaskEvent.SetString (strLabel.c_str());
-    addTaskEvent.SetInt (m_iTotalUnits);
-    addTaskEvent.SetClientData (this);
-    wxPostEvent (theApp->getBackgroundManager(), addTaskEvent);
-    wxPostEvent (m_pDocument, addTaskEvent);
-    m_bBackgroundTaskAdded = true;
-  }
+  std::string strLabel (m_strProcessTitle);
+  strLabel += " ";
+  strLabel += m_pParentFrame->GetTitle();
+
+#ifdef USE_BKGMGR
+  wxCommandEvent addTaskEvent (wxEVT_COMMAND_MENU_SELECTED, MSG_BACKGROUND_SUPERVISOR_ADD);
+  addTaskEvent.SetString (strLabel.c_str());
+  addTaskEvent.SetInt (m_iTotalUnits);
+  addTaskEvent.SetClientData (this);
+  wxPostEvent (theApp->getBackgroundManager(), addTaskEvent);
+#endif
+
+  m_pDocument->addBackgroundSupervisor (this);
   
   m_iRunning = m_iNumThreads;
   m_iUnitsDone = 0;
@@ -175,21 +153,15 @@ BackgroundSupervisor::start()
 }
 
 void
-BackgroundSupervisor::OnCancel(wxCommandEvent& event)
+BackgroundSupervisor::onCancel()
 {
   m_bCancelled = true;
   m_bDone = true;
-  deleteWorkers();
 }
 
-void
-BackgroundSupervisor::OnAckDocumentRemove(wxCommandEvent& event)
-{
-  m_bBackgroundTaskAdded = false;
-}
 
 void
-BackgroundSupervisor::OnWorkerUnitTick (wxCommandEvent& event)
+BackgroundSupervisor::onWorkerUnitTick ()
 {
     ++m_iUnitsDone;
     
@@ -198,22 +170,20 @@ BackgroundSupervisor::OnWorkerUnitTick (wxCommandEvent& event)
       *theApp->getLog() << "Units done: " << static_cast<int>(m_iUnitsDone) <<"\n";
 #endif
     
-    if (m_pDialogProgress) {
-      if (! m_pDialogProgress->Update (m_iUnitsDone - 1)) {
-        wxCommandEvent dummy;
-        OnCancel (dummy);
-      }
-    } else {
-      wxCommandEvent addTaskEvent (wxEVT_COMMAND_MENU_SELECTED, MSG_BACKGROUND_SUPERVISOR_UNIT_TICK);
-      addTaskEvent.SetInt (m_iUnitsDone - 1);
-      addTaskEvent.SetClientData (this);
-      wxPostEvent (theApp->getBackgroundManager(), addTaskEvent);
-    }
+#ifdef USE_BKGMGR
+    wxCommandEvent addTaskEvent (wxEVT_COMMAND_MENU_SELECTED, MSG_BACKGROUND_SUPERVISOR_UNIT_TICK);
+    addTaskEvent.SetInt (m_iUnitsDone - 1);
+    addTaskEvent.SetClientData (this);
+    wxPostEvent (theApp->getBackgroundManager(), addTaskEvent);
+#endif
 }
 
 void
-BackgroundSupervisor::OnWorkerDone (wxCommandEvent& event)
+BackgroundSupervisor::onWorkerDone (int iThread)
 {
+	wxCriticalSection critsectDone;
+	critsectDone.Enter();
+
   m_iRunning--;
   wxASSERT (m_iRunning >= 0);
 
@@ -226,21 +196,19 @@ BackgroundSupervisor::OnWorkerDone (wxCommandEvent& event)
     wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event
   }
 #endif
-  if (m_iRunning <= 0 && ! m_bCancelled) {
-    deleteWorkers();
-    onDone();
-  }
+
+  critsectDone.Leave();
 }
 
 void
-BackgroundSupervisor::OnWorkerFail (wxCommandEvent& event)
+BackgroundSupervisor::onWorkerFail (int iThread, std::string strFailMessage)
 {
   m_iRunning--;
   wxCommandEvent eventLog( wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT );
-  eventLog.SetString( event.GetString() );
+  eventLog.SetString( strFailMessage.c_str() );
   wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event
 
-  wxCommandEvent dummy;
-  OnCancel(dummy);
+  onCancel();
 }
 
+#endif // HAVE_WXTHREADS