** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: docs.cpp,v 1.20 2001/01/30 10:58:13 kevin Exp $
+** $Id: docs.cpp,v 1.25 2001/02/22 11:05:38 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
// #pragma implementation
#endif
-// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
#include "wx/txtstrm.h"
#include "wx/file.h"
+#include "wx/thread.h"
#if !wxUSE_DOC_VIEW_ARCHITECTURE
#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
#include "ctsim.h"
#include "docs.h"
#include "views.h"
+#include "threadrecon.h"
+
// ImageFileDocument
*theApp->getLog() << "Unable to write image file " << filename << "\n";
return false;
}
- *theApp->getLog() << "Wrote image file " << filename << "\n";
+ if (theApp->getVerboseLogging())
+ *theApp->getLog() << "Wrote image file " << filename << "\n";
Modify(false);
return true;
}
m_bBadFileOpen = true;
return false;
}
- *theApp->getLog() << "Read image file " << filename << "\n";
+ if (theApp->getVerboseLogging())
+ *theApp->getLog() << "Read image file " << filename << "\n";
SetFilename(filename, true);
Modify(false);
UpdateAllViews();
msg += "?";
wxMessageDialog dialog (getView()->getFrame(), msg, "Are you sure?", wxYES_NO | wxNO_DEFAULT);
if (dialog.ShowModal() == wxID_YES) {
- *theApp->getLog() << "Reverting to saved " << GetFilename() << "\n";
+ if (theApp->getVerboseLogging())
+ *theApp->getLog() << "Reverting to saved " << GetFilename() << "\n";
Modify (false);
OnOpenDocument (GetFilename());
}
*theApp->getLog() << "Unable to write projection file " << filename << "\n";
return false;
}
- *theApp->getLog() << "Wrote projection file " << filename << "\n";
+ if (theApp->getVerboseLogging())
+ *theApp->getLog() << "Wrote projection file " << filename << "\n";
Modify(false);
return true;
}
+ProjectionFileDocument::~ProjectionFileDocument()
+{
+ for (int i = 0; i < m_vecpActiveReconstructors.size(); i++) {
+ ThreadedReconstructor* pThreadedReconstructor = m_vecpActiveReconstructors[i];
+ if (pThreadedReconstructor) {
+ pThreadedReconstructor->cancel();
+ }
+ }
+
+ delete m_pProjectionFile;
+}
+
+void
+ProjectionFileDocument::addReconstructor (ThreadedReconstructor* pRecon)
+{
+ wxCriticalSectionLocker locker (m_criticalSection);
+ m_vecpActiveReconstructors.push_back (pRecon);
+}
+
+void
+ProjectionFileDocument::removeReconstructor (ThreadedReconstructor* pRecon)
+{
+ wxCriticalSectionLocker locker (m_criticalSection);
+ for (int i = 0; i < m_vecpActiveReconstructors.size(); i++) {
+ if (m_vecpActiveReconstructors[i] == pRecon)
+ m_vecpActiveReconstructors[i] = NULL;
+ }
+}
+
bool
ProjectionFileDocument::OnOpenDocument(const wxString& filename)
{
m_bBadFileOpen = true;
return false;
}
- *theApp->getLog() << "Read projection file " << filename << "\n";
+ if (theApp->getVerboseLogging())
+ *theApp->getLog() << "Read projection file " << filename << "\n";
SetFilename(filename, true);
Modify(false);
UpdateAllViews();
wxString myFilename = filename;
if (wxFile::Exists (myFilename)) {
m_phantom.createFromFile (myFilename);
- *theApp->getLog() << "Read phantom file " << filename << "\n";
+ if (theApp->getVerboseLogging())
+ *theApp->getLog() << "Read phantom file " << filename << "\n";
} else {
myFilename.Replace (".phm", "");
m_phantom.createFromPhantom (myFilename);
*theApp->getLog() << "Unable to write phantom file " << filename << "\n";
return false;
}
- *theApp->getLog() << "Wrote phantom file " << filename << "\n";
+ if (theApp->getVerboseLogging())
+ *theApp->getLog() << "Wrote phantom file " << filename << "\n";
Modify(false);
return true;
}
*theApp->getLog() << "Unable to write plot file " << filename << "\n";
return false;
}
- *theApp->getLog() << "Wrote plot file " << filename << "\n";
+ if (theApp->getVerboseLogging())
+ *theApp->getLog() << "Wrote plot file " << filename << "\n";
Modify(false);
return true;
}
m_bBadFileOpen = true;
return false;
}
- *theApp->getLog() << "Read plot file " << filename << "\n";
+ if (theApp->getVerboseLogging())
+ *theApp->getLog() << "Read plot file " << filename << "\n";
SetFilename (filename, true);
m_namePlot = filename.c_str();
Modify (false);
//
//////////////////////////////////////////////////////////////////////////
+#if wxUSE_GLCANVAS
+
IMPLEMENT_DYNAMIC_CLASS(Graph3dFileDocument, wxDocument)
Graph3dFileDocument::Graph3dFileDocument(void)
-: m_bBadFileOpen(false), m_nVertices(0), m_pVertices(0), m_pNormals(0)
+: m_bBadFileOpen(false), m_nVertices(0), m_pVertices(0), m_pNormals(0),m_nx(0),m_ny(0),m_array(0)
{
}
Graph3dFileDocument::~Graph3dFileDocument()
{
- delete [] m_pVertices;
- delete [] m_pNormals;
+// delete [] m_pVertices;
+// delete [] m_pNormals;
}
bool
bool
Graph3dFileDocument::createFromImageFile (const ImageFile& rImageFile)
{
- delete [] m_pVertices;
- delete [] m_pNormals;
+// delete [] m_pVertices;
+// delete [] m_pNormals;
+
m_nx = rImageFile.nx();
m_ny = rImageFile.ny();
m_array = rImageFile.getArray();
-#if 0
- const int nTriangles = nx * ny;
- m_nVertices = nTriangles;
- m_pVertices = new glTripleFloat [nTriangles];
- m_pNormals = new glTripleFloat [nTriangles];
-
- for (unsigned int ix = 0; ix < nx; ix++) {
- for (unsigned int iy = 0; iy < ny; iy++) {
- const int iTriangle = ix * iy;
- m_pVertices[iTriangle][0] = ix;
- m_pVertices[iTriangle][1] = iy;
- m_pVertices[iTriangle][2] = v[ix][iy];
- m_pNormals[iTriangle][0] = 0;
- m_pNormals[iTriangle][1] = 0;
- m_pNormals[iTriangle][2] = 0;
- }
- }
-#endif
+
return true;
}
+
+#endif // wxUSE_GLCANVAS