X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fviews.cpp;h=8053e7e710c07e517345aed8f9cb23c57537f29f;hb=a18f7b9629e21da7c33abc59718b5ab150f3e3d1;hp=0b8290d0005465c89a5db873ae17384e6c544134;hpb=01ed72399d433ce45a0195f8acaea349a421461e;p=ctsim.git diff --git a/src/views.cpp b/src/views.cpp index 0b8290d..8053e7e 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.75 2001/01/26 23:23:00 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 @@ -69,11 +69,13 @@ END_EVENT_TABLE() ImageFileCanvas::ImageFileCanvas (ImageFileView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style) -: wxScrolledWindow(frame, -1, pos, size, style) +: wxScrolledWindow(frame, -1, pos, size, style), m_pView(v), m_xCursor(-1), m_yCursor(-1) { - m_pView = v; - m_xCursor = -1; - m_yCursor = -1; +} + +ImageFileCanvas::~ImageFileCanvas() +{ + m_pView = NULL; } void @@ -221,14 +223,15 @@ EVT_MENU(IFMENU_PLOT_FFT_COL, ImageFileView::OnPlotFFTCol) 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) +ImageFileView::ImageFileView() +: wxView(), m_canvas(NULL), m_pFrame(NULL), m_bMinSpecified(false), m_bMaxSpecified(false), m_pFileMenu(0) { m_iDefaultExportFormatID = ImageFile::FORMAT_PNG; } -ImageFileView::~ImageFileView(void) +ImageFileView::~ImageFileView() { + theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); } void @@ -346,7 +349,7 @@ ImageFileView::OnCompare (wxCommandEvent& event) os << "Comparative Statistics: d=" << d << ", r=" << r << ", e=" << e << "\n"; *theApp->getLog() << os.str().c_str(); if (dialogGetCompare.getMakeDifferenceImage()) { - ImageFileDocument* pDifferenceDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); + ImageFileDocument* pDifferenceDoc = theApp->newImageDoc(); if (! pDifferenceDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); return; @@ -448,11 +451,11 @@ ImageFileView::OnAdd (wxCommandEvent& event) ImageFile& rIF = GetDocument()->getImageFile(); 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; - } + ImageFileDocument* pNewDoc = theApp->newImageDoc(); + 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); @@ -488,11 +491,11 @@ ImageFileView::OnSubtract (wxCommandEvent& event) ImageFile& rIF = GetDocument()->getImageFile(); 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; - } + ImageFileDocument* pNewDoc = theApp->newImageDoc(); + 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); @@ -528,11 +531,11 @@ ImageFileView::OnMultiply (wxCommandEvent& event) ImageFile& rIF = GetDocument()->getImageFile(); 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; - } + ImageFileDocument* pNewDoc = theApp->newImageDoc(); + 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); @@ -568,11 +571,11 @@ ImageFileView::OnDivide (wxCommandEvent& event) ImageFile& rIF = GetDocument()->getImageFile(); 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; - } + ImageFileDocument* pNewDoc = theApp->newImageDoc(); + 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 +738,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 +753,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); } } @@ -775,7 +778,11 @@ ImageFileView::CreateCanvas (wxView *view, wxFrame *parent) return pCanvas; } -wxFrame* +#if CTSIM_MDI +wxDocMDIChildFrame* +#else +wxDocChildFrame* +#endif ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) { #if CTSIM_MDI @@ -784,24 +791,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; + + 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(IFMENU_FILE_PROPERTIES, "P&roperties"); - file_menu->Append(IFMENU_FILE_EXPORT, "&Export..."); + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(IFMENU_FILE_PROPERTIES, "P&roperties"); + m_pFileMenu->Append(IFMENU_FILE_EXPORT, "&Export..."); - 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(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 +853,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 +873,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 +897,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; } @@ -892,23 +905,23 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) bool ImageFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) ) { - m_frame = CreateChildFrame(doc, this); - SetFrame (m_frame); + m_pFrame = CreateChildFrame(doc, this); + SetFrame (m_pFrame); m_bMinSpecified = false; m_bMaxSpecified = false; m_dAutoScaleFactor = 1.; int width, height; - m_frame->GetClientSize (&width, &height); - m_frame->SetTitle("ImageFileView"); - m_canvas = CreateCanvas (this, m_frame); + m_pFrame->GetClientSize (&width, &height); + m_pFrame->SetTitle("ImageFileView"); + m_canvas = CreateCanvas (this, m_pFrame); int x, y; // X requires a forced resize - m_frame->GetSize(&x, &y); - m_frame->SetSize(-1, -1, x, y); - m_frame->SetFocus(); - m_frame->Show(true); + m_pFrame->GetSize(&x, &y); + m_pFrame->SetSize(-1, -1, x, y); + m_pFrame->SetFocus(); + m_pFrame->Show(true); Activate(true); return true; @@ -917,11 +930,11 @@ ImageFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) ) void ImageFileView::OnDraw (wxDC* dc) { - wxSize sizeWindow = m_frame->GetClientSize(); + wxSize sizeWindow = m_pFrame->GetClientSize(); wxSize sizeBest = m_canvas->GetBestSize(); if (sizeWindow.x > sizeBest.x || sizeWindow.y > sizeBest.y) - m_frame->SetClientSize (sizeBest); - + m_pFrame->SetClientSize (sizeBest); + if (m_bitmap.Ok()) dc->DrawBitmap(m_bitmap, 0, 0, false); @@ -964,9 +977,8 @@ 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_pFrame->SetClientSize (xSize, ySize); m_canvas->SetScrollbars(20, 20, nx/20, ny/20); m_canvas->SetBackgroundColour(*wxWHITE); } @@ -978,22 +990,27 @@ ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) bool ImageFileView::OnClose (bool deleteWindow) { - if (!GetDocument()->Close()) + if (! GetDocument() || ! GetDocument()->Close()) return false; - m_canvas->Clear(); - //m_canvas->m_pView = NULL; - m_canvas = NULL; + if (m_canvas) { + m_canvas->Clear(); + m_canvas->Show(false); + m_canvas->setView(NULL); + m_canvas = NULL; + } wxString s(theApp->GetAppName()); - if (m_frame) - m_frame->SetTitle(s); + if (m_pFrame) + m_pFrame->SetTitle(s); SetFrame(NULL); Activate(false); if (deleteWindow) { - delete m_frame; - return true; + m_pFrame->Show(false); + m_pFrame->Destroy(); +// delete m_pFrame; + m_pFrame = NULL; } return true; } @@ -1014,12 +1031,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 +1049,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,14 +1066,14 @@ 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(); unsigned int iNewNY = dialogGetXYSize.getYSize(); std::ostringstream os; os << "Scale Size from (" << iOldNX << "," << iOldNY << ") to (" << iNewNX << "," << iNewNY << ")"; - ImageFileDocument* pScaledDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); + ImageFileDocument* pScaledDoc = theApp->newImageDoc(); if (! pScaledDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); return; @@ -1106,7 +1123,7 @@ ImageFileView::OnPlotRow (wxCommandEvent& event) pYMag[i] = ::sqrt (v[i][yCursor] * v[i][yCursor] + vImag[i][yCursor] * vImag[i][yCursor]); } } - PlotFileDocument* pPlotDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT)); + PlotFileDocument* pPlotDoc = theApp->newPlotDoc(); if (! pPlotDoc) { sys_error (ERR_SEVERE, "Internal error: unable to create Plot file"); } else { @@ -1190,7 +1207,7 @@ ImageFileView::OnPlotCol (wxCommandEvent& event) pYMag[i] = ::sqrt (v[xCursor][i] * v[xCursor][i] + vImag[xCursor][i] * vImag[xCursor][i]); } } - PlotFileDocument* pPlotDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT)); + PlotFileDocument* pPlotDoc = theApp->newPlotDoc(); if (! pPlotDoc) { sys_error (ERR_SEVERE, "Internal error: unable to create Plot file"); } else { @@ -1260,7 +1277,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 +1286,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,8 +1304,8 @@ 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)); + + PlotFileDocument* pPlotDoc = theApp->newPlotDoc(); if (! pPlotDoc) { sys_error (ERR_SEVERE, "Internal error: unable to create Plot file"); } else { @@ -1303,14 +1320,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 +1345,7 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event) delete pYImag; delete pYMag; delete [] pcIn; - + if (theApp->getSetModifyNewDocs()) pPlotDoc->Modify(true); pPlotDoc->UpdateAllViews(); @@ -1353,28 +1370,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,8 +1402,8 @@ 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)); + + PlotFileDocument* pPlotDoc = theApp->newPlotDoc(); if (! pPlotDoc) { sys_error (ERR_SEVERE, "Internal error: unable to create Plot file"); } else { @@ -1401,14 +1418,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 +1444,7 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event) delete pYMag; delete pdTemp; delete [] pcIn; - + if (theApp->getSetModifyNewDocs()) pPlotDoc->Modify(true); pPlotDoc->UpdateAllViews(); @@ -1471,7 +1488,7 @@ ImageFileView::OnCompareCol (wxCommandEvent& event) pY1[i] = v1[xCursor][i]; pY2[i] = v2[xCursor][i]; } - PlotFileDocument* pPlotDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT)); + PlotFileDocument* pPlotDoc = theApp->newPlotDoc(); if (! pPlotDoc) { sys_error (ERR_SEVERE, "Internal error: unable to create Plot file"); } else { @@ -1495,7 +1512,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(); @@ -1562,7 +1579,7 @@ ImageFileView::OnCompareRow (wxCommandEvent& event) pY1[i] = v1[i][yCursor]; pY2[i] = v2[i][yCursor]; } - PlotFileDocument* pPlotDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT)); + PlotFileDocument* pPlotDoc = theApp->newPlotDoc(); if (! pPlotDoc) { sys_error (ERR_SEVERE, "Internal error: unable to create Plot file"); } else { @@ -1625,18 +1642,18 @@ ImageFileView::OnPlotHistogram (wxCommandEvent& event) int ny = rIF.ny(); if (v != NULL && nx > 0 && ny > 0) { - PlotFileDocument* pPlotDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT)); + PlotFileDocument* pPlotDoc = theApp->newPlotDoc(); if (! pPlotDoc) { 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,46 +1664,51 @@ 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(); } } // PhantomCanvas -PhantomCanvas::PhantomCanvas (PhantomView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style) +PhantomCanvas::PhantomCanvas (PhantomFileView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style) : wxScrolledWindow(frame, -1, pos, size, style) { m_pView = v; } +PhantomCanvas::~PhantomCanvas () +{ + m_pView = NULL; +} + void PhantomCanvas::OnDraw (wxDC& dc) { @@ -1695,39 +1717,40 @@ PhantomCanvas::OnDraw (wxDC& dc) } -// PhantomView +// PhantomFileView -IMPLEMENT_DYNAMIC_CLASS(PhantomView, wxView) +IMPLEMENT_DYNAMIC_CLASS(PhantomFileView, wxView) -BEGIN_EVENT_TABLE(PhantomView, wxView) -EVT_MENU(PHMMENU_FILE_PROPERTIES, PhantomView::OnProperties) -EVT_MENU(PHMMENU_PROCESS_RASTERIZE, PhantomView::OnRasterize) -EVT_MENU(PHMMENU_PROCESS_PROJECTIONS, PhantomView::OnProjections) +BEGIN_EVENT_TABLE(PhantomFileView, wxView) +EVT_MENU(PHMMENU_FILE_PROPERTIES, PhantomFileView::OnProperties) +EVT_MENU(PHMMENU_PROCESS_RASTERIZE, PhantomFileView::OnRasterize) +EVT_MENU(PHMMENU_PROCESS_PROJECTIONS, PhantomFileView::OnProjections) END_EVENT_TABLE() -PhantomView::PhantomView(void) -: wxView(), m_canvas(NULL), m_frame(NULL) +PhantomFileView::PhantomFileView() +: wxView(), m_canvas(NULL), m_pFrame(NULL), m_pFileMenu(0) { m_iDefaultNDet = 367; m_iDefaultNView = 320; - m_iDefaultNSample = 2; + m_iDefaultNSample = 1; m_dDefaultRotation = 1; m_dDefaultFocalLength = 2; 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) +PhantomFileView::~PhantomFileView() { + theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); } void -PhantomView::OnProperties (wxCommandEvent& event) +PhantomFileView::OnProperties (wxCommandEvent& event) { const int idPhantom = GetDocument()->getPhantomID(); const wxString& namePhantom = GetDocument()->getPhantomName(); @@ -1744,7 +1767,7 @@ PhantomView::OnProperties (wxCommandEvent& event) void -PhantomView::OnProjections (wxCommandEvent& event) +PhantomFileView::OnProjections (wxCommandEvent& event) { DialogGetProjectionParameters dialogProjection (getFrameForChild(), m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample, m_dDefaultRotation, m_dDefaultFocalLength, m_dDefaultFieldOfView, m_iDefaultGeometry, m_iDefaultTrace); int retVal = dialogProjection.ShowModal(); @@ -1761,7 +1784,7 @@ PhantomView::OnProjections (wxCommandEvent& event) if (m_iDefaultNDet > 0 && m_iDefaultNView > 0 && sGeometry != "") { const Phantom& rPhantom = GetDocument()->getPhantom(); - ProjectionFileDocument* pProjectionDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.pj", wxDOC_SILENT)); + ProjectionFileDocument* pProjectionDoc = theApp->newProjectionDoc(); if (! pProjectionDoc) { sys_error (ERR_SEVERE, "Unable to create projection document"); return; @@ -1809,7 +1832,7 @@ PhantomView::OnProjections (wxCommandEvent& event) rProj.setRemark (os.str()); *theApp->getLog() << os.str().c_str() << "\n"; - m_frame->Lower(); + m_pFrame->Lower(); ::wxYield(); ProjectionFileView* projView = dynamic_cast(pProjectionDoc->GetFirstView()); if (projView) { @@ -1833,7 +1856,7 @@ PhantomView::OnProjections (wxCommandEvent& event) void -PhantomView::OnRasterize (wxCommandEvent& event) +PhantomFileView::OnRasterize (wxCommandEvent& event) { DialogGetRasterParameters dialogRaster (getFrameForChild(), m_iDefaultRasterNX, m_iDefaultRasterNY, m_iDefaultRasterNSamples); int retVal = dialogRaster.ShowModal(); @@ -1845,7 +1868,7 @@ PhantomView::OnRasterize (wxCommandEvent& event) m_iDefaultRasterNSamples = 1; if (m_iDefaultRasterNX > 0 && m_iDefaultRasterNY > 0) { const Phantom& rPhantom = GetDocument()->getPhantom(); - ImageFileDocument* pRasterDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); + ImageFileDocument* pRasterDoc = theApp->newImageDoc(); if (! pRasterDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); return; @@ -1882,13 +1905,13 @@ PhantomView::OnRasterize (wxCommandEvent& event) PhantomCanvas* -PhantomView::CreateCanvas (wxView *view, wxFrame *parent) +PhantomFileView::CreateCanvas (wxView *view, wxFrame *parent) { PhantomCanvas* pCanvas; int width, height; parent->GetClientSize(&width, &height); - pCanvas = new PhantomCanvas (dynamic_cast(view), parent, wxPoint(0, 0), wxSize(width, height), 0); + pCanvas = new PhantomCanvas (dynamic_cast(view), parent, wxPoint(0, 0), wxSize(width, height), 0); pCanvas->SetBackgroundColour(*wxWHITE); pCanvas->Clear(); @@ -1896,8 +1919,12 @@ PhantomView::CreateCanvas (wxView *view, wxFrame *parent) return pCanvas; } -wxFrame* -PhantomView::CreateChildFrame(wxDocument *doc, wxView *view) +#if CTSIM_MDI +wxDocMDIChildFrame* +#else +wxDocChildFrame* +#endif +PhantomFileView::CreateChildFrame(wxDocument *doc, wxView *view) { #if CTSIM_MDI wxDocMDIChildFrame *subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "Phantom Frame", wxPoint(10, 10), wxSize(256, 256), wxDEFAULT_FRAME_STYLE); @@ -1905,22 +1932,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 +1966,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,65 +1984,72 @@ 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; } bool -PhantomView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) +PhantomFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) { - m_frame = CreateChildFrame(doc, this); - SetFrame(m_frame); + m_pFrame = CreateChildFrame(doc, this); + SetFrame(m_pFrame); int width, height; - m_frame->GetClientSize(&width, &height); - m_frame->SetTitle("PhantomView"); - m_canvas = CreateCanvas (this, m_frame); + m_pFrame->GetClientSize(&width, &height); + m_pFrame->SetTitle("PhantomFileView"); + m_canvas = CreateCanvas (this, m_pFrame); #ifdef __X__ int x, y; // X requires a forced resize - m_frame->GetSize(&x, &y); - m_frame->SetSize(-1, -1, x, y); + m_pFrame->GetSize(&x, &y); + m_pFrame->SetSize(-1, -1, x, y); #endif - m_frame->Show(true); + m_pFrame->Show(true); Activate(true); return true; } void -PhantomView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) +PhantomFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) { if (m_canvas) m_canvas->Refresh(); } bool -PhantomView::OnClose (bool deleteWindow) +PhantomFileView::OnClose (bool deleteWindow) { - if (!GetDocument()->Close()) + if (! GetDocument() || ! GetDocument()->Close()) return false; - m_canvas->Clear(); - //m_canvas->m_pView = NULL; - m_canvas = NULL; + if (m_canvas) { + m_canvas->Clear(); + m_canvas->setView(NULL); + m_canvas->Show(false); + m_canvas = NULL; + } wxString s(wxTheApp->GetAppName()); - if (m_frame) - m_frame->SetTitle(s); + if (m_pFrame) + m_pFrame->SetTitle(s); SetFrame(NULL); Activate(false); - if (deleteWindow) - delete m_frame; - + if (deleteWindow) { + m_pFrame->Show(false); + m_pFrame->Destroy(); +// delete m_pFrame; + m_pFrame = NULL; + } + return true; } void -PhantomView::OnDraw (wxDC* dc) +PhantomFileView::OnDraw (wxDC* dc) { int xsize, ysize; m_canvas->GetClientSize (&xsize, &ysize); @@ -2028,6 +2068,11 @@ ProjectionFileCanvas::ProjectionFileCanvas (ProjectionFileView* v, wxFrame *fram m_pView = v; } +ProjectionFileCanvas::~ProjectionFileCanvas () +{ + m_pView = NULL; +} + void ProjectionFileCanvas::OnDraw(wxDC& dc) { @@ -2043,7 +2088,7 @@ ProjectionFileCanvas::GetBestSize () const Projections& rProj = m_pView->GetDocument()->getProjections(); best.Set (rProj.nDet(), rProj.nView()); } - + return best; } @@ -2059,8 +2104,8 @@ EVT_MENU(PJMENU_CONVERT_POLAR, ProjectionFileView::OnConvertPolar) EVT_MENU(PJMENU_CONVERT_FFT_POLAR, ProjectionFileView::OnConvertFFTPolar) END_EVENT_TABLE() -ProjectionFileView::ProjectionFileView(void) -: wxView(), m_canvas(NULL), m_frame(NULL) +ProjectionFileView::ProjectionFileView() +: wxView(), m_canvas(NULL), m_pFrame(NULL), m_pFileMenu(0) { m_iDefaultNX = 256; m_iDefaultNY = 256; @@ -2078,15 +2123,16 @@ 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; m_iDefaultPolarZeropad = 1; } -ProjectionFileView::~ProjectionFileView(void) +ProjectionFileView::~ProjectionFileView() { + theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); } void @@ -2111,7 +2157,7 @@ ProjectionFileView::OnConvertPolar (wxCommandEvent& event) wxString strInterpolation (dialogPolar.getInterpolationName()); m_iDefaultPolarNX = dialogPolar.getXSize(); m_iDefaultPolarNY = dialogPolar.getYSize(); - ImageFileDocument* pPolarDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); + ImageFileDocument* pPolarDoc = theApp->newImageDoc(); ImageFile& rIF = pPolarDoc->getImageFile(); if (! pPolarDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); @@ -2145,7 +2191,7 @@ ProjectionFileView::OnConvertFFTPolar (wxCommandEvent& event) m_iDefaultPolarNX = dialogPolar.getXSize(); m_iDefaultPolarNY = dialogPolar.getYSize(); m_iDefaultPolarZeropad = dialogPolar.getZeropad(); - ImageFileDocument* pPolarDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); + ImageFileDocument* pPolarDoc = theApp->newImageDoc(); ImageFile& rIF = pPolarDoc->getImageFile(); if (! pPolarDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); @@ -2165,7 +2211,7 @@ ProjectionFileView::OnConvertFFTPolar (wxCommandEvent& event) pPolarDoc->Modify(true); pPolarDoc->UpdateAllViews(); pPolarDoc->GetFirstView()->OnUpdate (this, NULL); - }} +}} void ProjectionFileView::OnReconstructFourier (wxCommandEvent& event) @@ -2197,7 +2243,7 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) m_iDefaultBackprojector = Backprojector::convertBackprojectNameToID (optBackprojectName.c_str()); m_iDefaultTrace = dialogReconstruction.getTrace(); if (m_iDefaultNX > 0 && m_iDefaultNY > 0) { - ImageFileDocument* pReconDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); + ImageFileDocument* pReconDoc = theApp->newImageDoc(); if (! pReconDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); return; @@ -2207,7 +2253,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()); @@ -2274,7 +2320,11 @@ ProjectionFileView::CreateCanvas (wxView *view, wxFrame *parent) return pCanvas; } -wxFrame* +#if CTSIM_MDI +wxDocMDIChildFrame* +#else +wxDocChildFrame* +#endif ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view) { #ifdef CTSIM_MDI @@ -2283,23 +2333,29 @@ 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; + + 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(PJMENU_FILE_PROPERTIES, "P&roperties"); + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(PJMENU_FILE_PROPERTIES, "P&roperties"); - 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(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 *convert_menu = new wxMenu; convert_menu->Append (PJMENU_CONVERT_POLAR, "&Polar Image...\tCtrl-L"); @@ -2308,7 +2364,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 +2372,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); @@ -2346,21 +2402,21 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view) bool ProjectionFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) { - m_frame = CreateChildFrame(doc, this); - SetFrame(m_frame); + m_pFrame = CreateChildFrame(doc, this); + SetFrame(m_pFrame); int width, height; - m_frame->GetClientSize(&width, &height); - m_frame->SetTitle("ProjectionFileView"); - m_canvas = CreateCanvas(this, m_frame); + m_pFrame->GetClientSize(&width, &height); + m_pFrame->SetTitle("ProjectionFileView"); + m_canvas = CreateCanvas(this, m_pFrame); #ifdef __X__ int x, y; // X requires a forced resize - m_frame->GetSize(&x, &y); - m_frame->SetSize(-1, -1, x, y); + m_pFrame->GetSize(&x, &y); + m_pFrame->SetSize(-1, -1, x, y); #endif - m_frame->Show(true); + m_pFrame->Show(true); Activate(true); return true; @@ -2369,12 +2425,12 @@ ProjectionFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) void ProjectionFileView::OnDraw (wxDC* dc) { - wxSize clientSize = m_frame->GetClientSize(); + wxSize clientSize = m_pFrame->GetClientSize(); wxSize bestSize = m_canvas->GetBestSize(); - + if (clientSize.x > bestSize.x || clientSize.y > bestSize.y) - m_frame->SetClientSize (bestSize); - + m_pFrame->SetClientSize (bestSize); + if (m_bitmap.Ok()) dc->DrawBitmap (m_bitmap, 0, 0, false); } @@ -2421,7 +2477,7 @@ ProjectionFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) int ySize = nView; xSize = clamp (xSize, 0, 800); ySize = clamp (ySize, 0, 800); - m_frame->SetClientSize (xSize, ySize); + m_pFrame->SetClientSize (xSize, ySize); m_canvas->SetScrollbars (20, 20, nDet/20, nView/20); } @@ -2432,22 +2488,27 @@ ProjectionFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) bool ProjectionFileView::OnClose (bool deleteWindow) { - if (!GetDocument()->Close()) + if (! GetDocument() || ! GetDocument()->Close()) return false; - m_canvas->Clear(); - // m_canvas->m_pView = NULL; - m_canvas = NULL; + if (m_canvas) { + m_canvas->Clear(); + m_canvas->setView(NULL); + m_canvas->Show(false); + m_canvas = NULL; + } wxString s(wxTheApp->GetAppName()); - if (m_frame) - m_frame->SetTitle(s); - SetFrame(NULL); + if (m_pFrame) + m_pFrame->SetTitle(s); +// SetFrame(NULL); Activate(false); if (deleteWindow) { - delete m_frame; - return true; + m_pFrame->Show(false); + m_pFrame->Destroy(); +// delete m_pFrame; + m_pFrame = NULL; } return true; } @@ -2461,6 +2522,11 @@ PlotFileCanvas::PlotFileCanvas (PlotFileView* v, wxFrame *frame, const wxPoint& m_pView = v; } +PlotFileCanvas::~PlotFileCanvas () +{ + m_pView = NULL; +} + void PlotFileCanvas::OnDraw(wxDC& dc) { @@ -2480,17 +2546,19 @@ EVT_MENU(PLOTMENU_VIEW_SCALE_AUTO, PlotFileView::OnScaleAuto) EVT_MENU(PLOTMENU_VIEW_SCALE_FULL, PlotFileView::OnScaleFull) END_EVENT_TABLE() -PlotFileView::PlotFileView(void) -: wxView(), m_canvas(NULL), m_frame(NULL), m_pEZPlot(NULL) +PlotFileView::PlotFileView() +: wxView(), m_canvas(NULL), m_pFrame(NULL), m_pEZPlot(NULL), m_pFileMenu(0) { m_bMinSpecified = false; m_bMaxSpecified = false; } -PlotFileView::~PlotFileView(void) +PlotFileView::~PlotFileView() { if (m_pEZPlot) delete m_pEZPlot; + + theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); } void @@ -2533,7 +2601,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"; @@ -2583,7 +2651,11 @@ PlotFileView::CreateCanvas (wxView *view, wxFrame *parent) return pCanvas; } -wxFrame* +#if CTSIM_MDI +wxDocMDIChildFrame* +#else +wxDocChildFrame* +#endif PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view) { #ifdef CTSIM_MDI @@ -2592,23 +2664,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 +2700,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); @@ -2650,27 +2728,27 @@ PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view) bool PlotFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) ) { - m_frame = CreateChildFrame(doc, this); - SetFrame(m_frame); + m_pFrame = CreateChildFrame(doc, this); + SetFrame(m_pFrame); m_bMinSpecified = false; m_bMaxSpecified = false; m_dAutoScaleFactor = 1.; int width, height; - m_frame->GetClientSize(&width, &height); - m_frame->SetTitle ("Plot File"); - m_canvas = CreateCanvas (this, m_frame); + m_pFrame->GetClientSize(&width, &height); + m_pFrame->SetTitle ("Plot File"); + m_canvas = CreateCanvas (this, m_pFrame); #ifdef __X__ int x, y; // X requires a forced resize - m_frame->GetSize(&x, &y); - m_frame->SetSize(-1, -1, x, y); + m_pFrame->GetSize(&x, &y); + m_pFrame->SetSize(-1, -1, x, y); #endif - m_frame->Show(true); + m_pFrame->Show(true); Activate(true); - + return true; } @@ -2695,70 +2773,211 @@ 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 PlotFileView::OnClose (bool deleteWindow) { - if (!GetDocument()->Close()) + if (! GetDocument() || ! GetDocument()->Close()) return false; - m_canvas->Clear(); - // m_canvas->m_pView = NULL; - m_canvas = NULL; + if (m_canvas) { + m_canvas->Clear(); + m_canvas->setView (NULL); + m_canvas->Show(false); + m_canvas = NULL; + } wxString s(wxTheApp->GetAppName()); - if (m_frame) - m_frame->SetTitle(s); + if (m_pFrame) + m_pFrame->SetTitle(s); SetFrame(NULL); Activate(false); if (deleteWindow) { - delete m_frame; - return true; + m_pFrame->Show(false); + m_pFrame->Destroy(); +// delete m_pFrame; + m_pFrame = NULL; } return true; } + +//////////////////////////////////////////////////////////////// + + +IMPLEMENT_DYNAMIC_CLASS(TextFileView, wxView) + +TextFileView::~TextFileView() +{ + theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); +} + +bool TextFileView::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("TextFile"); + m_pCanvas = new TextFileCanvas (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 TextFileView::OnDraw(wxDC *WXUNUSED(dc) ) +{ +} + +void TextFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) +{ +} + +bool +TextFileView::OnClose (bool deleteWindow) +{ + if (m_pFrame && m_pFrame->GetTitle() == "Log") + return false; + + if (! GetDocument() || ! GetDocument()->Close()) + return false; + + m_pCanvas->Show(false); + Activate(false); + + if (deleteWindow) { + m_pFrame->Show(false); + m_pFrame->Destroy(); +// delete m_pFrame; + m_pFrame = NULL; + + } + return TRUE; +} + +#if CTSIM_MDI +wxDocMDIChildFrame* +#else +wxDocChildFrame* +#endif +TextFileView::CreateChildFrame (wxDocument *doc, wxView *view) +{ +#if CTSIM_MDI + wxDocMDIChildFrame* subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(300, 150), wxDEFAULT_FRAME_STYLE); +#else + wxDocChildFrame* subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile 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 +TextFileCanvas::TextFileCanvas (TextFileView* v, wxFrame* frame, const wxPoint& pos, const wxSize& size, long style) + : wxTextCtrl (frame, -1, "", pos, size, style), m_pView(v) +{ +} + +TextFileCanvas::~TextFileCanvas () +{ + m_pView = NULL; +}