** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: docs.cpp,v 1.42 2002/06/04 19:24:03 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
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-#ifdef __GNUG__
-// #pragma implementation
-#endif
-
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
#include "threadrecon.h"
-const char szNEW_IMAGE_FILENAME[] = "___CTSIM___INTERNAL___NEW___.if";
-const char szNEW_PROJECTION_FILENAME[] = "___CTSIM___INTERNAL___NEW___.pj";
-const char szNEW_GRAPH3D_FILENAME[] = "___CTSIM___INTERNAL___NEW___.3d";
-const char szNEW_PLOT_FILENAME[] = "___CTSIM___INTERNAL___NEW___.plt";
-
-
// ImageFileDocument
IMPLEMENT_DYNAMIC_CLASS(ImageFileDocument, wxDocument)
return true;
}
-bool ImageFileDocument::OnOpenDocument(const wxString& constFilename)
+bool ImageFileDocument::OnOpenDocument(const wxString& filename)
{
if (! OnSaveModified())
return false;
- wxString filename (constFilename);
-
- if (filename == szNEW_IMAGE_FILENAME)
- filename = "";
- else if (! m_pImageFile->fileRead (filename.c_str())) {
+ if (! m_pImageFile->fileRead (filename.c_str())) {
*theApp->getLog() << "Unable to read image file " << filename << "\n";
m_bBadFileOpen = true;
return false;
OnOpenDocument (GetFilename());
}
}
- //getView()->OnUpdate (getView(), NULL);
UpdateAllViews();
return true;
// ProjectionFileDocument
-IMPLEMENT_DYNAMIC_CLASS(ProjectionFileDocument, BackgroundProcessingTask)
+IMPLEMENT_DYNAMIC_CLASS(ProjectionFileDocument, BackgroundProcessingDocument)
bool
ProjectionFileDocument::OnSaveDocument(const wxString& filename)
}
bool
-ProjectionFileDocument::OnOpenDocument(const wxString& constFilename)
+ProjectionFileDocument::OnOpenDocument(const wxString& filename)
{
if (! OnSaveModified())
return false;
- wxString filename (constFilename);
-
- if (filename == szNEW_PROJECTION_FILENAME)
- filename = "";
- else if (! m_pProjectionFile->read (filename.c_str())) {
+ if (! m_pProjectionFile->read (filename.c_str())) {
*theApp->getLog() << "Unable to read projection file " << filename << "\n";
m_bBadFileOpen = true;
return false;
}
+ m_bBadFileOpen = false;
if (theApp->getVerboseLogging() && filename != "")
*theApp->getLog() << "Read projection file " << filename << "\n";
Modify(false);
getView()->setInitialClientSize();
UpdateAllViews();
- m_bBadFileOpen = false;
return true;
}
// PhantomFileDocument
-IMPLEMENT_DYNAMIC_CLASS(PhantomFileDocument, BackgroundProcessingTask)
+IMPLEMENT_DYNAMIC_CLASS(PhantomFileDocument, BackgroundProcessingDocument)
PhantomFileDocument::~PhantomFileDocument()
{
}
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;
}
}
bool
-PlotFileDocument::OnOpenDocument(const wxString& constFilename)
+PlotFileDocument::OnOpenDocument(const wxString& filename)
{
if (! OnSaveModified())
return false;
- wxString filename (constFilename);
-
- if (filename == szNEW_PLOT_FILENAME)
- filename = "";
- else if (! m_plot.fileRead (filename.c_str())) {
+ if (! m_plot.fileRead (filename.c_str())) {
*theApp->getLog() << "Unable to read plot file " << filename << "\n";
m_bBadFileOpen = true;
return false;
}
+ 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();
- m_bBadFileOpen = false;
return true;
}
{
SetFilename (filename, true);
Modify (false);
+ getView()->setInitialClientSize();
UpdateAllViews();
m_bBadFileOpen = false;
return true;