projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r302: *** empty log message ***
[ctsim.git]
/
src
/
docs.cpp
diff --git
a/src/docs.cpp
b/src/docs.cpp
index 034cfe710041604be7815baf7575c92feb095ee6..179cc89750461dca1a20a89f22bdbf56a1a29dff 100644
(file)
--- a/
src/docs.cpp
+++ b/
src/docs.cpp
@@
-9,7
+9,7
@@
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: docs.cpp,v 1.
4 2000/12/16 06:12:47
kevin Exp $
+** $Id: docs.cpp,v 1.
6 2000/12/18 09:55:22
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
**
** 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
@@
-72,7
+72,7
@@
bool ImageFileDocument::OnOpenDocument(const wxString& filename)
wxString untitledFilename = theApp->getUntitledFilename();
SetFilename (untitledFilename, true);
} else {
wxString untitledFilename = theApp->getUntitledFilename();
SetFilename (untitledFilename, true);
} else {
- if (! m_imageFile.fileRead (filename)) {
+ if (! m_imageFile.fileRead (filename
.c_str()
)) {
*theApp->getLog() << "Unable to read image file " << filename << "\n";
return false;
}
*theApp->getLog() << "Unable to read image file " << filename << "\n";
return false;
}
@@
-80,7
+80,11
@@
bool ImageFileDocument::OnOpenDocument(const wxString& filename)
SetFilename(filename, true);
}
Modify(false);
SetFilename(filename, true);
}
Modify(false);
- UpdateAllViews();
+ UpdateAllViews();
\r
+ ImageFileView* ifView = dynamic_cast<ImageFileView*>(GetFirstView());
\r
+ if (ifView)
\r
+ ifView->OnUpdate(ifView, NULL);
\r
+
return true;
}
return true;
}
@@
-106,7
+110,7
@@
IMPLEMENT_DYNAMIC_CLASS(ProjectionFileDocument, wxDocument)
bool ProjectionFileDocument::OnSaveDocument(const wxString& filename)
{
bool ProjectionFileDocument::OnSaveDocument(const wxString& filename)
{
- if (! m_projectionFile.write (filename)) {
+ if (! m_projectionFile.write (filename
.c_str()
)) {
*theApp->getLog() << "Unable to write projection file " << filename << "\n";
return false;
}
*theApp->getLog() << "Unable to write projection file " << filename << "\n";
return false;
}
@@
-121,7
+125,7
@@
bool ProjectionFileDocument::OnOpenDocument(const wxString& filename)
wxString untitledFilename = theApp->getUntitledFilename();
SetFilename (untitledFilename, true);
} else {
wxString untitledFilename = theApp->getUntitledFilename();
SetFilename (untitledFilename, true);
} else {
- if (! m_projectionFile.read (filename)) {
+ if (! m_projectionFile.read (filename
.c_str()
)) {
*theApp->getLog() << "Unable to read projection file " << filename << "\n";
return false;
}
*theApp->getLog() << "Unable to read projection file " << filename << "\n";
return false;
}