X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fthreadraster.cpp;h=9853117a3755abaf40efc92ca3000b0e7bf43f9f;hb=e98a8a9d72a7b919debbbc9d1b0f237fe71c0fb3;hp=6edc17b5e09554f933748e35a94e4a4c5b4064c5;hpb=8cce345df80fdbeea1c03a04a71d805951a87b74;p=ctsim.git

diff --git a/src/threadraster.cpp b/src/threadraster.cpp
index 6edc17b..9853117 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.4 2001/03/04 03:14:47 kevin Exp $
+**  $Id: threadraster.cpp,v 1.7 2001/03/04 04:30:45 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
@@ -104,12 +104,12 @@ 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++) {
+  for (int iThread = 0; iThread < getNumWorkers(); iThread++) {
     m_vecpChildImageFiles[iThread] = new ImageFile;
   }
 
@@ -141,7 +141,12 @@ RasterizerSupervisor::onDone()
 
   ImageFile* pImageFile = getImageFile();
   pImageFile->labelAdd (m_pszLabel, getTimerEnd());
-  //  *theApp->getLog() << m_pszLabel << "\n";
+
+  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);
@@ -162,7 +167,7 @@ RasterizerSupervisor::getImageFile()
   int iGlobalCol = 0;
   for (int iw = 0; iw < getNumWorkers(); iw++) {
     ImageFileArray childArray = m_vecpChildImageFiles[iw]->getArray();
-    for (int iCol = 0; iCol < m_vecpChildImageFiles[iw]->nx(); iCol++) {
+    for (unsigned int iCol = 0; iCol < m_vecpChildImageFiles[iw]->nx(); iCol++) {
       memcpy (globalArray[iGlobalCol++], childArray[iCol], iColSize);
     }
   }