X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fdocs.cpp;h=965f4249f544ec1e4cdc85a1cb65dafa6603b8b8;hb=f3c7d22b4544bb1d5c4471bceded6dc5b9ed57fd;hp=bb8ec90d973e122046ac32d95cda6c34d7f52bb4;hpb=6480e936da257519dd36840862ac995ca8c374da;p=ctsim.git diff --git a/src/docs.cpp b/src/docs.cpp index bb8ec90..965f424 100644 --- a/src/docs.cpp +++ b/src/docs.cpp @@ -1,7 +1,7 @@ /***************************************************************************** ** FILE IDENTIFICATION ** -** Name: doc.cpp +** Name: docs.cpp ** Purpose: Document routines for CTSim program ** Programmer: Kevin Rosenberg ** Date Started: July 2000 @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: docs.cpp,v 1.27 2001/02/23 21:58:31 kevin Exp $ +** $Id: docs.cpp,v 1.43 2002/06/06 22:50:24 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 @@ -75,12 +75,14 @@ bool ImageFileDocument::OnOpenDocument(const wxString& filename) m_bBadFileOpen = true; return false; } - if (theApp->getVerboseLogging()) + + if (theApp->getVerboseLogging() && filename != "") *theApp->getLog() << "Read image file " << filename << "\n"; + SetFilename(filename, true); Modify(false); + getView()->setInitialClientSize(); UpdateAllViews(); - getView()->OnUpdate (getView(), NULL); m_bBadFileOpen = false; return true; @@ -104,7 +106,6 @@ ImageFileDocument::getView() const return dynamic_cast(GetFirstView()); } - bool ImageFileDocument::Revert () { @@ -120,64 +121,38 @@ ImageFileDocument::Revert () OnOpenDocument (GetFilename()); } } - getView()->OnUpdate (getView(), NULL); UpdateAllViews(); return true; } -// ProjectionFileDocument - -IMPLEMENT_DYNAMIC_CLASS(ProjectionFileDocument, wxDocument) -BEGIN_EVENT_TABLE(ProjectionFileDocument, wxDocument) -EVT_MENU(BackgroundSupervisor::MSG_BACKGROUND_SUPERVISOR_ADD, ProjectionFileDocument::OnAddBackground) -EVT_MENU(BackgroundSupervisor::MSG_BACKGROUND_SUPERVISOR_REMOVE, ProjectionFileDocument::OnRemoveBackground) -END_EVENT_TABLE() - -bool -ProjectionFileDocument::OnSaveDocument(const wxString& filename) +void +ImageFileDocument::Activate() { - if (! m_pProjectionFile->write (filename.c_str())) { - *theApp->getLog() << "Unable to write projection file " << filename << "\n"; - return false; - } - if (theApp->getVerboseLogging()) - *theApp->getLog() << "Wrote projection file " << filename << "\n"; - Modify(false); - return true; -} +#if CTSIM_MDI + getView()->getFrame()->Activate(); +#endif +}; -ProjectionFileDocument::~ProjectionFileDocument() -{ - for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin(); - i != m_vecpBackgroundSupervisors.end(); i++) { - BackgroundSupervisor::cancelSupervisor(*i); - } - - while (m_vecpBackgroundSupervisors.size() > 0) - ::wxYield(); +// BackgroundProcessingDocument - Base Class - delete m_pProjectionFile; -} +IMPLEMENT_DYNAMIC_CLASS(BackgroundProcessingDocument, wxDocument) +BEGIN_EVENT_TABLE(BackgroundProcessingDocument, wxDocument) +END_EVENT_TABLE() +#ifdef HAVE_WXTHREADS void -ProjectionFileDocument::OnAddBackground (wxCommandEvent& event) +BackgroundProcessingDocument::addBackgroundSupervisor (BackgroundSupervisor* pSupervisor) { - BackgroundSupervisor* pSupervisor = reinterpret_cast(event.GetClientData()); - wxASSERT (pSupervisor != NULL); - wxCriticalSectionLocker locker (m_criticalSection); if (pSupervisor) m_vecpBackgroundSupervisors.push_back (pSupervisor); } void -ProjectionFileDocument::OnRemoveBackground (wxCommandEvent& event) +BackgroundProcessingDocument::removeBackgroundSupervisor (BackgroundSupervisor* pSupervisor) { - BackgroundSupervisor* pSupervisor = reinterpret_cast(event.GetClientData()); - wxASSERT (pSupervisor != NULL); - - wxCriticalSectionLocker locker (m_criticalSection); + m_criticalSection.Enter(); bool bFound = false; for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin(); i != m_vecpBackgroundSupervisors.end(); @@ -187,8 +162,53 @@ ProjectionFileDocument::OnRemoveBackground (wxCommandEvent& event) bFound = true; break; } - if (! bFound) - sys_error (ERR_SEVERE, "Could not find background task [ProjectionFileDocument::removeBackgroundTask"); + m_criticalSection.Leave(); + + if (! bFound) + sys_error (ERR_SEVERE, "Could not find background task [OnRemoveBackground]"); +} +#endif + +void +BackgroundProcessingDocument::cancelRunningTasks() +{ +#ifdef HAVE_WXTHREADS + m_criticalSection.Enter(); + for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin(); + i != m_vecpBackgroundSupervisors.end(); i++) + (*i)->onCancel(); + m_criticalSection.Leave(); + + while (m_vecpBackgroundSupervisors.size() > 0) { + ::wxYield(); + ::wxUsleep(50); + } +#endif +} + + +// ProjectionFileDocument + +IMPLEMENT_DYNAMIC_CLASS(ProjectionFileDocument, BackgroundProcessingTask) + +bool +ProjectionFileDocument::OnSaveDocument(const wxString& filename) +{ + if (! m_pProjectionFile->write (filename.c_str())) { + *theApp->getLog() << "Unable to write projection file " << filename << "\n"; + return false; + } + if (theApp->getVerboseLogging()) + *theApp->getLog() << "Wrote projection file " << filename << "\n"; + Modify(false); + return true; +} + +ProjectionFileDocument::~ProjectionFileDocument() +{ + cancelRunningTasks(); + + delete m_pProjectionFile; } bool @@ -202,13 +222,15 @@ ProjectionFileDocument::OnOpenDocument(const wxString& filename) m_bBadFileOpen = true; return false; } - if (theApp->getVerboseLogging()) + m_bBadFileOpen = false; + + if (theApp->getVerboseLogging() && filename != "") *theApp->getLog() << "Read projection file " << filename << "\n"; + SetFilename(filename, true); Modify(false); + getView()->setInitialClientSize(); UpdateAllViews(); - GetFirstView()->OnUpdate (GetFirstView(), NULL); - m_bBadFileOpen = false; return true; } @@ -232,36 +254,49 @@ ProjectionFileDocument::getView() const return dynamic_cast(GetFirstView()); } +void +ProjectionFileDocument::Activate() +{ +#if CTSIM_MDI + getView()->getFrame()->Activate(); +#endif +}; + // PhantomFileDocument -IMPLEMENT_DYNAMIC_CLASS(PhantomFileDocument, wxDocument) +IMPLEMENT_DYNAMIC_CLASS(PhantomFileDocument, BackgroundProcessingTask) + +PhantomFileDocument::~PhantomFileDocument() +{ + cancelRunningTasks(); +} bool -PhantomFileDocument::OnOpenDocument(const wxString& filename) +PhantomFileDocument::OnOpenDocument(const wxString& constFilename) { if (! OnSaveModified()) return false; - wxString myFilename = filename; - if (wxFile::Exists (myFilename)) { - m_phantom.createFromFile (myFilename); + wxString filename (constFilename); + + if (wxFile::Exists (filename)) { + m_phantom.createFromFile (filename); if (theApp->getVerboseLogging()) *theApp->getLog() << "Read phantom file " << filename << "\n"; } else { - myFilename.Replace (".phm", ""); - m_phantom.createFromPhantom (myFilename); + filename.Replace (".phm", ""); + m_phantom.createFromPhantom (filename); } - m_namePhantom = myFilename; - SetFilename (myFilename, true); + m_namePhantom = filename; + SetFilename (filename, true); if (m_phantom.fail()) { - *theApp->getLog() << "Failure creating phantom " << myFilename << "\n"; + *theApp->getLog() << "Failure creating phantom " << filename << "\n"; m_bBadFileOpen = true; return false; } m_idPhantom = m_phantom.id(); Modify(false); UpdateAllViews(); - GetFirstView()->OnUpdate (GetFirstView(), NULL); m_bBadFileOpen = false; return true; @@ -299,6 +334,14 @@ PhantomFileDocument::getView() const return dynamic_cast(GetFirstView()); } +void +PhantomFileDocument::Activate() +{ +#if CTSIM_MDI + getView()->getFrame()->Activate(); +#endif +}; + // PlotFileDocument IMPLEMENT_DYNAMIC_CLASS(PlotFileDocument, wxDocument) @@ -328,14 +371,16 @@ PlotFileDocument::OnOpenDocument(const wxString& filename) m_bBadFileOpen = true; return false; } - if (theApp->getVerboseLogging()) + m_bBadFileOpen = false; + + if (theApp->getVerboseLogging() && filename != "") *theApp->getLog() << "Read plot file " << filename << "\n"; + SetFilename (filename, true); m_namePlot = filename.c_str(); Modify (false); + getView()->setInitialClientSize(); UpdateAllViews(); - GetFirstView()->OnUpdate (NULL, NULL); - m_bBadFileOpen = false; return true; } @@ -359,6 +404,14 @@ PlotFileDocument::getView() const return dynamic_cast(GetFirstView()); } +void +PlotFileDocument::Activate() +{ +#if CTSIM_MDI + getView()->getFrame()->Activate(); +#endif +}; + ////////////////////////////////////////////////////////////////////////// // // TextFileDocument @@ -437,8 +490,6 @@ Graph3dFileDocument::Graph3dFileDocument(void) Graph3dFileDocument::~Graph3dFileDocument() { -// delete [] m_pVertices; -// delete [] m_pNormals; } bool @@ -474,10 +525,6 @@ Graph3dFileDocument::getView() const bool Graph3dFileDocument::createFromImageFile (const ImageFile& rImageFile) { -// delete [] m_pVertices; -// delete [] m_pNormals; - - m_nx = rImageFile.nx(); m_ny = rImageFile.ny(); m_array = rImageFile.getArray(); @@ -485,4 +532,13 @@ Graph3dFileDocument::createFromImageFile (const ImageFile& rImageFile) return true; } +void +Graph3dFileDocument::Activate() +{ +#if CTSIM_MDI + getView()->getFrame()->Activate(); +#endif +}; + + #endif // wxUSE_GLCANVAS