X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fviews.cpp;h=4b7933351df230179b7400ab496cc264b251be96;hp=e2c0c47e4a08c6fb72765ef1d720f0c78451742a;hb=9f29c8b32c972db1178d6f8551d5cd57ceb67083;hpb=0c4d286b980e2d617b926f9dbea7572eaf1897cd diff --git a/src/views.cpp b/src/views.cpp index e2c0c47..4b79333 100644 --- a/src/views.cpp +++ b/src/views.cpp @@ -7,9 +7,9 @@ ** Date Started: July 2000 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: views.cpp,v 1.76 2001/01/27 01:51:47 kevin Exp $ +** $Id: views.cpp,v 1.84 2001/01/28 19:10:18 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 @@ -75,7 +75,7 @@ ImageFileCanvas::ImageFileCanvas (ImageFileView* v, wxFrame *frame, const wxPoin ImageFileCanvas::~ImageFileCanvas() { - m_pView = NULL; + m_pView = NULL; } void @@ -224,14 +224,15 @@ EVT_MENU(IFMENU_PLOT_HISTOGRAM, ImageFileView::OnPlotHistogram) END_EVENT_TABLE() ImageFileView::ImageFileView() -: wxView(), m_pCanvas(NULL), m_pFrame(NULL), m_bMinSpecified(false), m_bMaxSpecified(false), m_pFileMenu(0) +: wxView(), m_pFrame(NULL), m_pCanvas(NULL), m_pFileMenu(0), m_bMinSpecified(false), m_bMaxSpecified(false) { m_iDefaultExportFormatID = ImageFile::FORMAT_PNG; } ImageFileView::~ImageFileView() { - theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->ActivateView(this, FALSE, TRUE); } void @@ -358,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; } @@ -768,13 +769,13 @@ ImageFileView::OnPhase (wxCommandEvent& event) ImageFileCanvas* -ImageFileView::CreateCanvas (wxView *view, wxFrame *parent) +ImageFileView::CreateCanvas (wxFrame* parent) { ImageFileCanvas* pCanvas; int width, height; parent->GetClientSize(&width, &height); - pCanvas = new ImageFileCanvas (dynamic_cast(view), parent, wxPoint(0, 0), wxSize(width, height), 0); + pCanvas = new ImageFileCanvas (this, parent, wxPoint(0, 0), wxSize(width, height), 0); pCanvas->SetScrollbars(20, 20, 50, 50); pCanvas->SetBackgroundColour(*wxWHITE); @@ -818,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"); @@ -911,7 +912,7 @@ bool ImageFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) ) { m_pFrame = CreateChildFrame(doc, this); - SetFrame (m_pFrame); + (m_pFrame); m_bMinSpecified = false; m_bMaxSpecified = false; @@ -920,7 +921,7 @@ ImageFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) ) int width, height; m_pFrame->GetClientSize (&width, &height); m_pFrame->SetTitle("ImageFileView"); - m_pCanvas = CreateCanvas (this, m_pFrame); + m_pCanvas = CreateCanvas (m_pFrame); int x, y; // X requires a forced resize m_pFrame->GetSize(&x, &y); @@ -952,7 +953,7 @@ ImageFileView::OnDraw (wxDC* dc) void ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) { - const ImageFile& rIF = dynamic_cast(GetDocument())->getImageFile(); + const ImageFile& rIF = GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); int nx = rIF.nx(); int ny = rIF.ny(); @@ -999,7 +1000,6 @@ ImageFileView::OnClose (bool deleteWindow) return false; if (m_pCanvas) { - m_pCanvas->Clear(); m_pCanvas->Show(false); m_pCanvas->setView(NULL); m_pCanvas = NULL; @@ -1007,14 +1007,14 @@ ImageFileView::OnClose (bool deleteWindow) wxString s(theApp->GetAppName()); if (m_pFrame) m_pFrame->SetTitle(s); - SetFrame(NULL); + SetFrame(NULL); Activate(false); - + if (deleteWindow) { - m_pFrame->Show(false); - m_pFrame->Destroy(); -// delete m_pFrame; + m_pFrame->Show(false); + ::wxYield(); + m_pFrame->Destroy(); m_pFrame = NULL; } return true; @@ -1023,7 +1023,7 @@ ImageFileView::OnClose (bool deleteWindow) void ImageFileView::OnExport (wxCommandEvent& event) { - ImageFile& rIF = dynamic_cast(GetDocument())->getImageFile(); + ImageFile& rIF = GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); int nx = rIF.nx(); int ny = rIF.ny(); @@ -1106,7 +1106,7 @@ ImageFileView::OnPlotRow (wxCommandEvent& event) return; } - const ImageFile& rIF = dynamic_cast(GetDocument())->getImageFile(); + const ImageFile& rIF = GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); ImageFileArrayConst vImag = rIF.getImaginaryArray(); int nx = rIF.nx(); @@ -1190,7 +1190,7 @@ ImageFileView::OnPlotCol (wxCommandEvent& event) return; } - const ImageFile& rIF = dynamic_cast(GetDocument())->getImageFile(); + const ImageFile& rIF = GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); ImageFileArrayConst vImag = rIF.getImaginaryArray(); int nx = rIF.nx(); @@ -1275,7 +1275,7 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event) return; } - const ImageFile& rIF = dynamic_cast(GetDocument())->getImageFile(); + const ImageFile& rIF = GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); ImageFileArrayConst vImag = rIF.getImaginaryArray(); int nx = rIF.nx(); @@ -1367,7 +1367,7 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event) return; } - const ImageFile& rIF = dynamic_cast(GetDocument())->getImageFile(); + const ImageFile& rIF = GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); ImageFileArrayConst vImag = rIF.getImaginaryArray(); int nx = rIF.nx(); @@ -1642,7 +1642,7 @@ static int NUMBER_HISTOGRAM_BINS = 256; void ImageFileView::OnPlotHistogram (wxCommandEvent& event) { - const ImageFile& rIF = dynamic_cast(GetDocument())->getImageFile(); + const ImageFile& rIF = GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); int nx = rIF.nx(); int ny = rIF.ny(); @@ -1712,7 +1712,7 @@ PhantomCanvas::PhantomCanvas (PhantomFileView* v, wxFrame *frame, const wxPoint& PhantomCanvas::~PhantomCanvas () { - m_pView = NULL; + m_pView = NULL; } void @@ -1734,10 +1734,15 @@ EVT_MENU(PHMMENU_PROCESS_PROJECTIONS, PhantomFileView::OnProjections) END_EVENT_TABLE() PhantomFileView::PhantomFileView() -: wxView(), m_pCanvas(NULL), m_pFrame(NULL), m_pFileMenu(0) +: 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; +#endif m_iDefaultNSample = 1; m_dDefaultRotation = 1; m_dDefaultFocalLength = 2; @@ -1745,14 +1750,21 @@ PhantomFileView::PhantomFileView() 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 } PhantomFileView::~PhantomFileView() { - theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->ActivateView(this, FALSE, TRUE); } void @@ -1808,14 +1820,12 @@ PhantomFileView::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); @@ -1826,7 +1836,7 @@ PhantomFileView::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; } } @@ -1840,22 +1850,21 @@ PhantomFileView::OnProjections (wxCommandEvent& event) m_pFrame->Lower(); ::wxYield(); - ProjectionFileView* projView = dynamic_cast(pProjectionDoc->GetFirstView()); + ProjectionFileView* projView = pProjectionDoc->getView(); if (projView) { - projView->getFrame()->SetFocus(); projView->OnUpdate (projView, NULL); - } - if (wxView* pView = pProjectionDoc->GetFirstView()) { - if (wxFrame* pFrame = pView->GetFrame()) { + if (projView->getCanvas()) + projView->getCanvas()->SetClientSize (m_iDefaultNDet, m_iDefaultNView); + if (wxFrame* pFrame = projView->getFrame()) { + pFrame->Show(true); pFrame->SetFocus(); pFrame->Raise(); } - theApp->getDocManager()->ActivateView (pView, true, false); + GetDocumentManager()->ActivateView (projView, true, false); } ::wxYield(); if (theApp->getSetModifyNewDocs()) pProjectionDoc->Modify(true); - pProjectionDoc->getView()->getFrame()->Show(true); pProjectionDoc->UpdateAllViews(this); } } @@ -1888,7 +1897,8 @@ PhantomFileView::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; } } @@ -1901,7 +1911,7 @@ PhantomFileView::OnRasterize (wxCommandEvent& event) << m_iDefaultRasterNY << ", nSamples=" << m_iDefaultRasterNSamples; *theApp->getLog() << os.str().c_str() << "\n"; imageFile.labelAdd (os.str().c_str(), timer.timerEnd()); - ImageFileView* rasterView = dynamic_cast(pRasterDoc->GetFirstView()); + ImageFileView* rasterView = pRasterDoc->getView(); if (rasterView) { rasterView->getFrame()->SetFocus(); rasterView->OnUpdate (rasterView, NULL); @@ -1913,13 +1923,13 @@ PhantomFileView::OnRasterize (wxCommandEvent& event) PhantomCanvas* -PhantomFileView::CreateCanvas (wxView *view, wxFrame *parent) +PhantomFileView::CreateCanvas (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 (this, parent, wxPoint(0, 0), wxSize(width, height), 0); pCanvas->SetBackgroundColour(*wxWHITE); pCanvas->Clear(); @@ -1960,8 +1970,8 @@ PhantomFileView::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"); @@ -2006,7 +2016,7 @@ PhantomFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) int width, height; m_pFrame->GetClientSize(&width, &height); m_pFrame->SetTitle("PhantomFileView"); - m_pCanvas = CreateCanvas (this, m_pFrame); + m_pCanvas = CreateCanvas (m_pFrame); #ifdef __X__ int x, y; // X requires a forced resize @@ -2034,22 +2044,21 @@ PhantomFileView::OnClose (bool deleteWindow) return false; if (m_pCanvas) { - m_pCanvas->Clear(); - m_pCanvas->setView(NULL); m_pCanvas->Show(false); + m_pCanvas->setView(NULL); m_pCanvas = NULL; } wxString s(wxTheApp->GetAppName()); if (m_pFrame) m_pFrame->SetTitle(s); - SetFrame(NULL); + SetFrame(NULL); Activate(false); if (deleteWindow) { - m_pFrame->Show(false); - m_pFrame->Destroy(); -// delete m_pFrame; + m_pFrame->Show(false); + ::wxYield(); + m_pFrame->Destroy(); m_pFrame = NULL; } @@ -2078,7 +2087,7 @@ ProjectionFileCanvas::ProjectionFileCanvas (ProjectionFileView* v, wxFrame *fram ProjectionFileCanvas::~ProjectionFileCanvas () { - m_pView = NULL; + m_pView = NULL; } void @@ -2115,8 +2124,14 @@ END_EVENT_TABLE() 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 @@ -2140,7 +2155,8 @@ ProjectionFileView::ProjectionFileView() ProjectionFileView::~ProjectionFileView() { - theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->ActivateView(this, FALSE, TRUE);; } void @@ -2221,7 +2237,7 @@ ProjectionFileView::OnConvertFFTPolar (wxCommandEvent& event) pPolarDoc->UpdateAllViews(); pPolarDoc->getView()->OnUpdate (this, NULL); pPolarDoc->getView()->getFrame()->Show(true); -} + } } void @@ -2274,7 +2290,7 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) if (pDlgReconstruct->isCancelled() || ! pDlgReconstruct->reconstructView (iView)) { delete pDlgReconstruct; delete pReconstruct; - pReconDoc->DeleteAllViews(); + pReconDoc->getView()->getFrame()->Close(true); return; } ::wxYield(); @@ -2291,7 +2307,7 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) pReconstruct->reconstructView (i, 1); if (! dlgProgress.Update(i + 1)) { delete pReconstruct; - pReconDoc->DeleteAllViews(); + pReconDoc->getView()->getFrame()->Close(true); return; } } @@ -2300,11 +2316,10 @@ 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(); + if (ImageFileView* rasterView = pReconDoc->getView()) { rasterView->OnUpdate (rasterView, NULL); + rasterView->getFrame()->SetFocus(); + rasterView->getFrame()->Show(true); } std::ostringstream os; os << "Reconstruct " << rProj.getFilename() << ": xSize=" << m_iDefaultNX << ", ySize=" << m_iDefaultNY << ", Filter=" << optFilterName.c_str() << ", FilterParam=" << m_dDefaultFilterParam << ", FilterMethod=" << optFilterMethodName.c_str() << ", FilterGeneration=" << optFilterGenerationName.c_str() << ", Zeropad=" << m_iDefaultZeropad << ", Interpolation=" << optInterpName.c_str() << ", InterpolationParam=" << m_iDefaultInterpParam << ", Backprojection=" << optBackprojectName.c_str(); @@ -2317,13 +2332,13 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) ProjectionFileCanvas* -ProjectionFileView::CreateCanvas (wxView *view, wxFrame *parent) +ProjectionFileView::CreateCanvas (wxFrame *parent) { ProjectionFileCanvas* pCanvas; int width, height; parent->GetClientSize(&width, &height); - pCanvas = new ProjectionFileCanvas (dynamic_cast(view), parent, wxPoint(0, 0), wxSize(width, height), 0); + pCanvas = new ProjectionFileCanvas (this, parent, wxPoint(0, 0), wxSize(width, height), 0); pCanvas->SetScrollbars(20, 20, 50, 50); pCanvas->SetBackgroundColour(*wxWHITE); @@ -2366,8 +2381,8 @@ ProjectionFileView::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 *convert_menu = new wxMenu; convert_menu->Append (PJMENU_CONVERT_POLAR, "&Polar Image...\tCtrl-L"); @@ -2418,9 +2433,9 @@ ProjectionFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) SetFrame(m_pFrame); int width, height; - m_pFrame->GetClientSize(&width, &height); - m_pFrame->SetTitle("ProjectionFileView"); - m_pCanvas = CreateCanvas(this, m_pFrame); + m_pFrame->GetClientSize (&width, &height); + m_pFrame->SetTitle ("ProjectionFileView"); + m_pCanvas = CreateCanvas (m_pFrame); #ifdef __X__ int x, y; // X requires a forced resize @@ -2504,22 +2519,21 @@ ProjectionFileView::OnClose (bool deleteWindow) return false; if (m_pCanvas) { - m_pCanvas->Clear(); - m_pCanvas->setView(NULL); m_pCanvas->Show(false); + m_pCanvas->setView(NULL); m_pCanvas = NULL; } wxString s(wxTheApp->GetAppName()); if (m_pFrame) m_pFrame->SetTitle(s); -// SetFrame(NULL); + SetFrame(NULL); Activate(false); if (deleteWindow) { - m_pFrame->Show(false); - m_pFrame->Destroy(); -// delete m_pFrame; + m_pFrame->Show(false); + ::wxYield(); + m_pFrame->Destroy(); m_pFrame = NULL; } return true; @@ -2536,7 +2550,7 @@ PlotFileCanvas::PlotFileCanvas (PlotFileView* v, wxFrame *frame, const wxPoint& PlotFileCanvas::~PlotFileCanvas () { - m_pView = NULL; + m_pView = NULL; } void @@ -2567,8 +2581,8 @@ PlotFileView::~PlotFileView() { if (m_pEZPlot) delete m_pEZPlot; - - theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); + + GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); } void @@ -2647,13 +2661,13 @@ PlotFileView::OnScaleFull (wxCommandEvent& event) PlotFileCanvas* -PlotFileView::CreateCanvas (wxView *view, wxFrame *parent) +PlotFileView::CreateCanvas (wxFrame* parent) { PlotFileCanvas* pCanvas; int width, height; parent->GetClientSize(&width, &height); - pCanvas = new PlotFileCanvas (dynamic_cast(view), parent, wxPoint(0, 0), wxSize(width, height), 0); + pCanvas = new PlotFileCanvas (this, parent, wxPoint(0, 0), wxSize(width, height), 0); pCanvas->SetBackgroundColour(*wxWHITE); pCanvas->Clear(); @@ -2695,8 +2709,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"); @@ -2748,7 +2762,7 @@ PlotFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) ) int width, height; m_pFrame->GetClientSize(&width, &height); m_pFrame->SetTitle ("Plot File"); - m_pCanvas = CreateCanvas (this, m_pFrame); + m_pCanvas = CreateCanvas (m_pFrame); #ifdef __X__ int x, y; // X requires a forced resize @@ -2834,22 +2848,22 @@ PlotFileView::OnClose (bool deleteWindow) return false; if (m_pCanvas) { - m_pCanvas->Clear(); - m_pCanvas->setView (NULL); m_pCanvas->Show(false); + m_pCanvas->setView (NULL); m_pCanvas = NULL; } wxString s(wxTheApp->GetAppName()); if (m_pFrame) m_pFrame->SetTitle(s); - SetFrame(NULL); Activate(false); + m_pFrame->SetView(NULL); + SetFrame(NULL); if (deleteWindow) { - m_pFrame->Show(false); - m_pFrame->Destroy(); -// delete m_pFrame; + m_pFrame->Show(false); + ::wxYield(); + m_pFrame->Destroy(); m_pFrame = NULL; } return true; @@ -2863,7 +2877,8 @@ IMPLEMENT_DYNAMIC_CLASS(TextFileView, wxView) TextFileView::~TextFileView() { - theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->ActivateView(this, FALSE, TRUE);; } bool TextFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) @@ -2902,21 +2917,23 @@ void TextFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) bool TextFileView::OnClose (bool deleteWindow) { - if (m_pFrame && m_pFrame->GetTitle() == "Log") - return false; + // if (m_pFrame && m_pFrame->GetTitle() == "Log") + return false; if (! GetDocument() || ! GetDocument()->Close()) return false; - + m_pCanvas->Show(false); Activate(false); - + + SetFrame(NULL); + m_pFrame->SetView(NULL); if (deleteWindow) { - m_pFrame->Show(false); - m_pFrame->Destroy(); -// delete m_pFrame; - m_pFrame = NULL; - + m_pFrame->Show(false); + ::wxYield(); + m_pFrame->Destroy(); + m_pFrame = NULL; + } return TRUE; } @@ -2952,8 +2969,8 @@ TextFileView::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"); @@ -2983,11 +3000,11 @@ TextFileView::CreateChildFrame (wxDocument *doc, wxView *view) // 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) +: wxTextCtrl (frame, -1, "", pos, size, style), m_pView(v) { } TextFileCanvas::~TextFileCanvas () { - m_pView = NULL; + m_pView = NULL; }