X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fdocs.cpp;h=028c8214fe24841e2700209bbd4c6f670620d534;hp=c9f2b3ff0af45bfbb01e3998274fc267a4bf7c42;hb=f7ee98f7d964ed361068179f0e7ea4475ed1abdf;hpb=ba8635d790ee847d9746c6da24b60bd4cb6d9116

diff --git a/src/docs.cpp b/src/docs.cpp
index c9f2b3f..028c821 100644
--- a/src/docs.cpp
+++ b/src/docs.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 ** FILE IDENTIFICATION
 **
-**   Name:          doc.cpp
+**   Name:          docs.cpp
 **   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
 **
-**  $Id: docs.cpp,v 1.19 2001/01/30 07:32:13 kevin Exp $
+**  $Id$
 **
 **  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
@@ -25,22 +25,14 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
-#ifdef __GNUG__
-// #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!
@@ -50,6 +42,8 @@
 #include "ctsim.h"
 #include "docs.h"
 #include "views.h"
+#include "threadrecon.h"
+
 
 // ImageFileDocument
 
@@ -57,11 +51,12 @@ IMPLEMENT_DYNAMIC_CLASS(ImageFileDocument, wxDocument)
 
 bool ImageFileDocument::OnSaveDocument(const wxString& filename)
 {
-  if (! m_pImageFile->fileWrite (filename)) {
-    *theApp->getLog() << "Unable to write image file " << filename << "\n";
+  if (! m_pImageFile->fileWrite (filename.mb_str(wxConvUTF8))) {
+    *theApp->getLog() << _T("Unable to write image file ") << filename << _T("\n");
     return false;
   }
-  *theApp->getLog() << "Wrote image file " << filename << "\n";
+  if (theApp->getVerboseLogging())
+    *theApp->getLog() << _T("Wrote image file ") << filename << _T("\n");
   Modify(false);
   return true;
 }
@@ -71,239 +66,348 @@ bool ImageFileDocument::OnOpenDocument(const wxString& filename)
   if (! OnSaveModified())
     return false;
 
-  if (! m_pImageFile->fileRead (filename.c_str())) {
-    *theApp->getLog() << "Unable to read image file " << filename << "\n";
+  if (! m_pImageFile->fileRead (filename.mb_str(wxConvUTF8))) {
+    *theApp->getLog() << _T("Unable to read image file ") << filename << _T("\n");
     m_bBadFileOpen = true;
     return false;
   }
-  *theApp->getLog() << "Read image file " << filename << "\n";
-  SetFilename(filename, true);  
+
+  if (theApp->getVerboseLogging() && filename != _T(""))
+    *theApp->getLog() << _T("Read image file ") << filename << _T("\n");
+
+  SetFilename(filename, true);
   Modify(false);
+  getView()->setInitialClientSize();
   UpdateAllViews();
-  getView()->OnUpdate (getView(), NULL);
   m_bBadFileOpen = false;
 
   return true;
 }
 
-bool 
+bool
 ImageFileDocument::IsModified(void) const
 {
   return wxDocument::IsModified();
 }
 
-void 
+void
 ImageFileDocument::Modify(bool mod)
 {
   wxDocument::Modify(mod);
 }
 
-ImageFileView* 
+ImageFileView*
 ImageFileDocument::getView() const
-{ 
-  return dynamic_cast<ImageFileView*>(GetFirstView()); 
+{
+  return dynamic_cast<ImageFileView*>(GetFirstView());
 }
 
-
 bool
 ImageFileDocument::Revert ()
 {
   if (IsModified()) {
-    wxString msg ("Revert to saved ");
+    wxString msg (_T("Revert to saved "));
     msg += GetFilename();
-    msg += "?";
-    wxMessageDialog dialog (getView()->getFrame(), msg, "Are you sure?", wxYES_NO | wxNO_DEFAULT);
+    msg += _T("?");
+    wxMessageDialog dialog (getView()->getFrame(), msg, _T("Are you sure?"), wxYES_NO | wxNO_DEFAULT);
     if (dialog.ShowModal() == wxID_YES) {
-      *theApp->getLog() << "Reverting to saved " << GetFilename() << "\n";
+      if (theApp->getVerboseLogging())
+        *theApp->getLog() << _T("Reverting to saved ") << GetFilename() << _T("\n");
       Modify (false);
       OnOpenDocument (GetFilename());
     }
   }
-  getView()->OnUpdate (getView(), NULL);
   UpdateAllViews();
 
   return true;
 }
 
+void
+ImageFileDocument::Activate()
+{
+#if CTSIM_MDI
+  getView()->getFrame()->Activate();
+#endif
+};
+
+// BackgroundProcessingDocument - Base Class
+
+IMPLEMENT_DYNAMIC_CLASS(BackgroundProcessingDocument, wxDocument)
+BEGIN_EVENT_TABLE(BackgroundProcessingDocument, wxDocument)
+END_EVENT_TABLE()
+
+#ifdef HAVE_WXTHREADS
+void
+BackgroundProcessingDocument::addBackgroundSupervisor (BackgroundSupervisor* pSupervisor)
+{
+  wxCriticalSectionLocker locker (m_criticalSection);
+  if (pSupervisor)
+    m_vecpBackgroundSupervisors.push_back (pSupervisor);
+}
+
+void
+BackgroundProcessingDocument::removeBackgroundSupervisor (BackgroundSupervisor* pSupervisor)
+{
+  m_criticalSection.Enter();
+  bool bFound = false;
+  for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin();
+        i != m_vecpBackgroundSupervisors.end();
+        i++)
+          if (*i == pSupervisor) {
+            m_vecpBackgroundSupervisors.erase(i);
+            bFound = true;
+            break;
+        }
+  m_criticalSection.Leave();
+
+  if (! bFound)
+     sys_error (ERR_SEVERE, "Could not find background task [OnRemoveBackground]");
+}
+#endif
+
+void
+BackgroundProcessingDocument::cancelRunningTasks()
+{
+#ifdef HAVE_WXTHREADS
+  m_criticalSection.Enter();
+  for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin();
+        i != m_vecpBackgroundSupervisors.end(); i++)
+          (*i)->onCancel();
+  m_criticalSection.Leave();
+
+  while (m_vecpBackgroundSupervisors.size() > 0) {
+     ::wxYield();
+     ::wxMilliSleep(50);
+  }
+#endif
+}
+
+
 // ProjectionFileDocument
 
-IMPLEMENT_DYNAMIC_CLASS(ProjectionFileDocument, wxDocument)
+IMPLEMENT_DYNAMIC_CLASS(ProjectionFileDocument, BackgroundProcessingDocument)
 
-bool 
+bool
 ProjectionFileDocument::OnSaveDocument(const wxString& filename)
 {
-  if (! m_pProjectionFile->write (filename.c_str())) {
-    *theApp->getLog() << "Unable to write projection file " << filename << "\n";
+  if (! m_pProjectionFile->write (filename.mb_str(wxConvUTF8))) {
+    *theApp->getLog() << _T("Unable to write projection file ") << filename << _T("\n");
     return false;
   }
-  *theApp->getLog() << "Wrote projection file " << filename << "\n";
+  if (theApp->getVerboseLogging())
+    *theApp->getLog() << _T("Wrote projection file ") << filename << _T("\n");
   Modify(false);
   return true;
 }
 
-bool 
+ProjectionFileDocument::~ProjectionFileDocument()
+{
+  cancelRunningTasks();
+
+  delete m_pProjectionFile;
+}
+
+bool
 ProjectionFileDocument::OnOpenDocument(const wxString& filename)
 {
   if (! OnSaveModified())
     return false;
 
-  if (! m_pProjectionFile->read (filename.c_str())) {
-    *theApp->getLog() << "Unable to read projection file " << filename << "\n";
+  if (! m_pProjectionFile->read (filename.mb_str(wxConvUTF8))) {
+    *theApp->getLog() << _T("Unable to read projection file ") << filename << _T("\n");
     m_bBadFileOpen = true;
     return false;
   }
-  *theApp->getLog() << "Read projection file " << filename << "\n";
+  m_bBadFileOpen = false;
+
+  if (theApp->getVerboseLogging() && filename != _T(""))
+    *theApp->getLog() << _T("Read projection file ") << filename << _T("\n");
+
   SetFilename(filename, true);
   Modify(false);
+  getView()->setInitialClientSize();
   UpdateAllViews();
-  GetFirstView()->OnUpdate (GetFirstView(), NULL);
-  m_bBadFileOpen = false;
-  
+
   return true;
 }
 
-bool 
+bool
 ProjectionFileDocument::IsModified(void) const
 {
   return wxDocument::IsModified();
 }
 
-void 
+void
 ProjectionFileDocument::Modify(bool mod)
 {
   wxDocument::Modify(mod);
 }
 
 
-ProjectionFileView* 
+ProjectionFileView*
 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, wxDocument)
+IMPLEMENT_DYNAMIC_CLASS(PhantomFileDocument, BackgroundProcessingDocument)
+
+PhantomFileDocument::~PhantomFileDocument()
+{
+  cancelRunningTasks();
+}
 
-bool 
-PhantomFileDocument::OnOpenDocument(const wxString& filename)
+bool
+PhantomFileDocument::OnOpenDocument(const wxString& constFilename)
 {
   if (! OnSaveModified())
     return false;
 
-  wxString myFilename = filename;
-  if (wxFile::Exists (myFilename)) {
-    m_phantom.createFromFile (myFilename);
-    *theApp->getLog() << "Read phantom file " << filename << "\n";
+  wxString filename (constFilename);
+
+  if (wxFile::Exists (filename)) {
+    m_phantom.createFromFile (filename.mb_str(wxConvUTF8));
+    if (theApp->getVerboseLogging())
+      *theApp->getLog() << _T("Read phantom file ") << filename << _T("\n");
   } else {
-    myFilename.Replace (".phm", "");
-    m_phantom.createFromPhantom (myFilename);
+    filename.Replace (_T(".phm"), _T(""));
+    m_phantom.createFromPhantom (filename.mb_str(wxConvUTF8));
   }
-  m_namePhantom = myFilename;
-  SetFilename (myFilename, true);
+  m_namePhantom = filename;
+  SetFilename (filename, true);
   if (m_phantom.fail()) {
-    *theApp->getLog() << "Failure creating phantom " << myFilename << "\n";
+    *theApp->getLog() << _T("Failure creating phantom ") << filename << _T("\n");
     m_bBadFileOpen = true;
     return false;
   }
   m_idPhantom = m_phantom.id();
   Modify(false);
   UpdateAllViews();
-  GetFirstView()->OnUpdate (GetFirstView(), NULL);
   m_bBadFileOpen = false;
-  
+
   return true;
 }
 
-bool 
+bool
 PhantomFileDocument::OnSaveDocument(const wxString& filename)
 {
-  if (! m_phantom.fileWrite (filename.c_str())) {
-    *theApp->getLog() << "Unable to write phantom file " << filename << "\n";
+  if (! m_phantom.fileWrite (filename.mb_str(wxConvUTF8))) {
+    *theApp->getLog() << _T("Unable to write phantom file ") << filename << _T("\n");
     return false;
   }
-  *theApp->getLog() << "Wrote phantom file " << filename << "\n";
+  if (theApp->getVerboseLogging())
+    *theApp->getLog() << _T("Wrote phantom file ") << filename << _T("\n");
   Modify(false);
   return true;
 }
 
-bool 
+bool
 PhantomFileDocument::IsModified(void) const
 {
   return false;
 }
 
-void 
+void
 PhantomFileDocument::Modify(bool mod)
 {
   wxDocument::Modify(mod);
 }
 
 
-PhantomFileView* 
+PhantomFileView*
 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)
 
-bool 
+bool
 PlotFileDocument::OnSaveDocument(const wxString& filename)
 {
   m_namePlot = filename.c_str();
-  if (! m_plot.fileWrite (filename)) {
-    *theApp->getLog() << "Unable to write plot file " << filename << "\n";
+  if (! m_plot.fileWrite (filename.mb_str(wxConvUTF8))) {
+    *theApp->getLog() << _T("Unable to write plot file ") << filename << _T("\n");
     return false;
   }
-  *theApp->getLog() << "Wrote plot file " << filename << "\n";
+  if (theApp->getVerboseLogging())
+    *theApp->getLog() << _T("Wrote plot file ") << filename << _T("\n");
   Modify(false);
   return true;
 }
 
-bool 
+bool
 PlotFileDocument::OnOpenDocument(const wxString& filename)
 {
   if (! OnSaveModified())
     return false;
 
-  if (! m_plot.fileRead (filename.c_str())) {
-    *theApp->getLog() << "Unable to read plot file " << filename << "\n";
+  if (! m_plot.fileRead (filename.mb_str(wxConvUTF8))) {
+    *theApp->getLog() << _T("Unable to read plot file ") << filename << _T("\n");
     m_bBadFileOpen = true;
     return false;
   }
-  *theApp->getLog() << "Read plot file " << filename << "\n";
+  m_bBadFileOpen = false;
+
+  if (theApp->getVerboseLogging() && filename != _T(""))
+    *theApp->getLog() << _T("Read plot file ") << filename << _T("\n");
+
   SetFilename (filename, true);
   m_namePlot = filename.c_str();
   Modify (false);
+  getView()->setInitialClientSize();
   UpdateAllViews();
-  GetFirstView()->OnUpdate (NULL, NULL);
-  m_bBadFileOpen = false;
-  
+
   return true;
 }
 
 
-bool 
+bool
 PlotFileDocument::IsModified(void) const
 {
   return wxDocument::IsModified();
 }
 
-void 
+void
 PlotFileDocument::Modify (bool mod)
 {
   wxDocument::Modify(mod);
 }
 
-PlotFileView* 
+PlotFileView*
 PlotFileDocument::getView() const
-{ 
-  return dynamic_cast<PlotFileView*>(GetFirstView()); 
+{
+  return dynamic_cast<PlotFileView*>(GetFirstView());
 }
 
+void
+PlotFileDocument::Activate()
+{
+#if CTSIM_MDI
+  getView()->getFrame()->Activate();
+#endif
+};
+
 //////////////////////////////////////////////////////////////////////////
 //
 // TextFileDocument
@@ -312,7 +416,7 @@ PlotFileDocument::getView() const
 
 IMPLEMENT_DYNAMIC_CLASS(TextFileDocument, wxDocument)
 
-bool 
+bool
 TextFileDocument::OnSaveDocument(const wxString& filename)
 {
   TextFileView *view = getView();
@@ -322,16 +426,16 @@ TextFileDocument::OnSaveDocument(const wxString& filename)
   return true;
 }
 
-bool 
+bool
 TextFileDocument::OnOpenDocument(const wxString& filename)
 {
   TextFileView *view = getView();
-  
+
   if (! view->getTextCtrl()->LoadFile(filename)) {
     m_bBadFileOpen = true;
     return false;
   }
-  
+
   SetFilename (filename, true);
   Modify (false);
   UpdateAllViews();
@@ -339,13 +443,13 @@ TextFileDocument::OnOpenDocument(const wxString& filename)
   return true;
 }
 
-bool 
+bool
 TextFileDocument::IsModified(void) const
 {
   return false;
-  
+
   TextFileView *view = getView();
-  
+
   if (view)
     return (wxDocument::IsModified() || view->getTextCtrl()->IsModified());
   else
@@ -353,16 +457,16 @@ TextFileDocument::IsModified(void) const
 }
 
 
-TextFileView* 
+TextFileView*
 TextFileDocument::getView() const
-{ 
-  return dynamic_cast<TextFileView*>(GetFirstView()); 
+{
+  return dynamic_cast<TextFileView*>(GetFirstView());
 }
 
-wxTextCtrl* 
+wxTextCtrl*
 TextFileDocument::getTextCtrl()
-{ 
-  return dynamic_cast<TextFileView*>(GetFirstView())->getTextCtrl(); 
+{
+  return dynamic_cast<TextFileView*>(GetFirstView())->getTextCtrl();
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -371,35 +475,67 @@ TextFileDocument::getTextCtrl()
 //
 //////////////////////////////////////////////////////////////////////////
 
+#if wxUSE_GLCANVAS
+
 IMPLEMENT_DYNAMIC_CLASS(Graph3dFileDocument, wxDocument)
 
-bool 
+Graph3dFileDocument::Graph3dFileDocument(void)
+: m_bBadFileOpen(false), m_nVertices(0), m_pVertices(0), m_pNormals(0),m_nx(0),m_ny(0),m_array(0)
+{
+}
+
+Graph3dFileDocument::~Graph3dFileDocument()
+{
+}
+
+bool
 Graph3dFileDocument::OnSaveDocument(const wxString& filename)
 {
   Modify(false);
   return true;
 }
 
-bool 
+bool
 Graph3dFileDocument::OnOpenDocument(const wxString& filename)
 {
   SetFilename (filename, true);
   Modify (false);
+  getView()->setInitialClientSize();
   UpdateAllViews();
   m_bBadFileOpen = false;
   return true;
 }
 
-bool 
+bool
 Graph3dFileDocument::IsModified(void) const
 {
     return wxDocument::IsModified();
 }
 
 
-Graph3dFileView* 
+Graph3dFileView*
 Graph3dFileDocument::getView() const
-{ 
-  return dynamic_cast<Graph3dFileView*>(GetFirstView()); 
+{
+  return dynamic_cast<Graph3dFileView*>(GetFirstView());
+}
+
+bool
+Graph3dFileDocument::createFromImageFile (const ImageFile& rImageFile)
+{
+  m_nx = rImageFile.nx();
+  m_ny = rImageFile.ny();
+  m_array = rImageFile.getArray();
+
+  return true;
 }
 
+void
+Graph3dFileDocument::Activate()
+{
+#if CTSIM_MDI
+  getView()->getFrame()->Activate();
+#endif
+};
+
+
+#endif // wxUSE_GLCANVAS