X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctsim.cpp;h=6f6d6b1632e0194143e056a90f7844e4e97628b2;hb=ab78de6e33fff94c37847621458db3ad430a8bb3;hp=d8b073725c9ccf1f2fae66a7ede2901ff4cfb22e;hpb=dc5eb7b285e647a99535740a99d73d468a856ba3;p=ctsim.git diff --git a/src/ctsim.cpp b/src/ctsim.cpp index d8b0737..6f6d6b1 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.119 2002/06/27 03:19:23 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 @@ -46,7 +46,6 @@ #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h! #endif - #include "ct.h" #include "ctndicom.h" #include "ctsim.h" @@ -70,7 +69,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.119 2002/06/27 03:19:23 kevin Exp $"; struct option CTSimApp::ctsimOptions[] = { @@ -118,10 +117,10 @@ CTSimApp::OnInit() switch (c) { case O_VERSION: std::cout << rcsindent << std::endl; -#ifdef CTSIMVERSION - std::cout << "Version: CTSIMVERSION" << std::endl; -#elif defined(VERSION) - std::cout << "Version: VERSION" << std::endl; +#ifdef VERSION + std::cout << "Version: " << VERSION << std::endl; +#elif defined(CTSIMVERSION) + std::cout << "Version: " << CTSIMVERSION << std::endl; #endif exit(0); case O_HELP: @@ -164,7 +163,7 @@ CTSimApp::OnInit() #ifdef CTSIM_MDI wxSize(nearest(xDisplay * .75), nearest(yDisplay * .75)), #else - wxSize(nearest(xDisplay * .25), nearest(yDisplay * .25)), + wxSize(nearest(xDisplay * .6), nearest(yDisplay * .4)), #endif wxDEFAULT_FRAME_STYLE); @@ -186,7 +185,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 @@ -196,14 +195,21 @@ CTSimApp::OnInit() wxString helpDir; if (! m_pConfig->Read("HelpDir", &helpDir)) - helpDir = ::wxGetCwd(); + helpDir = ::wxGetCwd(); #ifdef CTSIM_WINHELP 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")) - *m_pLog << "Cannot initialize the HTML Help system" << "\n"; +#else +#ifdef DATADIR + wxString docDir (DATADIR); +#else + wxString docDir (::wxGetCwd()); +#endif + wxString docFile = docDir + "ctsim.htb"; + if (! m_pFrame->getHtmlHelpController().AddBook(docFile) && + ! m_pFrame->getHtmlHelpController().AddBook("/usr/share/ctsim/ctsim.htb") && + ! m_pFrame->getHtmlHelpController().AddBook("/tmp/ctsim.htb")) + *m_pLog << "Cannot initialize the HTML Help system" << "\n"; else { if (::wxDirExists ("/tmp")) m_pFrame->getHtmlHelpController().SetTempDir(_T("/tmp")); @@ -624,12 +630,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 +644,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 +676,7 @@ MainFrame::OnHelpButton (wxCommandEvent& event) void MainFrame::OnHelpSecondary (wxCommandEvent& event) { - m_htmlHelp.DisplayContents(); + m_htmlHelp.Display ("Contents"); } #endif @@ -696,11 +689,10 @@ MainFrame::showHelp (int commandID) #ifdef CTSIM_WINHELP m_winHelp.DisplayContents (); #else - m_htmlHelp.DisplayContents (); + m_htmlHelp.Display ("Contents"); #endif break; - - + default: #ifdef CTSIM_WINHELP m_winHelp.DisplaySection (commandID); @@ -993,15 +985,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 +1004,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"); } @@ -1028,21 +1019,22 @@ MainFrame::OnImport (wxCommandEvent& WXUNUSED(event) ) void MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) { - long lFreeMem = ::wxGetFreeMemory() / (1024L * 1024L); wxString strOSDesc = ::wxGetOsDescription(); *theApp->getLog() << "Operating System: " << strOSDesc; - if (lFreeMem > 0) - *theApp->getLog() << ", Free Memory: " << lFreeMem << " MB"; *theApp->getLog() << ", wxWindows: " << wxVERSION_STRING; #ifdef __TIMESTAMP__ *theApp->getLog() << ", Build Date: " << __TIMESTAMP__; #endif #if defined(DEBUG) - *theApp->getLog() << ", CTSim Debug version"; + *theApp->getLog() << ", Debug version"; #else - *theApp->getLog() << ", CTSim Release version"; + *theApp->getLog() << ", Release version"; +#endif +#ifdef VERSION + *theApp->getLog() << " " << VERSION; +#elif defined(CTSIMVERSION) + *theApp->getLog() << " " << CTSIMVERSION; #endif - *theApp->getLog() << "\n"; wxBitmap bmp (splash); @@ -1051,12 +1043,10 @@ MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) dlg.ShowModal(); } else { wxString msg = "CTSim\nThe Open Source Computed Tomography Simulator\n"; -#ifdef CTSIMVERSION - msg += "Version "; - msg += CTSIMVERSION; - msg += "\n\n"; -#elif defined(VERSION) +#ifdef VERSION msg << "Version: " << VERSION << "\n\n"; +#elif defined(CTSIMVERSION) + msg << "Version: " << CTSIMVERSION << "\n\n"; #endif msg += "Author: Kevin Rosenberg \nUsage: ctsim [files-to-open..] [--help]"; @@ -1065,27 +1055,19 @@ MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) } } + +// Create new documents ProjectionFileDocument* CTSimApp::newProjectionDoc() { ProjectionFileDocument* newDoc = dynamic_cast(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 +1080,7 @@ CTSimApp::newImageDoc() newDoc->SetDocumentTemplate (m_pDocTemplImage); newDoc->OnNewDocument(); } - + return newDoc; } @@ -1146,8 +1128,8 @@ CTSimApp::newPhantomDoc() return newDoc; } -#if wxUSE_GLCANVAS +#if wxUSE_GLCANVAS Graph3dFileDocument* CTSimApp::newGraph3dDoc() {