X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fviews.cpp;h=ec75fccf4410be59f6537d10e5faacdfa8b5e885;hb=4acfc6927c3e0ad652ed27ade40987703816aab3;hp=4e4313d8b98ec5bbf53a6ed67d38c23ffeb1ce66;hpb=af2b058715fb690c708734708ac178490371b3ad;p=ctsim.git diff --git a/src/views.cpp b/src/views.cpp index 4e4313d..ec75fcc 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.77 2001/01/27 02:01:41 kevin Exp $ +** $Id: views.cpp,v 1.81 2001/01/27 22:31:57 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 @@ -358,7 +358,7 @@ ImageFileView::OnCompare (wxCommandEvent& event) differenceImage.setArraySize (rIF.nx(), rIF.ny()); if (! rIF.subtractImages (rCompareIF, differenceImage)) { - pDifferenceDoc->DeleteAllViews(); + pDifferenceDoc->getView()->getFrame()->Close(true); return; } @@ -1000,7 +1000,7 @@ ImageFileView::OnClose (bool deleteWindow) if (m_pCanvas) { m_pCanvas->Clear(); - m_pCanvas->Show(false); + m_pCanvas->Show(false); m_pCanvas->setView(NULL); m_pCanvas = NULL; } @@ -1012,9 +1012,9 @@ ImageFileView::OnClose (bool deleteWindow) Activate(false); if (deleteWindow) { - m_pFrame->Show(false); - m_pFrame->Destroy(); -// delete m_pFrame; + //m_pFrame->Show(false); + m_pFrame->Destroy(); + // delete m_pFrame; m_pFrame = NULL; } return true; @@ -1712,7 +1712,7 @@ PhantomCanvas::PhantomCanvas (PhantomFileView* v, wxFrame *frame, const wxPoint& PhantomCanvas::~PhantomCanvas () { - m_pView = NULL; + m_pView = NULL; } void @@ -1734,7 +1734,7 @@ 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) { m_iDefaultNDet = 367; m_iDefaultNView = 320; @@ -1752,7 +1752,7 @@ PhantomFileView::PhantomFileView() PhantomFileView::~PhantomFileView() { - theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); + theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); } void @@ -1808,14 +1808,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 +1824,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; } } @@ -1888,7 +1886,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; } } @@ -2036,7 +2035,7 @@ PhantomFileView::OnClose (bool deleteWindow) if (m_pCanvas) { m_pCanvas->Clear(); m_pCanvas->setView(NULL); - m_pCanvas->Show(false); + m_pCanvas->Show(false); m_pCanvas = NULL; } wxString s(wxTheApp->GetAppName()); @@ -2047,9 +2046,9 @@ PhantomFileView::OnClose (bool deleteWindow) Activate(false); if (deleteWindow) { - m_pFrame->Show(false); - m_pFrame->Destroy(); -// delete m_pFrame; + // m_pFrame->Show(false); + m_pFrame->Destroy(); + // delete m_pFrame; m_pFrame = NULL; } @@ -2078,7 +2077,7 @@ ProjectionFileCanvas::ProjectionFileCanvas (ProjectionFileView* v, wxFrame *fram ProjectionFileCanvas::~ProjectionFileCanvas () { - m_pView = NULL; + m_pView = NULL; } void @@ -2140,7 +2139,7 @@ ProjectionFileView::ProjectionFileView() ProjectionFileView::~ProjectionFileView() { - theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); + theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); } void @@ -2221,7 +2220,7 @@ ProjectionFileView::OnConvertFFTPolar (wxCommandEvent& event) pPolarDoc->UpdateAllViews(); pPolarDoc->getView()->OnUpdate (this, NULL); pPolarDoc->getView()->getFrame()->Show(true); -} + } } void @@ -2274,7 +2273,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 +2290,7 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) pReconstruct->reconstructView (i, 1); if (! dlgProgress.Update(i + 1)) { delete pReconstruct; - pReconDoc->DeleteAllViews(); + pReconDoc->getView()->getFrame()->Close(true); return; } } @@ -2506,20 +2505,20 @@ ProjectionFileView::OnClose (bool deleteWindow) if (m_pCanvas) { m_pCanvas->Clear(); m_pCanvas->setView(NULL); - m_pCanvas->Show(false); + m_pCanvas->Show(false); 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); + m_pFrame->Destroy(); + // delete m_pFrame; m_pFrame = NULL; } return true; @@ -2536,7 +2535,7 @@ PlotFileCanvas::PlotFileCanvas (PlotFileView* v, wxFrame *frame, const wxPoint& PlotFileCanvas::~PlotFileCanvas () { - m_pView = NULL; + m_pView = NULL; } void @@ -2567,7 +2566,7 @@ PlotFileView::~PlotFileView() { if (m_pEZPlot) delete m_pEZPlot; - + theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); } @@ -2836,7 +2835,7 @@ PlotFileView::OnClose (bool deleteWindow) if (m_pCanvas) { m_pCanvas->Clear(); m_pCanvas->setView (NULL); - m_pCanvas->Show(false); + m_pCanvas->Show(false); m_pCanvas = NULL; } wxString s(wxTheApp->GetAppName()); @@ -2847,9 +2846,9 @@ PlotFileView::OnClose (bool deleteWindow) Activate(false); if (deleteWindow) { - m_pFrame->Show(false); - m_pFrame->Destroy(); -// delete m_pFrame; + //m_pFrame->Show(false); + m_pFrame->Destroy(); + // delete m_pFrame; m_pFrame = NULL; } return true; @@ -2863,7 +2862,7 @@ IMPLEMENT_DYNAMIC_CLASS(TextFileView, wxView) TextFileView::~TextFileView() { - theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); + theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); } bool TextFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) @@ -2902,21 +2901,21 @@ 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); if (deleteWindow) { - m_pFrame->Show(false); - m_pFrame->Destroy(); -// delete m_pFrame; - m_pFrame = NULL; - + //m_pFrame->Show(false); + m_pFrame->Destroy(); + // delete m_pFrame; + m_pFrame = NULL; + } return TRUE; } @@ -2983,11 +2982,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; }