From a5d437cb4228b07f8c005eaca497c317b8c19d14 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sat, 20 Jan 2001 17:43:41 +0000 Subject: [PATCH] r428: no message --- ChangeLog | 3 + msvc/ctsim.dsw | 12 + msvc/ctsim/ctsim.plg | 8 +- src/ctsim.cpp | 86 +++--- src/ctsim.h | 48 ++-- src/dialogs.cpp | 24 +- src/dialogs.h | 24 +- src/docs.cpp | 46 +++- src/docs.h | 22 +- src/views.cpp | 639 ++++++++++++++++++++++++++++--------------- src/views.h | 105 +++++-- 11 files changed, 678 insertions(+), 339 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8e4e569..4e8a5bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 3.0.0beta1 - Released + * ctsim: Added most-recently-used files to File menu with + registry storage between executions. + * ctsim: Added MDI interface for Windows version * ctsim: Added graphical About box diff --git a/msvc/ctsim.dsw b/msvc/ctsim.dsw index 1913074..fad76a8 100644 --- a/msvc/ctsim.dsw +++ b/msvc/ctsim.dsw @@ -3,6 +3,18 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### +Project: "DocVwMDIVC"=..\..\wx2\samples\docvwmdi\DocVwMDIVC.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "FFTW2st"="..\..\fftw-2.1.3\Win32\FFTW2st\FFTW2st.dsp" - Package Owner=<4> Package=<5> diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg index 810db81..3cdd121 100644 --- a/msvc/ctsim/ctsim.plg +++ b/msvc/ctsim/ctsim.plg @@ -6,13 +6,13 @@ --------------------Configuration: ctsim - Win32 Debug--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP2D6.tmp" with contents +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP443.tmp" with contents [ /nologo /G6 /MTd /W3 /Gm /GR /GX /Zi /Od /I "\wx2\include" /I "." /I "..\..\include" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\zlib" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /D VERSION=\"2.5.0\" /D "_DEBUG" /D "__WXMSW__" /D "HAVE_SGP" /D "HAVE_PNG" /D "HAVE_WXWINDOWS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_FFTW" /D "HAVE_RFFTW" /D "HAVE_GETOPT_H" /D "MSVC" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D CTSIMVERSION=\"3.0.0alpha5\" /FR"Debug/" /Fp"Debug/ctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c "C:\ctsim\src\views.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP2D6.tmp" -Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP2D7.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP443.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP444.tmp" with contents [ comctl32.lib winmm.lib rpcrt4.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ../libctsim/Debug/libctsim.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\..\lpng108\msvc\win32\libpng\lib_dbg\libpng.lib ..\..\..\lpng108\msvc\win32\zlib\lib_dbg\zlib.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib ../../../wx2/lib/wxd.lib xpmd.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/ctsim.pdb" /debug /machine:I386 /out:"Debug/ctsim.exe" /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" /libpath:"..\..\..\wx2\lib" .\Debug\ctsim.obj @@ -28,7 +28,7 @@ comctl32.lib winmm.lib rpcrt4.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib w \wx2\lib\wxd.lib \wx2\lib\xpmd.lib ] -Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP2D7.tmp" +Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP444.tmp"

Output Window

Compiling... views.cpp diff --git a/src/ctsim.cpp b/src/ctsim.cpp index 906112d..ee7b4a8 100644 --- a/src/ctsim.cpp +++ b/src/ctsim.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ctsim.cpp,v 1.39 2001/01/20 08:10:33 kevin Exp $ +** $Id: ctsim.cpp,v 1.40 2001/01/20 17:43: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.39 2001/01/20 08:10:33 kevin Exp $"; +static const char* rcsindent = "$Id: ctsim.cpp,v 1.40 2001/01/20 17:43:41 kevin Exp $"; struct option CTSimApp::ctsimOptions[] = { @@ -82,7 +82,7 @@ struct option CTSimApp::ctsimOptions[] = IMPLEMENT_APP(CTSimApp) CTSimApp::CTSimApp() -: m_docManager(NULL), m_pFrame(NULL) +: m_docManager(NULL), m_pFrame(NULL), m_pLog(0) { theApp = this; } @@ -101,7 +101,10 @@ CTSimApp::OnInit() #ifdef HAVE_SETPRIORITY setpriority (PRIO_PROCESS, 0, 15); // set to low scheduling priority #endif - + + m_pConfig = new wxConfig("ctsim"); + wxConfigBase::Set(m_pConfig); + g_bRunningWXWindows = true; // process options while (1) { @@ -130,10 +133,11 @@ CTSimApp::OnInit() m_docManager = new wxDocManager (wxDEFAULT_DOCMAN_FLAGS, true); - new wxDocTemplate (m_docManager, "ImageFile", "*.if", "", "if", "ImageFile doc", "ImageFile View", CLASSINFO(ImageFileDocument), CLASSINFO(ImageFileView)); - new wxDocTemplate (m_docManager, "ProjectionFile", "*.pj", "", "pj", "ProjectionFile doc", "ProjectionFile View", CLASSINFO(ProjectionFileDocument), CLASSINFO(ProjectionFileView)); - new wxDocTemplate (m_docManager, "PhantomFile", "*.phm", "", "phm", "Phantom doc", "Phantom View", CLASSINFO(PhantomDocument), CLASSINFO(PhantomView)); - new wxDocTemplate (m_docManager, "PlotFile", "*.plt", "", "plt", "Plot doc", "Plot View", CLASSINFO(PlotFileDocument), CLASSINFO(PlotFileView)); + new wxDocTemplate (m_docManager, "ImageFile", "*.if", "", "if", "ImageFile", "ImageView", CLASSINFO(ImageFileDocument), CLASSINFO(ImageFileView)); + new wxDocTemplate (m_docManager, "ProjectionFile", "*.pj", "", "pj", "ProjectionFile", "ProjectionView", CLASSINFO(ProjectionFileDocument), CLASSINFO(ProjectionFileView)); + new wxDocTemplate (m_docManager, "PhantomFile", "*.phm", "", "phm", "PhantomFile", "PhantomView", CLASSINFO(PhantomDocument), CLASSINFO(PhantomView)); + new wxDocTemplate (m_docManager, "PlotFile", "*.plt", "", "plt", "PlotFile", "PlotView", CLASSINFO(PlotFileDocument), CLASSINFO(PlotFileView)); + new wxDocTemplate (m_docManager, "TextEdit", "*.txt", "", "txt", "TextFile", "TextView", CLASSINFO(TextEditDocument), CLASSINFO(TextEditView), wxTEMPLATE_INVISIBLE); #if wxUSE_GIF wxImage::AddHandler(new wxGIFHandler); // Required for images in the online documentation @@ -146,25 +150,36 @@ CTSimApp::OnInit() // Create the main frame window m_pFrame = new MainFrame(m_docManager, (wxFrame *) NULL, -1, "CTSim", wxPoint(0, 0), wxSize(500, 400), wxDEFAULT_FRAME_STYLE); - SetTopWindow (m_pFrame); + setIconForFrame (m_pFrame); m_pFrame->Centre(wxBOTH); - - m_pFrame->Show(true); - + m_pFrame->Show(true); + SetTopWindow (m_pFrame); + for (int i = optind + 1; i <= argc; i++) { wxString filename = argv [i - 1]; m_docManager->CreateDocument (filename, wxDOC_SILENT); } - setIconForFrame (m_pFrame); - + if (m_pConfig) + m_docManager->FileHistoryLoad(*m_pConfig); + #ifdef CTSIM_WINHELP if (! m_pFrame->getWinHelpController().Initialize("ctsim")) ::wxMessageBox ("Cannot initialize the help system", "Error"); #endif if (! m_pFrame->getHtmlHelpController().Initialize(::wxGetCwd() + "/ctsim")) ::wxMessageBox ("Cannot initialize the help system", "Error"); - + +#ifdef CTSIM_MDI + TextEditDocument* pLogDoc = dynamic_cast(m_docManager->CreateDocument("Log.txt", wxDOC_SILENT)); + if (pLogDoc) { + m_pLog = pLogDoc->getTextCtrl(); + } else +#else + 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)); + return true; } @@ -192,7 +207,6 @@ CTSimApp::usage(const char* program) int CTSimApp::OnExit() { - delete m_docManager; #ifdef HAVE_DMALLOC dmalloc_shutdown(); #endif @@ -262,22 +276,12 @@ END_EVENT_TABLE() #if CTSIM_MDI MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long type) -: wxMDIParentFrame(NULL, id, title, pos, size, type), m_pLog(NULL) +: wxDocMDIParentFrame(manager, NULL, id, title, pos, size, type, "MainFrame") #else MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long type) -: wxDocParentFrame(manager, frame, id, title, pos, size, type), m_pLog(NULL) +: wxDocParentFrame(manager, frame, id, title, pos, size, type, "MainFrame") #endif { -#if 0 -//#if CTSIM_MDI - m_pLog = new wxLogWindow (this, "Log"); - //std::cout = new ostream (m_pLog->GetTextCtrl()); - wxLog::SetActiveTarget(m_pLog); -#else - m_pLog = new wxTextCtrl (this, -1, "Log Window\n", wxPoint(0, 0), wxSize(0,0), wxTE_MULTILINE | wxTE_READONLY); - wxLog::SetActiveTarget (new wxLogTextCtrl(m_pLog)); -#endif - //// Make a menubar wxMenu *file_menu = new wxMenu; @@ -316,7 +320,7 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const #ifndef CTSIM_MDI for (int i = 0; i < MAX_WINDOW_MENUITEMS; i++) { - m_apWindowMenuItems[i] = new wxMenuItem (m_pWindowMenu, MAINMENU_WINDOW_BASE+i, wxString("")); + m_apWindowMenuItems[i] = new wxMenuItem (m_pWindowMenu, MAINMENU_WINDOW_BASE+i, wxString("[EMPTY]")); m_pWindowMenu->Append (m_apWindowMenuItems[i]); m_pWindowMenu->Enable (MAINMENU_WINDOW_BASE+i, false); } @@ -349,6 +353,13 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const SetAcceleratorTable (accelTable); } +MainFrame::~MainFrame() +{ + if (theApp->getConfig()) + theApp->getDocManager()->FileHistorySave (*theApp->getConfig()); + delete theApp->getDocManager(); +} + void MainFrame::OnSize (wxSizeEvent& event) { @@ -365,8 +376,12 @@ MainFrame::OnSize (wxSizeEvent& event) sizeClient.y -= sizeLog.y; // m_pLog->SetSize (0, sizeClient.y, sizeLog.x, sizeLog.y); // GetClientWindow()->SetSize (0, 0, sizeClient.x, sizeClient.y); -// GetClientWindow()->Refresh(); - wxMDIParentFrame::OnSize (event); +// GetClientWindow()->Refresh(); +#if CTSIM_MDI + wxDocMDIParentFrame::OnSize (event); +#else + wxDocParentFrame::OnSize (event); +#endif } void @@ -489,7 +504,7 @@ MainFrame::showHelp (int commandID) break; default: - *getLog() << "Unknown help command # " << commandID << "\n"; + *theApp->getLog() << "Unknown help command # " << commandID << "\n"; break; } } @@ -521,18 +536,21 @@ MainFrame::OnUpdateUI (wxUpdateUIEvent& rEvent) } for (int i = iPos; i < MAX_WINDOW_MENUITEMS; i++) { m_pWindowMenu->Enable (MAINMENU_WINDOW_BASE+i, false); - static_cast(m_apWindowMenuItems[i])->SetName (wxString("")); + static_cast(m_apWindowMenuItems[i])->SetName (wxString("[EMPTY]")); m_apWindowMenuData[i] = NULL; } } -void MainFrame::OnMRUFile(wxCommandEvent& event) +#ifdef CTSIM_CUSTOM_MRU +void +MainFrame::OnMRUFile (wxCommandEvent& event) { wxString fileName (theApp->getDocManager()->GetHistoryFile(event.GetSelection())); if (fileName != "") theApp->getDocManager()->CreateDocument(fileName, wxDOC_SILENT); } +#endif void MainFrame::DoWindowMenu (int iMenuPosition, wxCommandEvent& event) diff --git a/src/ctsim.h b/src/ctsim.h index 103f08a..a242109 100644 --- a/src/ctsim.h +++ b/src/ctsim.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ctsim.h,v 1.29 2001/01/20 08:10:33 kevin Exp $ +** $Id: ctsim.h,v 1.30 2001/01/20 17:43: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 @@ -35,9 +35,15 @@ #include #endif +#ifndef WX_PRECOMP +#include "wx/wx.h" +#endif +#include "wx/config.h" + #ifdef MSVC #define CTSIM_MDI 1 #endif +#define CTSIM_CUSTOM_MRU 1 #if defined(CTSIM_MDI) && !wxUSE_MDI_ARCHITECTURE #error You must set wxUSE_MDI_ARCHITECTURE to 1 in setup.h! @@ -53,10 +59,6 @@ class ImageFileDocument; #include -#ifndef WX_PRECOMP -#include "wx/wx.h" -#endif - #include "wx/docview.h" #include "wx/textctrl.h" #include "wx/menu.h" @@ -71,14 +73,13 @@ class ImageFileDocument; // Define a new frame for main window #if CTSIM_MDI -class MainFrame: public wxMDIParentFrame +class MainFrame: public wxDocMDIParentFrame #else class MainFrame: public wxDocParentFrame #endif { DECLARE_CLASS(MainFrame) private: - wxTextCtrl* m_pLog; wxMenu* m_pWindowMenu; enum { MAX_WINDOW_MENUITEMS = 20 }; @@ -102,9 +103,11 @@ private: public: MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long type); + ~MainFrame(); +#ifdef CTSIM_CUSTOM_MRU void OnMRUFile (wxCommandEvent& event); - +#endif void OnSize (wxSizeEvent& event); #if CTSIM_WINHELP @@ -130,9 +133,6 @@ public: void OnUpdateUI (wxUpdateUIEvent& event); - wxTextCtrl* getLog() - { return m_pLog; } - void OnWindowMenu0 (wxCommandEvent& event); void OnWindowMenu1 (wxCommandEvent& event); void OnWindowMenu2 (wxCommandEvent& event); @@ -163,6 +163,18 @@ public: class wxDocManager; class CTSimApp: public wxApp { +private: + wxDocManager* m_docManager; + MainFrame* m_pFrame; + wxConfig* m_pConfig; + + void usage (const char* program); + + static struct option ctsimOptions[]; + + enum { O_HELP, O_VERSION }; + wxTextCtrl* m_pLog; + public: CTSimApp(); bool OnInit(); @@ -171,7 +183,7 @@ public: { return m_pFrame; } wxTextCtrl* getLog() - { return m_pFrame->getLog(); } + { return m_pLog; } wxDocManager* getDocManager() { return m_docManager; } @@ -187,16 +199,8 @@ public: { return true; } void setIconForFrame (wxFrame* pFrame); - -private: - wxDocManager* m_docManager; - MainFrame* m_pFrame; - - void usage (const char* program); - - static struct option ctsimOptions[]; - - enum { O_HELP, O_VERSION }; + wxConfig* getConfig() + { return m_pConfig; } }; DECLARE_APP(CTSimApp) diff --git a/src/dialogs.cpp b/src/dialogs.cpp index b5b32a5..bfa3010 100644 --- a/src/dialogs.cpp +++ b/src/dialogs.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: dialogs.cpp,v 1.25 2001/01/04 21:28:41 kevin Exp $ +** $Id: dialogs.cpp,v 1.26 2001/01/20 17:43: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 @@ -95,7 +95,7 @@ StringValueAndTitleListBox::getSelectionStringValue () const // DialogGetPhantom /////////////////////////////////////////////////////////////////////// -DialogGetPhantom::DialogGetPhantom (wxFrame* pParent, int iDefaultPhantom) +DialogGetPhantom::DialogGetPhantom (wxWindow* pParent, int iDefaultPhantom) : wxDialog (pParent, -1, "Select Phantom", wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxCAPTION) { wxBoxSizer* pTopSizer = new wxBoxSizer (wxVERTICAL); @@ -136,7 +136,7 @@ DialogGetPhantom::getPhantom() // DialogGetComparisonImage /////////////////////////////////////////////////////////////////////// -DialogGetComparisonImage::DialogGetComparisonImage (wxFrame* pParent, const char* const pszTitle, const std::vector& rVecIF, bool bShowMakeDifference) +DialogGetComparisonImage::DialogGetComparisonImage (wxWindow* pParent, const char* const pszTitle, const std::vector& rVecIF, bool bShowMakeDifference) : wxDialog (pParent, -1, pszTitle, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxCAPTION), m_rVecIF(rVecIF) { wxBoxSizer* pTopSizer = new wxBoxSizer (wxVERTICAL); @@ -202,7 +202,7 @@ DialogGetComparisonImage::getMakeDifferenceImage() // CLASS DiaglogGetMinMax Implementation ///////////////////////////////////////////////////////////////////// -DialogGetMinMax::DialogGetMinMax (wxFrame* pParent, const char* const pszTitle, double dDefaultMin, double dDefaultMax) +DialogGetMinMax::DialogGetMinMax (wxWindow* pParent, const char* const pszTitle, double dDefaultMin, double dDefaultMax) : wxDialog (pParent, -1, pszTitle, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxCAPTION) { wxBoxSizer* pTopSizer = new wxBoxSizer (wxVERTICAL); @@ -272,7 +272,7 @@ DialogGetMinMax::getMaximum () // CLASS DialogAutoScaleParameters IMPLEMENTATION ///////////////////////////////////////////////////////////////////// -DialogAutoScaleParameters::DialogAutoScaleParameters (wxFrame *pParent, double mean, double mode, double median, double stddev, double dDefaultScaleFactor) +DialogAutoScaleParameters::DialogAutoScaleParameters (wxWindow *pParent, double mean, double mode, double median, double stddev, double dDefaultScaleFactor) : wxDialog (pParent, -1, "Auto Scale Parameters", wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxCAPTION), m_dMean(mean), m_dMode(mode), m_dMedian(median), m_dStdDev(stddev) { wxBoxSizer* pTopSizer = new wxBoxSizer (wxVERTICAL); @@ -357,7 +357,7 @@ DialogAutoScaleParameters::getAutoScaleFactor () // DialogGetRasterParameters ///////////////////////////////////////////////////////////////////// -DialogGetRasterParameters::DialogGetRasterParameters (wxFrame* pParent, int iDefaultXSize, int iDefaultYSize, int iDefaultNSamples) +DialogGetRasterParameters::DialogGetRasterParameters (wxWindow* pParent, int iDefaultXSize, int iDefaultYSize, int iDefaultNSamples) : wxDialog (pParent, -1, "Set Rasterization Parameters", wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxCAPTION) { wxBoxSizer* pTopSizer = new wxBoxSizer (wxVERTICAL); @@ -449,7 +449,7 @@ DialogGetRasterParameters::getNSamples () ///////////////////////////////////////////////////////////////////// -DialogGetProjectionParameters::DialogGetProjectionParameters (wxFrame* pParent, int iDefaultNDet, int iDefaultNView, int iDefaultNSamples, double dDefaultRotAngle, double dDefaultFocalLength, double dDefaultFieldOfView, int iDefaultGeometry, int iDefaultTrace) +DialogGetProjectionParameters::DialogGetProjectionParameters (wxWindow* pParent, int iDefaultNDet, int iDefaultNView, int iDefaultNSamples, double dDefaultRotAngle, double dDefaultFocalLength, double dDefaultFieldOfView, int iDefaultGeometry, int iDefaultTrace) : wxDialog (pParent, -1, "Set Projection Parameters", wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxCAPTION) { wxBoxSizer* pTopSizer = new wxBoxSizer (wxVERTICAL); @@ -622,7 +622,7 @@ DialogGetProjectionParameters::getTrace () ///////////////////////////////////////////////////////////////////// -DialogGetReconstructionParameters::DialogGetReconstructionParameters (wxFrame* pParent, int iDefaultXSize, int iDefaultYSize, int iDefaultFilterID, double dDefaultFilterParam, int iDefaultFilterMethodID, int iDefaultFilterGenerationID, int iDefaultZeropad, int iDefaultInterpID, int iDefaultInterpParam, int iDefaultBackprojectID, int iTrace) +DialogGetReconstructionParameters::DialogGetReconstructionParameters (wxWindow* pParent, int iDefaultXSize, int iDefaultYSize, int iDefaultFilterID, double dDefaultFilterParam, int iDefaultFilterMethodID, int iDefaultFilterGenerationID, int iDefaultZeropad, int iDefaultInterpID, int iDefaultInterpParam, int iDefaultBackprojectID, int iTrace) : wxDialog (pParent, -1, "Set Reconstruction Parameters", wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxCAPTION) { wxBoxSizer* pTopSizer = new wxBoxSizer (wxVERTICAL); @@ -822,7 +822,7 @@ DialogGetReconstructionParameters::getFilterGenerationName () -DialogGetFilterParameters::DialogGetFilterParameters (wxFrame* pParent, int iDefaultXSize, int iDefaultYSize, int iDefaultFilterID, double dDefaultFilterParam, double dDefaultBandwidth, int iDefaultDomainID, double dDefaultInputScale, double dDefaultOutputScale) +DialogGetFilterParameters::DialogGetFilterParameters (wxWindow* pParent, int iDefaultXSize, int iDefaultYSize, int iDefaultFilterID, double dDefaultFilterParam, double dDefaultBandwidth, int iDefaultDomainID, double dDefaultInputScale, double dDefaultOutputScale) : wxDialog (pParent, -1, "Set Filter Parameters", wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxCAPTION) { wxBoxSizer* pTopSizer = new wxBoxSizer (wxVERTICAL); @@ -982,7 +982,7 @@ DialogGetFilterParameters::getDomainName () // DialogExportParameters /////////////////////////////////////////////////////////////////////// -DialogExportParameters::DialogExportParameters (wxFrame* pParent, int iDefaultFormatID) +DialogExportParameters::DialogExportParameters (wxWindow* pParent, int iDefaultFormatID) : wxDialog (pParent, -1, "Select ExportParameters", wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxCAPTION) { wxBoxSizer* pTopSizer = new wxBoxSizer (wxVERTICAL); @@ -1022,7 +1022,7 @@ DialogExportParameters::getFormatName() // CLASS DiaglogGetXYSize Implementation ///////////////////////////////////////////////////////////////////// -DialogGetXYSize::DialogGetXYSize (wxFrame* pParent, const char* const pszTitle, int iDefaultXSize, int iDefaultYSize) +DialogGetXYSize::DialogGetXYSize (wxWindow* pParent, const char* const pszTitle, int iDefaultXSize, int iDefaultYSize) : wxDialog (pParent, -1, pszTitle, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxCAPTION) { m_iDefaultXSize = iDefaultXSize; @@ -1098,7 +1098,7 @@ DialogGetXYSize::getYSize () // DialogGetConvertPolarParameters ///////////////////////////////////////////////////////////////////// -DialogGetConvertPolarParameters::DialogGetConvertPolarParameters (wxFrame* pParent, const char* const pszTitle, +DialogGetConvertPolarParameters::DialogGetConvertPolarParameters (wxWindow* pParent, const char* const pszTitle, int iDefaultXSize, int iDefaultYSize, int iDefaultInterpolationID, int iDefaultZeropad) : wxDialog (pParent, -1, pszTitle, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxCAPTION) { diff --git a/src/dialogs.h b/src/dialogs.h index d16981c..2eae3dc 100644 --- a/src/dialogs.h +++ b/src/dialogs.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: dialogs.h,v 1.20 2001/01/04 21:28:41 kevin Exp $ +** $Id: dialogs.h,v 1.21 2001/01/20 17:43: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 @@ -59,7 +59,7 @@ class StringValueAndTitleListBox : public wxListBox class DialogGetPhantom : public wxDialog { public: - DialogGetPhantom (wxFrame* pParent, int iDefaultPhantom = Phantom::PHM_HERMAN); + DialogGetPhantom (wxWindow* pParent, int iDefaultPhantom = Phantom::PHM_HERMAN); virtual ~DialogGetPhantom () {} const char* getPhantom (); @@ -74,7 +74,7 @@ class ImageFileDocument; class DialogGetComparisonImage : public wxDialog { public: - DialogGetComparisonImage (wxFrame* pParent, const char* const pszTitle, const std::vector& rVecIF, bool bShowMakeDifference); + DialogGetComparisonImage (wxWindow* pParent, const char* const pszTitle, const std::vector& rVecIF, bool bShowMakeDifference); virtual ~DialogGetComparisonImage () {} ImageFileDocument* getImageFileDocument (); @@ -92,7 +92,7 @@ class ImageFile; class DialogGetMinMax : public wxDialog { public: - DialogGetMinMax (wxFrame* pParent, const char* const pszTitle, double dDefaultMin = 0., double dDefaultMax = 0.); + DialogGetMinMax (wxWindow* pParent, const char* const pszTitle, double dDefaultMin = 0., double dDefaultMax = 0.); virtual ~DialogGetMinMax (); double getMinimum (); @@ -110,7 +110,7 @@ class DialogGetMinMax : public wxDialog class DialogGetRasterParameters : public wxDialog { public: - DialogGetRasterParameters (wxFrame* pParent, int iDefaultXSize = 0, int iDefaultYSize = 0, int iDefaultNSamples = 1); + DialogGetRasterParameters (wxWindow* pParent, int iDefaultXSize = 0, int iDefaultYSize = 0, int iDefaultNSamples = 1); virtual ~DialogGetRasterParameters (); unsigned int getXSize (); @@ -131,7 +131,7 @@ class DialogGetRasterParameters : public wxDialog class DialogGetProjectionParameters : public wxDialog { public: - DialogGetProjectionParameters (wxFrame* pParent, int iDefaultNDet = 0, int iDefaultNView = 0, int iDefaultNSamples = 1, double dDefaultRotAngle = 1., double dDefaultFocalLength = 1, double dDefaultFieldOfView = 1., int iDefaultGeometry = Scanner::GEOMETRY_PARALLEL, int iDefaultTrace = Trace::TRACE_NONE); + DialogGetProjectionParameters (wxWindow* pParent, int iDefaultNDet = 0, int iDefaultNView = 0, int iDefaultNSamples = 1, double dDefaultRotAngle = 1., double dDefaultFocalLength = 1, double dDefaultFieldOfView = 1., int iDefaultGeometry = Scanner::GEOMETRY_PARALLEL, int iDefaultTrace = Trace::TRACE_NONE); ~DialogGetProjectionParameters (); unsigned int getNDet (); @@ -170,7 +170,7 @@ class DialogGetProjectionParameters : public wxDialog class DialogGetReconstructionParameters : public wxDialog { public: - DialogGetReconstructionParameters (wxFrame* pParent, int iDefaultXSize = 0, int iDefaultYSize = 0, int iDefaultFilterID = SignalFilter::FILTER_ABS_BANDLIMIT, double dDefaultFilterParam = 1., int iDefaultFilterMethodID = ProcessSignal::FILTER_METHOD_CONVOLUTION, int iDefaultFilterGeneration = ProcessSignal::FILTER_GENERATION_INVALID, int iDefaultZeropad = 3, int iDefaultInterpID = Backprojector::INTERP_LINEAR, int iDefaultInterpParam = 1, int iDefaultBackprojectID = Backprojector::BPROJ_IDIFF3, int iDefaultTrace = Trace::TRACE_NONE); + DialogGetReconstructionParameters (wxWindow* pParent, int iDefaultXSize = 0, int iDefaultYSize = 0, int iDefaultFilterID = SignalFilter::FILTER_ABS_BANDLIMIT, double dDefaultFilterParam = 1., int iDefaultFilterMethodID = ProcessSignal::FILTER_METHOD_CONVOLUTION, int iDefaultFilterGeneration = ProcessSignal::FILTER_GENERATION_INVALID, int iDefaultZeropad = 3, int iDefaultInterpID = Backprojector::INTERP_LINEAR, int iDefaultInterpParam = 1, int iDefaultBackprojectID = Backprojector::BPROJ_IDIFF3, int iDefaultTrace = Trace::TRACE_NONE); virtual ~DialogGetReconstructionParameters (); unsigned int getXSize(); @@ -211,7 +211,7 @@ class DialogGetReconstructionParameters : public wxDialog class DialogGetFilterParameters : public wxDialog { public: - DialogGetFilterParameters (wxFrame* pParent, int iDefaultXSize = 0, int iDefaultYSize = 0, int iDefaultFilterID = SignalFilter::FILTER_BANDLIMIT, double dDefaultFilterParam = 1., double dDefaultBandwidth = 1., int iDefaultDomain = SignalFilter::DOMAIN_SPATIAL, double dDefaultInputScale = 1., double dDefaultOutputScale = 1.); + DialogGetFilterParameters (wxWindow* pParent, int iDefaultXSize = 0, int iDefaultYSize = 0, int iDefaultFilterID = SignalFilter::FILTER_BANDLIMIT, double dDefaultFilterParam = 1., double dDefaultBandwidth = 1., int iDefaultDomain = SignalFilter::DOMAIN_SPATIAL, double dDefaultInputScale = 1., double dDefaultOutputScale = 1.); virtual ~DialogGetFilterParameters (); unsigned int getXSize(); @@ -246,7 +246,7 @@ class DialogGetFilterParameters : public wxDialog class DialogExportParameters : public wxDialog { public: - DialogExportParameters (wxFrame* pParent, int iDefaultFormatID); + DialogExportParameters (wxWindow* pParent, int iDefaultFormatID); virtual ~DialogExportParameters () {} const char* getFormatName(); @@ -258,7 +258,7 @@ class DialogExportParameters : public wxDialog class DialogAutoScaleParameters : public wxDialog { public: - DialogAutoScaleParameters (wxFrame* pParent, double mean, double mode, double median, double stddev, double dDefaultScaleFactor = 1.); + DialogAutoScaleParameters (wxWindow* pParent, double mean, double mode, double median, double stddev, double dDefaultScaleFactor = 1.); virtual ~DialogAutoScaleParameters() {} bool getMinMax (double* pMin, double* pMax); @@ -277,7 +277,7 @@ class DialogAutoScaleParameters : public wxDialog class DialogGetXYSize : public wxDialog { public: - DialogGetXYSize (wxFrame* pParent, const char* const pszTitle, int iDefaultXSize = 1, int iDefaultYSize = 1); + DialogGetXYSize (wxWindow* pParent, const char* const pszTitle, int iDefaultXSize = 1, int iDefaultYSize = 1); virtual ~DialogGetXYSize (); unsigned int getXSize (); @@ -295,7 +295,7 @@ class DialogGetXYSize : public wxDialog class DialogGetConvertPolarParameters : public wxDialog { public: - DialogGetConvertPolarParameters (wxFrame* pParent, const char* const pszTitle, int iDefaultXSize = 0, + DialogGetConvertPolarParameters (wxWindow* pParent, const char* const pszTitle, int iDefaultXSize = 0, int iDefaultYSize = 0, int iDefaultInterpolationID = Projections::POLAR_INTERP_BILINEAR, int iDefaultZeropad = 1); virtual ~DialogGetConvertPolarParameters (); diff --git a/src/docs.cpp b/src/docs.cpp index 4520551..8bdb8d0 100644 --- a/src/docs.cpp +++ b/src/docs.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: docs.cpp,v 1.13 2001/01/20 08:10:33 kevin Exp $ +** $Id: docs.cpp,v 1.14 2001/01/20 17:43: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 @@ -242,3 +242,47 @@ void PlotFileDocument::Modify(bool mod) wxDocument::Modify(mod); } + +////////////////////////////////////////////////////////////////////////// +// +// TextEditDocument +// +////////////////////////////////////////////////////////////////////////// + +IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument) + +// Since text windows have their own method for saving to/loading from files, +// we override OnSave/OpenDocument instead of Save/LoadObject +bool TextEditDocument::OnSaveDocument(const wxString& filename) +{ + TextEditView *view = dynamic_cast(GetFirstView()); + if (! view->getTextCtrl()->SaveFile(filename)) + return false; + Modify(false); + return true; +} + +bool TextEditDocument::OnOpenDocument(const wxString& filename) +{ + TextEditView *view = dynamic_cast(GetFirstView()); + + if (filename != "Log.txt" && ! view->getTextCtrl()->LoadFile(filename)) + return false; + + SetFilename (filename, true); + Modify (false); + UpdateAllViews(); + return true; +} + +bool TextEditDocument::IsModified(void) const +{ + return false; + + TextEditView *view = dynamic_cast(GetFirstView()); + if (view) + return (wxDocument::IsModified() || view->getTextCtrl()->IsModified()); + else + return wxDocument::IsModified(); +} + diff --git a/src/docs.h b/src/docs.h index d4c1ca2..06cddcc 100644 --- a/src/docs.h +++ b/src/docs.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: docs.h,v 1.12 2001/01/20 08:10:33 kevin Exp $ +** $Id: docs.h,v 1.13 2001/01/20 17:43: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 @@ -39,6 +39,7 @@ #include "projections.h" #include "plotfile.h" + class ImageFileDocument: public wxDocument { DECLARE_DYNAMIC_CLASS(ImageFileDocument) @@ -151,5 +152,24 @@ public: virtual void Modify (bool mod); }; +#include "views.h" + +class TextEditDocument: public wxDocument +{ + private: + DECLARE_DYNAMIC_CLASS(TextEditDocument) + + public: + TextEditDocument(void) {} + ~TextEditDocument(void) {} + + virtual bool OnSaveDocument(const wxString& filename); + virtual bool OnOpenDocument(const wxString& filename); + virtual bool IsModified(void) const; + + wxTextCtrl* getTextCtrl() + { return dynamic_cast(GetFirstView())->getTextCtrl(); } +}; + #endif diff --git a/src/views.cpp b/src/views.cpp index 0b8290d..167c76e 100644 --- a/src/views.cpp +++ b/src/views.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: views.cpp,v 1.68 2001/01/20 08:10:33 kevin Exp $ +** $Id: views.cpp,v 1.69 2001/01/20 17:43: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 @@ -76,6 +76,14 @@ ImageFileCanvas::ImageFileCanvas (ImageFileView* v, wxFrame *frame, const wxPoin m_yCursor = -1; } +ImageFileCanvas::~ImageFileCanvas() +{ + if (m_pView) { + wxMenu* pMenu = m_pView->getFileMenu(); + theApp->getDocManager()->FileHistoryRemoveMenu (pMenu); + } +} + void ImageFileCanvas::OnDraw(wxDC& dc) { @@ -222,7 +230,7 @@ EVT_MENU(IFMENU_PLOT_HISTOGRAM, ImageFileView::OnPlotHistogram) END_EVENT_TABLE() ImageFileView::ImageFileView(void) -: wxView(), m_canvas(NULL), m_frame(NULL), m_bMinSpecified(false), m_bMaxSpecified(false) +: wxView(), m_canvas(NULL), m_frame(NULL), m_bMinSpecified(false), m_bMaxSpecified(false), m_pFileMenu(0) { m_iDefaultExportFormatID = ImageFile::FORMAT_PNG; } @@ -449,10 +457,10 @@ ImageFileView::OnAdd (wxCommandEvent& event) ImageFileDocument* pRHSDoc = dialogGetCompare.getImageFileDocument(); const ImageFile& rRHSIF = pRHSDoc->getImageFile(); ImageFileDocument* pNewDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); - if (! pNewDoc) { - sys_error (ERR_SEVERE, "Unable to create image file"); - return; - } + if (! pNewDoc) { + sys_error (ERR_SEVERE, "Unable to create image file"); + return; + } ImageFile& newImage = pNewDoc->getImageFile(); newImage.setArraySize (rIF.nx(), rIF.ny()); rIF.addImages (rRHSIF, newImage); @@ -489,10 +497,10 @@ ImageFileView::OnSubtract (wxCommandEvent& event) ImageFileDocument* pRHSDoc = dialogGetCompare.getImageFileDocument(); const ImageFile& rRHSIF = pRHSDoc->getImageFile(); ImageFileDocument* pNewDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); - if (! pNewDoc) { - sys_error (ERR_SEVERE, "Unable to create image file"); - return; - } + if (! pNewDoc) { + sys_error (ERR_SEVERE, "Unable to create image file"); + return; + } ImageFile& newImage = pNewDoc->getImageFile(); newImage.setArraySize (rIF.nx(), rIF.ny()); rIF.subtractImages (rRHSIF, newImage); @@ -529,10 +537,10 @@ ImageFileView::OnMultiply (wxCommandEvent& event) ImageFileDocument* pRHSDoc = dialogGetCompare.getImageFileDocument(); const ImageFile& rRHSIF = pRHSDoc->getImageFile(); ImageFileDocument* pNewDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); - if (! pNewDoc) { - sys_error (ERR_SEVERE, "Unable to create image file"); - return; - } + if (! pNewDoc) { + sys_error (ERR_SEVERE, "Unable to create image file"); + return; + } ImageFile& newImage = pNewDoc->getImageFile(); newImage.setArraySize (rIF.nx(), rIF.ny()); rIF.multiplyImages (rRHSIF, newImage); @@ -569,10 +577,10 @@ ImageFileView::OnDivide (wxCommandEvent& event) ImageFileDocument* pRHSDoc = dialogGetCompare.getImageFileDocument(); const ImageFile& rRHSIF = pRHSDoc->getImageFile(); ImageFileDocument* pNewDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); - if (! pNewDoc) { - sys_error (ERR_SEVERE, "Unable to create image file"); - return; - } + if (! pNewDoc) { + sys_error (ERR_SEVERE, "Unable to create image file"); + return; + } ImageFile& newImage = pNewDoc->getImageFile(); newImage.setArraySize (rIF.nx(), rIF.ny()); rIF.divideImages (rRHSIF, newImage); @@ -735,11 +743,11 @@ ImageFileView::OnMagnitude (wxCommandEvent& event) if (rIF.isComplex()) { rIF.magnitude (rIF); rIF.labelAdd ("Magnitude of complex-image"); - m_bMinSpecified = false; - m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + m_bMinSpecified = false; + m_bMaxSpecified = false; + if (theApp->getSetModifyNewDocs()) + GetDocument()->Modify(TRUE); + GetDocument()->UpdateAllViews(this); } } @@ -750,11 +758,11 @@ ImageFileView::OnPhase (wxCommandEvent& event) if (rIF.isComplex()) { rIF.phase (rIF); rIF.labelAdd ("Phase of complex-image"); - m_bMinSpecified = false; - m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + m_bMinSpecified = false; + m_bMaxSpecified = false; + if (theApp->getSetModifyNewDocs()) + GetDocument()->Modify(TRUE); + GetDocument()->UpdateAllViews(this); } } @@ -784,24 +792,30 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) wxDocChildFrame* subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "ImageFile Frame", wxPoint(-1, -1), wxSize(0, 0), wxDEFAULT_FRAME_STYLE); #endif theApp->setIconForFrame (subframe); - - 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->Append(wxID_SAVE, "&Save\tCtrl-S"); - file_menu->Append(wxID_SAVEAS, "Save &As..."); - file_menu->Append(wxID_CLOSE, "&Close\tCtrl-W"); + wxMenu *m_pFileMenu = new wxMenu; - file_menu->AppendSeparator(); - file_menu->Append(IFMENU_FILE_PROPERTIES, "P&roperties"); - file_menu->Append(IFMENU_FILE_EXPORT, "&Export..."); + m_pFileMenu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...\tCtrl-P"); + m_pFileMenu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...\tCtrl-F"); + m_pFileMenu->Append(wxID_OPEN, "&Open...\tCtrl-O"); + m_pFileMenu->Append(wxID_SAVE, "&Save\tCtrl-S"); + m_pFileMenu->Append(wxID_SAVEAS, "Save &As..."); + m_pFileMenu->Append(wxID_CLOSE, "&Close\tCtrl-W"); - file_menu->AppendSeparator(); - file_menu->Append(wxID_PRINT, "&Print..."); - file_menu->Append(wxID_PRINT_SETUP, "Print &Setup..."); - file_menu->Append(wxID_PREVIEW, "Print Pre&view"); + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(IFMENU_FILE_PROPERTIES, "P&roperties"); + m_pFileMenu->Append(IFMENU_FILE_EXPORT, "&Export..."); + + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(wxID_PRINT, "&Print..."); + m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup..."); + m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view"); +#ifdef CTSIM_MDI + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit"); +#endif + theApp->getDocManager()->FileHistoryAddFilesToMenu(m_pFileMenu); + theApp->getDocManager()->FileHistoryUseMenu(m_pFileMenu); wxMenu *view_menu = new wxMenu; view_menu->Append(IFMENU_VIEW_SCALE_MINMAX, "Display Scale S&et...\tCtrl-E"); @@ -840,7 +854,7 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) image_menu->Append (IFMENU_IMAGE_DIVIDE, "&Divide..."); image_menu->AppendSeparator(); image_menu->Append (IFMENU_IMAGE_SCALESIZE, "S&cale Size..."); - + wxMenu *analyze_menu = new wxMenu; analyze_menu->Append (IFMENU_PLOT_ROW, "Plot &Row"); analyze_menu->Append (IFMENU_PLOT_COL, "Plot &Column"); @@ -860,13 +874,13 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) wxMenuBar *menu_bar = new wxMenuBar; - menu_bar->Append(file_menu, "&File"); + menu_bar->Append(m_pFileMenu, "&File"); menu_bar->Append(view_menu, "&View"); menu_bar->Append(image_menu, "&Image"); menu_bar->Append(filter_menu, "Fi<er"); menu_bar->Append(analyze_menu, "&Analyze"); menu_bar->Append(help_menu, "&Help"); - + subframe->SetMenuBar(menu_bar); subframe->Centre(wxBOTH); @@ -884,7 +898,7 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) accelEntries[9].Set (wxACCEL_CTRL, static_cast('E'), IFMENU_VIEW_SCALE_MINMAX); wxAcceleratorTable accelTable (10, accelEntries); subframe->SetAcceleratorTable (accelTable); - + return subframe; } @@ -921,7 +935,7 @@ ImageFileView::OnDraw (wxDC* dc) wxSize sizeBest = m_canvas->GetBestSize(); if (sizeWindow.x > sizeBest.x || sizeWindow.y > sizeBest.y) m_frame->SetClientSize (sizeBest); - + if (m_bitmap.Ok()) dc->DrawBitmap(m_bitmap, 0, 0, false); @@ -964,7 +978,6 @@ ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) delete imageData; int xSize = nx; int ySize = ny; - xSize = clamp (xSize, 0, 800); ySize = clamp (ySize, 0, 800); m_frame->SetClientSize (xSize, ySize); m_canvas->SetScrollbars(20, 20, nx/20, ny/20); @@ -981,9 +994,9 @@ ImageFileView::OnClose (bool deleteWindow) if (!GetDocument()->Close()) return false; - m_canvas->Clear(); - //m_canvas->m_pView = NULL; - m_canvas = NULL; +// m_canvas->Clear(); +// m_canvas->setView(NULL); +// m_canvas = NULL; wxString s(theApp->GetAppName()); if (m_frame) m_frame->SetTitle(s); @@ -1014,12 +1027,12 @@ ImageFileView::OnExport (wxCommandEvent& event) if (! m_bMaxSpecified) m_dMaxPixel = max; } - + DialogExportParameters dialogExport (getFrameForChild(), m_iDefaultExportFormatID); if (dialogExport.ShowModal() == wxID_OK) { wxString strFormatName (dialogExport.getFormatName ()); m_iDefaultExportFormatID = ImageFile::convertFormatNameToID (strFormatName.c_str()); - + wxString strExt; wxString strWildcard; if (m_iDefaultExportFormatID == ImageFile::FORMAT_PGM || m_iDefaultExportFormatID == ImageFile::FORMAT_PGMASCII) { @@ -1032,7 +1045,7 @@ ImageFileView::OnExport (wxCommandEvent& event) strWildcard = "PNG Files (*.png)|*.png"; } #endif - + const wxString& strFilename = wxFileSelector (wxString("Export Filename"), wxString(""), wxString(""), strExt, strWildcard, wxOVERWRITE_PROMPT | wxHIDE_READONLY | wxSAVE); if (strFilename) { @@ -1049,7 +1062,7 @@ ImageFileView::OnScaleSize (wxCommandEvent& event) ImageFile& rIF = GetDocument()->getImageFile(); unsigned int iOldNX = rIF.nx(); unsigned int iOldNY = rIF.ny(); - + DialogGetXYSize dialogGetXYSize (getFrameForChild(), "Set New X & Y Dimensions", iOldNX, iOldNY); if (dialogGetXYSize.ShowModal() == wxID_OK) { unsigned int iNewNX = dialogGetXYSize.getXSize(); @@ -1260,7 +1273,7 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event) if (v != NULL && yCursor < ny) { fftw_complex* pcIn = new fftw_complex [nx]; - + int i; for (i = 0; i < nx; i++) { pcIn[i].re = v[i][yCursor]; @@ -1269,11 +1282,11 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event) else pcIn[i].im = 0; } - + fftw_plan plan = fftw_create_plan (nx, FFTW_FORWARD, FFTW_IN_PLACE); fftw_one (plan, pcIn, NULL); fftw_destroy_plan (plan); - + double* pX = new double [nx]; double* pYReal = new double [nx]; double* pYImag = new double [nx]; @@ -1287,7 +1300,7 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event) Fourier::shuffleFourierToNaturalOrder (pYReal, nx); Fourier::shuffleFourierToNaturalOrder (pYImag, nx); Fourier::shuffleFourierToNaturalOrder (pYMag, nx); - + PlotFileDocument* pPlotDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT)); if (! pPlotDoc) { sys_error (ERR_SEVERE, "Internal error: unable to create Plot file"); @@ -1303,14 +1316,14 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event) rPlotFile.addEzsetCommand ("lxfrac 0"); rPlotFile.addEzsetCommand ("curve 1"); rPlotFile.addEzsetCommand ("color 1"); - rPlotFile.addEzsetCommand ("dash 1"); - rPlotFile.addEzsetCommand ("curve 2"); - rPlotFile.addEzsetCommand ("color 4"); - rPlotFile.addEzsetCommand ("dash 3"); - rPlotFile.addEzsetCommand ("curve 3"); - rPlotFile.addEzsetCommand ("color 0"); - rPlotFile.addEzsetCommand ("solid"); - rPlotFile.addEzsetCommand ("box"); + rPlotFile.addEzsetCommand ("dash 1"); + rPlotFile.addEzsetCommand ("curve 2"); + rPlotFile.addEzsetCommand ("color 4"); + rPlotFile.addEzsetCommand ("dash 3"); + rPlotFile.addEzsetCommand ("curve 3"); + rPlotFile.addEzsetCommand ("color 0"); + rPlotFile.addEzsetCommand ("solid"); + rPlotFile.addEzsetCommand ("box"); rPlotFile.addEzsetCommand ("grid"); rPlotFile.setCurveSize (4, nx); rPlotFile.addColumn (0, pX); @@ -1328,7 +1341,7 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event) delete pYImag; delete pYMag; delete [] pcIn; - + if (theApp->getSetModifyNewDocs()) pPlotDoc->Modify(true); pPlotDoc->UpdateAllViews(); @@ -1353,28 +1366,28 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event) if (v != NULL && xCursor < nx) { fftw_complex* pcIn = new fftw_complex [ny]; double *pdTemp = new double [ny]; - + int i; for (i = 0; i < ny; i++) pdTemp[i] = v[xCursor][i]; Fourier::shuffleNaturalToFourierOrder (pdTemp, ny); for (i = 0; i < ny; i++) pcIn[i].re = pdTemp[i]; - + for (i = 0; i < ny; i++) { if (rIF.isComplex()) pdTemp[i] = vImag[xCursor][i]; else - pdTemp[i] = 0; + pdTemp[i] = 0; } Fourier::shuffleNaturalToFourierOrder (pdTemp, ny); for (i = 0; i < ny; i++) pcIn[i].im = pdTemp[i]; - + fftw_plan plan = fftw_create_plan (ny, FFTW_BACKWARD, FFTW_IN_PLACE); fftw_one (plan, pcIn, NULL); fftw_destroy_plan (plan); - + double* pX = new double [ny]; double* pYReal = new double [ny]; double* pYImag = new double [ny]; @@ -1385,7 +1398,7 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event) pYImag[i] = pcIn[i].im; pYMag[i] = ::sqrt (pcIn[i].re * pcIn[i].re + pcIn[i].im * pcIn[i].im); } - + PlotFileDocument* pPlotDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT)); if (! pPlotDoc) { sys_error (ERR_SEVERE, "Internal error: unable to create Plot file"); @@ -1401,14 +1414,14 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event) rPlotFile.addEzsetCommand ("lxfrac 0"); rPlotFile.addEzsetCommand ("curve 1"); rPlotFile.addEzsetCommand ("color 1"); - rPlotFile.addEzsetCommand ("dash 1"); - rPlotFile.addEzsetCommand ("curve 2"); - rPlotFile.addEzsetCommand ("color 4"); - rPlotFile.addEzsetCommand ("dash 3"); - rPlotFile.addEzsetCommand ("curve 3"); - rPlotFile.addEzsetCommand ("color 0"); - rPlotFile.addEzsetCommand ("solid"); - rPlotFile.addEzsetCommand ("box"); + rPlotFile.addEzsetCommand ("dash 1"); + rPlotFile.addEzsetCommand ("curve 2"); + rPlotFile.addEzsetCommand ("color 4"); + rPlotFile.addEzsetCommand ("dash 3"); + rPlotFile.addEzsetCommand ("curve 3"); + rPlotFile.addEzsetCommand ("color 0"); + rPlotFile.addEzsetCommand ("solid"); + rPlotFile.addEzsetCommand ("box"); rPlotFile.addEzsetCommand ("grid"); rPlotFile.setCurveSize (4, ny); rPlotFile.addColumn (0, pX); @@ -1427,7 +1440,7 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event) delete pYMag; delete pdTemp; delete [] pcIn; - + if (theApp->getSetModifyNewDocs()) pPlotDoc->Modify(true); pPlotDoc->UpdateAllViews(); @@ -1495,7 +1508,7 @@ ImageFileView::OnCompareCol (wxCommandEvent& event) rPlotFile.addColumn (0, pX); rPlotFile.addColumn (1, pY1); rPlotFile.addColumn (2, pY2); - + unsigned int iL; for (iL = 0; iL < rIF.nLabels(); iL++) { std::string s = GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str(); @@ -1630,13 +1643,13 @@ ImageFileView::OnPlotHistogram (wxCommandEvent& event) sys_error (ERR_SEVERE, "Internal error: unable to create Plot file"); return; } - + double* pX = new double [NUMBER_HISTOGRAM_BINS]; double* pY = new double [NUMBER_HISTOGRAM_BINS]; double dMin, dMax; rIF.getMinMax (dMin, dMax); double dBinWidth = (dMax - dMin) / NUMBER_HISTOGRAM_BINS; - + for (int i = 0; i < NUMBER_HISTOGRAM_BINS; i++) { pX[i] = dMin + (i + 0.5) * dBinWidth; pY[i] = 0; @@ -1647,34 +1660,34 @@ ImageFileView::OnPlotHistogram (wxCommandEvent& event) if (iBin >= 0 && iBin < NUMBER_HISTOGRAM_BINS) pY[iBin] += 1; } - - PlotFile& rPlotFile = pPlotDoc->getPlotFile(); - std::ostringstream os; - os << "Histogram"; - std::string title("title "); - title += os.str(); - rPlotFile.addEzsetCommand (title.c_str()); - rPlotFile.addEzsetCommand ("xlabel Pixel Value"); - rPlotFile.addEzsetCommand ("ylabel Count"); - rPlotFile.addEzsetCommand ("box"); - rPlotFile.addEzsetCommand ("grid"); - rPlotFile.setCurveSize (2, NUMBER_HISTOGRAM_BINS); - rPlotFile.addColumn (0, pX); - rPlotFile.addColumn (1, pY); - for (unsigned int iL = 0; iL < rIF.nLabels(); iL++) { - std::string s = GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str(); - s += ": "; - s += rIF.labelGet(iL).getLabelString(); - rPlotFile.addDescription (s.c_str()); - } - os << " Plot of " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str(); - *theApp->getLog() << os.str().c_str() << "\n"; - rPlotFile.addDescription (os.str().c_str()); - delete pX; - delete pY; - if (theApp->getSetModifyNewDocs()) - pPlotDoc->Modify(true); - pPlotDoc->UpdateAllViews(); + + PlotFile& rPlotFile = pPlotDoc->getPlotFile(); + std::ostringstream os; + os << "Histogram"; + std::string title("title "); + title += os.str(); + rPlotFile.addEzsetCommand (title.c_str()); + rPlotFile.addEzsetCommand ("xlabel Pixel Value"); + rPlotFile.addEzsetCommand ("ylabel Count"); + rPlotFile.addEzsetCommand ("box"); + rPlotFile.addEzsetCommand ("grid"); + rPlotFile.setCurveSize (2, NUMBER_HISTOGRAM_BINS); + rPlotFile.addColumn (0, pX); + rPlotFile.addColumn (1, pY); + for (unsigned int iL = 0; iL < rIF.nLabels(); iL++) { + std::string s = GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str(); + s += ": "; + s += rIF.labelGet(iL).getLabelString(); + rPlotFile.addDescription (s.c_str()); + } + os << " Plot of " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str(); + *theApp->getLog() << os.str().c_str() << "\n"; + rPlotFile.addDescription (os.str().c_str()); + delete pX; + delete pY; + if (theApp->getSetModifyNewDocs()) + pPlotDoc->Modify(true); + pPlotDoc->UpdateAllViews(); } } @@ -1687,6 +1700,14 @@ PhantomCanvas::PhantomCanvas (PhantomView* v, wxFrame *frame, const wxPoint& pos m_pView = v; } +PhantomCanvas::~PhantomCanvas () +{ + if (m_pView) { + wxMenu* pMenu = m_pView->getFileMenu(); + theApp->getDocManager()->FileHistoryRemoveMenu (pMenu); + } +} + void PhantomCanvas::OnDraw (wxDC& dc) { @@ -1706,7 +1727,7 @@ EVT_MENU(PHMMENU_PROCESS_PROJECTIONS, PhantomView::OnProjections) END_EVENT_TABLE() PhantomView::PhantomView(void) -: wxView(), m_canvas(NULL), m_frame(NULL) +: wxView(), m_canvas(NULL), m_frame(NULL), m_pFileMenu(0) { m_iDefaultNDet = 367; m_iDefaultNView = 320; @@ -1716,13 +1737,13 @@ PhantomView::PhantomView(void) m_dDefaultFieldOfView = 1; m_iDefaultGeometry = Scanner::GEOMETRY_PARALLEL; m_iDefaultTrace = Trace::TRACE_NONE; - + m_iDefaultRasterNX = 256; m_iDefaultRasterNY = 256; m_iDefaultRasterNSamples = 2; } -PhantomView::~PhantomView(void) +PhantomView::~PhantomView() { } @@ -1905,22 +1926,28 @@ PhantomView::CreateChildFrame(wxDocument *doc, wxView *view) wxDocChildFrame *subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "Phantom Frame", wxPoint(10, 10), wxSize(256, 256), wxDEFAULT_FRAME_STYLE); #endif theApp->setIconForFrame (subframe); - - 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->Append(wxID_SAVEAS, "Save &As..."); - file_menu->Append(wxID_CLOSE, "&Close"); + wxMenu *m_pFileMenu = new wxMenu; - file_menu->AppendSeparator(); - file_menu->Append(PHMMENU_FILE_PROPERTIES, "P&roperties"); + m_pFileMenu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...\tCtrl-P"); + m_pFileMenu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...\tCtrl-F"); + m_pFileMenu->Append(wxID_OPEN, "&Open...\tCtrl-O"); + m_pFileMenu->Append(wxID_SAVEAS, "Save &As..."); + m_pFileMenu->Append(wxID_CLOSE, "&Close"); - file_menu->AppendSeparator(); - file_menu->Append(wxID_PRINT, "&Print..."); - file_menu->Append(wxID_PRINT_SETUP, "Print &Setup..."); - file_menu->Append(wxID_PREVIEW, "Print Pre&view"); + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(PHMMENU_FILE_PROPERTIES, "P&roperties"); + + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(wxID_PRINT, "&Print..."); + m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup..."); + m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view"); +#ifdef CTSIM_MDI + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit"); +#endif + theApp->getDocManager()->FileHistoryAddFilesToMenu(m_pFileMenu); + theApp->getDocManager()->FileHistoryUseMenu(m_pFileMenu); wxMenu *process_menu = new wxMenu; process_menu->Append(PHMMENU_PROCESS_RASTERIZE, "&Rasterize...\tCtrl-R"); @@ -1933,13 +1960,13 @@ PhantomView::CreateChildFrame(wxDocument *doc, wxView *view) wxMenuBar *menu_bar = new wxMenuBar; - menu_bar->Append(file_menu, "&File"); + menu_bar->Append(m_pFileMenu, "&File"); menu_bar->Append(process_menu, "&Process"); menu_bar->Append(help_menu, "&Help"); subframe->SetMenuBar(menu_bar); subframe->Centre(wxBOTH); - + wxAcceleratorEntry accelEntries[8]; accelEntries[0].Set (wxACCEL_CTRL, static_cast('O'), wxID_OPEN); accelEntries[1].Set (wxACCEL_CTRL, static_cast('S'), wxID_SAVE); @@ -1951,7 +1978,7 @@ PhantomView::CreateChildFrame(wxDocument *doc, wxView *view) accelEntries[7].Set (wxACCEL_CTRL, static_cast('R'), PHMMENU_PROCESS_RASTERIZE); wxAcceleratorTable accelTable (8, accelEntries); subframe->SetAcceleratorTable (accelTable); - + return subframe; } @@ -1992,9 +2019,9 @@ PhantomView::OnClose (bool deleteWindow) if (!GetDocument()->Close()) return false; - m_canvas->Clear(); - //m_canvas->m_pView = NULL; - m_canvas = NULL; +// m_canvas->Clear(); +// m_canvas->setView(NULL); +// m_canvas = NULL; wxString s(wxTheApp->GetAppName()); if (m_frame) m_frame->SetTitle(s); @@ -2004,7 +2031,7 @@ PhantomView::OnClose (bool deleteWindow) if (deleteWindow) delete m_frame; - + return true; } @@ -2028,6 +2055,14 @@ ProjectionFileCanvas::ProjectionFileCanvas (ProjectionFileView* v, wxFrame *fram m_pView = v; } +ProjectionFileCanvas::~ProjectionFileCanvas () +{ + if (m_pView) { + wxMenu* pMenu = m_pView->getFileMenu(); + theApp->getDocManager()->FileHistoryRemoveMenu (pMenu); + } +} + void ProjectionFileCanvas::OnDraw(wxDC& dc) { @@ -2043,7 +2078,7 @@ ProjectionFileCanvas::GetBestSize () const Projections& rProj = m_pView->GetDocument()->getProjections(); best.Set (rProj.nDet(), rProj.nView()); } - + return best; } @@ -2060,7 +2095,7 @@ EVT_MENU(PJMENU_CONVERT_FFT_POLAR, ProjectionFileView::OnConvertFFTPolar) END_EVENT_TABLE() ProjectionFileView::ProjectionFileView(void) -: wxView(), m_canvas(NULL), m_frame(NULL) +: wxView(), m_canvas(NULL), m_frame(NULL), m_pFileMenu(0) { m_iDefaultNX = 256; m_iDefaultNY = 256; @@ -2078,7 +2113,7 @@ ProjectionFileView::ProjectionFileView(void) m_iDefaultInterpolation = Backprojector::INTERP_LINEAR; m_iDefaultInterpParam = 1; m_iDefaultTrace = Trace::TRACE_NONE; - + m_iDefaultPolarNX = 256; m_iDefaultPolarNY = 256; m_iDefaultPolarInterpolation = Projections::POLAR_INTERP_BILINEAR; @@ -2165,7 +2200,7 @@ ProjectionFileView::OnConvertFFTPolar (wxCommandEvent& event) pPolarDoc->Modify(true); pPolarDoc->UpdateAllViews(); pPolarDoc->GetFirstView()->OnUpdate (this, NULL); - }} +}} void ProjectionFileView::OnReconstructFourier (wxCommandEvent& event) @@ -2207,7 +2242,7 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) imageFile.setArraySize (m_iDefaultNX, m_iDefaultNY); Reconstructor* pReconstruct = new Reconstructor (rProj, imageFile, optFilterName.c_str(), m_dDefaultFilterParam, optFilterMethodName.c_str(), m_iDefaultZeropad, optFilterGenerationName.c_str(), optInterpName.c_str(), m_iDefaultInterpParam, optBackprojectName.c_str(), m_iDefaultTrace); - + Timer timerRecon; if (m_iDefaultTrace > Trace::TRACE_CONSOLE) { ReconstructDialog* pDlgReconstruct = new ReconstructDialog (*pReconstruct, rProj, imageFile, m_iDefaultTrace, getFrameForChild()); @@ -2283,23 +2318,27 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view) wxDocChildFrame *subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "Projection Frame", wxPoint(10, 10), wxSize(0, 0), wxDEFAULT_FRAME_STYLE); #endif theApp->setIconForFrame (subframe); - - 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->Append(wxID_SAVE, "&Save\tCtrl-S"); - file_menu->Append(wxID_SAVEAS, "Save &As..."); - file_menu->Append(wxID_CLOSE, "&Close\tCtrl-W"); + wxMenu *m_pFileMenu = new wxMenu; - file_menu->AppendSeparator(); - file_menu->Append(PJMENU_FILE_PROPERTIES, "P&roperties"); + m_pFileMenu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...\tCtrl-P"); + m_pFileMenu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...\tCtrl-F"); + m_pFileMenu->Append(wxID_OPEN, "&Open...\tCtrl-O"); + m_pFileMenu->Append(wxID_SAVE, "&Save\tCtrl-S"); + m_pFileMenu->Append(wxID_SAVEAS, "Save &As..."); + m_pFileMenu->Append(wxID_CLOSE, "&Close\tCtrl-W"); - file_menu->AppendSeparator(); - file_menu->Append(wxID_PRINT, "&Print..."); - file_menu->Append(wxID_PRINT_SETUP, "Print &Setup..."); - file_menu->Append(wxID_PREVIEW, "Print Pre&view"); + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(PJMENU_FILE_PROPERTIES, "P&roperties"); + + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(wxID_PRINT, "&Print..."); + m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup..."); + m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view"); +#ifdef CTSIM_MDI + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit"); +#endif wxMenu *convert_menu = new wxMenu; convert_menu->Append (PJMENU_CONVERT_POLAR, "&Polar Image...\tCtrl-L"); @@ -2308,7 +2347,7 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view) wxMenu *reconstruct_menu = new wxMenu; reconstruct_menu->Append (PJMENU_RECONSTRUCT_FBP, "&Filtered Backprojection...\tCtrl-R"); reconstruct_menu->Append (PJMENU_RECONSTRUCT_FOURIER, "&Fourier...\tCtrl-E"); - + wxMenu *help_menu = new wxMenu; help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1"); help_menu->Append(MAINMENU_HELP_TOPICS, "&Topics\tCtrl-H"); @@ -2316,14 +2355,14 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view) wxMenuBar *menu_bar = new wxMenuBar; - menu_bar->Append (file_menu, "&File"); + menu_bar->Append (m_pFileMenu, "&File"); menu_bar->Append (convert_menu, "&Convert"); menu_bar->Append (reconstruct_menu, "&Reconstruct"); menu_bar->Append (help_menu, "&Help"); subframe->SetMenuBar(menu_bar); subframe->Centre(wxBOTH); - + wxAcceleratorEntry accelEntries[11]; accelEntries[0].Set (wxACCEL_CTRL, static_cast('O'), wxID_OPEN); accelEntries[1].Set (wxACCEL_CTRL, static_cast('S'), wxID_SAVE); @@ -2371,10 +2410,10 @@ ProjectionFileView::OnDraw (wxDC* dc) { wxSize clientSize = m_frame->GetClientSize(); wxSize bestSize = m_canvas->GetBestSize(); - + if (clientSize.x > bestSize.x || clientSize.y > bestSize.y) m_frame->SetClientSize (bestSize); - + if (m_bitmap.Ok()) dc->DrawBitmap (m_bitmap, 0, 0, false); } @@ -2435,9 +2474,9 @@ ProjectionFileView::OnClose (bool deleteWindow) if (!GetDocument()->Close()) return false; - m_canvas->Clear(); - // m_canvas->m_pView = NULL; - m_canvas = NULL; +// m_canvas->Clear(); +// m_canvas->setView(NULL); +// m_canvas = NULL; wxString s(wxTheApp->GetAppName()); if (m_frame) m_frame->SetTitle(s); @@ -2461,6 +2500,14 @@ PlotFileCanvas::PlotFileCanvas (PlotFileView* v, wxFrame *frame, const wxPoint& m_pView = v; } +PlotFileCanvas::~PlotFileCanvas () +{ + if (m_pView) { + wxMenu* pMenu = m_pView->getFileMenu(); + theApp->getDocManager()->FileHistoryRemoveMenu (pMenu); + } +} + void PlotFileCanvas::OnDraw(wxDC& dc) { @@ -2481,7 +2528,7 @@ EVT_MENU(PLOTMENU_VIEW_SCALE_FULL, PlotFileView::OnScaleFull) END_EVENT_TABLE() PlotFileView::PlotFileView(void) -: wxView(), m_canvas(NULL), m_frame(NULL), m_pEZPlot(NULL) +: wxView(), m_canvas(NULL), m_frame(NULL), m_pEZPlot(NULL), m_pFileMenu(0) { m_bMinSpecified = false; m_bMaxSpecified = false; @@ -2533,7 +2580,7 @@ PlotFileView::OnScaleMinMax (wxCommandEvent& event) const PlotFile& rPlotFile = GetDocument()->getPlotFile(); double min; double max; - + if (! m_bMinSpecified || ! m_bMaxSpecified) { if (! rPlotFile.getMinMax (1, min, max)) { *theApp->getLog() << "Error: unable to find Min/Max\n"; @@ -2592,23 +2639,29 @@ PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view) wxDocChildFrame *subframe = new wxDocChildFrame(doc, view, theApp->getMainFrame(), -1, "Plot Frame", wxPoint(10, 10), wxSize(500, 300), wxDEFAULT_FRAME_STYLE); #endif theApp->setIconForFrame (subframe); - - 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->Append(wxID_SAVE, "&Save\tCtrl-S"); - file_menu->Append(wxID_SAVEAS, "Save &As..."); - file_menu->Append(wxID_CLOSE, "&Close\tCtrl-W"); + wxMenu *m_pFileMenu = new wxMenu; - file_menu->AppendSeparator(); - file_menu->Append(PJMENU_FILE_PROPERTIES, "P&roperties"); + m_pFileMenu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...\tCtrl-P"); + m_pFileMenu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...\tCtrl-F"); + m_pFileMenu->Append(wxID_OPEN, "&Open...\tCtrl-O"); + m_pFileMenu->Append(wxID_SAVE, "&Save\tCtrl-S"); + m_pFileMenu->Append(wxID_SAVEAS, "Save &As..."); + m_pFileMenu->Append(wxID_CLOSE, "&Close\tCtrl-W"); - file_menu->AppendSeparator(); - file_menu->Append(wxID_PRINT, "&Print..."); - file_menu->Append(wxID_PRINT_SETUP, "Print &Setup..."); - file_menu->Append(wxID_PREVIEW, "Print Pre&view"); + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(PJMENU_FILE_PROPERTIES, "P&roperties"); + + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(wxID_PRINT, "&Print..."); + m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup..."); + m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view"); +#ifdef CTSIM_MDI + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit"); +#endif + theApp->getDocManager()->FileHistoryAddFilesToMenu(m_pFileMenu); + theApp->getDocManager()->FileHistoryUseMenu(m_pFileMenu); wxMenu *view_menu = new wxMenu; view_menu->Append(PLOTMENU_VIEW_SCALE_MINMAX, "Display Scale &Set...\tCtrl-E"); @@ -2622,13 +2675,13 @@ PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view) wxMenuBar *menu_bar = new wxMenuBar; - menu_bar->Append(file_menu, "&File"); + menu_bar->Append(m_pFileMenu, "&File"); menu_bar->Append(view_menu, "&View"); menu_bar->Append(help_menu, "&Help"); subframe->SetMenuBar(menu_bar); subframe->Centre(wxBOTH); - + wxAcceleratorEntry accelEntries[10]; accelEntries[0].Set (wxACCEL_CTRL, static_cast('O'), wxID_OPEN); accelEntries[1].Set (wxACCEL_CTRL, static_cast('S'), wxID_SAVE); @@ -2670,7 +2723,7 @@ PlotFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) ) m_frame->Show(true); Activate(true); - + return true; } @@ -2695,48 +2748,48 @@ PlotFileView::OnDraw (wxDC* dc) void PlotFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) { - const PlotFile& rPlotFile = GetDocument()->getPlotFile(); - const int iNColumns = rPlotFile.getNumColumns(); - const int iNRecords = rPlotFile.getNumRecords(); + const PlotFile& rPlotFile = GetDocument()->getPlotFile(); + const int iNColumns = rPlotFile.getNumColumns(); + const int iNRecords = rPlotFile.getNumRecords(); + + if (iNColumns > 0 && iNRecords > 0) { + if (m_pEZPlot) + delete m_pEZPlot; + m_pEZPlot = new EZPlot; - if (iNColumns > 0 && iNRecords > 0) { - if (m_pEZPlot) - delete m_pEZPlot; - m_pEZPlot = new EZPlot; - - for (unsigned int iEzset = 0; iEzset < rPlotFile.getNumEzsetCommands(); iEzset++) - m_pEZPlot->ezset (rPlotFile.getEzsetCommand (iEzset)); - - if (m_bMinSpecified) { - std::ostringstream os; - os << "ymin " << m_dMinPixel; - m_pEZPlot->ezset (os.str()); - } - - if (m_bMaxSpecified) { - std::ostringstream os; - os << "ymax " << m_dMaxPixel; - m_pEZPlot->ezset (os.str()); - } - - m_pEZPlot->ezset("box"); - m_pEZPlot->ezset("grid"); - - double* pdXaxis = new double [iNRecords]; - rPlotFile.getColumn (0, pdXaxis); - - double* pdY = new double [iNRecords]; - for (int iCol = 1; iCol < iNColumns; iCol++) { - rPlotFile.getColumn (iCol, pdY); - m_pEZPlot->addCurve (pdXaxis, pdY, iNRecords); - } - - delete pdXaxis; - delete pdY; + for (unsigned int iEzset = 0; iEzset < rPlotFile.getNumEzsetCommands(); iEzset++) + m_pEZPlot->ezset (rPlotFile.getEzsetCommand (iEzset)); + + if (m_bMinSpecified) { + std::ostringstream os; + os << "ymin " << m_dMinPixel; + m_pEZPlot->ezset (os.str()); } - - if (m_canvas) - m_canvas->Refresh(); + + if (m_bMaxSpecified) { + std::ostringstream os; + os << "ymax " << m_dMaxPixel; + m_pEZPlot->ezset (os.str()); + } + + m_pEZPlot->ezset("box"); + m_pEZPlot->ezset("grid"); + + double* pdXaxis = new double [iNRecords]; + rPlotFile.getColumn (0, pdXaxis); + + double* pdY = new double [iNRecords]; + for (int iCol = 1; iCol < iNColumns; iCol++) { + rPlotFile.getColumn (iCol, pdY); + m_pEZPlot->addCurve (pdXaxis, pdY, iNRecords); + } + + delete pdXaxis; + delete pdY; + } + + if (m_canvas) + m_canvas->Refresh(); } bool @@ -2745,9 +2798,9 @@ PlotFileView::OnClose (bool deleteWindow) if (!GetDocument()->Close()) return false; - m_canvas->Clear(); - // m_canvas->m_pView = NULL; - m_canvas = NULL; +// m_canvas->Clear(); +// m_canvas->setView (NULL); +// m_canvas = NULL; wxString s(wxTheApp->GetAppName()); if (m_frame) m_frame->SetTitle(s); @@ -2762,3 +2815,135 @@ PlotFileView::OnClose (bool deleteWindow) return true; } + +//////////////////////////////////////////////////////////////// + + +IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView) + +TextEditView::~TextEditView() +{ + if (m_pFileMenu) + theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); +} + +bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) +{ + m_pFrame = CreateChildFrame(doc, this); + SetFrame (m_pFrame); + + int width, height; + m_pFrame->GetClientSize(&width, &height); + m_pFrame->SetTitle("TextEdit"); + m_pCanvas = new TextEditCanvas (this, m_pFrame, wxPoint(0, 0), wxSize(width, height), wxTE_MULTILINE | wxTE_READONLY); + m_pFrame->SetTitle("Log"); + +#ifdef __X__ + // X seems to require a forced resize + int x, y; + frame->GetSize(&x, &y); + frame->SetSize(-1, -1, x, y); +#endif + + m_pFrame->Show (true); + Activate (true); + + return true; +} + +// Handled by wxTextWindow +void TextEditView::OnDraw(wxDC *WXUNUSED(dc) ) +{ +} + +void TextEditView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) +{ +} + +bool +TextEditView::OnClose (bool deleteWindow) +{ + return false; + + if (!GetDocument()->Close()) + return false; + + Activate(false); + + if (deleteWindow) + { + delete m_pFrame; + return TRUE; + } + return TRUE; +} + +wxFrame* +TextEditView::CreateChildFrame (wxDocument *doc, wxView *view) +{ +#if CTSIM_MDI + wxDocMDIChildFrame* subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "TextEdit Frame", wxPoint(-1, -1), wxSize(300, 150), wxDEFAULT_FRAME_STYLE); +#else + wxDocChildFrame* subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "TextEdit Frame", wxPoint(-1, -1), wxSize(300, 150), wxDEFAULT_FRAME_STYLE); +#endif + theApp->setIconForFrame (subframe); + + wxMenu *m_pFileMenu = new wxMenu; + + m_pFileMenu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...\tCtrl-P"); + m_pFileMenu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...\tCtrl-F"); + m_pFileMenu->Append(wxID_OPEN, "&Open...\tCtrl-O"); + m_pFileMenu->Append(wxID_SAVE, "&Save\tCtrl-S"); + m_pFileMenu->Append(wxID_SAVEAS, "Save &As..."); + // m_pFileMenu->Append(wxID_CLOSE, "&Close\tCtrl-W"); + + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(wxID_PRINT, "&Print..."); + m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup..."); + m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view"); +#ifdef CTSIM_MDI + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit"); +#endif + theApp->getDocManager()->FileHistoryAddFilesToMenu(m_pFileMenu); + theApp->getDocManager()->FileHistoryUseMenu(m_pFileMenu); + + wxMenu *help_menu = new wxMenu; + help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1"); + help_menu->Append(MAINMENU_HELP_TOPICS, "&Topics\tCtrl-H"); + help_menu->Append(MAINMENU_HELP_ABOUT, "&About"); + + wxMenuBar *menu_bar = new wxMenuBar; + + menu_bar->Append(m_pFileMenu, "&File"); + menu_bar->Append(help_menu, "&Help"); + + subframe->SetMenuBar(menu_bar); + subframe->Centre(wxBOTH); + + wxAcceleratorEntry accelEntries[5]; + accelEntries[0].Set (wxACCEL_CTRL, static_cast('O'), wxID_OPEN); + accelEntries[1].Set (wxACCEL_CTRL, static_cast('S'), wxID_SAVE); + accelEntries[2].Set (wxACCEL_CTRL, static_cast('W'), wxID_CLOSE); + accelEntries[3].Set (wxACCEL_CTRL, static_cast('H'), MAINMENU_HELP_TOPICS); + accelEntries[4].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS); + wxAcceleratorTable accelTable (5, accelEntries); + subframe->SetAcceleratorTable (accelTable); + + return subframe; +} + + +// Define a constructor for my text subwindow +TextEditCanvas::TextEditCanvas (TextEditView* v, wxFrame* frame, const wxPoint& pos, const wxSize& size, long style) + : wxTextCtrl (frame, -1, "", pos, size, style), m_pView(v) +{ +} + +TextEditCanvas::~TextEditCanvas () +{ + if (m_pView) { + wxMenu* pMenu = m_pView->getFileMenu(); + theApp->getDocManager()->FileHistoryRemoveMenu (pMenu); + } +} diff --git a/src/views.h b/src/views.h index ca998f2..834bdfe 100644 --- a/src/views.h +++ b/src/views.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: views.h,v 1.27 2001/01/20 08:10:33 kevin Exp $ +** $Id: views.h,v 1.28 2001/01/20 17:43: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 @@ -39,14 +39,15 @@ class ImageFileCanvas; class ImageFileView : public wxView { +private: DECLARE_DYNAMIC_CLASS(ImageFileView) - wxMemoryDC m_memoryDC; + wxMemoryDC m_memoryDC; wxBitmap m_bitmap; -private: ImageFileCanvas *CreateCanvas(wxView *view, wxFrame *parent); wxFrame *CreateChildFrame(wxDocument *doc, wxView *view); + wxMenu* m_pFileMenu; ImageFileCanvas *m_canvas; wxFrame *m_frame; @@ -58,9 +59,9 @@ private: int m_iDefaultExportFormatID; - wxFrame* getFrameForChild() + wxWindow* getFrameForChild() #if CTSIM_MDI - { return theApp->getMainFrame(); } + { return theApp->getMainFrame()->GetClientWindow(); } #else { return m_frame; } #endif @@ -68,7 +69,10 @@ private: public: ImageFileView(void); virtual ~ImageFileView(void); - + + wxMenu* getFileMenu() + { return m_pFileMenu; } + bool OnCreate(wxDocument *doc, long flags); void OnDraw(wxDC* dc); void OnUpdate(wxView *sender, wxObject *hint = NULL); @@ -138,8 +142,7 @@ private: public: ImageFileCanvas (ImageFileView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style); - virtual ~ImageFileCanvas() - {} + virtual ~ImageFileCanvas(); virtual void OnDraw(wxDC& dc); void OnMouseEvent(wxMouseEvent& event); @@ -147,6 +150,9 @@ public: bool GetCurrentCursor (int& x, int& y); virtual wxSize GetBestSize() const; + void setView(ImageFileView* pView) + { m_pView = pView; } + DECLARE_EVENT_TABLE() }; @@ -166,6 +172,7 @@ private: ProjectionFileCanvas *m_canvas; wxFrame *m_frame; + wxMenu* m_pFileMenu; int m_iDefaultNX; int m_iDefaultNY; @@ -184,9 +191,9 @@ private: int m_iDefaultPolarInterpolation; int m_iDefaultPolarZeropad; - wxFrame* getFrameForChild() + wxWindow* getFrameForChild() #if CTSIM_MDI - { return theApp->getMainFrame(); } + { return theApp->getMainFrame()->GetClientWindow(); } #else { return m_frame; } #endif @@ -205,9 +212,10 @@ public: void OnConvertPolar (wxCommandEvent& event); void OnConvertFFTPolar (wxCommandEvent& event); - wxFrame* getFrame () - { return m_frame; } + wxFrame* getFrame () { return m_frame; } + wxMenu* getFileMenu() { return m_pFileMenu; } + ProjectionFileDocument* GetDocument(void) { return dynamic_cast(wxView::GetDocument()); } DECLARE_EVENT_TABLE() @@ -220,26 +228,28 @@ private: public: ProjectionFileCanvas (ProjectionFileView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style); - virtual ~ProjectionFileCanvas() - {} + virtual ~ProjectionFileCanvas() ; virtual wxSize GetBestSize() const; - virtual void OnDraw(wxDC& dc); + void setView(ProjectionFileView* pView) + { m_pView = pView; } }; class PhantomCanvas; class PhantomView : public wxView { +private: DECLARE_DYNAMIC_CLASS(PhantomView) + DECLARE_EVENT_TABLE() -private: PhantomCanvas *CreateCanvas(wxView *view, wxFrame *parent); wxFrame *CreateChildFrame(wxDocument *doc, wxView *view); PhantomCanvas *m_canvas; wxFrame *m_frame; + wxMenu* m_pFileMenu; int m_iDefaultNDet; int m_iDefaultNView; @@ -254,9 +264,9 @@ private: int m_iDefaultRasterNY; int m_iDefaultRasterNSamples; - wxFrame* getFrameForChild() + wxWindow* getFrameForChild() #if CTSIM_MDI - { return theApp->getMainFrame(); } + { return theApp->getMainFrame()->GetClientWindow(); } #else { return m_frame; } #endif @@ -276,7 +286,7 @@ public: PhantomDocument* GetDocument(void) { return dynamic_cast(wxView::GetDocument()); } - DECLARE_EVENT_TABLE() + wxMenu* getFileMenu() { return m_pFileMenu; } }; class PhantomCanvas: public wxScrolledWindow @@ -286,9 +296,10 @@ private: public: PhantomCanvas (PhantomView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style); - virtual ~PhantomCanvas() - {} + virtual ~PhantomCanvas(); + void setView(PhantomView* pView) + { m_pView = pView; } virtual void OnDraw(wxDC& dc); }; @@ -303,6 +314,7 @@ private: PlotFileCanvas *m_canvas; wxFrame *m_frame; + wxMenu* m_pFileMenu; EZPlot* m_pEZPlot; bool m_bMinSpecified; @@ -311,9 +323,9 @@ private: double m_dMaxPixel; double m_dAutoScaleFactor; - wxFrame* getFrameForChild() + wxWindow* getFrameForChild() #if CTSIM_MDI - { return theApp->getMainFrame(); } + { return theApp->getMainFrame()->GetClientWindow(); } #else { return m_frame; } #endif @@ -335,6 +347,7 @@ public: wxFrame* getFrame () { return m_frame; } + wxMenu* getFileMenu() { return m_pFileMenu; } PlotFileDocument* GetDocument(void) { return dynamic_cast(wxView::GetDocument()); } @@ -348,10 +361,50 @@ private: public: PlotFileCanvas (PlotFileView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style); - virtual ~PlotFileCanvas() - {} - + virtual ~PlotFileCanvas(); + virtual void OnDraw(wxDC& dc); + + void setView (PlotFileView* pView) + { m_pView = pView; } +}; + + +class TextEditCanvas; +class TextEditView: public wxView +{ +private: + DECLARE_DYNAMIC_CLASS(TextEditView) + + wxFrame *m_pFrame; + wxMenu* m_pFileMenu; + TextEditCanvas *m_pCanvas; + +public: + TextEditView() + : wxView() , m_pFrame(0), m_pCanvas(0) + {} + ~TextEditView(); + + wxFrame *CreateChildFrame(wxDocument *doc, wxView *view); + + bool OnCreate (wxDocument *doc, long flags); + void OnDraw (wxDC *dc); + void OnUpdate (wxView *sender, wxObject *hint = (wxObject *) NULL); + bool OnClose (bool deleteWindow = TRUE); + + TextEditCanvas* getTextCtrl() { return m_pCanvas; } + + wxMenu* getFileMenu() { return m_pFileMenu; } +}; + +class TextEditCanvas: public wxTextCtrl +{ + TextEditView *m_pView; + +public: + TextEditCanvas (TextEditView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, long style); + ~TextEditCanvas (); }; -- 2.34.1