X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fdocs.cpp;h=47ca4dcb160a706aeac56bff77626ffbf765dc00;hb=dc5eb7b285e647a99535740a99d73d468a856ba3;hp=99e6a56e9c9245d5cda5b1b88b8a840db209fdee;hpb=df521cfe14a9e0b47bdcd98d1f67d03acf242162;p=ctsim.git

diff --git a/src/docs.cpp b/src/docs.cpp
index 99e6a56..47ca4dc 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.29 2001/02/25 10:52:55 kevin Exp $
+**  $Id: docs.cpp,v 1.38 2002/05/03 00:40:30 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
@@ -80,7 +80,7 @@ bool ImageFileDocument::OnOpenDocument(const wxString& filename)
   SetFilename(filename, true);  
   Modify(false);
   UpdateAllViews();
-  getView()->OnUpdate (getView(), NULL);
+  getView()->setInitialClientSize();
   m_bBadFileOpen = false;
 
   return true;
@@ -104,7 +104,6 @@ ImageFileDocument::getView() const
   return dynamic_cast<ImageFileView*>(GetFirstView()); 
 }
 
-
 bool
 ImageFileDocument::Revert ()
 {
@@ -120,37 +119,38 @@ ImageFileDocument::Revert ()
       OnOpenDocument (GetFilename());
     }
   }
-  getView()->OnUpdate (getView(), NULL);
+  //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)
-EVT_MENU(BackgroundSupervisor::MSG_BACKGROUND_SUPERVISOR_ADD, BackgroundProcessingDocument::OnAddBackground)
-EVT_MENU(BackgroundSupervisor::MSG_BACKGROUND_SUPERVISOR_REMOVE, BackgroundProcessingDocument::OnRemoveBackground)
 END_EVENT_TABLE()
 
+#ifdef HAVE_WXTHREADS
 void
-BackgroundProcessingDocument::OnAddBackground (wxCommandEvent& event)
+BackgroundProcessingDocument::addBackgroundSupervisor (BackgroundSupervisor* pSupervisor)
 {
-  BackgroundSupervisor* pSupervisor = reinterpret_cast<BackgroundSupervisor*>(event.GetClientData());
-  wxASSERT (pSupervisor != NULL);
-
   wxCriticalSectionLocker locker (m_criticalSection);
   if (pSupervisor)
     m_vecpBackgroundSupervisors.push_back (pSupervisor);
 }
 
 void
-BackgroundProcessingDocument::OnRemoveBackground (wxCommandEvent& event)
+BackgroundProcessingDocument::removeBackgroundSupervisor (BackgroundSupervisor* pSupervisor)
 {
-  BackgroundSupervisor* pSupervisor = reinterpret_cast<BackgroundSupervisor*>(event.GetClientData());
-  wxASSERT (pSupervisor != NULL);
-
   m_criticalSection.Enter();
   bool bFound = false;
   for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin(); 
@@ -165,24 +165,24 @@ BackgroundProcessingDocument::OnRemoveBackground (wxCommandEvent& event)
 
   if (! bFound) 
      sys_error (ERR_SEVERE, "Could not find background task [OnRemoveBackground]");
-  
-  wxCommandEvent ackEvent (wxEVT_COMMAND_MENU_SELECTED, BackgroundSupervisor::MSG_DOCUMENT_ACK_REMOVE);
-  wxPostEvent (pSupervisor, ackEvent);
 }
+#endif
 
 void
 BackgroundProcessingDocument::cancelRunningTasks()
 {
+#ifdef HAVE_WXTHREADS
   m_criticalSection.Enter();
   for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin(); 
         i != m_vecpBackgroundSupervisors.end(); i++)
-          BackgroundSupervisor::cancelSupervisor(*i);
+          (*i)->onCancel();
   m_criticalSection.Leave();
 
   while (m_vecpBackgroundSupervisors.size() > 0) {
-     ::wxUsleep(50);
      ::wxYield();
+     ::wxUsleep(50);
   }
+#endif
 }
 
 
@@ -226,7 +226,7 @@ ProjectionFileDocument::OnOpenDocument(const wxString& filename)
   SetFilename(filename, true);
   Modify(false);
   UpdateAllViews();
-  GetFirstView()->OnUpdate (GetFirstView(), NULL);
+  getView()->setInitialClientSize();
   m_bBadFileOpen = false;
   
   return true;
@@ -251,10 +251,23 @@ ProjectionFileDocument::getView() const
   return dynamic_cast<ProjectionFileView*>(GetFirstView()); 
 }
 
+void
+ProjectionFileDocument::Activate()
+{
+#if CTSIM_MDI
+  getView()->getFrame()->Activate();
+#endif
+};
+
 // PhantomFileDocument
 
 IMPLEMENT_DYNAMIC_CLASS(PhantomFileDocument, BackgroundProcessingTask)
 
+PhantomFileDocument::~PhantomFileDocument()
+{
+  cancelRunningTasks();
+}
+
 bool 
 PhantomFileDocument::OnOpenDocument(const wxString& filename)
 {
@@ -280,7 +293,7 @@ PhantomFileDocument::OnOpenDocument(const wxString& filename)
   m_idPhantom = m_phantom.id();
   Modify(false);
   UpdateAllViews();
-  GetFirstView()->OnUpdate (GetFirstView(), NULL);
+  //GetFirstView()->OnUpdate (GetFirstView(), NULL);
   m_bBadFileOpen = false;
   
   return true;
@@ -318,6 +331,14 @@ PhantomFileDocument::getView() const
   return dynamic_cast<PhantomFileView*>(GetFirstView()); 
 }
 
+void
+PhantomFileDocument::Activate()
+{
+#if CTSIM_MDI
+  getView()->getFrame()->Activate();
+#endif
+};
+
 // PlotFileDocument
 
 IMPLEMENT_DYNAMIC_CLASS(PlotFileDocument, wxDocument)
@@ -353,7 +374,7 @@ PlotFileDocument::OnOpenDocument(const wxString& filename)
   m_namePlot = filename.c_str();
   Modify (false);
   UpdateAllViews();
-  GetFirstView()->OnUpdate (NULL, NULL);
+  //GetFirstView()->OnUpdate (NULL, NULL);
   m_bBadFileOpen = false;
   
   return true;
@@ -378,6 +399,14 @@ PlotFileDocument::getView() const
   return dynamic_cast<PlotFileView*>(GetFirstView()); 
 }
 
+void
+PlotFileDocument::Activate()
+{
+#if CTSIM_MDI
+  getView()->getFrame()->Activate();
+#endif
+};
+
 //////////////////////////////////////////////////////////////////////////
 //
 // TextFileDocument
@@ -408,7 +437,7 @@ TextFileDocument::OnOpenDocument(const wxString& filename)
   
   SetFilename (filename, true);
   Modify (false);
-  UpdateAllViews();
+  //  UpdateAllViews();
   m_bBadFileOpen = false;
   return true;
 }
@@ -456,8 +485,6 @@ Graph3dFileDocument::Graph3dFileDocument(void)
 
 Graph3dFileDocument::~Graph3dFileDocument() 
 {
-//    delete [] m_pVertices;
-//    delete [] m_pNormals;
 }
 
 bool 
@@ -472,7 +499,7 @@ Graph3dFileDocument::OnOpenDocument(const wxString& filename)
 {
   SetFilename (filename, true);
   Modify (false);
-  UpdateAllViews();
+  //  UpdateAllViews();
   m_bBadFileOpen = false;
   return true;
 }
@@ -493,10 +520,6 @@ Graph3dFileDocument::getView() const
 bool
 Graph3dFileDocument::createFromImageFile (const ImageFile& rImageFile)
 {
-//  delete [] m_pVertices;
-//  delete [] m_pNormals;
-
-
   m_nx = rImageFile.nx();
   m_ny = rImageFile.ny();
   m_array = rImageFile.getArray();
@@ -504,4 +527,13 @@ Graph3dFileDocument::createFromImageFile (const ImageFile& rImageFile)
   return true;
 }
 
+void
+Graph3dFileDocument::Activate()
+{
+#if CTSIM_MDI
+  getView()->getFrame()->Activate();
+#endif
+};
+
+
 #endif // wxUSE_GLCANVAS