X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctsim.cpp;h=fb1a5e59f34b0bb2cf285450d504f252b906382d;hb=1a050c98763fbbc0662731b0b76953acede6f5d7;hp=9d7e87052cd0b9ab9fc7adb10525ee52f7eaff22;hpb=3ea498d51ce4597e9649cd21f155b51175ea0bea;p=ctsim.git diff --git a/src/ctsim.cpp b/src/ctsim.cpp index 9d7e870..fb1a5e5 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.99 2001/03/21 21:45:31 kevin Exp $ +** $Id$ ** ** 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,9 +69,9 @@ #endif #endif -static const char* rcsindent = "$Id: ctsim.cpp,v 1.99 2001/03/21 21:45:31 kevin Exp $"; +static const char* rcsindent = "$Id$"; -struct option CTSimApp::ctsimOptions[] = +struct option CTSimApp::ctsimOptions[] = { {"help", 0, 0, O_HELP}, {"version", 0, 0, O_VERSION}, @@ -104,24 +103,28 @@ CTSimApp::OnInit() #ifdef HAVE_SETPRIORITY setpriority (PRIO_PROCESS, 0, 15); // set to low scheduling priority #endif - + openConfig(); - + g_bRunningWXWindows = true; bool bPrintFiles = false; // process options while (1) { +#ifdef __WXMAC__ + int c = -1; +#else int c = getopt_long (argc, argv, "", ctsimOptions, NULL); +#endif if (c == -1) break; - + 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: @@ -136,9 +139,9 @@ CTSimApp::OnInit() exit (1); } } - + m_docManager = new wxDocManager (wxDEFAULT_DOCMAN_FLAGS, true); - + m_pDocTemplImage = new wxDocTemplate (m_docManager, "ImageFile", "*.if", "", "if", "ImageFile", "ImageView", CLASSINFO(ImageFileDocument), CLASSINFO(ImageFileView)); m_pDocTemplProjection = new wxDocTemplate (m_docManager, "ProjectionFile", "*.pj", "", "pj", "ProjectionFile", "ProjectionView", CLASSINFO(ProjectionFileDocument), CLASSINFO(ProjectionFileView)); m_pDocTemplPhantom = new wxDocTemplate (m_docManager, "PhantomFile", "*.phm", "", "phm", "PhantomFile", "PhantomView", CLASSINFO(PhantomFileDocument), CLASSINFO(PhantomFileView)); @@ -147,29 +150,35 @@ CTSimApp::OnInit() #if wxUSE_GLCANVAS m_pDocTemplGraph3d = new wxDocTemplate (m_docManager, "Graph3dFile", "*.g3d", "", "g3d", "Graph3dFile", "Graph3dView", CLASSINFO(Graph3dFileDocument), CLASSINFO(Graph3dFileView), wxTEMPLATE_INVISIBLE); #endif - + #if wxUSE_GIF wxImage::AddHandler(new wxGIFHandler); // Required for images in the online documentation #endif - + #if wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB wxFileSystem::AddHandler(new wxZipFSHandler); // Required for advanced HTML help #endif - + // 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(xDisplay * .75), nearest(yDisplay * .755)), wxDEFAULT_FRAME_STYLE); - + + m_pFrame = new MainFrame(m_docManager, (wxFrame *) NULL, -1, "CTSim", wxPoint(0, 0), +#ifdef CTSIM_MDI + wxSize(nearest(xDisplay * .75), nearest(yDisplay * .75)), +#else + wxSize(nearest(xDisplay * .6), nearest(yDisplay * .4)), +#endif + wxDEFAULT_FRAME_STYLE); + setIconForFrame (m_pFrame); m_pFrame->Centre(wxBOTH); - m_pFrame->Show(true); + m_pFrame->Show(true); SetTopWindow (m_pFrame); - + if (m_pConfig) m_docManager->FileHistoryLoad(*m_pConfig); - + #ifdef CTSIM_MDI m_pLogDoc = newTextDoc(); if (m_pLogDoc) { @@ -187,7 +196,7 @@ CTSimApp::OnInit() m_pLog = new wxTextCtrl (m_pFrame, -1, "Log Window\n", wxPoint(0, 0), wxSize(0,0), wxTE_MULTILINE | wxTE_READONLY); #endif wxLog::SetActiveTarget (new wxLogTextCtrl(m_pLog)); - + wxString helpDir; if (! m_pConfig->Read("HelpDir", &helpDir)) helpDir = ::wxGetCwd(); @@ -195,16 +204,23 @@ 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")) - *m_pLog << "Cannot initialize the HTML Help system" << "\n"; +#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")); m_pFrame->getHtmlHelpController().UseConfig (m_pConfig); } #endif - + for (int i = optind + 1; i <= argc; i++) { wxString filename = argv [i - 1]; wxDocument* pNewDoc = m_docManager->CreateDocument (filename, wxDOC_SILENT); @@ -226,10 +242,10 @@ CTSimApp::OnInit() closeEvent.SetInt (MAINMENU_FILE_EXIT); m_pFrame->AddPendingEvent(closeEvent); } - + if (getStartupTips()) ShowTips(); - + #ifdef HAVE_WXTHREADS m_pBackgroundMgr = new BackgroundManager; #endif @@ -251,7 +267,7 @@ void CTSimApp::setIconForFrame(wxFrame* pFrame) { wxIcon iconApp (ctsim16_xpm); - + if (iconApp.Ok()) pFrame->SetIcon (iconApp); } @@ -270,7 +286,7 @@ int CTSimApp::OnExit() { closeConfig(); - + #ifdef HAVE_DMALLOC dmalloc_shutdown(); #endif @@ -285,7 +301,7 @@ CTSimApp::openConfig() #else m_pConfig = new wxConfig("ctsim", "Kevin Rosenberg", ".ctsim", "", wxCONFIG_USE_LOCAL_FILE); #endif - + wxConfigBase::Set(m_pConfig); m_pConfig->Read ("AdvancedOptions", &m_bAdvancedOptions); m_pConfig->Read ("SetModifyNewDocs", &m_bSetModifyNewDocs); @@ -325,10 +341,10 @@ wxString CTSimApp::getUntitledFilename() { static int untitledNumber = 1; - + wxString filename ("Untitled"); filename << untitledNumber++; - + return (filename); } @@ -409,28 +425,28 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const #endif { m_bShuttingDown = false; - + //// Make a menubar wxMenu *file_menu = new wxMenu; - + file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...\tCtrl-P"); file_menu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...\tCtrl-F"); file_menu->Append(wxID_OPEN, "&Open...\tCtrl-O"); - + file_menu->AppendSeparator(); file_menu->Append (MAINMENU_IMPORT, "&Import...\tCtrl-M"); file_menu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces..."); file_menu->Append(MAINMENU_FILE_EXIT, "E&xit"); - + // history of files visited theApp->getDocManager()->FileHistoryAddFilesToMenu(file_menu); theApp->getDocManager()->FileHistoryUseMenu(file_menu); - + #ifndef CTSIM_MDI m_pWindowMenu = new wxMenu; m_pWindowMenu->UpdateUI (this); #endif - + wxMenu* help_menu = new wxMenu; help_menu->Append (MAINMENU_HELP_CONTENTS, "&Contents\tF1"); help_menu->Append (MAINMENU_HELP_TIPS, "&Tips"); @@ -439,18 +455,18 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const help_menu->Append (MAINMENU_HELP_SECONDARY, "&Secondary Help"); #endif help_menu->Append (MAINMENU_HELP_ABOUT, "&About"); - + wxMenuBar* menu_bar = new wxMenuBar; - + menu_bar->Append(file_menu, "&File"); #ifndef CTSIM_MDI menu_bar->Append(m_pWindowMenu, "&Window"); #endif menu_bar->Append(help_menu, "&Help"); - + SetMenuBar(menu_bar); - - + + #ifndef CTSIM_MDI int i; for (i = 0; i < MAX_WINDOW_MENUITEMS; i++) { @@ -459,7 +475,7 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const m_pWindowMenu->Enable (MAINMENU_WINDOW_BASE+i, false); } #endif - + m_iDefaultPhantomID = Phantom::PHM_HERMAN; m_iDefaultFilterID = SignalFilter::FILTER_BANDLIMIT; m_iDefaultFilterDomainID = SignalFilter::DOMAIN_FREQUENCY; @@ -470,7 +486,7 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const m_dDefaultFilterInputScale = 1.; m_dDefaultFilterOutputScale = 1.; m_iDefaultImportFormat = ImageFile::IMPORT_FORMAT_PNG; - + wxAcceleratorEntry accelEntries[15]; accelEntries[0].Set (wxACCEL_CTRL, static_cast('O'), wxID_OPEN); accelEntries[1].Set (wxACCEL_CTRL, static_cast('P'), MAINMENU_FILE_CREATE_PHANTOM); @@ -484,7 +500,7 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const #else wxAcceleratorTable accelTable (5, accelEntries); #endif - + SetAcceleratorTable (accelTable); } @@ -506,8 +522,8 @@ MainFrame::~MainFrame() if (theApp->getConfig()) theApp->getDocManager()->FileHistorySave (*theApp->getConfig()); ::wxYield(); - delete theApp->getDocManager(); - + delete theApp->getDocManager(); + } void @@ -515,14 +531,14 @@ MainFrame::OnSize (wxSizeEvent& event) { #ifdef CTSIM_MDI if (theApp->getLogDoc()) { - int xSize, ySize; + 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 - + #if CTSIM_MDI wxDocMDIParentFrame::OnSize (event); #else @@ -530,7 +546,7 @@ MainFrame::OnSize (wxSizeEvent& event) #endif } -void +void MainFrame::OnCreatePhantom(wxCommandEvent& event) { DialogGetPhantom dialogPhantom (this, m_iDefaultPhantomID); @@ -543,10 +559,10 @@ MainFrame::OnCreatePhantom(wxCommandEvent& event) m_iDefaultPhantomID = Phantom::convertNameToPhantomID (selection.c_str()); theApp->getDocManager()->CreateDocument (filename, wxDOC_SILENT); } - + } -void +void MainFrame::OnCreateFilter (wxCommandEvent& WXUNUSED(event)) { DialogGetFilterParameters dialogFilter (this, m_iDefaultFilterXSize, m_iDefaultFilterYSize, m_iDefaultFilterID, m_dDefaultFilterParam, m_dDefaultFilterBandwidth, m_iDefaultFilterDomainID, m_dDefaultFilterInputScale, m_dDefaultFilterOutputScale); @@ -563,9 +579,9 @@ MainFrame::OnCreateFilter (wxCommandEvent& WXUNUSED(event)) m_dDefaultFilterInputScale = dialogFilter.getInputScale(); m_dDefaultFilterOutputScale = dialogFilter.getOutputScale(); std::ostringstream os; - os << "Generate Filter=" << strFilter.c_str() - << ", size=(" << static_cast(m_iDefaultFilterXSize) << "," << static_cast(m_iDefaultFilterYSize) - << "), domain=" << strDomain.c_str() << ", filterParam=" << m_dDefaultFilterParam << ", bandwidth=" << m_dDefaultFilterBandwidth + os << "Generate Filter=" << strFilter.c_str() + << ", size=(" << static_cast(m_iDefaultFilterXSize) << "," << static_cast(m_iDefaultFilterYSize) + << "), domain=" << strDomain.c_str() << ", filterParam=" << m_dDefaultFilterParam << ", bandwidth=" << m_dDefaultFilterBandwidth << ", inputScale=" << m_dDefaultFilterInputScale << ", outputScale=" << m_dDefaultFilterOutputScale; *theApp->getLog() << os.str().c_str() << "\n"; wxString filename = "untitled.if"; @@ -616,17 +632,10 @@ MainFrame::OnNewImageFile (wxCommandEvent& event) if (! pImageDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); return; - } - pImageDoc->setImageFile (pImageFile); - pImageDoc->UpdateAllViews (NULL); - if (ImageFileView* imageView = pImageDoc->getView()) { - imageView->OnUpdate (imageView, NULL); - imageView->getFrame()->SetFocus(); - imageView->getFrame()->Show(true); } + pImageDoc->setImageFile (pImageFile); if (theApp->getAskDeleteNewDocs()) pImageDoc->Modify (true); - } void @@ -637,15 +646,8 @@ MainFrame::OnNewProjectionFile (wxCommandEvent& event) if (! pProjDoc) { sys_error (ERR_SEVERE, "Unable to create projection file"); return; - } - pProjDoc->setProjections (pProjections); - pProjDoc->UpdateAllViews (NULL); - if (ProjectionFileView* projView = pProjDoc->getView()) { - projView->OnUpdate (projView, NULL); - projView->getFrame()->SetFocus(); - projView->getFrame()->Show(true); } - + pProjDoc->setProjections (pProjections); if (theApp->getAskDeleteNewDocs()) pProjDoc->Modify (true); } @@ -662,13 +664,13 @@ MainFrame::OnHelpTips (wxCommandEvent& event) theApp->ShowTips(); } -void +void MainFrame::OnHelpContents (wxCommandEvent& event) { showHelp (event.GetId()); } -void +void MainFrame::OnHelpButton (wxCommandEvent& event) { showHelp (event.GetId()); @@ -678,7 +680,7 @@ MainFrame::OnHelpButton (wxCommandEvent& event) void MainFrame::OnHelpSecondary (wxCommandEvent& event) { - m_htmlHelp.DisplayContents(); + m_htmlHelp.Display ("Contents"); } #endif @@ -686,16 +688,15 @@ void MainFrame::showHelp (int commandID) { switch (commandID) { - + case MAINMENU_HELP_CONTENTS: #ifdef CTSIM_WINHELP m_winHelp.DisplayContents (); #else - m_htmlHelp.DisplayContents (); + m_htmlHelp.Display ("Contents"); #endif break; - - + default: #ifdef CTSIM_WINHELP m_winHelp.DisplaySection (commandID); @@ -706,7 +707,7 @@ MainFrame::showHelp (int commandID) } } -void +void MainFrame::OnExit (wxCommandEvent& WXUNUSED(event) ) { Close(true); @@ -737,29 +738,20 @@ MainFrame::OnUpdateUI (wxUpdateUIEvent& rEvent) static_cast(m_apWindowMenuItems[i])->SetName (wxString("[EMPTY]")); m_apWindowMenuData[i] = NULL; } -#endif +#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 +void MainFrame::DoWindowMenu (int iMenuPosition, wxCommandEvent& event) { if (wxDocument* pDoc = m_apWindowMenuData [iMenuPosition]) { wxString strFilename = pDoc->GetFilename(); const wxView* pView = pDoc->GetFirstView(); if (pView) { - wxFrame* pFrame = pView->GetFrame(); - pFrame->SetFocus(); - pFrame->Raise(); + wxWindow* pWindow = pView->GetFrame(); + pWindow->SetFocus(); + pWindow->Raise(); } } } @@ -827,11 +819,11 @@ void MainFrame::OnWindowMenu19 (wxCommandEvent& event) class BitmapControl : public wxPanel { -private: +private: DECLARE_DYNAMIC_CLASS (BitmapControl) DECLARE_EVENT_TABLE () wxBitmap* m_pBitmap; - + public: BitmapControl (wxBitmap* pBitmap, wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, @@ -839,15 +831,15 @@ public: long style = wxSTATIC_BORDER, const wxValidator& validator = wxDefaultValidator, const wxString& name = "BitmapCtrl"); - - + + virtual ~BitmapControl(); - + virtual wxSize GetBestSize() const; - - wxBitmap* getBitmap() + + wxBitmap* getBitmap() { return m_pBitmap; } - + void OnPaint(wxPaintEvent& event); }; @@ -859,12 +851,12 @@ END_EVENT_TABLE() IMPLEMENT_CLASS(BitmapControl, wxPanel) -BitmapControl::BitmapControl (wxBitmap* pBitmap, wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, +BitmapControl::BitmapControl (wxBitmap* pBitmap, wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name) : m_pBitmap(pBitmap) { Create(parent, id, pos, size, style, name); - + SetSize (GetBestSize()); } @@ -892,7 +884,7 @@ BitmapControl::OnPaint (wxPaintEvent& event) class BitmapDialog : public wxDialog { private: BitmapControl* m_pBitmapCtrl; - + public: BitmapDialog (wxBitmap* pBitmap, char const* pszTitle); virtual ~BitmapDialog(); @@ -902,15 +894,15 @@ BitmapDialog::BitmapDialog (wxBitmap* pBitmap, char const* pszTitle) : wxDialog(theApp->getMainFrame(), -1, wxString(pszTitle), wxDefaultPosition, wxDefaultSize, wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE) { wxBoxSizer* pTopSizer = new wxBoxSizer (wxVERTICAL); - + pTopSizer->Add (new BitmapControl (pBitmap, this), 0, wxALIGN_CENTER | wxALL, 5); - + wxBoxSizer* pButtonSizer = new wxBoxSizer (wxHORIZONTAL); wxButton* pButtonOk = new wxButton (this, wxID_OK, "Ok"); pButtonSizer->Add (pButtonOk, 0, wxEXPAND | wxALL, 10); - + pTopSizer->Add (pButtonSizer, 0, wxALIGN_CENTER); - + SetAutoLayout (true); SetSizer (pTopSizer); pTopSizer->Fit (this); @@ -921,11 +913,11 @@ BitmapDialog::~BitmapDialog() {} -void +void MainFrame::OnPreferences (wxCommandEvent& WXUNUSED(event) ) { - DialogPreferences dlg (this, "CTSim Preferences", theApp->getAdvancedOptions(), - theApp->getAskDeleteNewDocs(), theApp->getVerboseLogging(), theApp->getStartupTips(), + DialogPreferences dlg (this, "CTSim Preferences", theApp->getAdvancedOptions(), + theApp->getAskDeleteNewDocs(), theApp->getVerboseLogging(), theApp->getStartupTips(), theApp->getUseBackgroundTasks()); if (dlg.ShowModal() == wxID_OK) { theApp->setAdvancedOptions (dlg.getAdvancedOptions()); @@ -936,16 +928,16 @@ MainFrame::OnPreferences (wxCommandEvent& WXUNUSED(event) ) } } -void +void MainFrame::OnImport (wxCommandEvent& WXUNUSED(event) ) { DialogImportParameters dialogImport (this, m_iDefaultImportFormat); if (dialogImport.ShowModal() != wxID_OK) return; - + wxString strFormatName (dialogImport.getFormatName ()); m_iDefaultImportFormat = ImageFile::convertImportFormatNameToID (strFormatName.c_str()); - + wxString strExt; wxString strWildcard; if (m_iDefaultImportFormat == ImageFile::IMPORT_FORMAT_PPM) { @@ -967,8 +959,8 @@ MainFrame::OnImport (wxCommandEvent& WXUNUSED(event) ) else { return; } - - wxString strFilename = wxFileSelector (wxString("Import Filename"), wxString(""), + + wxString strFilename = wxFileSelector (wxString("Import Filename"), wxString(""), wxString(""), strExt, strWildcard, wxHIDE_READONLY | wxOPEN); if (! strFilename.IsEmpty()) { if (m_iDefaultImportFormat == ImageFile::IMPORT_FORMAT_PPM || m_iDefaultImportFormat == ImageFile::IMPORT_FORMAT_PNG) { @@ -987,7 +979,7 @@ MainFrame::OnImport (wxCommandEvent& WXUNUSED(event) ) pIFDoc->getView()->getFrame()->Show(true); } else delete pIF; - } + } #ifdef HAVE_CTN_DICOM else if (m_iDefaultImportFormat == ImageFile::IMPORT_FORMAT_DICOM) { DicomImporter dicomImport (strFilename.c_str()); @@ -997,15 +989,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(); @@ -1017,11 +1008,11 @@ 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"); - } + } #endif else sys_error (ERR_WARNING, "Unknown import format type"); @@ -1029,54 +1020,58 @@ MainFrame::OnImport (wxCommandEvent& WXUNUSED(event) ) } #include "./splash.xpm" -void +void MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) { - long lFreeMem = ::wxGetFreeMemory() / (1024L * 1024L); wxString strOSDesc = ::wxGetOsDescription(); - *theApp->getLog() << "Operation System: " << strOSDesc; - if (lFreeMem > 0) - *theApp->getLog() << ", Free Memory: " << lFreeMem << " MB"; + *theApp->getLog() << "Operating System: " << strOSDesc; + *theApp->getLog() << ", wxWindows: " << wxVERSION_STRING; +#ifdef __TIMESTAMP__ + *theApp->getLog() << ", Build Date: " << __TIMESTAMP__; +#endif +#if defined(DEBUG) + *theApp->getLog() << ", Debug version"; +#else + *theApp->getLog() << ", Release version"; +#endif +#ifdef VERSION + *theApp->getLog() << " " << VERSION; +#elif defined(CTSIMVERSION) + *theApp->getLog() << " " << CTSIMVERSION; +#endif *theApp->getLog() << "\n"; - + wxBitmap bmp (splash); if (bmp.Ok()) { BitmapDialog dlg (&bmp, "About CTSim"); 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]"; - + wxMessageBox(msg, "About CTSim", wxOK | wxICON_INFORMATION, this); + *theApp->getLog() << msg << "\n"; } } +// 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) { - pFrame->SetSize (0,0); - pFrame->Show (false); - } - } newDoc->SetDocumentName (m_pDocTemplProjection->GetDocumentName()); newDoc->SetDocumentTemplate (m_pDocTemplProjection); newDoc->OnNewDocument(); } - + return newDoc; } @@ -1085,19 +1080,11 @@ CTSimApp::newImageDoc() { ImageFileDocument* newDoc = dynamic_cast(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(); } - + return newDoc; } @@ -1106,21 +1093,11 @@ CTSimApp::newPlotDoc() { PlotFileDocument* newDoc = dynamic_cast(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(); } - + return newDoc; } @@ -1130,24 +1107,14 @@ CTSimApp::newTextDoc() { wxString strFilename (getUntitledFilename()); strFilename += ".txt"; - + TextFileDocument* newDoc = dynamic_cast(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(); } - + return newDoc; } @@ -1157,38 +1124,26 @@ CTSimApp::newPhantomDoc() { PhantomFileDocument* newDoc = dynamic_cast(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(); } - + return newDoc; } -#if wxUSE_GLCANVAS +#if wxUSE_GLCANVAS Graph3dFileDocument* CTSimApp::newGraph3dDoc() { Graph3dFileDocument* newDoc = dynamic_cast(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(); } - + return newDoc; } #endif