X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fviews.cpp;h=a72ace4a3432104c64fdcbeecc31f8e2c17ccedd;hb=5f4aaf9a5ecff050f19a405bd274353a1b935163;hp=be956dbfc79e536805bcd0725b9004a8f730e7b7;hpb=8318d419cd75251f57f51f9988c2385aca82ee31;p=ctsim.git diff --git a/src/views.cpp b/src/views.cpp index be956db..a72ace4 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.79 2001/01/27 03:39:53 kevin Exp $ +** $Id: views.cpp,v 1.87 2001/01/28 22:45:54 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 @@ -156,6 +156,15 @@ ImageFileCanvas::OnMouseEvent(wxMouseEvent& event) DrawRubberBandCursor (dc, pt.x, yPt); m_xCursor = pt.x; m_yCursor = yPt; + wxMenu* pMenu = m_pView->getMenuAnalyze(); + if (pMenu && ! pMenu->IsEnabled(IFMENU_PLOT_ROW)) { + pMenu->Enable (IFMENU_PLOT_ROW, true); + pMenu->Enable (IFMENU_PLOT_COL, true); + pMenu->Enable (IFMENU_COMPARE_ROW, true); + pMenu->Enable (IFMENU_COMPARE_COL, true); + pMenu->Enable (IFMENU_PLOT_FFT_ROW, true); + pMenu->Enable (IFMENU_PLOT_FFT_COL, true); + } } else *theApp->getLog() << "Mouse out of image range (" << pt.x << "," << yPt << ")\n"; } @@ -231,7 +240,8 @@ ImageFileView::ImageFileView() ImageFileView::~ImageFileView() { - theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->ActivateView(this, FALSE, TRUE); } void @@ -358,7 +368,13 @@ ImageFileView::OnCompare (wxCommandEvent& event) differenceImage.setArraySize (rIF.nx(), rIF.ny()); if (! rIF.subtractImages (rCompareIF, differenceImage)) { - pDifferenceDoc->getView()->getFrame()->Close(true); + pDifferenceDoc->getView()->getFrame()->Show(true); + GetDocumentManager()->ActivateView (pDifferenceDoc->getView(), true, false); + pDifferenceDoc->getView()->getFrame()->SetFocus(); + wxCommandEvent event; + GetDocumentManager()->OnFileClose (event); + GetDocumentManager()->ActivateView (this, true, false); + getFrame()->SetFocus(); return; } @@ -372,8 +388,8 @@ ImageFileView::OnCompare (wxCommandEvent& event) << os.str().c_str(); differenceImage.labelAdd (os.str().c_str()); if (theApp->getSetModifyNewDocs()) - pDifferenceDoc->Modify(true); - pDifferenceDoc->UpdateAllViews(this); + pDifferenceDoc->Modify (true); + pDifferenceDoc->UpdateAllViews (this); pDifferenceDoc->getView()->OnUpdate (this, NULL); pDifferenceDoc->getView()->getFrame()->Show(true); } @@ -390,7 +406,7 @@ ImageFileView::OnInvertValues (wxCommandEvent& event) rIF.labelAdd ("Invert Pixel Values"); if (theApp->getSetModifyNewDocs()) GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->UpdateAllViews (this); } void @@ -401,7 +417,7 @@ ImageFileView::OnSquare (wxCommandEvent& event) rIF.labelAdd ("Square Pixel Values"); if (theApp->getSetModifyNewDocs()) GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->UpdateAllViews (this); } void @@ -412,7 +428,7 @@ ImageFileView::OnSquareRoot (wxCommandEvent& event) rIF.labelAdd ("Square-root Pixel Values"); if (theApp->getSetModifyNewDocs()) GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->UpdateAllViews (this); } void @@ -423,7 +439,7 @@ ImageFileView::OnLog (wxCommandEvent& event) rIF.labelAdd ("Logrithm base-e Pixel Values"); if (theApp->getSetModifyNewDocs()) GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->UpdateAllViews (this); } void @@ -434,7 +450,7 @@ ImageFileView::OnExp (wxCommandEvent& event) rIF.labelAdd ("Exponent base-e Pixel Values"); if (theApp->getSetModifyNewDocs()) GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->UpdateAllViews (this); } void @@ -471,7 +487,7 @@ ImageFileView::OnAdd (wxCommandEvent& event) *theApp->getLog() << os.str().c_str() << "\n"; if (theApp->getSetModifyNewDocs()) pNewDoc->Modify(TRUE); - pNewDoc->UpdateAllViews(this); + pNewDoc->UpdateAllViews (this); pNewDoc->getView()->OnUpdate (this, NULL); pNewDoc->getView()->getFrame()->Show(true); } @@ -512,7 +528,7 @@ ImageFileView::OnSubtract (wxCommandEvent& event) *theApp->getLog() << os.str().c_str() << "\n"; if (theApp->getSetModifyNewDocs()) pNewDoc->Modify(TRUE); - pNewDoc->UpdateAllViews(this); + pNewDoc->UpdateAllViews (this); pNewDoc->getView()->OnUpdate (this, NULL); pNewDoc->getView()->getFrame()->Show(true); } @@ -553,7 +569,7 @@ ImageFileView::OnMultiply (wxCommandEvent& event) *theApp->getLog() << os.str().c_str() << "\n"; if (theApp->getSetModifyNewDocs()) pNewDoc->Modify(TRUE); - pNewDoc->UpdateAllViews(this); + pNewDoc->UpdateAllViews (this); pNewDoc->getView()->OnUpdate (this, NULL); pNewDoc->getView()->getFrame()->Show(true); } @@ -594,7 +610,7 @@ ImageFileView::OnDivide (wxCommandEvent& event) *theApp->getLog() << os.str().c_str() << "\n"; if (theApp->getSetModifyNewDocs()) pNewDoc->Modify(TRUE); - pNewDoc->UpdateAllViews(this); + pNewDoc->UpdateAllViews (this); pNewDoc->getView()->OnUpdate (this, NULL); pNewDoc->getView()->getFrame()->Show(true); } @@ -613,7 +629,7 @@ ImageFileView::OnFFT (wxCommandEvent& event) m_bMaxSpecified = false; if (theApp->getSetModifyNewDocs()) GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->UpdateAllViews (this); } void @@ -626,7 +642,7 @@ ImageFileView::OnIFFT (wxCommandEvent& event) m_bMaxSpecified = false; if (theApp->getSetModifyNewDocs()) GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->UpdateAllViews (this); } void @@ -639,7 +655,7 @@ ImageFileView::OnFFTRows (wxCommandEvent& event) m_bMaxSpecified = false; if (theApp->getSetModifyNewDocs()) GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->UpdateAllViews (this); } void @@ -652,7 +668,7 @@ ImageFileView::OnIFFTRows (wxCommandEvent& event) m_bMaxSpecified = false; if (theApp->getSetModifyNewDocs()) GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->UpdateAllViews (this); } void @@ -665,7 +681,7 @@ ImageFileView::OnFFTCols (wxCommandEvent& event) m_bMaxSpecified = false; if (theApp->getSetModifyNewDocs()) GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->UpdateAllViews (this); } void @@ -678,7 +694,7 @@ ImageFileView::OnIFFTCols (wxCommandEvent& event) m_bMaxSpecified = false; if (theApp->getSetModifyNewDocs()) GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->UpdateAllViews (this); } #endif @@ -693,7 +709,7 @@ ImageFileView::OnFourier (wxCommandEvent& event) m_bMaxSpecified = false; if (theApp->getSetModifyNewDocs()) GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->UpdateAllViews (this); } void @@ -707,7 +723,7 @@ ImageFileView::OnInverseFourier (wxCommandEvent& event) m_bMaxSpecified = false; if (theApp->getSetModifyNewDocs()) GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->UpdateAllViews (this); } void @@ -720,7 +736,7 @@ ImageFileView::OnShuffleNaturalToFourierOrder (wxCommandEvent& event) m_bMaxSpecified = false; if (theApp->getSetModifyNewDocs()) GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->UpdateAllViews (this); } void @@ -733,7 +749,7 @@ ImageFileView::OnShuffleFourierToNaturalOrder (wxCommandEvent& event) m_bMaxSpecified = false; if (theApp->getSetModifyNewDocs()) GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->UpdateAllViews (this); } void @@ -747,7 +763,7 @@ ImageFileView::OnMagnitude (wxCommandEvent& event) m_bMaxSpecified = false; if (theApp->getSetModifyNewDocs()) GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->UpdateAllViews (this); } } @@ -762,19 +778,19 @@ ImageFileView::OnPhase (wxCommandEvent& event) m_bMaxSpecified = false; if (theApp->getSetModifyNewDocs()) GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + GetDocument()->UpdateAllViews (this); } } 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 +834,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"); @@ -859,17 +875,23 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) image_menu->AppendSeparator(); image_menu->Append (IFMENU_IMAGE_SCALESIZE, "S&cale Size..."); - wxMenu *analyze_menu = new wxMenu; - analyze_menu->Append (IFMENU_PLOT_ROW, "Plot &Row"); - analyze_menu->Append (IFMENU_PLOT_COL, "Plot &Column"); - analyze_menu->Append (IFMENU_PLOT_HISTOGRAM, "Plot &Histogram"); - analyze_menu->AppendSeparator(); - analyze_menu->Append (IFMENU_PLOT_FFT_ROW, "Plot FFT Row"); - analyze_menu->Append (IFMENU_PLOT_FFT_COL, "Plot FFT Column"); - analyze_menu->AppendSeparator(); - analyze_menu->Append (IFMENU_COMPARE_IMAGES, "Compare &Images..."); - analyze_menu->Append (IFMENU_COMPARE_ROW, "Compare &Row"); - analyze_menu->Append (IFMENU_COMPARE_COL, "Compare &Column"); + m_pMenuAnalyze = new wxMenu; + m_pMenuAnalyze->Append (IFMENU_PLOT_ROW, "Plot &Row"); + m_pMenuAnalyze->Append (IFMENU_PLOT_COL, "Plot &Column"); + m_pMenuAnalyze->Append (IFMENU_PLOT_HISTOGRAM, "Plot &Histogram"); + m_pMenuAnalyze->AppendSeparator(); + m_pMenuAnalyze->Append (IFMENU_PLOT_FFT_ROW, "Plot FFT Row"); + m_pMenuAnalyze->Append (IFMENU_PLOT_FFT_COL, "Plot FFT Column"); + m_pMenuAnalyze->AppendSeparator(); + m_pMenuAnalyze->Append (IFMENU_COMPARE_IMAGES, "Compare &Images..."); + m_pMenuAnalyze->Append (IFMENU_COMPARE_ROW, "Compare &Row"); + m_pMenuAnalyze->Append (IFMENU_COMPARE_COL, "Compare &Column"); + m_pMenuAnalyze->Enable (IFMENU_PLOT_ROW, false); + m_pMenuAnalyze->Enable (IFMENU_PLOT_COL, false); + m_pMenuAnalyze->Enable (IFMENU_COMPARE_ROW, false); + m_pMenuAnalyze->Enable (IFMENU_COMPARE_COL, false); + m_pMenuAnalyze->Enable (IFMENU_PLOT_FFT_ROW, false); + m_pMenuAnalyze->Enable (IFMENU_PLOT_FFT_COL, false); wxMenu *help_menu = new wxMenu; help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1"); @@ -882,7 +904,7 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) menu_bar->Append(view_menu, "&View"); menu_bar->Append(image_menu, "&Image"); menu_bar->Append(filter_menu, "Fi<er"); - menu_bar->Append(analyze_menu, "&Analyze"); + menu_bar->Append(m_pMenuAnalyze, "&Analyze"); menu_bar->Append(help_menu, "&Help"); subframe->SetMenuBar(menu_bar); @@ -911,7 +933,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 +942,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 +974,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,22 +1021,20 @@ ImageFileView::OnClose (bool deleteWindow) return false; if (m_pCanvas) { - m_pCanvas->Clear(); - m_pCanvas->Show(false); + m_pCanvas->Show(false); m_pCanvas->setView(NULL); m_pCanvas = NULL; } + m_pFrame->Show(false); 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->Destroy(); m_pFrame = NULL; } return true; @@ -1023,7 +1043,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 +1126,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(); @@ -1177,7 +1197,9 @@ ImageFileView::OnPlotRow (wxCommandEvent& event) } if (theApp->getSetModifyNewDocs()) pPlotDoc->Modify(true); - pPlotDoc->UpdateAllViews(); + pPlotDoc->UpdateAllViews (); + pPlotDoc->getView()->OnUpdate (this, NULL); + pPlotDoc->getView()->getFrame()->Show(true); } } @@ -1190,7 +1212,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(); @@ -1261,7 +1283,9 @@ ImageFileView::OnPlotCol (wxCommandEvent& event) } if (theApp->getSetModifyNewDocs()) pPlotDoc->Modify(true); - pPlotDoc->UpdateAllViews(); + pPlotDoc->UpdateAllViews (); + pPlotDoc->getView()->OnUpdate (this, NULL); + pPlotDoc->getView()->getFrame()->Show(true); } } @@ -1275,7 +1299,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(); @@ -1354,7 +1378,9 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event) if (theApp->getSetModifyNewDocs()) pPlotDoc->Modify(true); - pPlotDoc->UpdateAllViews(); + pPlotDoc->UpdateAllViews (); + pPlotDoc->getView()->OnUpdate (this, NULL); + pPlotDoc->getView()->getFrame()->Show(true); } } @@ -1367,7 +1393,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(); @@ -1453,7 +1479,9 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event) if (theApp->getSetModifyNewDocs()) pPlotDoc->Modify(true); - pPlotDoc->UpdateAllViews(); + pPlotDoc->UpdateAllViews (); + pPlotDoc->getView()->OnUpdate (this, NULL); + pPlotDoc->getView()->getFrame()->Show(true); } } #endif @@ -1542,7 +1570,9 @@ ImageFileView::OnCompareCol (wxCommandEvent& event) delete pY2; if (theApp->getSetModifyNewDocs()) pPlotDoc->Modify(true); - pPlotDoc->UpdateAllViews(); + pPlotDoc->UpdateAllViews (); + pPlotDoc->getView()->OnUpdate (this, NULL); + pPlotDoc->getView()->getFrame()->Show(true); } } } @@ -1632,7 +1662,9 @@ ImageFileView::OnCompareRow (wxCommandEvent& event) delete pY2; if (theApp->getSetModifyNewDocs()) pPlotDoc->Modify(true); - pPlotDoc->UpdateAllViews(); + pPlotDoc->UpdateAllViews (); + pPlotDoc->getView()->OnUpdate (this, NULL); + pPlotDoc->getView()->getFrame()->Show(true); } } } @@ -1642,7 +1674,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(); @@ -1697,7 +1729,9 @@ ImageFileView::OnPlotHistogram (wxCommandEvent& event) delete pY; if (theApp->getSetModifyNewDocs()) pPlotDoc->Modify(true); - pPlotDoc->UpdateAllViews(); + pPlotDoc->UpdateAllViews (); + pPlotDoc->getView()->OnUpdate (this, NULL); + pPlotDoc->getView()->getFrame()->Show(true); } } @@ -1712,7 +1746,7 @@ PhantomCanvas::PhantomCanvas (PhantomFileView* v, wxFrame *frame, const wxPoint& PhantomCanvas::~PhantomCanvas () { - m_pView = NULL; + m_pView = NULL; } void @@ -1734,10 +1768,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 +1784,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 @@ -1810,7 +1856,13 @@ PhantomFileView::OnProjections (wxCommandEvent& event) for (int iView = 0; iView < rProj.nView(); iView++) { ::wxYield(); if (dialogProjections.isCancelled() || ! dialogProjections.projectView (iView)) { - pProjectionDoc->getView()->getFrame()->Close(true); + pProjectionDoc->getView()->getFrame()->Show(true); + GetDocumentManager()->ActivateView (pProjectionDoc->getView(), true, false); + pProjectionDoc->getView()->getFrame()->SetFocus(); + wxCommandEvent event; + GetDocumentManager()->OnFileClose (event); + GetDocumentManager()->ActivateView (this, true, false); + getFrame()->SetFocus(); return; } ::wxYield(); @@ -1824,7 +1876,13 @@ 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->getView()->getFrame()->Close(true); + pProjectionDoc->getView()->getFrame()->Show(true); + GetDocumentManager()->ActivateView (pProjectionDoc->getView(), true, false); + pProjectionDoc->getView()->getFrame()->SetFocus(); + wxCommandEvent event; + GetDocumentManager()->OnFileClose (event); + GetDocumentManager()->ActivateView (this, true, false); + getFrame()->SetFocus(); return; } } @@ -1836,25 +1894,23 @@ PhantomFileView::OnProjections (wxCommandEvent& event) rProj.setRemark (os.str()); *theApp->getLog() << os.str().c_str() << "\n"; - 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); + pProjectionDoc->UpdateAllViews (this); } } } @@ -1880,27 +1936,31 @@ PhantomFileView::OnRasterize (wxCommandEvent& event) } ImageFile& imageFile = pRasterDoc->getImageFile(); - imageFile.setArraySize (m_iDefaultRasterNX, m_iDefaultRasterNX); + imageFile.setArraySize (m_iDefaultRasterNX, m_iDefaultRasterNY); wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"), imageFile.nx() + 1, getFrameForChild(), wxPD_CAN_ABORT); Timer timer; 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->Close(); - pRasterDoc->getView()->getFrame()->Close(true); + if (! dlgProgress.Update (i+1)) { + GetDocumentManager()->ActivateView (pRasterDoc->getView(), true, true); + pRasterDoc->getView()->getFrame()->SetFocus(); + wxCommandEvent event; + GetDocumentManager()->OnFileClose (event); + GetDocumentManager()->ActivateView (this, true, false); + getFrame()->SetFocus(); return; } } if (theApp->getSetModifyNewDocs()) pRasterDoc->Modify(true); - pRasterDoc->UpdateAllViews(this); + 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; *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); @@ -1912,13 +1972,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(); @@ -1959,8 +2019,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"); @@ -2005,7 +2065,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 @@ -2020,7 +2080,7 @@ PhantomFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) } void -PhantomFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) +PhantomFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) { if (m_pCanvas) m_pCanvas->Refresh(); @@ -2033,22 +2093,20 @@ PhantomFileView::OnClose (bool deleteWindow) return false; if (m_pCanvas) { - m_pCanvas->Clear(); + m_pCanvas->Show(false); m_pCanvas->setView(NULL); - m_pCanvas->Show(false); m_pCanvas = NULL; } + m_pFrame->Show(false); 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->Destroy(); m_pFrame = NULL; } @@ -2077,7 +2135,7 @@ ProjectionFileCanvas::ProjectionFileCanvas (ProjectionFileView* v, wxFrame *fram ProjectionFileCanvas::~ProjectionFileCanvas () { - m_pView = NULL; + m_pView = NULL; } void @@ -2114,8 +2172,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 @@ -2139,7 +2203,8 @@ ProjectionFileView::ProjectionFileView() ProjectionFileView::~ProjectionFileView() { - theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->ActivateView(this, FALSE, TRUE);; } void @@ -2182,7 +2247,7 @@ ProjectionFileView::OnConvertPolar (wxCommandEvent& event) rIF.labelAdd (os.str().c_str()); if (theApp->getSetModifyNewDocs()) pPolarDoc->Modify(true); - pPolarDoc->UpdateAllViews(); + pPolarDoc->UpdateAllViews (); pPolarDoc->getView()->OnUpdate (this, NULL); pPolarDoc->getView()->getFrame()->Show(true); } @@ -2217,10 +2282,10 @@ ProjectionFileView::OnConvertFFTPolar (wxCommandEvent& event) rIF.labelAdd (os.str().c_str()); if (theApp->getSetModifyNewDocs()) pPolarDoc->Modify(true); - pPolarDoc->UpdateAllViews(); + pPolarDoc->UpdateAllViews (); pPolarDoc->getView()->OnUpdate (this, NULL); pPolarDoc->getView()->getFrame()->Show(true); -} + } } void @@ -2288,9 +2353,14 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) wxProgressDialog dlgProgress (wxString("Reconstruction"), wxString("Reconstruction Progress"), rProj.nView() + 1, getFrameForChild(), wxPD_CAN_ABORT); for (int i = 0; i < rProj.nView(); i++) { pReconstruct->reconstructView (i, 1); - if (! dlgProgress.Update(i + 1)) { + if (! dlgProgress.Update (i + 1)) { delete pReconstruct; - pReconDoc->getView()->getFrame()->Close(true); + GetDocumentManager()->ActivateView (pReconDoc->getView(), true, true); + pReconDoc->getView()->getFrame()->SetFocus(); + wxCommandEvent event; + GetDocumentManager()->OnFileClose (event); + GetDocumentManager()->ActivateView (this, true, false); + getFrame()->SetFocus(); return; } } @@ -2298,12 +2368,11 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) delete pReconstruct; 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(); + pReconDoc->UpdateAllViews (this); + 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(); @@ -2316,13 +2385,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); @@ -2365,16 +2434,17 @@ 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"); convert_menu->Append (PJMENU_CONVERT_FFT_POLAR, "&FFT->Polar Image...\tCtrl-I"); wxMenu *reconstruct_menu = new wxMenu; - reconstruct_menu->Append (PJMENU_RECONSTRUCT_FBP, "&Filtered Backprojection...\tCtrl-R"); - reconstruct_menu->Append (PJMENU_RECONSTRUCT_FOURIER, "&Fourier...\tCtrl-E"); + reconstruct_menu->Append (PJMENU_RECONSTRUCT_FBP, "&Filtered Backprojection...\tCtrl-R", "Reconstruct image using filtered backprojection"); + reconstruct_menu->Append (PJMENU_RECONSTRUCT_FOURIER, "&Fourier...\tCtrl-E", "Reconstruct image using inverse Fourier"); + reconstruct_menu->Enable (PJMENU_RECONSTRUCT_FOURIER, false); wxMenu *help_menu = new wxMenu; help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1"); @@ -2417,9 +2487,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 @@ -2448,7 +2518,7 @@ ProjectionFileView::OnDraw (wxDC* dc) void -ProjectionFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) +ProjectionFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) { const Projections& rProj = GetDocument()->getProjections(); const int nDet = rProj.nDet(); @@ -2503,22 +2573,20 @@ ProjectionFileView::OnClose (bool deleteWindow) return false; if (m_pCanvas) { - m_pCanvas->Clear(); + m_pCanvas->Show(false); m_pCanvas->setView(NULL); - m_pCanvas->Show(false); m_pCanvas = NULL; } + m_pFrame->Show(false); 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->Destroy(); m_pFrame = NULL; } return true; @@ -2535,7 +2603,7 @@ PlotFileCanvas::PlotFileCanvas (PlotFileView* v, wxFrame *frame, const wxPoint& PlotFileCanvas::~PlotFileCanvas () { - m_pView = NULL; + m_pView = NULL; } void @@ -2566,8 +2634,8 @@ PlotFileView::~PlotFileView() { if (m_pEZPlot) delete m_pEZPlot; - - theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); + + GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); } void @@ -2646,13 +2714,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(); @@ -2694,8 +2762,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"); @@ -2747,7 +2815,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 @@ -2833,22 +2901,21 @@ PlotFileView::OnClose (bool deleteWindow) return false; if (m_pCanvas) { - m_pCanvas->Clear(); + m_pCanvas->Show(false); m_pCanvas->setView (NULL); - m_pCanvas->Show(false); m_pCanvas = NULL; } + m_pFrame->Show(false); 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->Destroy(); m_pFrame = NULL; } return true; @@ -2862,7 +2929,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) ) @@ -2894,28 +2962,29 @@ void TextFileView::OnDraw(wxDC *WXUNUSED(dc) ) { } -void TextFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) +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); + m_pFrame->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->Destroy(); + m_pFrame = NULL; + } return TRUE; } @@ -2951,8 +3020,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"); @@ -2982,11 +3051,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; }