X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fviews.cpp;h=8b28fef1bbeda806d2e3616d3b4609e9341de0ba;hb=5e6c61b9ab5a05fff344b1aacf70e5ff61b81060;hp=167c76e011ee0e04a6cb72d8cddb28b901bf493c;hpb=a5d437cb4228b07f8c005eaca497c317b8c19d14;p=ctsim.git diff --git a/src/views.cpp b/src/views.cpp index 167c76e..8b28fef 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.69 2001/01/20 17:43:41 kevin Exp $ +** $Id: views.cpp,v 1.83 2001/01/28 04:24:03 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,19 +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 = NULL; } void @@ -229,14 +223,16 @@ 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_pFrame(NULL), m_pCanvas(NULL), m_pFileMenu(0), m_bMinSpecified(false), m_bMaxSpecified(false) { m_iDefaultExportFormatID = ImageFile::FORMAT_PNG; } -ImageFileView::~ImageFileView(void) +ImageFileView::~ImageFileView() { + GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->ActivateView(this, FALSE, TRUE); } void @@ -354,7 +350,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; @@ -363,7 +359,7 @@ ImageFileView::OnCompare (wxCommandEvent& event) differenceImage.setArraySize (rIF.nx(), rIF.ny()); if (! rIF.subtractImages (rCompareIF, differenceImage)) { - pDifferenceDoc->DeleteAllViews(); + pDifferenceDoc->getView()->getFrame()->Close(true); return; } @@ -379,7 +375,8 @@ ImageFileView::OnCompare (wxCommandEvent& event) if (theApp->getSetModifyNewDocs()) pDifferenceDoc->Modify(true); pDifferenceDoc->UpdateAllViews(this); - pDifferenceDoc->GetFirstView()->OnUpdate (this, NULL); + pDifferenceDoc->getView()->OnUpdate (this, NULL); + pDifferenceDoc->getView()->getFrame()->Show(true); } wxMessageBox(os.str().c_str(), "Image Comparison"); } @@ -456,7 +453,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; @@ -476,7 +473,8 @@ ImageFileView::OnAdd (wxCommandEvent& event) if (theApp->getSetModifyNewDocs()) pNewDoc->Modify(TRUE); pNewDoc->UpdateAllViews(this); - pNewDoc->GetFirstView()->OnUpdate (this, NULL); + pNewDoc->getView()->OnUpdate (this, NULL); + pNewDoc->getView()->getFrame()->Show(true); } } } @@ -496,7 +494,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; @@ -516,7 +514,8 @@ ImageFileView::OnSubtract (wxCommandEvent& event) if (theApp->getSetModifyNewDocs()) pNewDoc->Modify(TRUE); pNewDoc->UpdateAllViews(this); - pNewDoc->GetFirstView()->OnUpdate (this, NULL); + pNewDoc->getView()->OnUpdate (this, NULL); + pNewDoc->getView()->getFrame()->Show(true); } } } @@ -536,7 +535,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; @@ -556,7 +555,8 @@ ImageFileView::OnMultiply (wxCommandEvent& event) if (theApp->getSetModifyNewDocs()) pNewDoc->Modify(TRUE); pNewDoc->UpdateAllViews(this); - pNewDoc->GetFirstView()->OnUpdate (this, NULL); + pNewDoc->getView()->OnUpdate (this, NULL); + pNewDoc->getView()->getFrame()->Show(true); } } } @@ -576,7 +576,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; @@ -596,7 +596,8 @@ ImageFileView::OnDivide (wxCommandEvent& event) if (theApp->getSetModifyNewDocs()) pNewDoc->Modify(TRUE); pNewDoc->UpdateAllViews(this); - pNewDoc->GetFirstView()->OnUpdate (this, NULL); + pNewDoc->getView()->OnUpdate (this, NULL); + pNewDoc->getView()->getFrame()->Show(true); } } } @@ -783,7 +784,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 @@ -814,8 +819,8 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) m_pFileMenu->AppendSeparator(); m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit"); #endif - theApp->getDocManager()->FileHistoryAddFilesToMenu(m_pFileMenu); - theApp->getDocManager()->FileHistoryUseMenu(m_pFileMenu); + GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu); + GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu); wxMenu *view_menu = new wxMenu; view_menu->Append(IFMENU_VIEW_SCALE_MINMAX, "Display Scale S&et...\tCtrl-E"); @@ -906,23 +911,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); + (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_pCanvas = 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; @@ -931,17 +936,17 @@ ImageFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) ) void ImageFileView::OnDraw (wxDC* dc) { - wxSize sizeWindow = m_frame->GetClientSize(); - wxSize sizeBest = m_canvas->GetBestSize(); + wxSize sizeWindow = m_pFrame->GetClientSize(); + wxSize sizeBest = m_pCanvas->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); int xCursor, yCursor; - if (m_canvas->GetCurrentCursor (xCursor, yCursor)) - m_canvas->DrawRubberBandCursor (*dc, xCursor, yCursor); + if (m_pCanvas->GetCurrentCursor (xCursor, yCursor)) + m_pCanvas->DrawRubberBandCursor (*dc, xCursor, yCursor); } @@ -979,34 +984,36 @@ 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_canvas->SetScrollbars(20, 20, nx/20, ny/20); - m_canvas->SetBackgroundColour(*wxWHITE); + m_pFrame->SetClientSize (xSize, ySize); + m_pCanvas->SetScrollbars(20, 20, nx/20, ny/20); + m_pCanvas->SetBackgroundColour(*wxWHITE); } - if (m_canvas) - m_canvas->Refresh(); + if (m_pCanvas) + m_pCanvas->Refresh(); } 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_pCanvas) { + m_pCanvas->setView(NULL); + m_pCanvas = NULL; + } wxString s(theApp->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(); + m_pFrame = NULL; } return true; } @@ -1069,7 +1076,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; @@ -1083,7 +1090,8 @@ ImageFileView::OnScaleSize (wxCommandEvent& event) if (theApp->getSetModifyNewDocs()) pScaledDoc->Modify(TRUE); pScaledDoc->UpdateAllViews (this); - pScaledDoc->GetFirstView()->OnUpdate (this, NULL); + pScaledDoc->getView()->OnUpdate (this, NULL); + pScaledDoc->getView()->getFrame()->Show(true); } } @@ -1091,7 +1099,7 @@ void ImageFileView::OnPlotRow (wxCommandEvent& event) { int xCursor, yCursor; - if (! m_canvas->GetCurrentCursor (xCursor, yCursor)) { + if (! m_pCanvas->GetCurrentCursor (xCursor, yCursor)) { wxMessageBox ("No row selected. Please use left mouse button on image to select column","Error"); return; } @@ -1119,7 +1127,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 { @@ -1175,7 +1183,7 @@ void ImageFileView::OnPlotCol (wxCommandEvent& event) { int xCursor, yCursor; - if (! m_canvas->GetCurrentCursor (xCursor, yCursor)) { + if (! m_pCanvas->GetCurrentCursor (xCursor, yCursor)) { wxMessageBox ("No column selected. Please use left mouse button on image to select column","Error"); return; } @@ -1203,7 +1211,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 +1268,7 @@ void ImageFileView::OnPlotFFTRow (wxCommandEvent& event) { int xCursor, yCursor; - if (! m_canvas->GetCurrentCursor (xCursor, yCursor)) { + if (! m_pCanvas->GetCurrentCursor (xCursor, yCursor)) { wxMessageBox ("No row selected. Please use left mouse button on image to select column","Error"); return; } @@ -1301,7 +1309,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 { @@ -1352,7 +1360,7 @@ void ImageFileView::OnPlotFFTCol (wxCommandEvent& event) { int xCursor, yCursor; - if (! m_canvas->GetCurrentCursor (xCursor, yCursor)) { + if (! m_pCanvas->GetCurrentCursor (xCursor, yCursor)) { wxMessageBox ("No column selected. Please use left mouse button on image to select column","Error"); return; } @@ -1399,7 +1407,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 { @@ -1452,7 +1460,7 @@ void ImageFileView::OnCompareCol (wxCommandEvent& event) { int xCursor, yCursor; - if (! m_canvas->GetCurrentCursor (xCursor, yCursor)) { + if (! m_pCanvas->GetCurrentCursor (xCursor, yCursor)) { wxMessageBox ("No column selected. Please use left mouse button on image to select column","Error"); return; } @@ -1484,7 +1492,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 { @@ -1541,7 +1549,7 @@ void ImageFileView::OnCompareRow (wxCommandEvent& event) { int xCursor, yCursor; - if (! m_canvas->GetCurrentCursor (xCursor, yCursor)) { + if (! m_pCanvas->GetCurrentCursor (xCursor, yCursor)) { wxMessageBox ("No column selected. Please use left mouse button on image to select column","Error"); return; } @@ -1575,7 +1583,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 { @@ -1638,7 +1646,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; @@ -1694,7 +1702,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; @@ -1702,10 +1710,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 = NULL; } void @@ -1716,39 +1721,52 @@ 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_pFrame(NULL), m_pCanvas(NULL), m_pFileMenu(0) { +#if defined(DEBUG) || defined(_DEBUG) + m_iDefaultNDet = 165; + m_iDefaultNView = 180; +#else m_iDefaultNDet = 367; m_iDefaultNView = 320; - m_iDefaultNSample = 2; +#endif + m_iDefaultNSample = 1; m_dDefaultRotation = 1; m_dDefaultFocalLength = 2; m_dDefaultFieldOfView = 1; m_iDefaultGeometry = Scanner::GEOMETRY_PARALLEL; m_iDefaultTrace = Trace::TRACE_NONE; +#ifdef DEBUG + m_iDefaultRasterNX = 115; + m_iDefaultRasterNY = 115; + m_iDefaultRasterNSamples = 1; +#else m_iDefaultRasterNX = 256; m_iDefaultRasterNY = 256; m_iDefaultRasterNSamples = 2; +#endif } -PhantomView::~PhantomView() +PhantomFileView::~PhantomFileView() { + GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->ActivateView(this, FALSE, TRUE); } void -PhantomView::OnProperties (wxCommandEvent& event) +PhantomFileView::OnProperties (wxCommandEvent& event) { const int idPhantom = GetDocument()->getPhantomID(); const wxString& namePhantom = GetDocument()->getPhantomName(); @@ -1765,7 +1783,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(); @@ -1782,7 +1800,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; @@ -1800,14 +1818,12 @@ PhantomView::OnProjections (wxCommandEvent& event) if (m_iDefaultTrace > Trace::TRACE_CONSOLE) { ProjectionsDialog dialogProjections (theScanner, rProj, rPhantom, m_iDefaultTrace, dynamic_cast(getFrameForChild())); for (int iView = 0; iView < rProj.nView(); iView++) { - ::wxYield(); ::wxYield(); if (dialogProjections.isCancelled() || ! dialogProjections.projectView (iView)) { - pProjectionDoc->DeleteAllViews(); + pProjectionDoc->getView()->getFrame()->Close(true); return; } ::wxYield(); - ::wxYield(); while (dialogProjections.isPaused()) { ::wxYield(); ::wxUsleep(50); @@ -1818,7 +1834,7 @@ PhantomView::OnProjections (wxCommandEvent& event) for (int i = 0; i < rProj.nView(); i++) { theScanner.collectProjections (rProj, rPhantom, i, 1, true, m_iDefaultTrace); if (! dlgProgress.Update (i+1)) { - pProjectionDoc->DeleteAllViews(); + pProjectionDoc->getView()->getFrame()->Close(true); return; } } @@ -1830,7 +1846,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) { @@ -1842,11 +1858,12 @@ PhantomView::OnProjections (wxCommandEvent& event) pFrame->SetFocus(); pFrame->Raise(); } - theApp->getDocManager()->ActivateView (pView, true, false); + GetDocumentManager()->ActivateView (pView, true, false); } ::wxYield(); if (theApp->getSetModifyNewDocs()) pProjectionDoc->Modify(true); + pProjectionDoc->getView()->getFrame()->Show(true); pProjectionDoc->UpdateAllViews(this); } } @@ -1854,7 +1871,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(); @@ -1866,7 +1883,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; @@ -1879,13 +1896,15 @@ PhantomView::OnRasterize (wxCommandEvent& event) for (unsigned int i = 0; i < imageFile.nx(); i++) { rPhantom.convertToImagefile (imageFile, m_iDefaultRasterNSamples, Trace::TRACE_NONE, i, 1, true); if (! dlgProgress.Update(i+1)) { - pRasterDoc->DeleteAllViews(); + pRasterDoc->Close(); + pRasterDoc->getView()->getFrame()->Close(true); return; } } if (theApp->getSetModifyNewDocs()) pRasterDoc->Modify(true); pRasterDoc->UpdateAllViews(this); + pRasterDoc->getView()->getFrame()->Show(true); std::ostringstream os; os << "Rasterize Phantom " << rPhantom.name() << ": XSize=" << m_iDefaultRasterNX << ", YSize=" << m_iDefaultRasterNY << ", nSamples=" << m_iDefaultRasterNSamples; @@ -1903,13 +1922,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(); @@ -1917,8 +1936,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); @@ -1946,8 +1969,8 @@ PhantomView::CreateChildFrame(wxDocument *doc, wxView *view) m_pFileMenu->AppendSeparator(); m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit"); #endif - theApp->getDocManager()->FileHistoryAddFilesToMenu(m_pFileMenu); - theApp->getDocManager()->FileHistoryUseMenu(m_pFileMenu); + GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu); + GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu); wxMenu *process_menu = new wxMenu; process_menu->Append(PHMMENU_PROCESS_RASTERIZE, "&Rasterize...\tCtrl-R"); @@ -1984,62 +2007,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_pCanvas = 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(); + if (m_pCanvas) + m_pCanvas->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_pCanvas) { + m_pCanvas->setView(NULL); + m_pCanvas = 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; + if (deleteWindow) { + m_pFrame->Show(false); + m_pFrame->Destroy(); + m_pFrame = NULL; + } return true; } void -PhantomView::OnDraw (wxDC* dc) +PhantomFileView::OnDraw (wxDC* dc) { int xsize, ysize; - m_canvas->GetClientSize (&xsize, &ysize); + m_pCanvas->GetClientSize (&xsize, &ysize); SGPDriver driver (dc, xsize, ysize); SGP sgp (driver); const Phantom& rPhantom = GetDocument()->getPhantom(); @@ -2057,10 +2084,7 @@ ProjectionFileCanvas::ProjectionFileCanvas (ProjectionFileView* v, wxFrame *fram ProjectionFileCanvas::~ProjectionFileCanvas () { - if (m_pView) { - wxMenu* pMenu = m_pView->getFileMenu(); - theApp->getDocManager()->FileHistoryRemoveMenu (pMenu); - } + m_pView = NULL; } void @@ -2094,11 +2118,17 @@ 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_pCanvas(NULL), m_pFrame(NULL), m_pFileMenu(0) { +#ifdef DEBUG + m_iDefaultNX = 115; + m_iDefaultNY = 115; +#else m_iDefaultNX = 256; m_iDefaultNY = 256; +#endif + m_iDefaultFilter = SignalFilter::FILTER_ABS_BANDLIMIT; m_dDefaultFilterParam = 1.; #if HAVE_FFTW @@ -2120,8 +2150,10 @@ ProjectionFileView::ProjectionFileView(void) m_iDefaultPolarZeropad = 1; } -ProjectionFileView::~ProjectionFileView(void) +ProjectionFileView::~ProjectionFileView() { + GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->ActivateView(this, FALSE, TRUE);; } void @@ -2146,7 +2178,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"); @@ -2165,7 +2197,8 @@ ProjectionFileView::OnConvertPolar (wxCommandEvent& event) if (theApp->getSetModifyNewDocs()) pPolarDoc->Modify(true); pPolarDoc->UpdateAllViews(); - pPolarDoc->GetFirstView()->OnUpdate (this, NULL); + pPolarDoc->getView()->OnUpdate (this, NULL); + pPolarDoc->getView()->getFrame()->Show(true); } } @@ -2180,7 +2213,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"); @@ -2199,8 +2232,10 @@ ProjectionFileView::OnConvertFFTPolar (wxCommandEvent& event) if (theApp->getSetModifyNewDocs()) pPolarDoc->Modify(true); pPolarDoc->UpdateAllViews(); - pPolarDoc->GetFirstView()->OnUpdate (this, NULL); -}} + pPolarDoc->getView()->OnUpdate (this, NULL); + pPolarDoc->getView()->getFrame()->Show(true); + } +} void ProjectionFileView::OnReconstructFourier (wxCommandEvent& event) @@ -2232,7 +2267,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; @@ -2252,7 +2287,7 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) if (pDlgReconstruct->isCancelled() || ! pDlgReconstruct->reconstructView (iView)) { delete pDlgReconstruct; delete pReconstruct; - pReconDoc->DeleteAllViews(); + pReconDoc->getView()->getFrame()->Close(true); return; } ::wxYield(); @@ -2269,7 +2304,7 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) pReconstruct->reconstructView (i, 1); if (! dlgProgress.Update(i + 1)) { delete pReconstruct; - pReconDoc->DeleteAllViews(); + pReconDoc->getView()->getFrame()->Close(true); return; } } @@ -2278,6 +2313,7 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) if (theApp->getSetModifyNewDocs()) pReconDoc->Modify(true); pReconDoc->UpdateAllViews(this); + pReconDoc->getView()->getFrame()->Show(true); ImageFileView* rasterView = dynamic_cast(pReconDoc->GetFirstView()); if (rasterView) { rasterView->getFrame()->SetFocus(); @@ -2309,7 +2345,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 @@ -2339,6 +2379,8 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view) m_pFileMenu->AppendSeparator(); m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit"); #endif + GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu); + GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu); wxMenu *convert_menu = new wxMenu; convert_menu->Append (PJMENU_CONVERT_POLAR, "&Polar Image...\tCtrl-L"); @@ -2385,21 +2427,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_pCanvas = 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; @@ -2408,11 +2450,11 @@ ProjectionFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) void ProjectionFileView::OnDraw (wxDC* dc) { - wxSize clientSize = m_frame->GetClientSize(); - wxSize bestSize = m_canvas->GetBestSize(); + wxSize clientSize = m_pFrame->GetClientSize(); + wxSize bestSize = m_pCanvas->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); @@ -2460,33 +2502,35 @@ 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_canvas->SetScrollbars (20, 20, nDet/20, nView/20); + m_pFrame->SetClientSize (xSize, ySize); + m_pCanvas->SetScrollbars (20, 20, nDet/20, nView/20); } - if (m_canvas) - m_canvas->Refresh(); + if (m_pCanvas) + m_pCanvas->Refresh(); } bool ProjectionFileView::OnClose (bool deleteWindow) { - if (!GetDocument()->Close()) + if (! GetDocument() || ! GetDocument()->Close()) return false; -// m_canvas->Clear(); -// m_canvas->setView(NULL); -// m_canvas = NULL; + if (m_pCanvas) { + m_pCanvas->setView(NULL); + m_pCanvas = 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(); + m_pFrame = NULL; } return true; } @@ -2502,10 +2546,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 = NULL; } void @@ -2527,17 +2568,17 @@ 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_pFrame(NULL), m_pCanvas(NULL), m_pEZPlot(NULL), m_pFileMenu(0), m_bMinSpecified(false), m_bMaxSpecified(false) { - m_bMinSpecified = false; - m_bMaxSpecified = false; } -PlotFileView::~PlotFileView(void) +PlotFileView::~PlotFileView() { if (m_pEZPlot) delete m_pEZPlot; + + GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); } void @@ -2630,7 +2671,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 @@ -2660,8 +2705,8 @@ PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view) m_pFileMenu->AppendSeparator(); m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit"); #endif - theApp->getDocManager()->FileHistoryAddFilesToMenu(m_pFileMenu); - theApp->getDocManager()->FileHistoryUseMenu(m_pFileMenu); + GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu); + GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu); wxMenu *view_menu = new wxMenu; view_menu->Append(PLOTMENU_VIEW_SCALE_MINMAX, "Display Scale &Set...\tCtrl-E"); @@ -2703,25 +2748,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_pCanvas = 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; @@ -2736,7 +2781,7 @@ PlotFileView::OnDraw (wxDC* dc) if (iNColumns > 0 && iNRecords > 0) { int xsize, ysize; - m_canvas->GetClientSize (&xsize, &ysize); + m_pCanvas->GetClientSize (&xsize, &ysize); SGPDriver driver (dc, xsize, ysize); SGP sgp (driver); if (m_pEZPlot) @@ -2788,29 +2833,32 @@ PlotFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) delete pdY; } - if (m_canvas) - m_canvas->Refresh(); + if (m_pCanvas) + m_pCanvas->Refresh(); } bool PlotFileView::OnClose (bool deleteWindow) { - if (!GetDocument()->Close()) + if (! GetDocument() || ! GetDocument()->Close()) return false; -// m_canvas->Clear(); -// m_canvas->setView (NULL); -// m_canvas = NULL; + if (m_pCanvas) { + m_pCanvas->setView (NULL); + m_pCanvas = NULL; + } wxString s(wxTheApp->GetAppName()); - if (m_frame) - m_frame->SetTitle(s); - SetFrame(NULL); + if (m_pFrame) + m_pFrame->SetTitle(s); Activate(false); + m_pFrame->SetView(NULL); + SetFrame(NULL); if (deleteWindow) { - delete m_frame; - return true; + m_pFrame->Show(false); + m_pFrame->Destroy(); + m_pFrame = NULL; } return true; } @@ -2819,23 +2867,23 @@ PlotFileView::OnClose (bool deleteWindow) //////////////////////////////////////////////////////////////// -IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView) +IMPLEMENT_DYNAMIC_CLASS(TextFileView, wxView) -TextEditView::~TextEditView() +TextFileView::~TextFileView() { - if (m_pFileMenu) - theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->ActivateView(this, FALSE, TRUE);; } -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__ @@ -2852,39 +2900,48 @@ 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; + + SetFrame(NULL); + m_pFrame->SetView(NULL); + if (deleteWindow) { + m_pFrame->Show(false); + m_pFrame->Destroy(); + 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); @@ -2905,8 +2962,8 @@ TextEditView::CreateChildFrame (wxDocument *doc, wxView *view) m_pFileMenu->AppendSeparator(); m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit"); #endif - theApp->getDocManager()->FileHistoryAddFilesToMenu(m_pFileMenu); - theApp->getDocManager()->FileHistoryUseMenu(m_pFileMenu); + GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu); + GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu); wxMenu *help_menu = new wxMenu; help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1"); @@ -2935,15 +2992,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) - : wxTextCtrl (frame, -1, "", pos, size, style), m_pView(v) +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 = NULL; }