X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fviews.cpp;h=4b7933351df230179b7400ab496cc264b251be96;hp=315474d0371250f93e6bf083b0aea45061a274b0;hb=9f29c8b32c972db1178d6f8551d5cd57ceb67083;hpb=9538989b04262388ea2cb9315939fb801cc8eae2 diff --git a/src/views.cpp b/src/views.cpp index 315474d..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.82 2001/01/28 03:48:55 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 @@ -769,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); @@ -921,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); @@ -953,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(); @@ -1000,8 +1000,7 @@ ImageFileView::OnClose (bool deleteWindow) return false; if (m_pCanvas) { -// m_pCanvas->Show(false); -// m_pCanvas->Clear(); + m_pCanvas->Show(false); m_pCanvas->setView(NULL); m_pCanvas = NULL; } @@ -1014,9 +1013,8 @@ ImageFileView::OnClose (bool deleteWindow) if (deleteWindow) { m_pFrame->Show(false); - //m_pFrame->Close(true); + ::wxYield(); m_pFrame->Destroy(); - // delete m_pFrame; m_pFrame = NULL; } return true; @@ -1025,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(); @@ -1108,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(); @@ -1192,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(); @@ -1277,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(); @@ -1369,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(); @@ -1644,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(); @@ -1852,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(); } - GetDocumentManager()->ActivateView (pView, true, false); + GetDocumentManager()->ActivateView (projView, true, false); } ::wxYield(); if (theApp->getSetModifyNewDocs()) pProjectionDoc->Modify(true); - pProjectionDoc->getView()->getFrame()->Show(true); pProjectionDoc->UpdateAllViews(this); } } @@ -1914,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); @@ -1926,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(); @@ -2019,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 @@ -2047,8 +2044,7 @@ PhantomFileView::OnClose (bool deleteWindow) return false; if (m_pCanvas) { - //m_pCanvas->Show(false); - //m_pCanvas->Clear(); + m_pCanvas->Show(false); m_pCanvas->setView(NULL); m_pCanvas = NULL; } @@ -2060,10 +2056,9 @@ PhantomFileView::OnClose (bool deleteWindow) Activate(false); if (deleteWindow) { - m_pFrame->Show(false); + m_pFrame->Show(false); + ::wxYield(); m_pFrame->Destroy(); - //GetDocumentManager()->ActivateView(this, FALSE, TRUE); - // delete m_pFrame; m_pFrame = NULL; } @@ -2321,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(); @@ -2338,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); @@ -2439,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 @@ -2525,8 +2519,7 @@ ProjectionFileView::OnClose (bool deleteWindow) return false; if (m_pCanvas) { - //m_pCanvas->Show(false); - //m_pCanvas->Clear(); + m_pCanvas->Show(false); m_pCanvas->setView(NULL); m_pCanvas = NULL; } @@ -2539,9 +2532,8 @@ ProjectionFileView::OnClose (bool deleteWindow) if (deleteWindow) { m_pFrame->Show(false); + ::wxYield(); m_pFrame->Destroy(); - // delete m_pFrame; - //m_pFrame->Close(true); m_pFrame = NULL; } return true; @@ -2669,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(); @@ -2770,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 @@ -2856,8 +2848,7 @@ PlotFileView::OnClose (bool deleteWindow) return false; if (m_pCanvas) { -// m_pCanvas->Show(false); -// m_pCanvas->Clear(); + m_pCanvas->Show(false); m_pCanvas->setView (NULL); m_pCanvas = NULL; } @@ -2871,10 +2862,8 @@ PlotFileView::OnClose (bool deleteWindow) SetFrame(NULL); if (deleteWindow) { m_pFrame->Show(false); + ::wxYield(); m_pFrame->Destroy(); - //m_pFrame->Close(true); - //GetDocumentManager()->ActivateView(this, FALSE, TRUE); - // delete m_pFrame; m_pFrame = NULL; } return true; @@ -2941,10 +2930,8 @@ TextFileView::OnClose (bool deleteWindow) m_pFrame->SetView(NULL); if (deleteWindow) { m_pFrame->Show(false); + ::wxYield(); m_pFrame->Destroy(); - //m_pFrame->Close(true); - //GetDocumentManager()->ActivateView(this, FALSE, TRUE); - // delete m_pFrame; m_pFrame = NULL; }