X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fdocs.cpp;h=0f07a5223507874b56fc5c7c59a20838a512f942;hp=2c18e4a6fa76b662f72a13fa535d727c8bacf0a7;hb=1a050c98763fbbc0662731b0b76953acede6f5d7;hpb=0e305a6bd11df323b21c77f16159ef365b6846ff diff --git a/src/docs.cpp b/src/docs.cpp index 2c18e4a..0f07a52 100644 --- a/src/docs.cpp +++ b/src/docs.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: docs.cpp,v 1.37 2002/04/30 18:13:40 kevin Exp $ +** $Id$ ** ** 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,33 +71,35 @@ 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); + + SetFilename(filename, true); Modify(false); + getView()->setInitialClientSize(); UpdateAllViews(); - // getView()->OnUpdate (NULL, NULL); m_bBadFileOpen = false; return true; } -bool +bool ImageFileDocument::IsModified(void) const { return wxDocument::IsModified(); } -void +void ImageFileDocument::Modify(bool mod) { wxDocument::Modify(mod); } -ImageFileView* +ImageFileView* ImageFileDocument::getView() const -{ - return dynamic_cast(GetFirstView()); +{ + return dynamic_cast(GetFirstView()); } bool @@ -119,7 +117,6 @@ ImageFileDocument::Revert () OnOpenDocument (GetFilename()); } } - //getView()->OnUpdate (getView(), NULL); UpdateAllViews(); return true; @@ -153,9 +150,9 @@ BackgroundProcessingDocument::removeBackgroundSupervisor (BackgroundSupervisor* { m_criticalSection.Enter(); bool bFound = false; - for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin(); - i != m_vecpBackgroundSupervisors.end(); - i++) + for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin(); + i != m_vecpBackgroundSupervisors.end(); + i++) if (*i == pSupervisor) { m_vecpBackgroundSupervisors.erase(i); bFound = true; @@ -163,7 +160,7 @@ BackgroundProcessingDocument::removeBackgroundSupervisor (BackgroundSupervisor* } m_criticalSection.Leave(); - if (! bFound) + if (! bFound) sys_error (ERR_SEVERE, "Could not find background task [OnRemoveBackground]"); } #endif @@ -173,7 +170,7 @@ BackgroundProcessingDocument::cancelRunningTasks() { #ifdef HAVE_WXTHREADS m_criticalSection.Enter(); - for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin(); + for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin(); i != m_vecpBackgroundSupervisors.end(); i++) (*i)->onCancel(); m_criticalSection.Leave(); @@ -188,9 +185,9 @@ BackgroundProcessingDocument::cancelRunningTasks() // ProjectionFileDocument -IMPLEMENT_DYNAMIC_CLASS(ProjectionFileDocument, BackgroundProcessingTask) +IMPLEMENT_DYNAMIC_CLASS(ProjectionFileDocument, BackgroundProcessingDocument) -bool +bool ProjectionFileDocument::OnSaveDocument(const wxString& filename) { if (! m_pProjectionFile->write (filename.c_str())) { @@ -210,7 +207,7 @@ ProjectionFileDocument::~ProjectionFileDocument() delete m_pProjectionFile; } -bool +bool ProjectionFileDocument::OnOpenDocument(const wxString& filename) { if (! OnSaveModified()) @@ -221,33 +218,36 @@ 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(); - m_bBadFileOpen = false; - + return true; } -bool +bool ProjectionFileDocument::IsModified(void) const { return wxDocument::IsModified(); } -void +void ProjectionFileDocument::Modify(bool mod) { wxDocument::Modify(mod); } -ProjectionFileView* +ProjectionFileView* ProjectionFileDocument::getView() const -{ - return dynamic_cast(GetFirstView()); +{ + return dynamic_cast(GetFirstView()); } void @@ -260,45 +260,45 @@ ProjectionFileDocument::Activate() // PhantomFileDocument -IMPLEMENT_DYNAMIC_CLASS(PhantomFileDocument, BackgroundProcessingTask) +IMPLEMENT_DYNAMIC_CLASS(PhantomFileDocument, BackgroundProcessingDocument) PhantomFileDocument::~PhantomFileDocument() { cancelRunningTasks(); } -bool -PhantomFileDocument::OnOpenDocument(const wxString& filename) +bool +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; } -bool +bool PhantomFileDocument::OnSaveDocument(const wxString& filename) { if (! m_phantom.fileWrite (filename.c_str())) { @@ -311,23 +311,23 @@ PhantomFileDocument::OnSaveDocument(const wxString& filename) return true; } -bool +bool PhantomFileDocument::IsModified(void) const { return false; } -void +void PhantomFileDocument::Modify(bool mod) { wxDocument::Modify(mod); } -PhantomFileView* +PhantomFileView* PhantomFileDocument::getView() const -{ - return dynamic_cast(GetFirstView()); +{ + return dynamic_cast(GetFirstView()); } void @@ -342,7 +342,7 @@ PhantomFileDocument::Activate() IMPLEMENT_DYNAMIC_CLASS(PlotFileDocument, wxDocument) -bool +bool PlotFileDocument::OnSaveDocument(const wxString& filename) { m_namePlot = filename.c_str(); @@ -356,7 +356,7 @@ PlotFileDocument::OnSaveDocument(const wxString& filename) return true; } -bool +bool PlotFileDocument::OnOpenDocument(const wxString& filename) { if (! OnSaveModified()) @@ -367,35 +367,37 @@ 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; } -bool +bool PlotFileDocument::IsModified(void) const { return wxDocument::IsModified(); } -void +void PlotFileDocument::Modify (bool mod) { wxDocument::Modify(mod); } -PlotFileView* +PlotFileView* PlotFileDocument::getView() const -{ - return dynamic_cast(GetFirstView()); +{ + return dynamic_cast(GetFirstView()); } void @@ -414,7 +416,7 @@ PlotFileDocument::Activate() IMPLEMENT_DYNAMIC_CLASS(TextFileDocument, wxDocument) -bool +bool TextFileDocument::OnSaveDocument(const wxString& filename) { TextFileView *view = getView(); @@ -424,30 +426,30 @@ TextFileDocument::OnSaveDocument(const wxString& filename) return true; } -bool +bool TextFileDocument::OnOpenDocument(const wxString& filename) { TextFileView *view = getView(); - + if (! view->getTextCtrl()->LoadFile(filename)) { m_bBadFileOpen = true; return false; } - + SetFilename (filename, true); Modify (false); - // UpdateAllViews(); + UpdateAllViews(); m_bBadFileOpen = false; return true; } -bool +bool TextFileDocument::IsModified(void) const { return false; - + TextFileView *view = getView(); - + if (view) return (wxDocument::IsModified() || view->getTextCtrl()->IsModified()); else @@ -455,16 +457,16 @@ TextFileDocument::IsModified(void) const } -TextFileView* +TextFileView* TextFileDocument::getView() const -{ - return dynamic_cast(GetFirstView()); +{ + return dynamic_cast(GetFirstView()); } -wxTextCtrl* +wxTextCtrl* TextFileDocument::getTextCtrl() -{ - return dynamic_cast(GetFirstView())->getTextCtrl(); +{ + return dynamic_cast(GetFirstView())->getTextCtrl(); } ////////////////////////////////////////////////////////////////////////// @@ -477,43 +479,44 @@ TextFileDocument::getTextCtrl() IMPLEMENT_DYNAMIC_CLASS(Graph3dFileDocument, wxDocument) -Graph3dFileDocument::Graph3dFileDocument(void) +Graph3dFileDocument::Graph3dFileDocument(void) : m_bBadFileOpen(false), m_nVertices(0), m_pVertices(0), m_pNormals(0),m_nx(0),m_ny(0),m_array(0) { } -Graph3dFileDocument::~Graph3dFileDocument() +Graph3dFileDocument::~Graph3dFileDocument() { } -bool +bool Graph3dFileDocument::OnSaveDocument(const wxString& filename) { Modify(false); return true; } -bool +bool Graph3dFileDocument::OnOpenDocument(const wxString& filename) { SetFilename (filename, true); Modify (false); - // UpdateAllViews(); + getView()->setInitialClientSize(); + UpdateAllViews(); m_bBadFileOpen = false; return true; } -bool +bool Graph3dFileDocument::IsModified(void) const { return wxDocument::IsModified(); } -Graph3dFileView* +Graph3dFileView* Graph3dFileDocument::getView() const -{ - return dynamic_cast(GetFirstView()); +{ + return dynamic_cast(GetFirstView()); } bool