X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fdocs.cpp;h=685f23c5b7aa18260de67a1ac2497d86f77cbaba;hb=06066d9192936b4c4cc69847cd4c1f5aa7017829;hp=99e6a56e9c9245d5cda5b1b88b8a840db209fdee;hpb=df521cfe14a9e0b47bdcd98d1f67d03acf242162;p=ctsim.git diff --git a/src/docs.cpp b/src/docs.cpp index 99e6a56..685f23c 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.29 2001/02/25 10:52:55 kevin Exp $ +** $Id: docs.cpp,v 1.46 2003/01/30 21:53:16 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,10 +25,6 @@ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ******************************************************************************/ -#ifdef __GNUG__ -// #pragma implementation -#endif - #include "wx/wxprec.h" #ifndef WX_PRECOMP @@ -75,12 +71,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 +102,6 @@ ImageFileDocument::getView() const return dynamic_cast(GetFirstView()); } - bool ImageFileDocument::Revert () { @@ -120,37 +117,37 @@ ImageFileDocument::Revert () OnOpenDocument (GetFilename()); } } - getView()->OnUpdate (getView(), NULL); UpdateAllViews(); return true; } +void +ImageFileDocument::Activate() +{ +#if CTSIM_MDI + getView()->getFrame()->Activate(); +#endif +}; + // BackgroundProcessingDocument - Base Class IMPLEMENT_DYNAMIC_CLASS(BackgroundProcessingDocument, wxDocument) BEGIN_EVENT_TABLE(BackgroundProcessingDocument, wxDocument) -EVT_MENU(BackgroundSupervisor::MSG_BACKGROUND_SUPERVISOR_ADD, BackgroundProcessingDocument::OnAddBackground) -EVT_MENU(BackgroundSupervisor::MSG_BACKGROUND_SUPERVISOR_REMOVE, BackgroundProcessingDocument::OnRemoveBackground) END_EVENT_TABLE() +#ifdef HAVE_WXTHREADS void -BackgroundProcessingDocument::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 -BackgroundProcessingDocument::OnRemoveBackground (wxCommandEvent& event) +BackgroundProcessingDocument::removeBackgroundSupervisor (BackgroundSupervisor* pSupervisor) { - BackgroundSupervisor* pSupervisor = reinterpret_cast(event.GetClientData()); - wxASSERT (pSupervisor != NULL); - m_criticalSection.Enter(); bool bFound = false; for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin(); @@ -165,30 +162,30 @@ BackgroundProcessingDocument::OnRemoveBackground (wxCommandEvent& event) if (! bFound) sys_error (ERR_SEVERE, "Could not find background task [OnRemoveBackground]"); - - wxCommandEvent ackEvent (wxEVT_COMMAND_MENU_SELECTED, BackgroundSupervisor::MSG_DOCUMENT_ACK_REMOVE); - wxPostEvent (pSupervisor, ackEvent); } +#endif void BackgroundProcessingDocument::cancelRunningTasks() { +#ifdef HAVE_WXTHREADS m_criticalSection.Enter(); for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin(); i != m_vecpBackgroundSupervisors.end(); i++) - BackgroundSupervisor::cancelSupervisor(*i); + (*i)->onCancel(); m_criticalSection.Leave(); while (m_vecpBackgroundSupervisors.size() > 0) { - ::wxUsleep(50); ::wxYield(); + ::wxUsleep(50); } +#endif } // ProjectionFileDocument -IMPLEMENT_DYNAMIC_CLASS(ProjectionFileDocument, BackgroundProcessingTask) +IMPLEMENT_DYNAMIC_CLASS(ProjectionFileDocument, BackgroundProcessingDocument) bool ProjectionFileDocument::OnSaveDocument(const wxString& filename) @@ -221,13 +218,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; } @@ -251,36 +250,49 @@ ProjectionFileDocument::getView() const return dynamic_cast(GetFirstView()); } +void +ProjectionFileDocument::Activate() +{ +#if CTSIM_MDI + getView()->getFrame()->Activate(); +#endif +}; + // PhantomFileDocument -IMPLEMENT_DYNAMIC_CLASS(PhantomFileDocument, BackgroundProcessingTask) +IMPLEMENT_DYNAMIC_CLASS(PhantomFileDocument, BackgroundProcessingDocument) + +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; @@ -318,6 +330,14 @@ PhantomFileDocument::getView() const return dynamic_cast(GetFirstView()); } +void +PhantomFileDocument::Activate() +{ +#if CTSIM_MDI + getView()->getFrame()->Activate(); +#endif +}; + // PlotFileDocument IMPLEMENT_DYNAMIC_CLASS(PlotFileDocument, wxDocument) @@ -347,14 +367,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; } @@ -378,6 +400,14 @@ PlotFileDocument::getView() const return dynamic_cast(GetFirstView()); } +void +PlotFileDocument::Activate() +{ +#if CTSIM_MDI + getView()->getFrame()->Activate(); +#endif +}; + ////////////////////////////////////////////////////////////////////////// // // TextFileDocument @@ -456,8 +486,6 @@ Graph3dFileDocument::Graph3dFileDocument(void) Graph3dFileDocument::~Graph3dFileDocument() { -// delete [] m_pVertices; -// delete [] m_pNormals; } bool @@ -472,6 +500,7 @@ Graph3dFileDocument::OnOpenDocument(const wxString& filename) { SetFilename (filename, true); Modify (false); + getView()->setInitialClientSize(); UpdateAllViews(); m_bBadFileOpen = false; return true; @@ -493,10 +522,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(); @@ -504,4 +529,13 @@ Graph3dFileDocument::createFromImageFile (const ImageFile& rImageFile) return true; } +void +Graph3dFileDocument::Activate() +{ +#if CTSIM_MDI + getView()->getFrame()->Activate(); +#endif +}; + + #endif // wxUSE_GLCANVAS