projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r3158: *** empty log message ***
[ctsim.git]
/
src
/
docs.cpp
diff --git
a/src/docs.cpp
b/src/docs.cpp
index bd4e404416579ccc1cf924b4d3150ca16b8f6979..965f4249f544ec1e4cdc85a1cb65dafa6603b8b8 100644
(file)
--- a/
src/docs.cpp
+++ b/
src/docs.cpp
@@
-1,7
+1,7
@@
/*****************************************************************************
** FILE IDENTIFICATION
**
/*****************************************************************************
** FILE IDENTIFICATION
**
-** Name: doc.cpp
+** Name: doc
s
.cpp
** Purpose: Document routines for CTSim program
** Programmer: Kevin Rosenberg
** Date Started: July 2000
** 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
**
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: docs.cpp,v 1.
33 2001/03/05 17:26:46
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);
+ getView()->setInitialClientSize();
UpdateAllViews();
UpdateAllViews();
- getView()->OnUpdate (getView(), NULL);
m_bBadFileOpen = false;
return true;
m_bBadFileOpen = false;
return true;
@@
-104,7
+106,6
@@
ImageFileDocument::getView() const
return dynamic_cast<ImageFileView*>(GetFirstView());
}
return dynamic_cast<ImageFileView*>(GetFirstView());
}
-
bool
ImageFileDocument::Revert ()
{
bool
ImageFileDocument::Revert ()
{
@@
-120,12
+121,19
@@
ImageFileDocument::Revert ()
OnOpenDocument (GetFilename());
}
}
OnOpenDocument (GetFilename());
}
}
- getView()->OnUpdate (getView(), NULL);
UpdateAllViews();
return true;
}
UpdateAllViews();
return true;
}
+void
+ImageFileDocument::Activate()
+{
+#if CTSIM_MDI
+ getView()->getFrame()->Activate();
+#endif
+};
+
// BackgroundProcessingDocument - Base Class
IMPLEMENT_DYNAMIC_CLASS(BackgroundProcessingDocument, wxDocument)
// BackgroundProcessingDocument - Base Class
IMPLEMENT_DYNAMIC_CLASS(BackgroundProcessingDocument, wxDocument)
@@
-214,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);
+ getView()->setInitialClientSize();
UpdateAllViews();
UpdateAllViews();
- GetFirstView()->OnUpdate (GetFirstView(), NULL);
- m_bBadFileOpen = false;
return true;
}
return true;
}
@@
-244,6
+254,14
@@
ProjectionFileDocument::getView() const
return dynamic_cast<ProjectionFileView*>(GetFirstView());
}
return dynamic_cast<ProjectionFileView*>(GetFirstView());
}
+void
+ProjectionFileDocument::Activate()
+{
+#if CTSIM_MDI
+ getView()->getFrame()->Activate();
+#endif
+};
+
// PhantomFileDocument
IMPLEMENT_DYNAMIC_CLASS(PhantomFileDocument, BackgroundProcessingTask)
// PhantomFileDocument
IMPLEMENT_DYNAMIC_CLASS(PhantomFileDocument, BackgroundProcessingTask)
@@
-254,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;
@@
-316,6
+334,14
@@
PhantomFileDocument::getView() const
return dynamic_cast<PhantomFileView*>(GetFirstView());
}
return dynamic_cast<PhantomFileView*>(GetFirstView());
}
+void
+PhantomFileDocument::Activate()
+{
+#if CTSIM_MDI
+ getView()->getFrame()->Activate();
+#endif
+};
+
// PlotFileDocument
IMPLEMENT_DYNAMIC_CLASS(PlotFileDocument, wxDocument)
// PlotFileDocument
IMPLEMENT_DYNAMIC_CLASS(PlotFileDocument, wxDocument)
@@
-345,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;
}
@@
-376,6
+404,14
@@
PlotFileDocument::getView() const
return dynamic_cast<PlotFileView*>(GetFirstView());
}
return dynamic_cast<PlotFileView*>(GetFirstView());
}
+void
+PlotFileDocument::Activate()
+{
+#if CTSIM_MDI
+ getView()->getFrame()->Activate();
+#endif
+};
+
//////////////////////////////////////////////////////////////////////////
//
// TextFileDocument
//////////////////////////////////////////////////////////////////////////
//
// TextFileDocument
@@
-454,8
+490,6
@@
Graph3dFileDocument::Graph3dFileDocument(void)
Graph3dFileDocument::~Graph3dFileDocument()
{
Graph3dFileDocument::~Graph3dFileDocument()
{
-// delete [] m_pVertices;
-// delete [] m_pNormals;
}
bool
}
bool
@@
-491,10
+525,6
@@
Graph3dFileDocument::getView() const
bool
Graph3dFileDocument::createFromImageFile (const ImageFile& rImageFile)
{
bool
Graph3dFileDocument::createFromImageFile (const ImageFile& rImageFile)
{
-// delete [] m_pVertices;
-// delete [] m_pNormals;
-
-
m_nx = rImageFile.nx();
m_ny = rImageFile.ny();
m_array = rImageFile.getArray();
m_nx = rImageFile.nx();
m_ny = rImageFile.ny();
m_array = rImageFile.getArray();
@@
-502,4
+532,13
@@
Graph3dFileDocument::createFromImageFile (const ImageFile& rImageFile)
return true;
}
return true;
}
+void
+Graph3dFileDocument::Activate()
+{
+#if CTSIM_MDI
+ getView()->getFrame()->Activate();
+#endif
+};
+
+
#endif // wxUSE_GLCANVAS
#endif // wxUSE_GLCANVAS