** This is part of the CTSim program
** Copyright (C) 1983-2001 Kevin Rosenberg
**
-** $Id: threadraster.cpp,v 1.2 2001/03/02 21:11:50 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
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)
{
}
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;
}
wxCriticalSectionLocker critsect (doneSection);
ImageFile* pImageFile = getImageFile();
-
- 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";
- 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();
}
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);
}
}