X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fthreadraster.cpp;h=607977fb0b9636e9bb2553f0e5e977fb876912e8;hb=15582f4ca80f519d7ddca580ff8cb852878fd2a2;hp=00f89dc103c670901ba203ac60c9b97965407f1a;hpb=432ba2c487a5320352f14bdd2cce008fccef6902;p=ctsim.git

diff --git a/src/threadraster.cpp b/src/threadraster.cpp
index 00f89dc..607977f 100644
--- 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.1 2001/02/27 03:59:30 kevin Exp $
+**  $Id: threadraster.cpp,v 1.5 2001/03/04 04:16:20 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
@@ -25,6 +25,11 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
+
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
@@ -35,15 +40,15 @@
 #include "ctsim.h"
 #include "docs.h"
 #include "views.h"
+
+
+#ifdef HAVE_WXTHREADS
+
+
 #include "threadraster.h"
 #include "backgroundmgr.h"
 #include "backgroundsupr.h"
 
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif
-
-
 
 /////////////////////////////////////////////////////////////////////
 //
@@ -53,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)
 {
 }
 
@@ -135,25 +139,19 @@ RasterizerSupervisor::onDone()
   wxCriticalSection doneSection;
   wxCriticalSectionLocker critsect (doneSection);
 
-  ImageFileDocument* pImageDoc = theApp->newImageDoc();
-  if (! pImageDoc) {
-    sys_error (ERR_SEVERE, "Unable to create image file");
-    return;
-  }
-    
   ImageFile* pImageFile = getImageFile();
-  pImageDoc->setImageFile (pImageFile);
-  if (theApp->getAskDeleteNewDocs())
-    pImageDoc->Modify (true);
-  pImageDoc->UpdateAllViews (NULL);
-  if (ImageFileView* imageView = pImageDoc->getView()) {
-    imageView->OnUpdate (imageView, NULL);
-    imageView->getFrame()->SetFocus();
-    imageView->getFrame()->Show(true);
-  }
-  *theApp->getLog() << m_pszLabel << "\n";
   pImageFile->labelAdd (m_pszLabel, getTimerEnd());
 
+  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();
 }
 
@@ -230,3 +228,5 @@ void
 RasterizerWorker::OnExit ()
 {
 }
+
+#endif // HAVE_WXTHREADS