projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r2239: *** empty log message ***
[ctsim.git]
/
src
/
docs.cpp
diff --git
a/src/docs.cpp
b/src/docs.cpp
index 47ca4dcb160a706aeac56bff77626ffbf765dc00..965f4249f544ec1e4cdc85a1cb65dafa6603b8b8 100644
(file)
--- 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
**
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: docs.cpp,v 1.
38 2002/05/03 00:40:30
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
**
** 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;
}
m_bBadFileOpen = true;
return false;
}
- if (theApp->getVerboseLogging())
+
+ if (theApp->getVerboseLogging() && filename != "")
*theApp->getLog() << "Read image file " << filename << "\n";
*theApp->getLog() << "Read image file " << filename << "\n";
+
SetFilename(filename, true);
Modify(false);
SetFilename(filename, true);
Modify(false);
- UpdateAllViews();
getView()->setInitialClientSize();
getView()->setInitialClientSize();
+ UpdateAllViews();
m_bBadFileOpen = false;
return true;
m_bBadFileOpen = false;
return true;
@@
-119,7
+121,6
@@
ImageFileDocument::Revert ()
OnOpenDocument (GetFilename());
}
}
OnOpenDocument (GetFilename());
}
}
- //getView()->OnUpdate (getView(), NULL);
UpdateAllViews();
return true;
UpdateAllViews();
return true;
@@
-221,13
+222,15
@@
ProjectionFileDocument::OnOpenDocument(const wxString& filename)
m_bBadFileOpen = true;
return false;
}
m_bBadFileOpen = true;
return false;
}
- if (theApp->getVerboseLogging())
+ m_bBadFileOpen = false;
+
+ if (theApp->getVerboseLogging() && filename != "")
*theApp->getLog() << "Read projection file " << filename << "\n";
*theApp->getLog() << "Read projection file " << filename << "\n";
+
SetFilename(filename, true);
Modify(false);
SetFilename(filename, true);
Modify(false);
- UpdateAllViews();
getView()->setInitialClientSize();
getView()->setInitialClientSize();
-
m_bBadFileOpen = false
;
+
UpdateAllViews()
;
return true;
}
return true;
}
@@
-269,31
+272,31
@@
PhantomFileDocument::~PhantomFileDocument()
}
bool
}
bool
-PhantomFileDocument::OnOpenDocument(const wxString&
f
ilename)
+PhantomFileDocument::OnOpenDocument(const wxString&
constF
ilename)
{
if (! OnSaveModified())
return false;
{
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 {
if (theApp->getVerboseLogging())
*theApp->getLog() << "Read phantom file " << filename << "\n";
} else {
-
myF
ilename.Replace (".phm", "");
- m_phantom.createFromPhantom (
myF
ilename);
+
f
ilename.Replace (".phm", "");
+ m_phantom.createFromPhantom (
f
ilename);
}
}
- m_namePhantom =
myF
ilename;
- SetFilename (
myF
ilename, true);
+ m_namePhantom =
f
ilename;
+ SetFilename (
f
ilename, true);
if (m_phantom.fail()) {
if (m_phantom.fail()) {
- *theApp->getLog() << "Failure creating phantom " <<
myF
ilename << "\n";
+ *theApp->getLog() << "Failure creating phantom " <<
f
ilename << "\n";
m_bBadFileOpen = true;
return false;
}
m_idPhantom = m_phantom.id();
Modify(false);
UpdateAllViews();
m_bBadFileOpen = true;
return false;
}
m_idPhantom = m_phantom.id();
Modify(false);
UpdateAllViews();
- //GetFirstView()->OnUpdate (GetFirstView(), NULL);
m_bBadFileOpen = false;
return true;
m_bBadFileOpen = false;
return true;
@@
-368,14
+371,16
@@
PlotFileDocument::OnOpenDocument(const wxString& filename)
m_bBadFileOpen = true;
return false;
}
m_bBadFileOpen = true;
return false;
}
- if (theApp->getVerboseLogging())
+ m_bBadFileOpen = false;
+
+ if (theApp->getVerboseLogging() && filename != "")
*theApp->getLog() << "Read plot file " << filename << "\n";
*theApp->getLog() << "Read plot file " << filename << "\n";
+
SetFilename (filename, true);
m_namePlot = filename.c_str();
Modify (false);
SetFilename (filename, true);
m_namePlot = filename.c_str();
Modify (false);
+ getView()->setInitialClientSize();
UpdateAllViews();
UpdateAllViews();
- //GetFirstView()->OnUpdate (NULL, NULL);
- m_bBadFileOpen = false;
return true;
}
return true;
}
@@
-437,7
+442,7
@@
TextFileDocument::OnOpenDocument(const wxString& filename)
SetFilename (filename, true);
Modify (false);
SetFilename (filename, true);
Modify (false);
-
//
UpdateAllViews();
+ UpdateAllViews();
m_bBadFileOpen = false;
return true;
}
m_bBadFileOpen = false;
return true;
}
@@
-499,7
+504,7
@@
Graph3dFileDocument::OnOpenDocument(const wxString& filename)
{
SetFilename (filename, true);
Modify (false);
{
SetFilename (filename, true);
Modify (false);
-
//
UpdateAllViews();
+ UpdateAllViews();
m_bBadFileOpen = false;
return true;
}
m_bBadFileOpen = false;
return true;
}