r2105: *** empty log message ***

[ctsim.git] / src / ctsim.cpp

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index cf6b738a18f5cf72ca1cbbeed3a0e810b8f56647..873e17f43b4260b73feb2005468df85063a437b4 100644 (file)
--- a/src/ctsim.cpp
+++ b/src/ctsim.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: ctsim.cpp,v 1.110 2002/05/05 14:22:44 kevin Exp $
+**  $Id: ctsim.cpp,v 1.114 2002/06/04 19:19:40 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
@@ -70,7 +70,7 @@
 #endif
 #endif
 
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.110 2002/05/05 14:22:44 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.114 2002/06/04 19:19:40 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -982,15 +982,14 @@ MainFrame::OnImport (wxCommandEvent& WXUNUSED(event) )
         ImageFileDocument* pIFDoc = theApp->newImageDoc();
         ImageFile* pIF = dicomImport.getImageFile();
         pIFDoc->setImageFile (pIF);
-        pIFDoc->getView()->getFrame()->Show(true);
         std::ostringstream os;
         os << "Import file " << strFilename.c_str() << " (type " << strFormatName.c_str() << ")";
         pIF->labelAdd (os.str().c_str());
         if (theApp->getAskDeleteNewDocs())
           pIFDoc->Modify (true);
         pIFDoc->UpdateAllViews();
-        pIFDoc->GetFirstView()->OnUpdate (NULL, NULL);
-        pIFDoc->getView()->getFrame()->Show(true);
+        pIFDoc->getView()->setInitialClientSize();
+       pIFDoc->Activate();
       } else if (dicomImport.testProjections()) {
         ProjectionFileDocument* pProjDoc = theApp->newProjectionDoc();
         Projections* pProj = dicomImport.getProjections();
@@ -1002,8 +1001,8 @@ MainFrame::OnImport (wxCommandEvent& WXUNUSED(event) )
         if (theApp->getAskDeleteNewDocs())
           pProjDoc->Modify (true);
         pProjDoc->UpdateAllViews();
-        pProjDoc->GetFirstView()->OnUpdate (NULL, NULL);
-        pProjDoc->getView()->getFrame()->Show(true);
+        pProjDoc->getView()->setInitialClientSize();
+       pProjDoc->Activate();
       } else
         ::wxMessageBox ("Unrecognized DICOM file contents", "Import Error");
     } 
@@ -1027,11 +1026,16 @@ MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
   *theApp->getLog() << ", Build Date: " << __TIMESTAMP__;
 #endif
 #if defined(DEBUG)
-  *theApp->getLog() << ", CTSim Debug version";
+  *theApp->getLog() << ", CTSim Debug version" << "\n";
 #else
-  *theApp->getLog() << ", CTSim Release version";
+  *theApp->getLog() << ", CTSim Release version" << "\n";
+#endif
+#ifdef CTSIMVERSION
+  *theApp->getLog() << "Version ";
+  *theApp->getLog() << CTSIMVERSION;
+#elif defined(VERSION)
+    *theApp->getLog() << "Version: " <<  VERSION;
 #endif
-
   *theApp->getLog() << "\n";
   
   wxBitmap bmp (splash);
@@ -1054,11 +1058,12 @@ MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
   }
 }
 
-
+#if 0
 ProjectionFileDocument*
 CTSimApp::newProjectionDoc()
 {
-  ProjectionFileDocument* newDoc = dynamic_cast<ProjectionFileDocument*>(m_pDocTemplProjection->CreateDocument (""));
+  ProjectionFileDocument* newDoc = dynamic_cast<ProjectionFileDocument*>
+    (m_pDocTemplProjection->CreateDocument (""));
   if (newDoc) {
     newDoc->SetDocumentName (m_pDocTemplProjection->GetDocumentName());
     newDoc->SetDocumentTemplate (m_pDocTemplProjection);
@@ -1067,31 +1072,30 @@ CTSimApp::newProjectionDoc()
   
   return newDoc;
 }
+#endif
+
+ProjectionFileDocument*
+CTSimApp::newProjectionDoc()
+{
+  ProjectionFileDocument* doc = dynamic_cast<ProjectionFileDocument*>(theApp->getDocManager()->CreateDocument (szNEW_PROJECTION_FILENAME, wxDOC_SILENT));
+  doc->getView()->getFrame()->Show(false);
+
+  return doc;
+}
 
 ImageFileDocument*
 CTSimApp::newImageDoc()
 {
-  ImageFileDocument* newDoc = dynamic_cast<ImageFileDocument*>(m_pDocTemplImage->CreateDocument (""));
-  if (newDoc) {
-    newDoc->SetDocumentName (m_pDocTemplImage->GetDocumentName());
-    newDoc->SetDocumentTemplate (m_pDocTemplImage);
-    newDoc->OnNewDocument();
-  }
-  
-  return newDoc;
+  return dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument (szNEW_IMAGE_FILENAME, wxDOC_SILENT));
 }
 
 PlotFileDocument*
 CTSimApp::newPlotDoc()
 {
-  PlotFileDocument* newDoc = dynamic_cast<PlotFileDocument*>(m_pDocTemplPlot->CreateDocument (""));
-  if (newDoc) {
-    newDoc->SetDocumentName (m_pDocTemplPlot->GetDocumentName());
-    newDoc->SetDocumentTemplate (m_pDocTemplPlot);
-    newDoc->OnNewDocument();
-  }
-  
-  return newDoc;
+  PlotFileDocument* doc = dynamic_cast<PlotFileDocument*>(theApp->getDocManager()->CreateDocument (szNEW_PLOT_FILENAME, wxDOC_SILENT));
+  doc->getView()->getFrame()->Show(false);
+
+  return doc;
 }