** 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
#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[] =
{
IMPLEMENT_APP(CTSimApp)
CTSimApp::CTSimApp()
-: m_docManager(NULL), m_pFrame(NULL)
+: m_docManager(NULL), m_pFrame(NULL), m_pLog(0)
{
theApp = this;
}
#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) {
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
// 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<TextEditDocument*>(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;
}
int
CTSimApp::OnExit()
{
- delete m_docManager;
#ifdef HAVE_DMALLOC
dmalloc_shutdown();
#endif
#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;
#ifndef CTSIM_MDI
for (int i = 0; i < MAX_WINDOW_MENUITEMS; i++) {
- m_apWindowMenuItems[i] = new wxMenuItem (m_pWindowMenu, MAINMENU_WINDOW_BASE+i, wxString("<Empty>"));
+ 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);
}
SetAcceleratorTable (accelTable);
}
+MainFrame::~MainFrame()
+{
+ if (theApp->getConfig())
+ theApp->getDocManager()->FileHistorySave (*theApp->getConfig());
+ delete theApp->getDocManager();
+}
+
void
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
break;
default:
- *getLog() << "Unknown help command # " << commandID << "\n";
+ *theApp->getLog() << "Unknown help command # " << commandID << "\n";
break;
}
}
}
for (int i = iPos; i < MAX_WINDOW_MENUITEMS; i++) {
m_pWindowMenu->Enable (MAINMENU_WINDOW_BASE+i, false);
- static_cast<wxMenuItemBase*>(m_apWindowMenuItems[i])->SetName (wxString("<Empty>"));
+ static_cast<wxMenuItemBase*>(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)
** 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
// 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);
// DialogGetComparisonImage
///////////////////////////////////////////////////////////////////////
-DialogGetComparisonImage::DialogGetComparisonImage (wxFrame* pParent, const char* const pszTitle, const std::vector<ImageFileDocument*>& rVecIF, bool bShowMakeDifference)
+DialogGetComparisonImage::DialogGetComparisonImage (wxWindow* pParent, const char* const pszTitle, const std::vector<ImageFileDocument*>& rVecIF, bool bShowMakeDifference)
: wxDialog (pParent, -1, pszTitle, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxCAPTION), m_rVecIF(rVecIF)
{
wxBoxSizer* pTopSizer = new wxBoxSizer (wxVERTICAL);
// 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);
// 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);
// 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);
/////////////////////////////////////////////////////////////////////
-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);
/////////////////////////////////////////////////////////////////////
-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);
-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);
// 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);
// 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;
// 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)
{
** 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
m_yCursor = -1;
}
+ImageFileCanvas::~ImageFileCanvas()
+{
+ if (m_pView) {
+ wxMenu* pMenu = m_pView->getFileMenu();
+ theApp->getDocManager()->FileHistoryRemoveMenu (pMenu);
+ }
+}
+
void
ImageFileCanvas::OnDraw(wxDC& dc)
{
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;
}
ImageFileDocument* pRHSDoc = dialogGetCompare.getImageFileDocument();
const ImageFile& rRHSIF = pRHSDoc->getImageFile();
ImageFileDocument* pNewDoc = dynamic_cast<ImageFileDocument*>(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);
ImageFileDocument* pRHSDoc = dialogGetCompare.getImageFileDocument();
const ImageFile& rRHSIF = pRHSDoc->getImageFile();
ImageFileDocument* pNewDoc = dynamic_cast<ImageFileDocument*>(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);
ImageFileDocument* pRHSDoc = dialogGetCompare.getImageFileDocument();
const ImageFile& rRHSIF = pRHSDoc->getImageFile();
ImageFileDocument* pNewDoc = dynamic_cast<ImageFileDocument*>(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);
ImageFileDocument* pRHSDoc = dialogGetCompare.getImageFileDocument();
const ImageFile& rRHSIF = pRHSDoc->getImageFile();
ImageFileDocument* pNewDoc = dynamic_cast<ImageFileDocument*>(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);
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);
}
}
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);
}
}
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");
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");
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);
accelEntries[9].Set (wxACCEL_CTRL, static_cast<int>('E'), IFMENU_VIEW_SCALE_MINMAX);
wxAcceleratorTable accelTable (10, accelEntries);
subframe->SetAcceleratorTable (accelTable);
-
+
return subframe;
}
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);
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);
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);
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) {
strWildcard = "PNG Files (*.png)|*.png";
}
#endif
-
+
const wxString& strFilename = wxFileSelector (wxString("Export Filename"), wxString(""),
wxString(""), strExt, strWildcard, wxOVERWRITE_PROMPT | wxHIDE_READONLY | wxSAVE);
if (strFilename) {
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();
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];
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];
Fourier::shuffleFourierToNaturalOrder (pYReal, nx);
Fourier::shuffleFourierToNaturalOrder (pYImag, nx);
Fourier::shuffleFourierToNaturalOrder (pYMag, nx);
-
+
PlotFileDocument* pPlotDoc = dynamic_cast<PlotFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT));
if (! pPlotDoc) {
sys_error (ERR_SEVERE, "Internal error: unable to create Plot file");
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);
delete pYImag;
delete pYMag;
delete [] pcIn;
-
+
if (theApp->getSetModifyNewDocs())
pPlotDoc->Modify(true);
pPlotDoc->UpdateAllViews();
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];
pYImag[i] = pcIn[i].im;
pYMag[i] = ::sqrt (pcIn[i].re * pcIn[i].re + pcIn[i].im * pcIn[i].im);
}
-
+
PlotFileDocument* pPlotDoc = dynamic_cast<PlotFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT));
if (! pPlotDoc) {
sys_error (ERR_SEVERE, "Internal error: unable to create Plot file");
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);
delete pYMag;
delete pdTemp;
delete [] pcIn;
-
+
if (theApp->getSetModifyNewDocs())
pPlotDoc->Modify(true);
pPlotDoc->UpdateAllViews();
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();
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;
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();
}
}
m_pView = v;
}
+PhantomCanvas::~PhantomCanvas ()
+{
+ if (m_pView) {
+ wxMenu* pMenu = m_pView->getFileMenu();
+ theApp->getDocManager()->FileHistoryRemoveMenu (pMenu);
+ }
+}
+
void
PhantomCanvas::OnDraw (wxDC& dc)
{
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;
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()
{
}
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");
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<int>('O'), wxID_OPEN);
accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('S'), wxID_SAVE);
accelEntries[7].Set (wxACCEL_CTRL, static_cast<int>('R'), PHMMENU_PROCESS_RASTERIZE);
wxAcceleratorTable accelTable (8, accelEntries);
subframe->SetAcceleratorTable (accelTable);
-
+
return subframe;
}
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);
if (deleteWindow)
delete m_frame;
-
+
return true;
}
m_pView = v;
}
+ProjectionFileCanvas::~ProjectionFileCanvas ()
+{
+ if (m_pView) {
+ wxMenu* pMenu = m_pView->getFileMenu();
+ theApp->getDocManager()->FileHistoryRemoveMenu (pMenu);
+ }
+}
+
void
ProjectionFileCanvas::OnDraw(wxDC& dc)
{
Projections& rProj = m_pView->GetDocument()->getProjections();
best.Set (rProj.nDet(), rProj.nView());
}
-
+
return best;
}
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;
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;
pPolarDoc->Modify(true);
pPolarDoc->UpdateAllViews();
pPolarDoc->GetFirstView()->OnUpdate (this, NULL);
- }}
+}}
void
ProjectionFileView::OnReconstructFourier (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());
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");
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");
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<int>('O'), wxID_OPEN);
accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('S'), wxID_SAVE);
{
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);
}
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);
m_pView = v;
}
+PlotFileCanvas::~PlotFileCanvas ()
+{
+ if (m_pView) {
+ wxMenu* pMenu = m_pView->getFileMenu();
+ theApp->getDocManager()->FileHistoryRemoveMenu (pMenu);
+ }
+}
+
void
PlotFileCanvas::OnDraw(wxDC& dc)
{
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;
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";
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");
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<int>('O'), wxID_OPEN);
accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('S'), wxID_SAVE);
m_frame->Show(true);
Activate(true);
-
+
return true;
}
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
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);
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<int>('O'), wxID_OPEN);
+ accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('S'), wxID_SAVE);
+ accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('W'), wxID_CLOSE);
+ accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('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);
+ }
+}
projects / ctsim.git / commitdiff