r602: no message

[ctsim.git] / src / threadraster.cpp

diff --git a/src/threadraster.cpp b/src/threadraster.cpp
index 6602ccedc1f3a000ff01a7cc86032042757310a8..837a22fb844a452a4426b1e058a1504893a51995 100644 (file)
--- a/src/threadraster.cpp
+++ b/src/threadraster.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2001 Kevin Rosenberg
 **
-**  $Id: threadraster.cpp,v 1.3 2001/03/02 21:32:34 kevin Exp $
+**  $Id: threadraster.cpp,v 1.6 2001/03/04 04:27:55 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
@@ -58,8 +58,7 @@
 
 RasterizerSupervisorThread::RasterizerSupervisorThread (PhantomFileView* pProjView, int iNX, int iNY, 
    int iNSample, double dViewRatio, const char* const pszLabel)
-: m_pPhantomView(pProjView), m_iNX(iNX), m_iNY(iNY), m_iNSample(iNSample), m_dViewRatio(dViewRatio), m_strLabel(pszLabel),
-  SupervisorThread()
+:   SupervisorThread(), m_pPhantomView(pProjView), m_iNX(iNX), m_iNY(iNY), m_iNSample(iNSample), m_dViewRatio(dViewRatio), m_strLabel(pszLabel)
 {
 }
 
@@ -105,9 +104,9 @@ RasterizerSupervisorThread::OnExit()
 
 RasterizerSupervisor::RasterizerSupervisor (SupervisorThread* pThread, PhantomFileView* pPhantomView, int iNX, int iNY, 
    int iNSample, double dViewRatio, const char* const pszLabel)
-    : m_pPhantomView(pPhantomView), m_pPhantomDoc(pPhantomView->GetDocument()), 
-      m_iNX(iNX), m_iNY(iNY), m_iNSample(iNSample), m_dViewRatio(dViewRatio), m_pszLabel(pszLabel), 
-      BackgroundSupervisor (pThread, pPhantomView->GetFrame(), pPhantomView->GetDocument(), "Rasterizing", iNX)
+    : BackgroundSupervisor (pThread, pPhantomView->GetFrame(), pPhantomView->GetDocument(), "Rasterizing", iNX),
+      m_pPhantomView(pPhantomView), m_pPhantomDoc(pPhantomView->GetDocument()), 
+      m_iNX(iNX), m_iNY(iNY), m_iNSample(iNSample), m_dViewRatio(dViewRatio), m_pszLabel(pszLabel)
 {
   m_vecpChildImageFiles.reserve (getNumWorkers());
   for (unsigned int iThread = 0; iThread < getNumWorkers(); iThread++) {
@@ -141,28 +140,18 @@ RasterizerSupervisor::onDone()
   wxCriticalSectionLocker critsect (doneSection);
 
   ImageFile* pImageFile = getImageFile();
-
-  if (! wxThread::IsMain())
-    wxMutexGuiEnter();
-  ImageFileDocument* pImageDoc = theApp->newImageDoc();
-  if (! pImageDoc) {
-    sys_error (ERR_SEVERE, "Unable to create image file");
-    return;
-  }  
-  pImageDoc->setImageFile (pImageFile);
-  pImageDoc->UpdateAllViews (NULL);
-  if (ImageFileView* imageView = pImageDoc->getView()) {
-    imageView->OnUpdate (imageView, NULL);
-    imageView->getFrame()->SetFocus();
-    imageView->getFrame()->Show(true);
-  }
-  *theApp->getLog() << m_pszLabel << "\n";
-  if (! wxThread::IsMain())
-    wxMutexGuiLeave();
   pImageFile->labelAdd (m_pszLabel, getTimerEnd());
-  if (theApp->getAskDeleteNewDocs())
-    pImageDoc->Modify (true);
 
+  wxCommandEvent eventLog (wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT );
+  wxString msg (m_pszLabel);
+  msg += "\n";
+  eventLog.SetString( msg );
+  wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event
+
+  wxCommandEvent newImageEvent (wxEVT_COMMAND_MENU_SELECTED, NEW_IMAGEFILE_EVENT);
+  newImageEvent.SetClientData (pImageFile);
+  wxPostEvent (theApp->getMainFrame(), newImageEvent);
+  
   setDone();
 }