X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fviews.cpp;h=8053e7e710c07e517345aed8f9cb23c57537f29f;hb=a18f7b9629e21da7c33abc59718b5ab150f3e3d1;hp=65ab9f6d744797083b2121f84652ebaf1708f546;hpb=dd8faeb9c2a1633c96ca31bce81e338a591fab71;p=ctsim.git diff --git a/src/views.cpp b/src/views.cpp index 65ab9f6..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.70 2001/01/26 00:45:24 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,21 +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() { - if (m_pView) { - wxMenu* pMenu = m_pView->getFileMenu(); - theApp->getDocManager()->FileHistoryRemoveMenu (pMenu); - m_pView->canvasClosed(); - m_pView = NULL; - } + m_pView = NULL; } void @@ -231,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), m_pFileMenu(0) +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 @@ -356,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; @@ -458,7 +451,7 @@ 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)); + ImageFileDocument* pNewDoc = theApp->newImageDoc(); if (! pNewDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); return; @@ -498,7 +491,7 @@ 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)); + ImageFileDocument* pNewDoc = theApp->newImageDoc(); if (! pNewDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); return; @@ -538,7 +531,7 @@ 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)); + ImageFileDocument* pNewDoc = theApp->newImageDoc(); if (! pNewDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); return; @@ -578,7 +571,7 @@ 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)); + ImageFileDocument* pNewDoc = theApp->newImageDoc(); if (! pNewDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); return; @@ -785,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 @@ -908,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; @@ -933,10 +930,10 @@ 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); @@ -981,7 +978,7 @@ ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) int xSize = nx; int ySize = ny; 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); } @@ -993,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->setView(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; } @@ -1071,7 +1073,7 @@ ImageFileView::OnScaleSize (wxCommandEvent& event) 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; @@ -1121,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 { @@ -1205,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 { @@ -1303,7 +1305,7 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event) 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 { @@ -1401,7 +1403,7 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event) 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 { @@ -1486,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 { @@ -1577,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 { @@ -1640,7 +1642,7 @@ 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; @@ -1696,7 +1698,7 @@ ImageFileView::OnPlotHistogram (wxCommandEvent& event) // 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; @@ -1704,12 +1706,7 @@ PhantomCanvas::PhantomCanvas (PhantomView* v, wxFrame *frame, const wxPoint& pos PhantomCanvas::~PhantomCanvas () { - if (m_pView) { - wxMenu* pMenu = m_pView->getFileMenu(); - theApp->getDocManager()->FileHistoryRemoveMenu (pMenu); - m_pView->canvasClosed(); m_pView = NULL; - } } void @@ -1720,22 +1717,22 @@ 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), m_pFileMenu(0) +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; @@ -1747,12 +1744,13 @@ PhantomView::PhantomView(void) m_iDefaultRasterNSamples = 2; } -PhantomView::~PhantomView() +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(); @@ -1769,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(); @@ -1786,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; @@ -1834,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) { @@ -1858,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(); @@ -1870,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; @@ -1907,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(); @@ -1921,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); @@ -1988,61 +1990,66 @@ PhantomView::CreateChildFrame(wxDocument *doc, wxView *view) 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->setView(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; - m_frame = NULL; + 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); @@ -2063,12 +2070,7 @@ ProjectionFileCanvas::ProjectionFileCanvas (ProjectionFileView* v, wxFrame *fram ProjectionFileCanvas::~ProjectionFileCanvas () { - if (m_pView) { - wxMenu* pMenu = m_pView->getFileMenu(); - theApp->getDocManager()->FileHistoryRemoveMenu (pMenu); - m_pView->canvasClosed(); - m_pView = NULL; - } + m_pView = NULL; } void @@ -2102,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), m_pFileMenu(0) +ProjectionFileView::ProjectionFileView() +: wxView(), m_canvas(NULL), m_pFrame(NULL), m_pFileMenu(0) { m_iDefaultNX = 256; m_iDefaultNY = 256; @@ -2128,8 +2130,9 @@ ProjectionFileView::ProjectionFileView(void) m_iDefaultPolarZeropad = 1; } -ProjectionFileView::~ProjectionFileView(void) +ProjectionFileView::~ProjectionFileView() { + theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); } void @@ -2154,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"); @@ -2188,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"); @@ -2240,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; @@ -2317,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 @@ -2395,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; @@ -2418,11 +2425,11 @@ 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); @@ -2470,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); } @@ -2481,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->setView(NULL); - m_canvas = NULL; -// wxString s(wxTheApp->GetAppName()); -// if (m_frame) -// m_frame->SetTitle(s); - SetFrame(NULL); + if (m_canvas) { + m_canvas->Clear(); + m_canvas->setView(NULL); + m_canvas->Show(false); + m_canvas = NULL; + } + wxString s(wxTheApp->GetAppName()); + 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; } @@ -2512,12 +2524,7 @@ PlotFileCanvas::PlotFileCanvas (PlotFileView* v, wxFrame *frame, const wxPoint& PlotFileCanvas::~PlotFileCanvas () { - if (m_pView) { - wxMenu* pMenu = m_pView->getFileMenu(); - theApp->getDocManager()->FileHistoryRemoveMenu (pMenu); - m_pView->canvasClosed(); m_pView = NULL; - } } void @@ -2539,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), m_pFileMenu(0) +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 @@ -2642,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 @@ -2715,25 +2728,25 @@ 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; @@ -2807,22 +2820,27 @@ PlotFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) bool PlotFileView::OnClose (bool deleteWindow) { - if (!GetDocument()->Close()) + if (! GetDocument() || ! GetDocument()->Close()) return false; - //m_canvas->Clear(); - //m_canvas->setView (NULL); - m_canvas = NULL; -// wxString s(wxTheApp->GetAppName()); -// if (m_frame) -// m_frame->SetTitle(s); + if (m_canvas) { + m_canvas->Clear(); + m_canvas->setView (NULL); + m_canvas->Show(false); + m_canvas = NULL; + } + wxString s(wxTheApp->GetAppName()); + 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; } @@ -2831,21 +2849,22 @@ PlotFileView::OnClose (bool deleteWindow) //////////////////////////////////////////////////////////////// -IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView) +IMPLEMENT_DYNAMIC_CLASS(TextFileView, wxView) -TextEditView::~TextEditView() +TextFileView::~TextFileView() { + theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); } -bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) +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("TextEdit"); - m_pCanvas = new TextEditCanvas (this, m_pFrame, wxPoint(0, 0), wxSize(width, height), wxTE_MULTILINE | wxTE_READONLY); + 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__ @@ -2862,39 +2881,47 @@ bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) } // Handled by wxTextWindow -void TextEditView::OnDraw(wxDC *WXUNUSED(dc) ) +void TextFileView::OnDraw(wxDC *WXUNUSED(dc) ) { } -void TextEditView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) +void TextFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) { } bool -TextEditView::OnClose (bool deleteWindow) +TextFileView::OnClose (bool deleteWindow) { - return false; + if (m_pFrame && m_pFrame->GetTitle() == "Log") + return false; - if (!GetDocument()->Close()) + if (! GetDocument() || ! GetDocument()->Close()) return false; - + + m_pCanvas->Show(false); Activate(false); - if (deleteWindow) - { - delete m_pFrame; - return TRUE; + if (deleteWindow) { + m_pFrame->Show(false); + m_pFrame->Destroy(); +// delete m_pFrame; + m_pFrame = NULL; + } return TRUE; } -wxFrame* -TextEditView::CreateChildFrame (wxDocument *doc, wxView *view) +#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, "TextEdit Frame", wxPoint(-1, -1), wxSize(300, 150), wxDEFAULT_FRAME_STYLE); + 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, "TextEdit Frame", wxPoint(-1, -1), wxSize(300, 150), wxDEFAULT_FRAME_STYLE); + wxDocChildFrame* subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(300, 150), wxDEFAULT_FRAME_STYLE); #endif theApp->setIconForFrame (subframe); @@ -2945,17 +2972,12 @@ TextEditView::CreateChildFrame (wxDocument *doc, wxView *view) // Define a constructor for my text subwindow -TextEditCanvas::TextEditCanvas (TextEditView* v, wxFrame* frame, const wxPoint& pos, const wxSize& size, long style) +TextFileCanvas::TextFileCanvas (TextFileView* v, wxFrame* frame, const wxPoint& pos, const wxSize& size, long style) : wxTextCtrl (frame, -1, "", pos, size, style), m_pView(v) { } -TextEditCanvas::~TextEditCanvas () +TextFileCanvas::~TextFileCanvas () { - if (m_pView) { - wxMenu* pMenu = m_pView->getFileMenu(); - theApp->getDocManager()->FileHistoryRemoveMenu (pMenu); - m_pView->canvasClosed(); - m_pView = NULL; - } + m_pView = NULL; }