X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctsim.cpp;h=afdc4b354c273190b77ee57bd9dffb4e1ac6b3c9;hb=67e0b59f7b40b2c2f1d0587b24b4ecf4881b3824;hp=cf6b738a18f5cf72ca1cbbeed3a0e810b8f56647;hpb=6562049dd76f2b8d6ded69dc75b4649e1b203743;p=ctsim.git

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index cf6b738..afdc4b3 100644
--- 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.112 2002/06/02 17:57:02 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.112 2002/06/02 17:57:02 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);