r1883: *** empty log message ***

[ctsim.git] / src / ctsim.cpp

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 9248247d03640f0fdb77c4179d28beda2c97ffaa..7f5193b520dfb931e643a4832a3895a21d24b9b9 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.101 2001/03/30 19:17:32 kevin Exp $
+**  $Id: ctsim.cpp,v 1.107 2002/05/03 09:57:41 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.101 2001/03/30 19:17:32 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.107 2002/05/03 09:57:41 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -159,8 +159,14 @@ CTSimApp::OnInit()
   // Create the main frame window
   int xDisplay, yDisplay;
   ::wxDisplaySize (&xDisplay, &yDisplay);
+
   m_pFrame = new MainFrame(m_docManager, (wxFrame *) NULL, -1, "CTSim", wxPoint(0, 0), 
-    wxSize(nearest<int>(xDisplay * .75), nearest<int>(yDisplay * .755)), wxDEFAULT_FRAME_STYLE);
+#ifdef CTSIM_MDI
+    wxSize(nearest<int>(xDisplay * .75), nearest<int>(yDisplay * .75)), 
+#else
+    wxSize(nearest<int>(xDisplay * .25), nearest<int>(yDisplay * .25)), 
+#endif
+    wxDEFAULT_FRAME_STYLE);
   
   setIconForFrame (m_pFrame);
   m_pFrame->Centre(wxBOTH);
@@ -180,7 +186,7 @@ CTSimApp::OnInit()
     int xSize, ySize;
     m_pFrame->GetClientSize(&xSize, &ySize);
     int yLogSize = ySize / 4;
-    m_pLogDoc->getView()->getFrame()->SetSize (0, ySize - yLogSize, xSize, yLogSize);
+    m_pLogDoc->getView()->getFrame()->SetClientSize (0, ySize - yLogSize, xSize, yLogSize);
     m_pLogDoc->getView()->getFrame()->Show (true);
   } else
 #else
@@ -195,8 +201,8 @@ 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"))
+  if (! m_pFrame->getHtmlHelpController().Initialize("/usr/share/ctsim/ctsim") &&
+    ! m_pFrame->getHtmlHelpController().Initialize("/usr/local/share/ctsim/ctsim"))
     *m_pLog << "Cannot initialize the HTML Help system" << "\n";
   else {
     if (::wxDirExists ("/tmp"))
@@ -518,8 +524,8 @@ MainFrame::OnSize (wxSizeEvent& event)
     int xSize, ySize;  
     GetClientSize(&xSize, &ySize);
     int yLogSize = ySize / 4;
-                 theApp->getLogDoc()->getView()->getFrame()->SetSize (0, ySize - yLogSize, xSize, yLogSize);
-      theApp->getLogDoc()->getView()->getFrame()->Show (true);
+    theApp->getLogDoc()->getView()->getFrame()->SetSize (0, ySize - yLogSize, xSize, yLogSize);
+    theApp->getLogDoc()->getView()->getFrame()->Show (true);
   }
 #endif
   
@@ -618,15 +624,8 @@ 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);
-
 }
 
 void
@@ -639,13 +638,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);
 }
@@ -740,15 +732,6 @@ MainFrame::OnUpdateUI (wxUpdateUIEvent& rEvent)
 #endif 
 }
 
-#ifdef CTSIM_CUSTOM_MRU
-void 
-MainFrame::OnMRUFile (wxCommandEvent& event)
-{
-  wxString fileName (theApp->getDocManager()->GetHistoryFile(event.GetId() - wxID_FILE1));
-  if (fileName != "")
-    theApp->getDocManager()->CreateDocument(fileName, wxDOC_SILENT);
-}
-#endif
 
 void 
 MainFrame::DoWindowMenu (int iMenuPosition, wxCommandEvent& event)
@@ -1076,13 +1059,6 @@ CTSimApp::newProjectionDoc()
   ProjectionFileDocument* newDoc = dynamic_cast<ProjectionFileDocument*>(m_pDocTemplProjection->CreateDocument (""));
   if (newDoc) {
     ProjectionFileView* pView = newDoc->getView();
-    if (pView) {
-      wxFrame* pFrame = pView->getFrame();
-      if (pFrame) {
-        pFrame->SetSize (0,0);
-        pFrame->Show (false);
-      }
-    }
     newDoc->SetDocumentName (m_pDocTemplProjection->GetDocumentName());
     newDoc->SetDocumentTemplate (m_pDocTemplProjection);
     newDoc->OnNewDocument();
@@ -1096,14 +1072,6 @@ CTSimApp::newImageDoc()
 {
   ImageFileDocument* newDoc = dynamic_cast<ImageFileDocument*>(m_pDocTemplImage->CreateDocument (""));
   if (newDoc) {
-    ImageFileView* pView = newDoc->getView();
-    if (pView) {
-      wxFrame* pFrame = pView->getFrame();
-      if (pFrame) {
-        pFrame->SetSize (0,0);
-        pFrame->Show (false);
-      }
-    }
     newDoc->SetDocumentName (m_pDocTemplImage->GetDocumentName());
     newDoc->SetDocumentTemplate (m_pDocTemplImage);
     newDoc->OnNewDocument();
@@ -1117,16 +1085,6 @@ CTSimApp::newPlotDoc()
 {
   PlotFileDocument* newDoc = dynamic_cast<PlotFileDocument*>(m_pDocTemplPlot->CreateDocument (""));
   if (newDoc) {
-    PlotFileView* pView = newDoc->getView();
-    if (pView) {
-      wxFrame* pFrame = pView->getFrame();
-      if (pFrame) {
-        wxSize size;
-        m_pFrame->GetClientSize (&size.x, &size.y);
-        pFrame->SetSize (size.x / 2, size.y / 2);
-        pFrame->Show (false);
-      }
-    }
     newDoc->SetDocumentName (m_pDocTemplPlot->GetDocumentName());
     newDoc->SetDocumentTemplate (m_pDocTemplPlot);
     newDoc->OnNewDocument();
@@ -1144,16 +1102,6 @@ CTSimApp::newTextDoc()
   
   TextFileDocument* newDoc = dynamic_cast<TextFileDocument*>(m_pDocTemplText->CreateDocument (""));
   if (newDoc) {
-    TextFileView* pView = newDoc->getView();
-    if (pView) {
-      wxFrame* pFrame = pView->getFrame();
-      if (pFrame) {
-        wxSize size;
-        m_pFrame->GetClientSize (&size.x, &size.y);;
-        pFrame->SetSize (size.x / 2, size.y / 2);
-        pFrame->Show (false);
-      }
-    }
     newDoc->SetDocumentName (m_pDocTemplText->GetDocumentName());
     newDoc->SetDocumentTemplate (m_pDocTemplText);
     newDoc->OnNewDocument();
@@ -1168,12 +1116,6 @@ CTSimApp::newPhantomDoc()
 {
   PhantomFileDocument* newDoc = dynamic_cast<PhantomFileDocument*>(m_pDocTemplPhantom->CreateDocument (""));
   if (newDoc) {
-    PhantomFileView* pView = newDoc->getView();
-    if (pView) {
-      wxFrame* pFrame = pView->getFrame();
-      if (pFrame)
-        pFrame->SetSize (0,0);
-    }
     newDoc->SetDocumentName (m_pDocTemplPhantom->GetDocumentName());
     newDoc->SetDocumentTemplate (m_pDocTemplPhantom);
     newDoc->OnNewDocument();
@@ -1189,12 +1131,6 @@ CTSimApp::newGraph3dDoc()
 {
   Graph3dFileDocument* newDoc = dynamic_cast<Graph3dFileDocument*>(m_pDocTemplGraph3d->CreateDocument (""));
   if (newDoc) {
-    Graph3dFileView* pView = newDoc->getView();
-    if (pView) {
-      wxFrame* pFrame = pView->getFrame();
-      if (pFrame)
-        pFrame->SetSize (0,0);
-    }
     newDoc->SetDocumentName (m_pDocTemplGraph3d->GetDocumentName());
     newDoc->SetDocumentTemplate (m_pDocTemplGraph3d);
     newDoc->OnNewDocument();