X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctsim.cpp;h=5297830900e048ac32a77fe7f50de50ab50441b9;hb=cf73da96069292cb372f9fe2b18885f5fc16a3cf;hp=d8b073725c9ccf1f2fae66a7ede2901ff4cfb22e;hpb=dc5eb7b285e647a99535740a99d73d468a856ba3;p=ctsim.git

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index d8b0737..5297830 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.105 2002/05/03 00:40:30 kevin Exp $
+**  $Id: ctsim.cpp,v 1.117 2002/06/20 08:22:48 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.105 2002/05/03 00:40:30 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.117 2002/06/20 08:22:48 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -119,9 +119,9 @@ CTSimApp::OnInit()
     case O_VERSION:
       std::cout << rcsindent << std::endl;
 #ifdef CTSIMVERSION
-      std::cout << "Version: CTSIMVERSION" << std::endl;
+      std::cout << "Version: " << CTSIMVERSION << std::endl;
 #elif defined(VERSION)
-      std::cout << "Version: VERSION" << std::endl;
+      std::cout << "Version: " << VERSION << std::endl;
 #endif
       exit(0);
     case O_HELP:
@@ -164,7 +164,7 @@ CTSimApp::OnInit()
 #ifdef CTSIM_MDI
     wxSize(nearest<int>(xDisplay * .75), nearest<int>(yDisplay * .75)), 
 #else
-    wxSize(nearest<int>(xDisplay * .25), nearest<int>(yDisplay * .25)), 
+    wxSize(nearest<int>(xDisplay * .6), nearest<int>(yDisplay * .4)), 
 #endif
     wxDEFAULT_FRAME_STYLE);
   
@@ -186,7 +186,7 @@ CTSimApp::OnInit()
     int xSize, ySize;
     m_pFrame->GetClientSize(&xSize, &ySize);
     int yLogSize = ySize / 4;
-    m_pLogDoc->getView()->getFrame()->SetClientSize (0, ySize - yLogSize, xSize, yLogSize);
+    m_pLogDoc->getView()->getFrame()->SetSize (0, ySize - yLogSize, xSize, yLogSize);
     m_pLogDoc->getView()->getFrame()->Show (true);
   } else
 #else
@@ -201,8 +201,10 @@ CTSimApp::OnInit()
   if (! m_pFrame->getWinHelpController().Initialize(helpDir + "/ctsim"))
     *m_pLog << "Cannot initialize the Windows Help system" << "\n";
 #else
-  if (! m_pFrame->getHtmlHelpController().Initialize(helpDir + "/ctsim") &&
-    ! m_pFrame->getHtmlHelpController().Initialize("/usr/local/man/ctsim"))
+  wxString docDir (DATADIR);
+  wxString docFile = docDir + "ctsim.htb";
+  if (! m_pFrame->getHtmlHelpController().AddBook(docFile) &&
+    ! m_pFrame->getHtmlHelpController().Initialize("/usr/share/ctsim/ctsim.htb"))
     *m_pLog << "Cannot initialize the HTML Help system" << "\n";
   else {
     if (::wxDirExists ("/tmp"))
@@ -624,12 +626,6 @@ MainFrame::OnNewImageFile (wxCommandEvent& event)
     return;
   }  
   pImageDoc->setImageFile (pImageFile);
-  //  pImageDoc->UpdateAllViews (NULL);
-  //  if (ImageFileView* imageView = pImageDoc->getView()) {
-  //    imageView->OnUpdate (imageView, NULL);
-  //    imageView->getFrame()->SetFocus();
-  //    imageView->getFrame()->Show(true);
-  //  }
   if (theApp->getAskDeleteNewDocs())
     pImageDoc->Modify (true);
 }
@@ -644,13 +640,6 @@ MainFrame::OnNewProjectionFile (wxCommandEvent& event)
     return;
   }  
   pProjDoc->setProjections (pProjections);
-  pProjDoc->UpdateAllViews (NULL);
-  if (ProjectionFileView* projView = pProjDoc->getView()) {
-    projView->OnUpdate (projView, NULL);
-    projView->getFrame()->SetFocus();
-    projView->getFrame()->Show(true);
-  }
-
   if (theApp->getAskDeleteNewDocs())
     pProjDoc->Modify (true);
 }
@@ -683,7 +672,7 @@ MainFrame::OnHelpButton (wxCommandEvent& event)
 void
 MainFrame::OnHelpSecondary (wxCommandEvent& event)
 {
-  m_htmlHelp.DisplayContents();
+  m_htmlHelp.Display ("Contents");
 }
 #endif
 
@@ -696,7 +685,7 @@ MainFrame::showHelp (int commandID)
 #ifdef CTSIM_WINHELP
     m_winHelp.DisplayContents ();
 #else
-    m_htmlHelp.DisplayContents ();
+    m_htmlHelp.Display ("Contents");
 #endif
     break;
     
@@ -993,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();
@@ -1013,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");
     } 
@@ -1038,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);
@@ -1065,27 +1058,32 @@ MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
   }
 }
 
+#if 0
+ProjectionFileDocument*
+CTSimApp::newProjectionDoc()
+{
+  ProjectionFileDocument* newDoc = dynamic_cast<ProjectionFileDocument*>
+    (m_pDocTemplProjection->CreateDocument (""));
+  if (newDoc) {
+    newDoc->SetDocumentName (m_pDocTemplProjection->GetDocumentName());
+    newDoc->SetDocumentTemplate (m_pDocTemplProjection);
+    newDoc->OnNewDocument();
+  }
+  
+  return newDoc;
+}
+#endif
 
 ProjectionFileDocument*
 CTSimApp::newProjectionDoc()
 {
   ProjectionFileDocument* newDoc = dynamic_cast<ProjectionFileDocument*>(m_pDocTemplProjection->CreateDocument (""));
   if (newDoc) {
-    ProjectionFileView* pView = newDoc->getView();
-    if (pView) {
-      wxFrame* pFrame = pView->getFrame();
-      if (pFrame) {
-	//        wxSize size;
-	//        m_pFrame->GetClientSize (&size.x, &size.y);
-	//        pFrame->SetClientSize (size.x / 2, size.y / 2);
-        pFrame->Show (false);
-      }
-    }
     newDoc->SetDocumentName (m_pDocTemplProjection->GetDocumentName());
     newDoc->SetDocumentTemplate (m_pDocTemplProjection);
     newDoc->OnNewDocument();
   }
-  
+
   return newDoc;
 }
 
@@ -1098,7 +1096,7 @@ CTSimApp::newImageDoc()
     newDoc->SetDocumentTemplate (m_pDocTemplImage);
     newDoc->OnNewDocument();
   }
-  
+
   return newDoc;
 }
 
@@ -1146,8 +1144,8 @@ CTSimApp::newPhantomDoc()
   return newDoc;
 }
 
-#if wxUSE_GLCANVAS
 
+#if wxUSE_GLCANVAS
 Graph3dFileDocument*
 CTSimApp::newGraph3dDoc()
 {