projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r11859: Canonicalize whitespace
[ctsim.git]
/
src
/
docs.cpp
diff --git
a/src/docs.cpp
b/src/docs.cpp
index 82a740e7b2412aeefe854aa08c4076c35b7ee39c..0f07a5223507874b56fc5c7c59a20838a512f942 100644
(file)
--- a/
src/docs.cpp
+++ b/
src/docs.cpp
@@
-71,11
+71,11
@@
bool ImageFileDocument::OnOpenDocument(const wxString& filename)
m_bBadFileOpen = true;
return false;
}
m_bBadFileOpen = true;
return false;
}
-
+
if (theApp->getVerboseLogging() && filename != "")
*theApp->getLog() << "Read image file " << filename << "\n";
if (theApp->getVerboseLogging() && filename != "")
*theApp->getLog() << "Read image file " << filename << "\n";
-
- SetFilename(filename, true);
+
+ SetFilename(filename, true);
Modify(false);
getView()->setInitialClientSize();
UpdateAllViews();
Modify(false);
getView()->setInitialClientSize();
UpdateAllViews();
@@
-84,22
+84,22
@@
bool ImageFileDocument::OnOpenDocument(const wxString& filename)
return true;
}
return true;
}
-bool
+bool
ImageFileDocument::IsModified(void) const
{
return wxDocument::IsModified();
}
ImageFileDocument::IsModified(void) const
{
return wxDocument::IsModified();
}
-void
+void
ImageFileDocument::Modify(bool mod)
{
wxDocument::Modify(mod);
}
ImageFileDocument::Modify(bool mod)
{
wxDocument::Modify(mod);
}
-ImageFileView*
+ImageFileView*
ImageFileDocument::getView() const
ImageFileDocument::getView() const
-{
- return dynamic_cast<ImageFileView*>(GetFirstView());
+{
+ return dynamic_cast<ImageFileView*>(GetFirstView());
}
bool
}
bool
@@
-150,9
+150,9
@@
BackgroundProcessingDocument::removeBackgroundSupervisor (BackgroundSupervisor*
{
m_criticalSection.Enter();
bool bFound = false;
{
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;
if (*i == pSupervisor) {
m_vecpBackgroundSupervisors.erase(i);
bFound = true;
@@
-160,7
+160,7
@@
BackgroundProcessingDocument::removeBackgroundSupervisor (BackgroundSupervisor*
}
m_criticalSection.Leave();
}
m_criticalSection.Leave();
- if (! bFound)
+ if (! bFound)
sys_error (ERR_SEVERE, "Could not find background task [OnRemoveBackground]");
}
#endif
sys_error (ERR_SEVERE, "Could not find background task [OnRemoveBackground]");
}
#endif
@@
-170,7
+170,7
@@
BackgroundProcessingDocument::cancelRunningTasks()
{
#ifdef HAVE_WXTHREADS
m_criticalSection.Enter();
{
#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();
i != m_vecpBackgroundSupervisors.end(); i++)
(*i)->onCancel();
m_criticalSection.Leave();
@@
-187,7
+187,7
@@
BackgroundProcessingDocument::cancelRunningTasks()
IMPLEMENT_DYNAMIC_CLASS(ProjectionFileDocument, BackgroundProcessingDocument)
IMPLEMENT_DYNAMIC_CLASS(ProjectionFileDocument, BackgroundProcessingDocument)
-bool
+bool
ProjectionFileDocument::OnSaveDocument(const wxString& filename)
{
if (! m_pProjectionFile->write (filename.c_str())) {
ProjectionFileDocument::OnSaveDocument(const wxString& filename)
{
if (! m_pProjectionFile->write (filename.c_str())) {
@@
-207,7
+207,7
@@
ProjectionFileDocument::~ProjectionFileDocument()
delete m_pProjectionFile;
}
delete m_pProjectionFile;
}
-bool
+bool
ProjectionFileDocument::OnOpenDocument(const wxString& filename)
{
if (! OnSaveModified())
ProjectionFileDocument::OnOpenDocument(const wxString& filename)
{
if (! OnSaveModified())
@@
-227,27
+227,27
@@
ProjectionFileDocument::OnOpenDocument(const wxString& filename)
Modify(false);
getView()->setInitialClientSize();
UpdateAllViews();
Modify(false);
getView()->setInitialClientSize();
UpdateAllViews();
-
+
return true;
}
return true;
}
-bool
+bool
ProjectionFileDocument::IsModified(void) const
{
return wxDocument::IsModified();
}
ProjectionFileDocument::IsModified(void) const
{
return wxDocument::IsModified();
}
-void
+void
ProjectionFileDocument::Modify(bool mod)
{
wxDocument::Modify(mod);
}
ProjectionFileDocument::Modify(bool mod)
{
wxDocument::Modify(mod);
}
-ProjectionFileView*
+ProjectionFileView*
ProjectionFileDocument::getView() const
ProjectionFileDocument::getView() const
-{
- return dynamic_cast<ProjectionFileView*>(GetFirstView());
+{
+ return dynamic_cast<ProjectionFileView*>(GetFirstView());
}
void
}
void
@@
-267,7
+267,7
@@
PhantomFileDocument::~PhantomFileDocument()
cancelRunningTasks();
}
cancelRunningTasks();
}
-bool
+bool
PhantomFileDocument::OnOpenDocument(const wxString& constFilename)
{
if (! OnSaveModified())
PhantomFileDocument::OnOpenDocument(const wxString& constFilename)
{
if (! OnSaveModified())
@@
-294,11
+294,11
@@
PhantomFileDocument::OnOpenDocument(const wxString& constFilename)
Modify(false);
UpdateAllViews();
m_bBadFileOpen = false;
Modify(false);
UpdateAllViews();
m_bBadFileOpen = false;
-
+
return true;
}
return true;
}
-bool
+bool
PhantomFileDocument::OnSaveDocument(const wxString& filename)
{
if (! m_phantom.fileWrite (filename.c_str())) {
PhantomFileDocument::OnSaveDocument(const wxString& filename)
{
if (! m_phantom.fileWrite (filename.c_str())) {
@@
-311,23
+311,23
@@
PhantomFileDocument::OnSaveDocument(const wxString& filename)
return true;
}
return true;
}
-bool
+bool
PhantomFileDocument::IsModified(void) const
{
return false;
}
PhantomFileDocument::IsModified(void) const
{
return false;
}
-void
+void
PhantomFileDocument::Modify(bool mod)
{
wxDocument::Modify(mod);
}
PhantomFileDocument::Modify(bool mod)
{
wxDocument::Modify(mod);
}
-PhantomFileView*
+PhantomFileView*
PhantomFileDocument::getView() const
PhantomFileDocument::getView() const
-{
- return dynamic_cast<PhantomFileView*>(GetFirstView());
+{
+ return dynamic_cast<PhantomFileView*>(GetFirstView());
}
void
}
void
@@
-342,7
+342,7
@@
PhantomFileDocument::Activate()
IMPLEMENT_DYNAMIC_CLASS(PlotFileDocument, wxDocument)
IMPLEMENT_DYNAMIC_CLASS(PlotFileDocument, wxDocument)
-bool
+bool
PlotFileDocument::OnSaveDocument(const wxString& filename)
{
m_namePlot = filename.c_str();
PlotFileDocument::OnSaveDocument(const wxString& filename)
{
m_namePlot = filename.c_str();
@@
-356,7
+356,7
@@
PlotFileDocument::OnSaveDocument(const wxString& filename)
return true;
}
return true;
}
-bool
+bool
PlotFileDocument::OnOpenDocument(const wxString& filename)
{
if (! OnSaveModified())
PlotFileDocument::OnOpenDocument(const wxString& filename)
{
if (! OnSaveModified())
@@
-377,27
+377,27
@@
PlotFileDocument::OnOpenDocument(const wxString& filename)
Modify (false);
getView()->setInitialClientSize();
UpdateAllViews();
Modify (false);
getView()->setInitialClientSize();
UpdateAllViews();
-
+
return true;
}
return true;
}
-bool
+bool
PlotFileDocument::IsModified(void) const
{
return wxDocument::IsModified();
}
PlotFileDocument::IsModified(void) const
{
return wxDocument::IsModified();
}
-void
+void
PlotFileDocument::Modify (bool mod)
{
wxDocument::Modify(mod);
}
PlotFileDocument::Modify (bool mod)
{
wxDocument::Modify(mod);
}
-PlotFileView*
+PlotFileView*
PlotFileDocument::getView() const
PlotFileDocument::getView() const
-{
- return dynamic_cast<PlotFileView*>(GetFirstView());
+{
+ return dynamic_cast<PlotFileView*>(GetFirstView());
}
void
}
void
@@
-416,7
+416,7
@@
PlotFileDocument::Activate()
IMPLEMENT_DYNAMIC_CLASS(TextFileDocument, wxDocument)
IMPLEMENT_DYNAMIC_CLASS(TextFileDocument, wxDocument)
-bool
+bool
TextFileDocument::OnSaveDocument(const wxString& filename)
{
TextFileView *view = getView();
TextFileDocument::OnSaveDocument(const wxString& filename)
{
TextFileView *view = getView();
@@
-426,16
+426,16
@@
TextFileDocument::OnSaveDocument(const wxString& filename)
return true;
}
return true;
}
-bool
+bool
TextFileDocument::OnOpenDocument(const wxString& filename)
{
TextFileView *view = getView();
TextFileDocument::OnOpenDocument(const wxString& filename)
{
TextFileView *view = getView();
-
+
if (! view->getTextCtrl()->LoadFile(filename)) {
m_bBadFileOpen = true;
return false;
}
if (! view->getTextCtrl()->LoadFile(filename)) {
m_bBadFileOpen = true;
return false;
}
-
+
SetFilename (filename, true);
Modify (false);
UpdateAllViews();
SetFilename (filename, true);
Modify (false);
UpdateAllViews();
@@
-443,13
+443,13
@@
TextFileDocument::OnOpenDocument(const wxString& filename)
return true;
}
return true;
}
-bool
+bool
TextFileDocument::IsModified(void) const
{
return false;
TextFileDocument::IsModified(void) const
{
return false;
-
+
TextFileView *view = getView();
TextFileView *view = getView();
-
+
if (view)
return (wxDocument::IsModified() || view->getTextCtrl()->IsModified());
else
if (view)
return (wxDocument::IsModified() || view->getTextCtrl()->IsModified());
else
@@
-457,16
+457,16
@@
TextFileDocument::IsModified(void) const
}
}
-TextFileView*
+TextFileView*
TextFileDocument::getView() const
TextFileDocument::getView() const
-{
- return dynamic_cast<TextFileView*>(GetFirstView());
+{
+ return dynamic_cast<TextFileView*>(GetFirstView());
}
}
-wxTextCtrl*
+wxTextCtrl*
TextFileDocument::getTextCtrl()
TextFileDocument::getTextCtrl()
-{
- return dynamic_cast<TextFileView*>(GetFirstView())->getTextCtrl();
+{
+ return dynamic_cast<TextFileView*>(GetFirstView())->getTextCtrl();
}
//////////////////////////////////////////////////////////////////////////
}
//////////////////////////////////////////////////////////////////////////
@@
-479,23
+479,23
@@
TextFileDocument::getTextCtrl()
IMPLEMENT_DYNAMIC_CLASS(Graph3dFileDocument, wxDocument)
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)
{
}
: 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;
}
Graph3dFileDocument::OnSaveDocument(const wxString& filename)
{
Modify(false);
return true;
}
-bool
+bool
Graph3dFileDocument::OnOpenDocument(const wxString& filename)
{
SetFilename (filename, true);
Graph3dFileDocument::OnOpenDocument(const wxString& filename)
{
SetFilename (filename, true);
@@
-506,17
+506,17
@@
Graph3dFileDocument::OnOpenDocument(const wxString& filename)
return true;
}
return true;
}
-bool
+bool
Graph3dFileDocument::IsModified(void) const
{
return wxDocument::IsModified();
}
Graph3dFileDocument::IsModified(void) const
{
return wxDocument::IsModified();
}
-Graph3dFileView*
+Graph3dFileView*
Graph3dFileDocument::getView() const
Graph3dFileDocument::getView() const
-{
- return dynamic_cast<Graph3dFileView*>(GetFirstView());
+{
+ return dynamic_cast<Graph3dFileView*>(GetFirstView());
}
bool
}
bool