X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fviews.cpp;h=3aca5d4d1ff979ef68a63cb11c6974e2aeaa4292;hp=7b291a0188c256d6bd2cd7516979a608f450395d;hb=b68175983375191c7f302a140c8cab8151a3d628;hpb=45397dc165b10a955712c851dba54da411f60dab diff --git a/src/views.cpp b/src/views.cpp index 7b291a0..3aca5d4 100644 --- a/src/views.cpp +++ b/src/views.cpp @@ -1,15 +1,15 @@ /***************************************************************************** ** FILE IDENTIFICATION ** -** Name: view.cpp +** Name: views.cpp ** Purpose: View & Canvas routines for CTSim program ** Programmer: Kevin Rosenberg ** 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.78 2001/01/27 03:08:16 kevin Exp $ +** $Id: views.cpp,v 1.150 2002/05/01 15:17:36 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 @@ -25,13 +25,7 @@ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ******************************************************************************/ -// For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif @@ -42,6 +36,7 @@ #include "wx/image.h" #include "wx/progdlg.h" +#include "wx/clipbrd.h" #include "ct.h" #include "ctsim.h" @@ -53,6 +48,9 @@ #include "backprojectors.h" #include "reconstruct.h" #include "timer.h" +#include "threadproj.h" +#include "threadrecon.h" +#include "threadraster.h" #if defined(MSVC) || HAVE_SSTREAM #include @@ -65,6 +63,7 @@ BEGIN_EVENT_TABLE(ImageFileCanvas, wxScrolledWindow) EVT_MOUSE_EVENTS(ImageFileCanvas::OnMouseEvent) +EVT_CHAR(ImageFileCanvas::OnChar) END_EVENT_TABLE() @@ -75,7 +74,7 @@ ImageFileCanvas::ImageFileCanvas (ImageFileView* v, wxFrame *frame, const wxPoin ImageFileCanvas::~ImageFileCanvas() { - m_pView = NULL; + m_pView = NULL; } void @@ -118,6 +117,7 @@ ImageFileCanvas::OnMouseEvent(wxMouseEvent& event) if (! m_pView) return; + wxClientDC dc(this); PrepareDC(dc); @@ -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"; } @@ -166,6 +175,18 @@ ImageFileCanvas::OnMouseEvent(wxMouseEvent& event) } } +void +ImageFileCanvas::OnChar (wxKeyEvent& event) +{ + if (event.GetKeyCode() == WXK_ESCAPE) { + m_xCursor = -1; + m_yCursor = -1; + if (m_pView) + m_pView->OnUpdate (NULL); + } else + wxScrolledWindow::OnChar (event); +} + wxSize ImageFileCanvas::GetBestSize() const { @@ -184,6 +205,9 @@ IMPLEMENT_DYNAMIC_CLASS(ImageFileView, wxView) BEGIN_EVENT_TABLE(ImageFileView, wxView) EVT_MENU(IFMENU_FILE_EXPORT, ImageFileView::OnExport) EVT_MENU(IFMENU_FILE_PROPERTIES, ImageFileView::OnProperties) +EVT_MENU(IFMENU_EDIT_COPY, ImageFileView::OnEditCopy) +EVT_MENU(IFMENU_EDIT_CUT, ImageFileView::OnEditCut) +EVT_MENU(IFMENU_EDIT_PASTE, ImageFileView::OnEditPaste) EVT_MENU(IFMENU_VIEW_SCALE_MINMAX, ImageFileView::OnScaleMinMax) EVT_MENU(IFMENU_VIEW_SCALE_AUTO, ImageFileView::OnScaleAuto) EVT_MENU(IFMENU_VIEW_SCALE_FULL, ImageFileView::OnScaleFull) @@ -204,6 +228,9 @@ EVT_MENU(IFMENU_IMAGE_SUBTRACT, ImageFileView::OnSubtract) EVT_MENU(IFMENU_IMAGE_MULTIPLY, ImageFileView::OnMultiply) EVT_MENU(IFMENU_IMAGE_DIVIDE, ImageFileView::OnDivide) EVT_MENU(IFMENU_IMAGE_SCALESIZE, ImageFileView::OnScaleSize) +#if wxUSE_GLCANVAS +EVT_MENU(IFMENU_IMAGE_CONVERT3D, ImageFileView::OnConvert3d) +#endif #ifdef HAVE_FFT EVT_MENU(IFMENU_FILTER_FFT, ImageFileView::OnFFT) EVT_MENU(IFMENU_FILTER_IFFT, ImageFileView::OnIFFT) @@ -214,6 +241,8 @@ EVT_MENU(IFMENU_FILTER_IFFT_COLS, ImageFileView::OnIFFTCols) #endif EVT_MENU(IFMENU_FILTER_MAGNITUDE, ImageFileView::OnMagnitude) EVT_MENU(IFMENU_FILTER_PHASE, ImageFileView::OnPhase) +EVT_MENU(IFMENU_FILTER_REAL, ImageFileView::OnReal) +EVT_MENU(IFMENU_FILTER_IMAGINARY, ImageFileView::OnImaginary) EVT_MENU(IFMENU_PLOT_ROW, ImageFileView::OnPlotRow) EVT_MENU(IFMENU_PLOT_COL, ImageFileView::OnPlotCol) #ifdef HAVE_FFT @@ -224,16 +253,18 @@ EVT_MENU(IFMENU_PLOT_HISTOGRAM, ImageFileView::OnPlotHistogram) END_EVENT_TABLE() ImageFileView::ImageFileView() -: wxView(), m_pFrame(NULL), m_pCanvas(NULL), m_pFileMenu(0), m_bMinSpecified(false), m_bMaxSpecified(false) +: wxView(), m_pFrame(NULL), m_pCanvas(NULL), m_pFileMenu(0), m_pFilterMenu(0), m_bMinSpecified(false), m_bMaxSpecified(false) { - m_iDefaultExportFormatID = ImageFile::FORMAT_PNG; + m_iDefaultExportFormatID = ImageFile::EXPORT_FORMAT_PNG; } ImageFileView::~ImageFileView() { - theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->ActivateView(this, FALSE, TRUE); } + void ImageFileView::OnProperties (wxCommandEvent& event) { @@ -241,7 +272,7 @@ ImageFileView::OnProperties (wxCommandEvent& event) if (rIF.nx() == 0 || rIF.ny() == 0) *theApp->getLog() << "Properties: empty imagefile\n"; else { - const std::string& rFilename = rIF.getFilename(); + const std::string rFilename = m_pFrame->GetTitle().c_str(); std::ostringstream os; double min, max, mean, mode, median, stddev; rIF.statistics (rIF.getArray(), min, max, mean, mode, median, stddev); @@ -252,19 +283,19 @@ ImageFileView::OnProperties (wxCommandEvent& event) os << "Complex\n"; else os << "Real\n"; - os << "\nMinimum: "< 0) { - os << "\n"; rIF.printLabelsBrief (os); } - *theApp->getLog() << os.str().c_str(); + *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<\n"; wxMessageDialog dialogMsg (getFrameForChild(), os.str().c_str(), "Imagefile Properties", wxOK | wxICON_INFORMATION); dialogMsg.ShowModal(); } + GetDocument()->Activate(); } void @@ -283,9 +314,10 @@ ImageFileView::OnScaleAuto (wxCommandEvent& event) m_dMinPixel = dMin; m_dMaxPixel = dMax; m_dAutoScaleFactor = dialogAutoScale.getAutoScaleFactor(); - OnUpdate (this, NULL); + GetDocument()->UpdateAllViews (this); } } + GetDocument()->Activate(); } void @@ -308,8 +340,9 @@ ImageFileView::OnScaleMinMax (wxCommandEvent& event) m_bMaxSpecified = true; m_dMinPixel = dialogMinMax.getMinimum(); m_dMaxPixel = dialogMinMax.getMaximum(); - OnUpdate (this, NULL); + GetDocument()->UpdateAllViews (this); } + GetDocument()->Activate(); } void @@ -318,8 +351,9 @@ ImageFileView::OnScaleFull (wxCommandEvent& event) if (m_bMinSpecified || m_bMaxSpecified) { m_bMinSpecified = false; m_bMaxSpecified = false; - OnUpdate (this, NULL); + GetDocument()->UpdateAllViews (this); } + GetDocument()->Activate(); } void @@ -343,40 +377,41 @@ ImageFileView::OnCompare (wxCommandEvent& event) os << GetFrame()->GetTitle().c_str() << ": minimum=" << min << ", maximum=" << max << ", mean=" << mean << ", mode=" << mode << ", median=" << median << ", stddev=" << stddev << "\n"; rCompareIF.statistics (min, max, mean, mode, median, stddev); os << pCompareDoc->GetFirstView()->GetFrame()->GetTitle().c_str() << ": minimum=" << min << ", maximum=" << max << ", mean=" << mean << ", mode=" << mode << ", median=" << median << ", stddev=" << stddev << "\n"; - os << "\n"; double d, r, e; rIF.comparativeStatistics (rCompareIF, d, r, e); os << "Comparative Statistics: d=" << d << ", r=" << r << ", e=" << e << "\n"; - *theApp->getLog() << os.str().c_str(); + *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<\n"; if (dialogGetCompare.getMakeDifferenceImage()) { + ImageFile* pDifferenceImage = new ImageFile; + + pDifferenceImage->setArraySize (rIF.nx(), rIF.ny()); + if (! rIF.subtractImages (rCompareIF, *pDifferenceImage)) { + *theApp->getLog() << "Unable to subtract images\n"; + delete pDifferenceImage; + return; + } ImageFileDocument* pDifferenceDoc = theApp->newImageDoc(); if (! pDifferenceDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); return; } - ImageFile& differenceImage = pDifferenceDoc->getImageFile(); - - differenceImage.setArraySize (rIF.nx(), rIF.ny()); - if (! rIF.subtractImages (rCompareIF, differenceImage)) { - pDifferenceDoc->Close(); - //pDifferenceDoc->DeleteAllViews(); - return; - } + pDifferenceDoc->setImageFile (pDifferenceImage); wxString s = GetFrame()->GetTitle() + ": "; - differenceImage.labelsCopy (rIF, s.c_str()); + pDifferenceImage->labelsCopy (rIF, s.c_str()); s = pCompareDoc->GetFirstView()->GetFrame()->GetTitle() + ": "; - differenceImage.labelsCopy (rCompareIF, s.c_str()); + pDifferenceImage->labelsCopy (rCompareIF, s.c_str()); std::ostringstream osLabel; osLabel << "Compare image " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str() << " and " << pCompareDoc->GetFirstView()->GetFrame()->GetTitle().c_str() << ": " << os.str().c_str(); - differenceImage.labelAdd (os.str().c_str()); - if (theApp->getSetModifyNewDocs()) - pDifferenceDoc->Modify(true); - pDifferenceDoc->UpdateAllViews(this); + pDifferenceImage->labelAdd (os.str().c_str()); + if (theApp->getAskDeleteNewDocs()) + pDifferenceDoc->Modify (true); + pDifferenceDoc->UpdateAllViews (this); pDifferenceDoc->getView()->OnUpdate (this, NULL); pDifferenceDoc->getView()->getFrame()->Show(true); + pDifferenceDoc->Activate(); } wxMessageBox(os.str().c_str(), "Image Comparison"); } @@ -389,9 +424,10 @@ ImageFileView::OnInvertValues (wxCommandEvent& event) ImageFile& rIF = GetDocument()->getImageFile(); rIF.invertPixelValues (rIF); rIF.labelAdd ("Invert Pixel Values"); - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + if (theApp->getAskDeleteNewDocs()) + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); + GetDocument()->Activate(); } void @@ -400,9 +436,10 @@ ImageFileView::OnSquare (wxCommandEvent& event) ImageFile& rIF = GetDocument()->getImageFile(); rIF.square (rIF); rIF.labelAdd ("Square Pixel Values"); - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + if (theApp->getAskDeleteNewDocs()) + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); + GetDocument()->Activate(); } void @@ -411,9 +448,10 @@ ImageFileView::OnSquareRoot (wxCommandEvent& event) ImageFile& rIF = GetDocument()->getImageFile(); rIF.sqrt (rIF); rIF.labelAdd ("Square-root Pixel Values"); - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + if (theApp->getAskDeleteNewDocs()) + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); + GetDocument()->Activate(); } void @@ -422,9 +460,10 @@ ImageFileView::OnLog (wxCommandEvent& event) ImageFile& rIF = GetDocument()->getImageFile(); rIF.log (rIF); rIF.labelAdd ("Logrithm base-e Pixel Values"); - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + if (theApp->getAskDeleteNewDocs()) + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); + GetDocument()->Activate(); } void @@ -433,9 +472,10 @@ ImageFileView::OnExp (wxCommandEvent& event) ImageFile& rIF = GetDocument()->getImageFile(); rIF.exp (rIF); rIF.labelAdd ("Exponent base-e Pixel Values"); - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + if (theApp->getAskDeleteNewDocs()) + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); + GetDocument()->Activate(); } void @@ -470,11 +510,11 @@ ImageFileView::OnAdd (wxCommandEvent& event) newImage.labelsCopy (rRHSIF, s.c_str()); newImage.labelAdd (os.str().c_str()); *theApp->getLog() << os.str().c_str() << "\n"; - if (theApp->getSetModifyNewDocs()) - pNewDoc->Modify(TRUE); - pNewDoc->UpdateAllViews(this); - pNewDoc->getView()->OnUpdate (this, NULL); + if (theApp->getAskDeleteNewDocs()) + pNewDoc->Modify (true); + pNewDoc->UpdateAllViews (this); pNewDoc->getView()->getFrame()->Show(true); + pNewDoc->Activate(); } } } @@ -511,11 +551,11 @@ ImageFileView::OnSubtract (wxCommandEvent& event) newImage.labelsCopy (rRHSIF, s.c_str()); newImage.labelAdd (os.str().c_str()); *theApp->getLog() << os.str().c_str() << "\n"; - if (theApp->getSetModifyNewDocs()) - pNewDoc->Modify(TRUE); - pNewDoc->UpdateAllViews(this); - pNewDoc->getView()->OnUpdate (this, NULL); + if (theApp->getAskDeleteNewDocs()) + pNewDoc->Modify (true); + pNewDoc->UpdateAllViews (this); pNewDoc->getView()->getFrame()->Show(true); + pNewDoc->Activate(); } } } @@ -552,11 +592,11 @@ ImageFileView::OnMultiply (wxCommandEvent& event) newImage.labelsCopy (rRHSIF, s.c_str()); newImage.labelAdd (os.str().c_str()); *theApp->getLog() << os.str().c_str() << "\n"; - if (theApp->getSetModifyNewDocs()) - pNewDoc->Modify(TRUE); - pNewDoc->UpdateAllViews(this); - pNewDoc->getView()->OnUpdate (this, NULL); + if (theApp->getAskDeleteNewDocs()) + pNewDoc->Modify (true); + pNewDoc->UpdateAllViews (this); pNewDoc->getView()->getFrame()->Show(true); + pNewDoc->Activate(); } } } @@ -593,11 +633,11 @@ ImageFileView::OnDivide (wxCommandEvent& event) newImage.labelsCopy (rRHSIF, s.c_str()); newImage.labelAdd (os.str().c_str()); *theApp->getLog() << os.str().c_str() << "\n"; - if (theApp->getSetModifyNewDocs()) - pNewDoc->Modify(TRUE); - pNewDoc->UpdateAllViews(this); - pNewDoc->getView()->OnUpdate (this, NULL); + if (theApp->getAskDeleteNewDocs()) + pNewDoc->Modify (true); + pNewDoc->UpdateAllViews (this); pNewDoc->getView()->getFrame()->Show(true); + pNewDoc->Activate(); } } } @@ -612,9 +652,10 @@ ImageFileView::OnFFT (wxCommandEvent& event) rIF.labelAdd ("FFT Image"); m_bMinSpecified = false; m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + if (theApp->getAskDeleteNewDocs()) + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); + GetDocument()->Activate(); } void @@ -625,9 +666,10 @@ ImageFileView::OnIFFT (wxCommandEvent& event) rIF.labelAdd ("IFFT Image"); m_bMinSpecified = false; m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + if (theApp->getAskDeleteNewDocs()) + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); + GetDocument()->Activate(); } void @@ -638,9 +680,10 @@ ImageFileView::OnFFTRows (wxCommandEvent& event) rIF.labelAdd ("FFT Rows"); m_bMinSpecified = false; m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + if (theApp->getAskDeleteNewDocs()) + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); + GetDocument()->Activate(); } void @@ -651,9 +694,10 @@ ImageFileView::OnIFFTRows (wxCommandEvent& event) rIF.labelAdd ("IFFT Rows"); m_bMinSpecified = false; m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + if (theApp->getAskDeleteNewDocs()) + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); + GetDocument()->Activate(); } void @@ -664,9 +708,10 @@ ImageFileView::OnFFTCols (wxCommandEvent& event) rIF.labelAdd ("FFT Columns"); m_bMinSpecified = false; m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + if (theApp->getAskDeleteNewDocs()) + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); + GetDocument()->Activate(); } void @@ -677,9 +722,10 @@ ImageFileView::OnIFFTCols (wxCommandEvent& event) rIF.labelAdd ("IFFT Columns"); m_bMinSpecified = false; m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + if (theApp->getAskDeleteNewDocs()) + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); + GetDocument()->Activate(); } #endif @@ -692,9 +738,10 @@ ImageFileView::OnFourier (wxCommandEvent& event) rIF.labelAdd ("Fourier Image"); m_bMinSpecified = false; m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + if (theApp->getAskDeleteNewDocs()) + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); + GetDocument()->Activate(); } void @@ -706,9 +753,10 @@ ImageFileView::OnInverseFourier (wxCommandEvent& event) rIF.labelAdd ("Inverse Fourier Image"); m_bMinSpecified = false; m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + if (theApp->getAskDeleteNewDocs()) + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); + GetDocument()->Activate(); } void @@ -719,9 +767,10 @@ ImageFileView::OnShuffleNaturalToFourierOrder (wxCommandEvent& event) rIF.labelAdd ("Shuffle Natural To Fourier Order"); m_bMinSpecified = false; m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + if (theApp->getAskDeleteNewDocs()) + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); + GetDocument()->Activate(); } void @@ -732,50 +781,83 @@ ImageFileView::OnShuffleFourierToNaturalOrder (wxCommandEvent& event) rIF.labelAdd ("Shuffle Fourier To Natural Order"); m_bMinSpecified = false; m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + if (theApp->getAskDeleteNewDocs()) + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); + GetDocument()->Activate(); } void ImageFileView::OnMagnitude (wxCommandEvent& event) +{ + ImageFile& rIF = GetDocument()->getImageFile(); + rIF.magnitude (rIF); + rIF.labelAdd ("Magnitude"); + m_bMinSpecified = false; + m_bMaxSpecified = false; + if (theApp->getAskDeleteNewDocs()) + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); + GetDocument()->Activate(); +} + +void +ImageFileView::OnPhase (wxCommandEvent& event) { ImageFile& rIF = GetDocument()->getImageFile(); if (rIF.isComplex()) { - rIF.magnitude (rIF); - rIF.labelAdd ("Magnitude of complex-image"); + rIF.phase (rIF); + rIF.labelAdd ("Phase of complex-image"); m_bMinSpecified = false; m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + if (theApp->getAskDeleteNewDocs()) + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); } + GetDocument()->Activate(); } void -ImageFileView::OnPhase (wxCommandEvent& event) +ImageFileView::OnReal (wxCommandEvent& event) { ImageFile& rIF = GetDocument()->getImageFile(); if (rIF.isComplex()) { - rIF.phase (rIF); - rIF.labelAdd ("Phase of complex-image"); + rIF.real (rIF); + rIF.labelAdd ("Real component of complex-image"); + m_bMinSpecified = false; + m_bMaxSpecified = false; + if (theApp->getAskDeleteNewDocs()) + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); + } + GetDocument()->Activate(); +} + +void +ImageFileView::OnImaginary (wxCommandEvent& event) +{ + ImageFile& rIF = GetDocument()->getImageFile(); + if (rIF.isComplex()) { + rIF.imaginary (rIF); + rIF.labelAdd ("Imaginary component of complex-image"); m_bMinSpecified = false; m_bMaxSpecified = false; - if (theApp->getSetModifyNewDocs()) - GetDocument()->Modify(TRUE); - GetDocument()->UpdateAllViews(this); + if (theApp->getAskDeleteNewDocs()) + GetDocument()->Modify (true); + GetDocument()->UpdateAllViews (this); } + GetDocument()->Activate(); } 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); @@ -798,59 +880,70 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) #endif theApp->setIconForFrame (subframe); - wxMenu *m_pFileMenu = new wxMenu; - + m_pFileMenu = new wxMenu; m_pFileMenu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...\tCtrl-P"); m_pFileMenu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...\tCtrl-F"); m_pFileMenu->Append(wxID_OPEN, "&Open...\tCtrl-O"); m_pFileMenu->Append(wxID_SAVE, "&Save\tCtrl-S"); m_pFileMenu->Append(wxID_SAVEAS, "Save &As..."); m_pFileMenu->Append(wxID_CLOSE, "&Close\tCtrl-W"); + m_pFileMenu->Append(wxID_REVERT, "Re&vert"); m_pFileMenu->AppendSeparator(); - m_pFileMenu->Append(IFMENU_FILE_PROPERTIES, "P&roperties"); - m_pFileMenu->Append(IFMENU_FILE_EXPORT, "&Export..."); + m_pFileMenu->Append(IFMENU_FILE_PROPERTIES, "P&roperties\tCtrl-I"); + m_pFileMenu->Append(IFMENU_FILE_EXPORT, "Expor&t..."); m_pFileMenu->AppendSeparator(); m_pFileMenu->Append(wxID_PRINT, "&Print..."); m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup..."); - m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view"); + m_pFileMenu->Append(wxID_PREVIEW, "Print Preview"); + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(MAINMENU_IMPORT, "&Import...\tCtrl-M"); #ifdef CTSIM_MDI m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces..."); 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* edit_menu = new wxMenu; + edit_menu->Append(IFMENU_EDIT_COPY, "Copy\tCtrl-C"); + edit_menu->Append(IFMENU_EDIT_CUT, "Cut\tCtrl-X"); + edit_menu->Append(IFMENU_EDIT_PASTE, "Paste\tCtrl-V"); wxMenu *view_menu = new wxMenu; view_menu->Append(IFMENU_VIEW_SCALE_MINMAX, "Display Scale S&et...\tCtrl-E"); view_menu->Append(IFMENU_VIEW_SCALE_AUTO, "Display Scale &Auto...\tCtrl-A"); view_menu->Append(IFMENU_VIEW_SCALE_FULL, "Display F&ull Scale\tCtrl-U"); - wxMenu* filter_menu = new wxMenu; - filter_menu->Append (IFMENU_FILTER_INVERTVALUES, "&Invert Values"); - filter_menu->Append (IFMENU_FILTER_SQUARE, "&Square"); - filter_menu->Append (IFMENU_FILTER_SQRT, "Square &Root"); - filter_menu->Append (IFMENU_FILTER_LOG, "&Log"); - filter_menu->Append (IFMENU_FILTER_EXP, "&Exp"); - filter_menu->AppendSeparator(); + m_pFilterMenu = new wxMenu; + m_pFilterMenu->Append (IFMENU_FILTER_INVERTVALUES, "In&vert Values"); + m_pFilterMenu->Append (IFMENU_FILTER_SQUARE, "&Square"); + m_pFilterMenu->Append (IFMENU_FILTER_SQRT, "Square &Root"); + m_pFilterMenu->Append (IFMENU_FILTER_LOG, "&Log"); + m_pFilterMenu->Append (IFMENU_FILTER_EXP, "E&xp"); + m_pFilterMenu->AppendSeparator(); #ifdef HAVE_FFT - filter_menu->Append (IFMENU_FILTER_FFT, "2D &FFT"); - filter_menu->Append (IFMENU_FILTER_IFFT, "2D &IFFT"); - filter_menu->Append (IFMENU_FILTER_FFT_ROWS, "FFT Rows"); - filter_menu->Append (IFMENU_FILTER_IFFT_ROWS, "IFFT Rows"); - filter_menu->Append (IFMENU_FILTER_FFT_COLS, "FFT Columns"); - filter_menu->Append (IFMENU_FILTER_IFFT_COLS, "IFFT Columns"); - filter_menu->Append (IFMENU_FILTER_FOURIER, "F&ourier"); - filter_menu->Append (IFMENU_FILTER_INVERSE_FOURIER, "Inverse Fo&urier"); + m_pFilterMenu->Append (IFMENU_FILTER_FFT, "2-D &FFT\tCtrl-2"); + m_pFilterMenu->Append (IFMENU_FILTER_IFFT, "2-D &IFFT\tAlt-2"); + m_pFilterMenu->Append (IFMENU_FILTER_FFT_ROWS, "FFT Rows"); + m_pFilterMenu->Append (IFMENU_FILTER_IFFT_ROWS, "IFFT Rows"); + m_pFilterMenu->Append (IFMENU_FILTER_FFT_COLS, "FFT Columns"); + m_pFilterMenu->Append (IFMENU_FILTER_IFFT_COLS, "IFFT Columns"); + m_pFilterMenu->Append (IFMENU_FILTER_FOURIER, "2-D F&ourier"); + m_pFilterMenu->Append (IFMENU_FILTER_INVERSE_FOURIER, "2-D Inverse Fo&urier"); #else - filter_menu->Append (IFMENU_FILTER_FOURIER, "&Fourier"); - filter_menu->Append (IFMENU_FILTER_INVERSE_FOURIER, "&Inverse Fourier"); + m_pFilterMenu->Append (IFMENU_FILTER_FOURIER, "&Fourier"); + m_pFilterMenu->Append (IFMENU_FILTER_INVERSE_FOURIER, "&Inverse Fourier"); #endif - filter_menu->Append (IFMENU_FILTER_SHUFFLEFOURIERTONATURALORDER, "S&huffle Fourier to Natural Order"); - filter_menu->Append (IFMENU_FILTER_SHUFFLENATURALTOFOURIERORDER, "Shu&ffle Natural to Fourier Order"); - filter_menu->Append (IFMENU_FILTER_MAGNITUDE, "&Magnitude"); - filter_menu->Append (IFMENU_FILTER_PHASE, "&Phase"); + m_pFilterMenu->Append (IFMENU_FILTER_SHUFFLEFOURIERTONATURALORDER, "Shuffl&e Fourier to Natural Order"); + m_pFilterMenu->Append (IFMENU_FILTER_SHUFFLENATURALTOFOURIERORDER, "Shuffle &Natural to Fourier Order"); + m_pFilterMenu->AppendSeparator(); + m_pFilterMenu->Append (IFMENU_FILTER_MAGNITUDE, "&Magnitude"); + m_pFilterMenu->Append (IFMENU_FILTER_PHASE, "&Phase"); + m_pFilterMenu->Append (IFMENU_FILTER_REAL, "Re&al"); + m_pFilterMenu->Append (IFMENU_FILTER_IMAGINARY, "Ima&ginary"); wxMenu* image_menu = new wxMenu; image_menu->Append (IFMENU_IMAGE_ADD, "&Add..."); @@ -859,31 +952,42 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) image_menu->Append (IFMENU_IMAGE_DIVIDE, "&Divide..."); image_menu->AppendSeparator(); image_menu->Append (IFMENU_IMAGE_SCALESIZE, "S&cale Size..."); +#if wxUSE_GLCANVAS + image_menu->Append (IFMENU_IMAGE_CONVERT3D, "Convert &3-D\tCtrl-3"); +#endif - 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, "P&lot FFT Row"); + m_pMenuAnalyze->Append (IFMENU_PLOT_FFT_COL, "Plo&t FFT Column"); + m_pMenuAnalyze->AppendSeparator(); + m_pMenuAnalyze->Append (IFMENU_COMPARE_IMAGES, "Compare &Images..."); + m_pMenuAnalyze->Append (IFMENU_COMPARE_ROW, "Compare Ro&w"); + m_pMenuAnalyze->Append (IFMENU_COMPARE_COL, "Compare Colu&mn"); + 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"); - help_menu->Append(MAINMENU_HELP_TOPICS, "&Topics\tCtrl-H"); + help_menu->Append (MAINMENU_HELP_TIPS, "&Tips"); + help_menu->Append (IDH_QUICKSTART, "&Quick Start"); help_menu->Append(MAINMENU_HELP_ABOUT, "&About"); wxMenuBar *menu_bar = new wxMenuBar; menu_bar->Append(m_pFileMenu, "&File"); + menu_bar->Append(edit_menu, "&Edit"); 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_pFilterMenu, "Fi<er"); + menu_bar->Append(m_pMenuAnalyze, "&Analyze"); menu_bar->Append(help_menu, "&Help"); subframe->SetMenuBar(menu_bar); @@ -891,17 +995,23 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) subframe->Centre(wxBOTH); wxAcceleratorEntry accelEntries[10]; - accelEntries[0].Set (wxACCEL_CTRL, static_cast('O'), wxID_OPEN); - accelEntries[1].Set (wxACCEL_CTRL, static_cast('S'), wxID_SAVE); - accelEntries[2].Set (wxACCEL_CTRL, static_cast('W'), wxID_CLOSE); - accelEntries[3].Set (wxACCEL_CTRL, static_cast('H'), MAINMENU_HELP_TOPICS); - accelEntries[4].Set (wxACCEL_CTRL, static_cast('P'), MAINMENU_FILE_CREATE_PHANTOM); - accelEntries[5].Set (wxACCEL_CTRL, static_cast('F'), MAINMENU_FILE_CREATE_FILTER); - accelEntries[6].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS); - accelEntries[7].Set (wxACCEL_CTRL, static_cast('A'), IFMENU_VIEW_SCALE_AUTO); - accelEntries[8].Set (wxACCEL_CTRL, static_cast('U'), IFMENU_VIEW_SCALE_FULL); - accelEntries[9].Set (wxACCEL_CTRL, static_cast('E'), IFMENU_VIEW_SCALE_MINMAX); - wxAcceleratorTable accelTable (10, accelEntries); + accelEntries[0].Set (wxACCEL_CTRL, static_cast('A'), IFMENU_VIEW_SCALE_AUTO); + accelEntries[1].Set (wxACCEL_CTRL, static_cast('U'), IFMENU_VIEW_SCALE_FULL); + accelEntries[2].Set (wxACCEL_CTRL, static_cast('E'), IFMENU_VIEW_SCALE_MINMAX); + accelEntries[3].Set (wxACCEL_CTRL, static_cast('I'), IFMENU_FILE_PROPERTIES); + accelEntries[4].Set (wxACCEL_CTRL, static_cast('C'), IFMENU_EDIT_COPY); + accelEntries[5].Set (wxACCEL_CTRL, static_cast('X'), IFMENU_EDIT_CUT); + accelEntries[6].Set (wxACCEL_CTRL, static_cast('V'), IFMENU_EDIT_PASTE); + int iEntry = 7; +#ifdef HAVE_FFT + accelEntries[iEntry++].Set (wxACCEL_CTRL, static_cast('2'), IFMENU_FILTER_FFT); + accelEntries[iEntry++].Set (wxACCEL_ALT, static_cast('2'), IFMENU_FILTER_IFFT); +#endif +#if wxUSE_GLCANVAS + accelEntries[iEntry++].Set (wxACCEL_CTRL, static_cast('3'), IFMENU_IMAGE_CONVERT3D); +#endif + wxAcceleratorTable accelTable (iEntry, accelEntries); + subframe->SetAcceleratorTable (accelTable); return subframe; @@ -912,23 +1022,22 @@ bool ImageFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) ) { m_pFrame = CreateChildFrame(doc, this); - SetFrame (m_pFrame); m_bMinSpecified = false; m_bMaxSpecified = false; m_dAutoScaleFactor = 1.; - int width, height; - m_pFrame->GetClientSize (&width, &height); + // 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); - m_pFrame->SetSize(-1, -1, x, y); + // int x, y; // X requires a forced resize + // m_pFrame->GetSize(&x, &y); + // m_pFrame->SetSize(-1, -1, x, y); m_pFrame->SetFocus(); m_pFrame->Show(true); - Activate(true); + // Activate(true); return true; } @@ -953,7 +1062,16 @@ 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(); + if (m_pFilterMenu && rIF.isComplex()) { + m_pFilterMenu->Enable(IFMENU_FILTER_REAL, true); + m_pFilterMenu->Enable(IFMENU_FILTER_IMAGINARY, true); + m_pFilterMenu->Enable(IFMENU_FILTER_PHASE, true); + } else { + m_pFilterMenu->Enable(IFMENU_FILTER_REAL, false); + m_pFilterMenu->Enable(IFMENU_FILTER_IMAGINARY, false); + m_pFilterMenu->Enable(IFMENU_FILTER_PHASE, false); + } ImageFileArrayConst v = rIF.getArray(); int nx = rIF.nx(); int ny = rIF.ny(); @@ -969,6 +1087,10 @@ ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) double scaleWidth = m_dMaxPixel - m_dMinPixel; unsigned char* imageData = new unsigned char [nx * ny * 3]; + if (! imageData) { + sys_error (ERR_SEVERE, "Unable to allocate memory for Image display"); + return; + } for (int ix = 0; ix < nx; ix++) { for (int iy = 0; iy < ny; iy++) { double scaleValue = ((v[ix][iy] - m_dMinPixel) / scaleWidth) * 255; @@ -984,7 +1106,7 @@ ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) int xSize = nx; int ySize = ny; ySize = clamp (ySize, 0, 800); - m_pFrame->SetClientSize (xSize, ySize); + // m_pFrame->SetClientSize (xSize, ySize); // KMR m_pCanvas->SetScrollbars(20, 20, nx/20, ny/20); m_pCanvas->SetBackgroundColour(*wxWHITE); } @@ -996,35 +1118,110 @@ ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) bool ImageFileView::OnClose (bool deleteWindow) { + //GetDocumentManager()->ActivateView (this, false, true); if (! GetDocument() || ! GetDocument()->Close()) return false; + Activate (false); if (m_pCanvas) { - m_pCanvas->Clear(); - m_pCanvas->Show(false); m_pCanvas->setView(NULL); m_pCanvas = NULL; } wxString s(theApp->GetAppName()); if (m_pFrame) m_pFrame->SetTitle(s); - SetFrame(NULL); - Activate(false); + SetFrame(NULL); if (deleteWindow) { - m_pFrame->Show(false); - m_pFrame->Destroy(); -// delete m_pFrame; + delete m_pFrame; m_pFrame = NULL; + if (GetDocument() && GetDocument()->getBadFileOpen()) + ::wxYield(); // wxWindows bug workaround } + return true; } +void +ImageFileView::OnEditCopy (wxCommandEvent& event) +{ + wxBitmapDataObject *pBitmapObject = new wxBitmapDataObject; + + pBitmapObject->SetBitmap (m_bitmap); + + if (wxTheClipboard->Open()) { + wxTheClipboard->SetData (pBitmapObject); + wxTheClipboard->Close(); + } +} + +void +ImageFileView::OnEditCut (wxCommandEvent& event) +{ + OnEditCopy (event); + ImageFile& rIF = GetDocument()->getImageFile(); + int nx = rIF.nx(); + int ny = rIF.ny(); + ImageFile* pIF = new ImageFile (nx, ny); + pIF->arrayDataClear(); + GetDocument()->setImageFile (pIF); // deletes old IF + OnUpdate(this, NULL); + GetDocument()->UpdateAllViews(); + if (theApp->getAskDeleteNewDocs()) + GetDocument()->Modify (true); +} + +void +ImageFileView::OnEditPaste (wxCommandEvent& event) +{ + ImageFile& rIF = GetDocument()->getImageFile(); + + if (wxTheClipboard->Open()) { + wxBitmap bitmap; + if (wxTheClipboard->IsSupported (wxDF_BITMAP)) { + wxBitmapDataObject bitmapObject; + wxTheClipboard->GetData (bitmapObject); + bitmap = bitmapObject.GetBitmap (); + } + wxTheClipboard->Close(); + + int nx = rIF.nx(); + int ny = rIF.ny(); + bool bMonochrome = false; + + if (bitmap.Ok() == true && bitmap.GetWidth() == nx && bitmap.GetHeight() == ny) { + wxImage image (bitmap); + double dScale3 = 3 * 255; + unsigned char* pixels = image.GetData(); + ImageFileArray v = rIF.getArray(); + for (unsigned int ix = 0; ix < rIF.nx(); ix++) { + for (unsigned int iy = 0; iy < rIF.ny(); iy++) { + unsigned int iBase = 3 * (iy * nx + ix); + if (ix == 0 && iy == 0 && (pixels[iBase] == pixels[iBase+1] && pixels[iBase+1] == pixels[iBase+2])) + bMonochrome = true; + if (bMonochrome) { + v[ix][ny - 1 - iy] = (pixels[iBase]+pixels[iBase+1]+pixels[iBase+2]) / dScale3; + } else { + double dR = pixels[iBase] / 255.; + double dG = pixels[iBase+1] / 255.; + double dB = pixels[iBase+2] / 255.; + v[ix][ny - 1 - iy] = ImageFile::colorToGrayscale (dR, dG, dB); + } + } + } + OnUpdate(this, NULL); + GetDocument()->UpdateAllViews(); + if (theApp->getAskDeleteNewDocs()) + GetDocument()->Modify(true); + } + } +} + 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(); @@ -1041,20 +1238,34 @@ ImageFileView::OnExport (wxCommandEvent& event) DialogExportParameters dialogExport (getFrameForChild(), m_iDefaultExportFormatID); if (dialogExport.ShowModal() == wxID_OK) { wxString strFormatName (dialogExport.getFormatName ()); - m_iDefaultExportFormatID = ImageFile::convertFormatNameToID (strFormatName.c_str()); + m_iDefaultExportFormatID = ImageFile::convertExportFormatNameToID (strFormatName.c_str()); wxString strExt; wxString strWildcard; - if (m_iDefaultExportFormatID == ImageFile::FORMAT_PGM || m_iDefaultExportFormatID == ImageFile::FORMAT_PGMASCII) { + if (m_iDefaultExportFormatID == ImageFile::EXPORT_FORMAT_PGM || m_iDefaultExportFormatID == ImageFile::EXPORT_FORMAT_PGMASCII) { strExt = ".pgm"; strWildcard = "PGM Files (*.pgm)|*.pgm"; } #ifdef HAVE_PNG - else if (m_iDefaultExportFormatID == ImageFile::FORMAT_PNG || m_iDefaultExportFormatID == ImageFile::FORMAT_PNG16) { + else if (m_iDefaultExportFormatID == ImageFile::EXPORT_FORMAT_PNG || m_iDefaultExportFormatID == ImageFile::EXPORT_FORMAT_PNG16) { strExt = ".png"; strWildcard = "PNG Files (*.png)|*.png"; } #endif +#ifdef HAVE_CTN_DICOM + else if (m_iDefaultExportFormatID == ImageFile::EXPORT_FORMAT_DICOM) { + strExt = ""; + strWildcard = "DICOM Files (*.*)|*.*"; + } +#endif + else if (m_iDefaultExportFormatID == ImageFile::EXPORT_FORMAT_TEXT) { + strExt = ".txt"; + strWildcard = "Text (*.txt)|*.txt"; + } + else { + strExt = ""; + strWildcard = "Miscellaneous (*.*)|*.*"; + } const wxString& strFilename = wxFileSelector (wxString("Export Filename"), wxString(""), wxString(""), strExt, strWildcard, wxOVERWRITE_PROMPT | wxHIDE_READONLY | wxSAVE); @@ -1090,14 +1301,32 @@ ImageFileView::OnScaleSize (wxCommandEvent& event) rScaledIF.labelAdd (os.str().c_str()); rIF.scaleImage (rScaledIF); *theApp->getLog() << os.str().c_str() << "\n"; - if (theApp->getSetModifyNewDocs()) - pScaledDoc->Modify(TRUE); + if (theApp->getAskDeleteNewDocs()) + pScaledDoc->Modify (true); pScaledDoc->UpdateAllViews (this); - pScaledDoc->getView()->OnUpdate (this, NULL); pScaledDoc->getView()->getFrame()->Show(true); + pScaledDoc->Activate(); } } +#if wxUSE_GLCANVAS +void +ImageFileView::OnConvert3d (wxCommandEvent& event) +{ + ImageFile& rIF = GetDocument()->getImageFile(); + Graph3dFileDocument* pGraph3d = theApp->newGraph3dDoc(); + pGraph3d->setBadFileOpen(); + pGraph3d->createFromImageFile (rIF); + pGraph3d->getView()->OnUpdate (this, NULL); + pGraph3d->UpdateAllViews(); + pGraph3d->getView()->getFrame()->SetClientSize (400, 400); + pGraph3d->getView()->getFrame()->Show (true); + GetDocumentManager()->ActivateView (pGraph3d->getView(), true, false); + ::wxYield(); + pGraph3d->getView()->getCanvas()->SetFocus(); +} +#endif + void ImageFileView::OnPlotRow (wxCommandEvent& event) { @@ -1107,7 +1336,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(); @@ -1176,9 +1405,11 @@ ImageFileView::OnPlotRow (wxCommandEvent& event) delete pYImag; delete pYMag; } - if (theApp->getSetModifyNewDocs()) - pPlotDoc->Modify(true); - pPlotDoc->UpdateAllViews(); + if (theApp->getAskDeleteNewDocs()) + pPlotDoc->Modify (true); + pPlotDoc->getView()->getFrame()->Show(true); + pPlotDoc->UpdateAllViews (); + pPlotDoc->Activate(); } } @@ -1191,7 +1422,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(); @@ -1260,9 +1491,11 @@ ImageFileView::OnPlotCol (wxCommandEvent& event) delete pYImag; delete pYMag; } - if (theApp->getSetModifyNewDocs()) - pPlotDoc->Modify(true); - pPlotDoc->UpdateAllViews(); + if (theApp->getAskDeleteNewDocs()) + pPlotDoc->Modify (true); + pPlotDoc->getView()->getFrame()->Show(true); + pPlotDoc->UpdateAllViews (); + pPlotDoc->Activate(); } } @@ -1276,7 +1509,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(); @@ -1294,7 +1527,7 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event) pcIn[i].im = 0; } - fftw_plan plan = fftw_create_plan (nx, FFTW_FORWARD, FFTW_IN_PLACE); + fftw_plan plan = fftw_create_plan (nx, FFTW_FORWARD, FFTW_IN_PLACE | FFTW_ESTIMATE | FFTW_USE_WISDOM); fftw_one (plan, pcIn, NULL); fftw_destroy_plan (plan); @@ -1304,8 +1537,8 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event) double* pYMag = new double [nx]; for (i = 0; i < nx; i++) { pX[i] = i; - pYReal[i] = pcIn[i].re; - pYImag[i] = pcIn[i].im; + pYReal[i] = pcIn[i].re / nx; + pYImag[i] = pcIn[i].im / nx; pYMag[i] = ::sqrt (pcIn[i].re * pcIn[i].re + pcIn[i].im * pcIn[i].im); } Fourier::shuffleFourierToNaturalOrder (pYReal, nx); @@ -1341,7 +1574,7 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event) rPlotFile.addColumn (1, pYReal); rPlotFile.addColumn (2, pYImag); rPlotFile.addColumn (3, pYMag); - for (int iL = 0; iL < rIF.nLabels(); iL++) + for (unsigned int iL = 0; iL < rIF.nLabels(); iL++) rPlotFile.addDescription (rIF.labelGet(iL).getLabelString().c_str()); os << " FFT Plot of " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str(); *theApp->getLog() << os.str().c_str() << "\n"; @@ -1353,9 +1586,11 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event) delete pYMag; delete [] pcIn; - if (theApp->getSetModifyNewDocs()) - pPlotDoc->Modify(true); - pPlotDoc->UpdateAllViews(); + if (theApp->getAskDeleteNewDocs()) + pPlotDoc->Modify (true); + pPlotDoc->getView()->getFrame()->Show(true); + pPlotDoc->UpdateAllViews (); + pPlotDoc->Activate(); } } @@ -1368,7 +1603,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(); @@ -1395,7 +1630,7 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event) for (i = 0; i < ny; i++) pcIn[i].im = pdTemp[i]; - fftw_plan plan = fftw_create_plan (ny, FFTW_BACKWARD, FFTW_IN_PLACE); + fftw_plan plan = fftw_create_plan (ny, FFTW_BACKWARD, FFTW_IN_PLACE | FFTW_ESTIMATE | FFTW_USE_WISDOM); fftw_one (plan, pcIn, NULL); fftw_destroy_plan (plan); @@ -1405,8 +1640,8 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event) double* pYMag = new double [ny]; for (i = 0; i < ny; i++) { pX[i] = i; - pYReal[i] = pcIn[i].re; - pYImag[i] = pcIn[i].im; + pYReal[i] = pcIn[i].re / ny; + pYImag[i] = pcIn[i].im / ny; pYMag[i] = ::sqrt (pcIn[i].re * pcIn[i].re + pcIn[i].im * pcIn[i].im); } @@ -1439,7 +1674,7 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event) rPlotFile.addColumn (1, pYReal); rPlotFile.addColumn (2, pYImag); rPlotFile.addColumn (3, pYMag); - for (int iL = 0; iL < rIF.nLabels(); iL++) + for (unsigned int iL = 0; iL < rIF.nLabels(); iL++) rPlotFile.addDescription (rIF.labelGet(iL).getLabelString().c_str()); os << " FFT Plot of " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str(); *theApp->getLog() << os.str().c_str() << "\n"; @@ -1452,9 +1687,11 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event) delete pdTemp; delete [] pcIn; - if (theApp->getSetModifyNewDocs()) - pPlotDoc->Modify(true); - pPlotDoc->UpdateAllViews(); + if (theApp->getAskDeleteNewDocs()) + pPlotDoc->Modify (true); + pPlotDoc->getView()->getFrame()->Show(true); + pPlotDoc->UpdateAllViews (); + pPlotDoc->Activate(); } } #endif @@ -1541,9 +1778,11 @@ ImageFileView::OnCompareCol (wxCommandEvent& event) delete pX; delete pY1; delete pY2; - if (theApp->getSetModifyNewDocs()) - pPlotDoc->Modify(true); - pPlotDoc->UpdateAllViews(); + if (theApp->getAskDeleteNewDocs()) + pPlotDoc->Modify (true); + pPlotDoc->getView()->getFrame()->Show(true); + pPlotDoc->UpdateAllViews (); + pPlotDoc->Activate(); } } } @@ -1631,9 +1870,11 @@ ImageFileView::OnCompareRow (wxCommandEvent& event) delete pX; delete pY1; delete pY2; - if (theApp->getSetModifyNewDocs()) - pPlotDoc->Modify(true); - pPlotDoc->UpdateAllViews(); + if (theApp->getAskDeleteNewDocs()) + pPlotDoc->Modify (true); + pPlotDoc->getView()->getFrame()->Show(true); + pPlotDoc->UpdateAllViews (); + pPlotDoc->Activate(); } } } @@ -1643,7 +1884,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(); @@ -1691,14 +1932,16 @@ ImageFileView::OnPlotHistogram (wxCommandEvent& event) s += rIF.labelGet(iL).getLabelString(); rPlotFile.addDescription (s.c_str()); } - os << " Plot of " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str(); + os << " plot of " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str(); *theApp->getLog() << os.str().c_str() << "\n"; rPlotFile.addDescription (os.str().c_str()); delete pX; delete pY; - if (theApp->getSetModifyNewDocs()) - pPlotDoc->Modify(true); - pPlotDoc->UpdateAllViews(); + if (theApp->getAskDeleteNewDocs()) + pPlotDoc->Modify (true); + pPlotDoc->getView()->getFrame()->Show(true); + pPlotDoc->UpdateAllViews (); + pPlotDoc->Activate(); } } @@ -1713,7 +1956,7 @@ PhantomCanvas::PhantomCanvas (PhantomFileView* v, wxFrame *frame, const wxPoint& PhantomCanvas::~PhantomCanvas () { - m_pView = NULL; + m_pView = NULL; } void @@ -1723,6 +1966,24 @@ PhantomCanvas::OnDraw (wxDC& dc) m_pView->OnDraw(& dc); } +wxSize +PhantomCanvas::GetBestSize() const +{ + if (! m_pView) + return wxSize(0,0); + + int xSize, ySize; + theApp->getMainFrame()->GetClientSize (&xSize, &ySize); + xSize = maxValue (xSize, ySize); +#ifdef CTSIM_MDI + ySize = xSize = (xSize / 4); +#else + ySize = xSize; +#endif + return wxSize (xSize, ySize); +} + + // PhantomFileView @@ -1735,25 +1996,42 @@ 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; + m_iDefaultNSample = 1; +#else m_iDefaultNDet = 367; m_iDefaultNView = 320; - m_iDefaultNSample = 1; + m_iDefaultNSample = 2; +#endif + m_iDefaultOffsetView = 0; m_dDefaultRotation = 1; m_dDefaultFocalLength = 2; - m_dDefaultFieldOfView = 1; + m_dDefaultCenterDetectorLength = 2; + m_dDefaultViewRatio = 1; + m_dDefaultScanRatio = 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 + m_dDefaultRasterViewRatio = 1; } PhantomFileView::~PhantomFileView() { - theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->ActivateView(this, FALSE, TRUE); } void @@ -1768,161 +2046,226 @@ PhantomFileView::OnProperties (wxCommandEvent& event) #if DEBUG rPhantom.print (os); #endif - *theApp->getLog() << os.str().c_str() << "\n"; + *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<\n"; wxMessageBox (os.str().c_str(), "Phantom Properties"); + GetDocument()->Activate(); } void PhantomFileView::OnProjections (wxCommandEvent& event) { - DialogGetProjectionParameters dialogProjection (getFrameForChild(), m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample, m_dDefaultRotation, m_dDefaultFocalLength, m_dDefaultFieldOfView, m_iDefaultGeometry, m_iDefaultTrace); + DialogGetProjectionParameters dialogProjection (getFrameForChild(), + m_iDefaultNDet, m_iDefaultNView, m_iDefaultOffsetView, m_iDefaultNSample, m_dDefaultRotation, + m_dDefaultFocalLength, m_dDefaultCenterDetectorLength, m_dDefaultViewRatio, m_dDefaultScanRatio, + m_iDefaultGeometry, m_iDefaultTrace); int retVal = dialogProjection.ShowModal(); - if (retVal == wxID_OK) { - m_iDefaultNDet = dialogProjection.getNDet(); - m_iDefaultNView = dialogProjection.getNView(); - m_iDefaultNSample = dialogProjection.getNSamples(); - m_iDefaultTrace = dialogProjection.getTrace(); - m_dDefaultRotation = dialogProjection.getRotAngle(); - m_dDefaultFocalLength = dialogProjection.getFocalLengthRatio(); - m_dDefaultFieldOfView = dialogProjection.getFieldOfViewRatio(); - wxString sGeometry = dialogProjection.getGeometry(); - m_iDefaultGeometry = Scanner::convertGeometryNameToID (sGeometry.c_str()); + if (retVal != wxID_OK) + return; + + m_iDefaultNDet = dialogProjection.getNDet(); + m_iDefaultNView = dialogProjection.getNView(); + m_iDefaultOffsetView = dialogProjection.getOffsetView(); + m_iDefaultNSample = dialogProjection.getNSamples(); + m_iDefaultTrace = dialogProjection.getTrace(); + m_dDefaultRotation = dialogProjection.getRotAngle(); + m_dDefaultFocalLength = dialogProjection.getFocalLengthRatio(); + m_dDefaultCenterDetectorLength = dialogProjection.getCenterDetectorLengthRatio(); + m_dDefaultViewRatio = dialogProjection.getViewRatio(); + m_dDefaultScanRatio = dialogProjection.getScanRatio(); + wxString sGeometry = dialogProjection.getGeometry(); + m_iDefaultGeometry = Scanner::convertGeometryNameToID (sGeometry.c_str()); + double dRotationRadians = m_dDefaultRotation; + m_dDefaultRotation /= TWOPI; // convert back to fraction of a circle + + if (m_iDefaultNDet <= 0 || m_iDefaultNView <= 0 || sGeometry == "") + return; + + const Phantom& rPhantom = GetDocument()->getPhantom(); + Scanner theScanner (rPhantom, sGeometry.c_str(), m_iDefaultNDet, m_iDefaultNView, m_iDefaultOffsetView, m_iDefaultNSample, + dRotationRadians, m_dDefaultFocalLength, m_dDefaultCenterDetectorLength, m_dDefaultViewRatio, m_dDefaultScanRatio); + if (theScanner.fail()) { + wxString msg = "Failed making scanner\n"; + msg += theScanner.failMessage().c_str(); + *theApp->getLog() << msg << "\n"; + wxMessageBox (msg, "Error"); + return; + } + + std::ostringstream os; + os << "Projections for " << rPhantom.name() + << ": nDet=" << m_iDefaultNDet + << ", nView=" << m_iDefaultNView + << ", gantry offset=" << m_iDefaultOffsetView + << ", nSamples=" << m_iDefaultNSample + << ", RotAngle=" << m_dDefaultRotation + << ", FocalLengthRatio=" << m_dDefaultFocalLength + << ", CenterDetectorLengthRatio=" << m_dDefaultCenterDetectorLength + << ", ViewRatio=" << m_dDefaultViewRatio + << ", ScanRatio=" << m_dDefaultScanRatio + << ", Geometry=" << sGeometry.c_str() + << ", FanBeamAngle=" << convertRadiansToDegrees (theScanner.fanBeamAngle()); + + Timer timer; + Projections* pProj = NULL; + if (m_iDefaultTrace > Trace::TRACE_CONSOLE) { + pProj = new Projections; + pProj->initFromScanner (theScanner); - if (m_iDefaultNDet > 0 && m_iDefaultNView > 0 && sGeometry != "") { - const Phantom& rPhantom = GetDocument()->getPhantom(); - ProjectionFileDocument* pProjectionDoc = theApp->newProjectionDoc(); - if (! pProjectionDoc) { - sys_error (ERR_SEVERE, "Unable to create projection document"); - return; - } - Projections& rProj = pProjectionDoc->getProjections(); - Scanner theScanner (rPhantom, sGeometry.c_str(), m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample, m_dDefaultRotation, m_dDefaultFocalLength, m_dDefaultFieldOfView); - if (theScanner.fail()) { - *theApp->getLog() << "Failed making scanner: " << theScanner.failMessage().c_str() << "\n"; + ProjectionsDialog dialogProjections (theScanner, *pProj, rPhantom, m_iDefaultTrace, dynamic_cast(getFrameForChild())); + for (int iView = 0; iView < pProj->nView(); iView++) { + ::wxYield(); + if (dialogProjections.isCancelled() || ! dialogProjections.projectView (iView)) { + delete pProj; return; } - rProj.initFromScanner (theScanner); - m_dDefaultRotation /= PI; // convert back to PI units - - Timer timer; - 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(); - if (dialogProjections.isCancelled() || ! dialogProjections.projectView (iView)) { - pProjectionDoc->Close(); - //pProjectionDoc->DeleteAllViews(); - return; - } - ::wxYield(); - while (dialogProjections.isPaused()) { - ::wxYield(); - ::wxUsleep(50); - } - } - } else { - wxProgressDialog dlgProgress (wxString("Projection"), wxString("Projection Progress"), rProj.nView() + 1, getFrameForChild(), wxPD_CAN_ABORT); - for (int i = 0; i < rProj.nView(); i++) { - theScanner.collectProjections (rProj, rPhantom, i, 1, true, m_iDefaultTrace); - if (! dlgProgress.Update (i+1)) { - pProjectionDoc->Close(); - //pProjectionDoc->DeleteAllViews(); - return; - } - } - } - - std::ostringstream os; - os << "Projections for " << rPhantom.name() << ": nDet=" << m_iDefaultNDet << ", nView=" << m_iDefaultNView << ", nSamples=" << m_iDefaultNSample << ", RotAngle=" << m_dDefaultRotation << ", FocalLengthRatio=" << m_dDefaultFocalLength << ", FieldOfViewRatio=" << m_dDefaultFieldOfView << ", Geometry=" << sGeometry.c_str(); - rProj.setCalcTime (timer.timerEnd()); - rProj.setRemark (os.str()); - *theApp->getLog() << os.str().c_str() << "\n"; - - m_pFrame->Lower(); ::wxYield(); - ProjectionFileView* projView = dynamic_cast(pProjectionDoc->GetFirstView()); - if (projView) { - projView->getFrame()->SetFocus(); - projView->OnUpdate (projView, NULL); + while (dialogProjections.isPaused()) { + ::wxYield(); + ::wxUsleep(50); + } + } + } else { +#if HAVE_WXTHREADS + if (theApp->getUseBackgroundTasks()) { + ProjectorSupervisorThread* pProjector = new ProjectorSupervisorThread (this, m_iDefaultNDet, + m_iDefaultNView, m_iDefaultOffsetView, sGeometry.c_str(), m_iDefaultNSample, dRotationRadians, + m_dDefaultFocalLength, m_dDefaultCenterDetectorLength, m_dDefaultViewRatio, m_dDefaultScanRatio, os.str().c_str()); + if (pProjector->Create() != wxTHREAD_NO_ERROR) { + sys_error (ERR_SEVERE, "Error creating projector thread"); + delete pProjector; + return; } - if (wxView* pView = pProjectionDoc->GetFirstView()) { - if (wxFrame* pFrame = pView->GetFrame()) { - pFrame->SetFocus(); - pFrame->Raise(); + pProjector->SetPriority(60); + pProjector->Run(); + return; + } else +#endif // HAVE_WXTHREADS + { + pProj = new Projections; + pProj->initFromScanner (theScanner); + wxProgressDialog dlgProgress (wxString("Projection"), wxString("Projection Progress"), pProj->nView() + 1, getFrameForChild(), wxPD_CAN_ABORT ); + for (int i = 0; i < pProj->nView(); i++) { + //theScanner.collectProjections (*pProj, rPhantom, i, 1, true, m_iDefaultTrace); + theScanner.collectProjections (*pProj, rPhantom, i, 1, theScanner.offsetView(), true, m_iDefaultTrace); + if (! dlgProgress.Update (i+1)) { + delete pProj; + return; } - theApp->getDocManager()->ActivateView (pView, true, false); } - ::wxYield(); - if (theApp->getSetModifyNewDocs()) - pProjectionDoc->Modify(true); - pProjectionDoc->getView()->getFrame()->Show(true); - pProjectionDoc->UpdateAllViews(this); } } + + *theApp->getLog() << os.str().c_str() << "\n"; + pProj->setRemark (os.str()); + pProj->setCalcTime (timer.timerEnd()); + + ProjectionFileDocument* pProjectionDoc = theApp->newProjectionDoc(); + if (! pProjectionDoc) { + sys_error (ERR_SEVERE, "Unable to create projection document"); + return; + } + pProjectionDoc->setProjections (pProj); + ProjectionFileView* projView = pProjectionDoc->getView(); + if (projView) { + projView->OnUpdate (projView, NULL); + if (projView->getCanvas()) + projView->getCanvas()->SetClientSize (m_iDefaultNDet, m_iDefaultNView); + if (wxFrame* pFrame = projView->getFrame()) { + pFrame->Show(true); + pFrame->SetFocus(); + pFrame->Raise(); + } + GetDocumentManager()->ActivateView (projView, true, false); + } + if (theApp->getAskDeleteNewDocs()) + pProjectionDoc-> Modify(true); + pProjectionDoc->UpdateAllViews (this); + pProjectionDoc->Activate(); } void PhantomFileView::OnRasterize (wxCommandEvent& event) { - DialogGetRasterParameters dialogRaster (getFrameForChild(), m_iDefaultRasterNX, m_iDefaultRasterNY, m_iDefaultRasterNSamples); + DialogGetRasterParameters dialogRaster (getFrameForChild(), m_iDefaultRasterNX, m_iDefaultRasterNY, + m_iDefaultRasterNSamples, m_dDefaultRasterViewRatio); int retVal = dialogRaster.ShowModal(); - if (retVal == wxID_OK) { - m_iDefaultRasterNX = dialogRaster.getXSize(); - m_iDefaultRasterNY = dialogRaster.getYSize(); - m_iDefaultRasterNSamples = dialogRaster.getNSamples(); - if (m_iDefaultRasterNSamples < 1) - m_iDefaultRasterNSamples = 1; - if (m_iDefaultRasterNX > 0 && m_iDefaultRasterNY > 0) { - const Phantom& rPhantom = GetDocument()->getPhantom(); - ImageFileDocument* pRasterDoc = theApp->newImageDoc(); - if (! pRasterDoc) { - sys_error (ERR_SEVERE, "Unable to create image file"); - return; - } - ImageFile& imageFile = pRasterDoc->getImageFile(); - - imageFile.setArraySize (m_iDefaultRasterNX, m_iDefaultRasterNX); - 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->DeleteAllViews(); - 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; - *theApp->getLog() << os.str().c_str() << "\n"; - imageFile.labelAdd (os.str().c_str(), timer.timerEnd()); - ImageFileView* rasterView = dynamic_cast(pRasterDoc->GetFirstView()); - if (rasterView) { - rasterView->getFrame()->SetFocus(); - rasterView->OnUpdate (rasterView, NULL); + if (retVal != wxID_OK) + return; + + m_iDefaultRasterNX = dialogRaster.getXSize(); + m_iDefaultRasterNY = dialogRaster.getYSize(); + m_iDefaultRasterNSamples = dialogRaster.getNSamples(); + m_dDefaultRasterViewRatio = dialogRaster.getViewRatio(); + if (m_iDefaultRasterNSamples < 1) + m_iDefaultRasterNSamples = 1; + if (m_dDefaultRasterViewRatio < 0) + m_dDefaultRasterViewRatio = 0; + if (m_iDefaultRasterNX <= 0 || m_iDefaultRasterNY <= 0) + return; + + const Phantom& rPhantom = GetDocument()->getPhantom(); + std::ostringstream os; + os << "Rasterize Phantom " << rPhantom.name() << ": XSize=" << m_iDefaultRasterNX << ", YSize=" + << m_iDefaultRasterNY << ", ViewRatio=" << m_dDefaultRasterViewRatio << ", nSamples=" + << m_iDefaultRasterNSamples;; + +#if HAVE_WXTHREADS + if (theApp->getUseBackgroundTasks()) { + RasterizerSupervisorThread* pThread = new RasterizerSupervisorThread (this, m_iDefaultRasterNX, m_iDefaultRasterNY, + m_iDefaultRasterNSamples, m_dDefaultRasterViewRatio, os.str().c_str()); + if (pThread->Create() != wxTHREAD_NO_ERROR) { + *theApp->getLog() << "Error creating rasterizer thread\n"; + return; + } + pThread->SetPriority (60); + pThread->Run(); + } else +#endif + { + ImageFile* pImageFile = new ImageFile (m_iDefaultRasterNX, m_iDefaultRasterNY); + + wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"), + pImageFile->nx() + 1, getFrameForChild(), wxPD_CAN_ABORT ); + Timer timer; + for (unsigned int i = 0; i < pImageFile->nx(); i++) { + rPhantom.convertToImagefile (*pImageFile, m_dDefaultRasterViewRatio, m_iDefaultRasterNSamples, Trace::TRACE_NONE, i, 1, true); + if (! dlgProgress.Update (i+1)) { + delete pImageFile; + return; } - } + + ImageFileDocument* pRasterDoc = theApp->newImageDoc(); + if (! pRasterDoc) { + sys_error (ERR_SEVERE, "Unable to create image file"); + return; + } + pRasterDoc->setImageFile (pImageFile); + if (theApp->getAskDeleteNewDocs()) + pRasterDoc->Modify (true); + *theApp->getLog() << os.str().c_str() << "\n"; + pImageFile->labelAdd (os.str().c_str(), timer.timerEnd()); + + if (ImageFileView* rasterView = pRasterDoc->getView()) { + rasterView->getFrame()->Show(true); + rasterView->getFrame()->SetFocus(); + rasterView->OnUpdate (rasterView, NULL); + } + // Causes loss of frame in wxGTK + // pRasterDoc->UpdateAllViews (this); + // pRasterDoc->Activate(); } } 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(0,0), 0); pCanvas->SetBackgroundColour(*wxWHITE); pCanvas->Clear(); @@ -1937,13 +2280,13 @@ wxDocChildFrame* 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); + wxDocMDIChildFrame *subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "Phantom Frame", wxPoint(10, 10), wxSize(0, 0), wxDEFAULT_FRAME_STYLE); #else - wxDocChildFrame *subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "Phantom Frame", wxPoint(10, 10), wxSize(256, 256), wxDEFAULT_FRAME_STYLE); + wxDocChildFrame *subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "Phantom Frame", wxPoint(10, 10), wxSize(0, 0), wxDEFAULT_FRAME_STYLE); #endif theApp->setIconForFrame (subframe); - wxMenu *m_pFileMenu = new wxMenu; + m_pFileMenu = new wxMenu; m_pFileMenu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...\tCtrl-P"); m_pFileMenu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...\tCtrl-F"); @@ -1952,18 +2295,21 @@ PhantomFileView::CreateChildFrame(wxDocument *doc, wxView *view) m_pFileMenu->Append(wxID_CLOSE, "&Close"); m_pFileMenu->AppendSeparator(); - m_pFileMenu->Append(PHMMENU_FILE_PROPERTIES, "P&roperties"); + m_pFileMenu->Append(PHMMENU_FILE_PROPERTIES, "P&roperties\tCtrl-I"); m_pFileMenu->AppendSeparator(); m_pFileMenu->Append(wxID_PRINT, "&Print..."); m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup..."); m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view"); + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(MAINMENU_IMPORT, "&Import...\tCtrl-M"); #ifdef CTSIM_MDI m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces..."); 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"); @@ -1971,7 +2317,8 @@ PhantomFileView::CreateChildFrame(wxDocument *doc, wxView *view) wxMenu *help_menu = new wxMenu; help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1"); - help_menu->Append(MAINMENU_HELP_TOPICS, "&Topics\tCtrl-H"); + help_menu->Append (MAINMENU_HELP_TIPS, "&Tips"); + help_menu->Append (IDH_QUICKSTART, "&Quick Start"); help_menu->Append(MAINMENU_HELP_ABOUT, "&About"); wxMenuBar *menu_bar = new wxMenuBar; @@ -1983,16 +2330,11 @@ PhantomFileView::CreateChildFrame(wxDocument *doc, wxView *view) subframe->SetMenuBar(menu_bar); subframe->Centre(wxBOTH); - wxAcceleratorEntry accelEntries[8]; - accelEntries[0].Set (wxACCEL_CTRL, static_cast('O'), wxID_OPEN); - accelEntries[1].Set (wxACCEL_CTRL, static_cast('S'), wxID_SAVE); - accelEntries[2].Set (wxACCEL_CTRL, static_cast('H'), MAINMENU_HELP_TOPICS); - accelEntries[3].Set (wxACCEL_CTRL, static_cast('P'), MAINMENU_FILE_CREATE_PHANTOM); - accelEntries[4].Set (wxACCEL_CTRL, static_cast('F'), MAINMENU_FILE_CREATE_FILTER); - accelEntries[5].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS); - accelEntries[6].Set (wxACCEL_CTRL, static_cast('J'), PHMMENU_PROCESS_PROJECTIONS); - accelEntries[7].Set (wxACCEL_CTRL, static_cast('R'), PHMMENU_PROCESS_RASTERIZE); - wxAcceleratorTable accelTable (8, accelEntries); + wxAcceleratorEntry accelEntries[3]; + accelEntries[0].Set (wxACCEL_CTRL, static_cast('J'), PHMMENU_PROCESS_PROJECTIONS); + accelEntries[1].Set (wxACCEL_CTRL, static_cast('R'), PHMMENU_PROCESS_RASTERIZE); + accelEntries[2].Set (wxACCEL_CTRL, static_cast('I'), PHMMENU_FILE_PROPERTIES); + wxAcceleratorTable accelTable (3, accelEntries); subframe->SetAcceleratorTable (accelTable); return subframe; @@ -2004,11 +2346,11 @@ PhantomFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) { m_pFrame = CreateChildFrame(doc, this); SetFrame(m_pFrame); + m_pCanvas = CreateCanvas (m_pFrame); + m_pFrame->SetClientSize (m_pCanvas->GetBestSize()); + m_pCanvas->SetClientSize (m_pCanvas->GetBestSize()); - int width, height; - m_pFrame->GetClientSize(&width, &height); - m_pFrame->SetTitle("PhantomFileView"); - m_pCanvas = CreateCanvas (this, m_pFrame); + m_pFrame->SetTitle ("PhantomFileView"); #ifdef __X__ int x, y; // X requires a forced resize @@ -2023,7 +2365,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(); @@ -2032,27 +2374,26 @@ PhantomFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) bool PhantomFileView::OnClose (bool deleteWindow) { + //GetDocumentManager()->ActivateView (this, false, true); if (! GetDocument() || ! GetDocument()->Close()) return false; + Activate(false); if (m_pCanvas) { - m_pCanvas->Clear(); m_pCanvas->setView(NULL); - m_pCanvas->Show(false); m_pCanvas = NULL; } wxString s(wxTheApp->GetAppName()); if (m_pFrame) m_pFrame->SetTitle(s); - SetFrame(NULL); - Activate(false); + SetFrame(NULL); if (deleteWindow) { - m_pFrame->Show(false); - m_pFrame->Destroy(); -// delete m_pFrame; + delete m_pFrame; m_pFrame = NULL; + if (GetDocument() && GetDocument()->getBadFileOpen()) + ::wxYield(); // wxWindows bug workaround } return true; @@ -2080,7 +2421,7 @@ ProjectionFileCanvas::ProjectionFileCanvas (ProjectionFileView* v, wxFrame *fram ProjectionFileCanvas::~ProjectionFileCanvas () { - m_pView = NULL; + m_pView = NULL; } void @@ -2110,15 +2451,29 @@ IMPLEMENT_DYNAMIC_CLASS(ProjectionFileView, wxView) BEGIN_EVENT_TABLE(ProjectionFileView, wxView) EVT_MENU(PJMENU_FILE_PROPERTIES, ProjectionFileView::OnProperties) EVT_MENU(PJMENU_RECONSTRUCT_FBP, ProjectionFileView::OnReconstructFBP) +EVT_MENU(PJMENU_RECONSTRUCT_FBP_REBIN, ProjectionFileView::OnReconstructFBPRebin) +EVT_MENU(PJMENU_RECONSTRUCT_FOURIER, ProjectionFileView::OnReconstructFourier) +EVT_MENU(PJMENU_CONVERT_RECTANGULAR, ProjectionFileView::OnConvertRectangular) EVT_MENU(PJMENU_CONVERT_POLAR, ProjectionFileView::OnConvertPolar) EVT_MENU(PJMENU_CONVERT_FFT_POLAR, ProjectionFileView::OnConvertFFTPolar) +EVT_MENU(PJMENU_CONVERT_PARALLEL, ProjectionFileView::OnConvertParallel) +EVT_MENU(PJMENU_PLOT_TTHETA_SAMPLING, ProjectionFileView::OnPlotTThetaSampling) +EVT_MENU(PJMENU_PLOT_HISTOGRAM, ProjectionFileView::OnPlotHistogram) + // EVT_MENU(PJMENU_ARTIFACT_REDUCTION, ProjectionFileView::OnArtifactReduction) END_EVENT_TABLE() + ProjectionFileView::ProjectionFileView() -: wxView(), m_pCanvas(NULL), m_pFrame(NULL), m_pFileMenu(0) +: wxView(), m_pFrame(0), m_pCanvas(0), 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 @@ -2129,7 +2484,7 @@ ProjectionFileView::ProjectionFileView() m_iDefaultFilterGeneration = ProcessSignal::FILTER_GENERATION_DIRECT; #endif m_iDefaultZeropad = 1; - m_iDefaultBackprojector = Backprojector::BPROJ_IDIFF3; + m_iDefaultBackprojector = Backprojector::BPROJ_IDIFF; m_iDefaultInterpolation = Backprojector::INTERP_LINEAR; m_iDefaultInterpParam = 1; m_iDefaultTrace = Trace::TRACE_NONE; @@ -2142,7 +2497,8 @@ ProjectionFileView::ProjectionFileView() ProjectionFileView::~ProjectionFileView() { - theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); + GetDocumentManager()->ActivateView(this, FALSE, TRUE);; } void @@ -2151,43 +2507,86 @@ ProjectionFileView::OnProperties (wxCommandEvent& event) const Projections& rProj = GetDocument()->getProjections(); std::ostringstream os; rProj.printScanInfo(os); - *theApp->getLog() << os.str().c_str(); + *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<\n"; wxMessageDialog dialogMsg (getFrameForChild(), os.str().c_str(), "Projection File Properties", wxOK | wxICON_INFORMATION); dialogMsg.ShowModal(); + GetDocument()->Activate(); } +void +ProjectionFileView::OnConvertRectangular (wxCommandEvent& event) +{ + Projections& rProj = GetDocument()->getProjections(); + + int nDet = rProj.nDet(); + int nView = rProj.nView(); + ImageFile* pIF = new ImageFile (nDet, nView); + ImageFileArray v = pIF->getArray(); + for (int iv = 0; iv < nView; iv++) { + DetectorValue* detval = rProj.getDetectorArray(iv).detValues(); + + for (int id = 0; id < nDet; id++) + v[id][iv] = detval[id]; + } + + ImageFileDocument* pRectDoc = theApp->newImageDoc (); + if (! pRectDoc) { + sys_error (ERR_SEVERE, "Unable to create image file"); + return; + } + pRectDoc->setImageFile (pIF); + pIF->labelAdd (rProj.getLabel().getLabelString().c_str(), rProj.calcTime()); + std::ostringstream os; + os << "Convert projection file " << GetFrame()->GetTitle().c_str() << " to rectangular image"; + *theApp->getLog() << os.str().c_str() << "\n"; + pIF->labelAdd (os.str().c_str()); + if (theApp->getAskDeleteNewDocs()) + pRectDoc->Modify (true); + pRectDoc->getView()->getFrame()->Show(true); + pRectDoc->UpdateAllViews (); + pRectDoc->Activate(); +} + void ProjectionFileView::OnConvertPolar (wxCommandEvent& event) { Projections& rProj = GetDocument()->getProjections(); DialogGetConvertPolarParameters dialogPolar (getFrameForChild(), "Convert Polar", m_iDefaultPolarNX, m_iDefaultPolarNY, - m_iDefaultPolarInterpolation, -1); + m_iDefaultPolarInterpolation, -1, IDH_DLG_POLAR); if (dialogPolar.ShowModal() == wxID_OK) { + wxProgressDialog dlgProgress (wxString("Convert Polar"), wxString("Conversion Progress"), 1, getFrameForChild(), wxPD_APP_MODAL); wxString strInterpolation (dialogPolar.getInterpolationName()); m_iDefaultPolarNX = dialogPolar.getXSize(); m_iDefaultPolarNY = dialogPolar.getYSize(); ImageFileDocument* pPolarDoc = theApp->newImageDoc(); - ImageFile& rIF = pPolarDoc->getImageFile(); + ImageFile* pIF = new ImageFile (m_iDefaultPolarNX, m_iDefaultPolarNY); + m_iDefaultPolarInterpolation = Projections::convertInterpNameToID (strInterpolation.c_str()); + + if (! rProj.convertPolar (*pIF, m_iDefaultPolarInterpolation)) { + delete pIF; + *theApp->getLog() << "Error converting to Polar\n"; + return; + } + + pPolarDoc = theApp->newImageDoc (); if (! pPolarDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); return; } - rIF.setArraySize (m_iDefaultPolarNX, m_iDefaultPolarNY); - m_iDefaultPolarInterpolation = Projections::convertInterpNameToID (strInterpolation.c_str()); - rProj.convertPolar (rIF, m_iDefaultPolarInterpolation); - rIF.labelAdd (rProj.getLabel().getLabelString().c_str(), rProj.calcTime()); + pPolarDoc->setImageFile (pIF); + pIF->labelAdd (rProj.getLabel().getLabelString().c_str(), rProj.calcTime()); std::ostringstream os; os << "Convert projection file " << GetFrame()->GetTitle().c_str() << " to polar image: xSize=" << m_iDefaultPolarNX << ", ySize=" << m_iDefaultPolarNY << ", interpolation=" << strInterpolation.c_str(); *theApp->getLog() << os.str().c_str() << "\n"; - rIF.labelAdd (os.str().c_str()); - if (theApp->getSetModifyNewDocs()) - pPolarDoc->Modify(true); - pPolarDoc->UpdateAllViews(); - pPolarDoc->getView()->OnUpdate (this, NULL); + pIF->labelAdd (os.str().c_str()); + if (theApp->getAskDeleteNewDocs()) + pPolarDoc->Modify (true); pPolarDoc->getView()->getFrame()->Show(true); + pPolarDoc->UpdateAllViews (); + pPolarDoc->Activate(); } } @@ -2196,138 +2595,394 @@ ProjectionFileView::OnConvertFFTPolar (wxCommandEvent& event) { Projections& rProj = GetDocument()->getProjections(); DialogGetConvertPolarParameters dialogPolar (getFrameForChild(), "Convert to FFT Polar", m_iDefaultPolarNX, m_iDefaultPolarNY, - m_iDefaultPolarInterpolation, m_iDefaultPolarZeropad); + m_iDefaultPolarInterpolation, m_iDefaultPolarZeropad, IDH_DLG_FFT_POLAR); if (dialogPolar.ShowModal() == wxID_OK) { + wxProgressDialog dlgProgress (wxString("Convert FFT Polar"), wxString("Conversion Progress"), 1, getFrameForChild(), wxPD_APP_MODAL); wxString strInterpolation (dialogPolar.getInterpolationName()); m_iDefaultPolarNX = dialogPolar.getXSize(); m_iDefaultPolarNY = dialogPolar.getYSize(); m_iDefaultPolarZeropad = dialogPolar.getZeropad(); + ImageFile* pIF = new ImageFile (m_iDefaultPolarNX, m_iDefaultPolarNY); + + m_iDefaultPolarInterpolation = Projections::convertInterpNameToID (strInterpolation.c_str()); + if (! rProj.convertFFTPolar (*pIF, m_iDefaultPolarInterpolation, m_iDefaultPolarZeropad)) { + delete pIF; + *theApp->getLog() << "Error converting to polar\n"; + return; + } ImageFileDocument* pPolarDoc = theApp->newImageDoc(); - ImageFile& rIF = pPolarDoc->getImageFile(); if (! pPolarDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); return; } - rIF.setArraySize (m_iDefaultPolarNX, m_iDefaultPolarNY); - m_iDefaultPolarInterpolation = Projections::convertInterpNameToID (strInterpolation.c_str()); - rProj.convertFFTPolar (rIF, m_iDefaultPolarInterpolation, m_iDefaultPolarZeropad); - rIF.labelAdd (rProj.getLabel().getLabelString().c_str(), rProj.calcTime()); + pPolarDoc->setImageFile (pIF); + pIF->labelAdd (rProj.getLabel().getLabelString().c_str(), rProj.calcTime()); std::ostringstream os; os << "Convert projection file " << GetFrame()->GetTitle().c_str() << " to FFT polar image: xSize=" << m_iDefaultPolarNX << ", ySize=" << m_iDefaultPolarNY << ", interpolation=" << strInterpolation.c_str() << ", zeropad=" << m_iDefaultPolarZeropad; *theApp->getLog() << os.str().c_str() << "\n"; - rIF.labelAdd (os.str().c_str()); - if (theApp->getSetModifyNewDocs()) - pPolarDoc->Modify(true); - pPolarDoc->UpdateAllViews(); - pPolarDoc->getView()->OnUpdate (this, NULL); + pIF->labelAdd (os.str().c_str()); + if (theApp->getAskDeleteNewDocs()) + pPolarDoc->Modify (true); pPolarDoc->getView()->getFrame()->Show(true); + pPolarDoc->UpdateAllViews (); + pPolarDoc->Activate(); + } +} + +void +ProjectionFileView::OnPlotTThetaSampling (wxCommandEvent& event) +{ + DialogGetThetaRange dlgTheta (this->getFrame(), ParallelRaysums::THETA_RANGE_UNCONSTRAINED); + if (dlgTheta.ShowModal() != wxID_OK) + return; + + int iThetaRange = dlgTheta.getThetaRange(); + + Projections& rProj = GetDocument()->getProjections(); + ParallelRaysums parallel (&rProj, iThetaRange); + PlotFileDocument* pPlotDoc = theApp->newPlotDoc(); + PlotFile& rPlot = pPlotDoc->getPlotFile(); + ParallelRaysums::CoordinateContainer& coordContainer = parallel.getCoordinates(); + double* pdT = new double [parallel.getNumCoordinates()]; + double* pdTheta = new double [parallel.getNumCoordinates()]; + + for (int i = 0; i < parallel.getNumCoordinates(); i++) { + pdT[i] = coordContainer[i]->m_dT; + pdTheta[i] = coordContainer[i]->m_dTheta; + } + rPlot.setCurveSize (2, parallel.getNumCoordinates(), true); + rPlot.addEzsetCommand ("title T-Theta Sampling"); + rPlot.addEzsetCommand ("xlabel T"); + rPlot.addEzsetCommand ("ylabel Theta"); + rPlot.addEzsetCommand ("curve 1"); + if (rProj.nDet() < 50 && rProj.nView() < 50) + rPlot.addEzsetCommand ("symbol 1"); // x symbol + else + rPlot.addEzsetCommand ("symbol 6"); // point symbol + rPlot.addEzsetCommand ("noline"); + rPlot.addColumn (0, pdT); + rPlot.addColumn (1, pdTheta); + delete pdT; + delete pdTheta; + if (theApp->getAskDeleteNewDocs()) + pPlotDoc->Modify (true); + pPlotDoc->getView()->getFrame()->Show(true); + pPlotDoc->UpdateAllViews (); + pPlotDoc->Activate(); } + + +void +ProjectionFileView::OnPlotHistogram (wxCommandEvent& event) +{ + Projections& rProj = GetDocument()->getProjections(); + int nDet = rProj.nDet(); + int nView = rProj.nView(); + + if (nDet < 1 || nView < 1) + return; + + PlotFileDocument* pPlotDoc = theApp->newPlotDoc(); + if (! pPlotDoc) { + sys_error (ERR_SEVERE, "Internal error: unable to create Plot file"); + return; + } + + DetectorValue* pdDetval = rProj.getDetectorArray(0).detValues(); + double dMin = pdDetval[0], dMax = pdDetval[0]; + + for (int iv = 0; iv < nView; iv++) { + pdDetval = rProj.getDetectorArray(iv).detValues(); + for (int id = 0; id < nDet; id++) { + double dV = pdDetval[id]; + if (dV < dMin) + dMin = dV; + else if (dV > dMax) + dMax = dV; + } + } + + double* pX = new double [NUMBER_HISTOGRAM_BINS]; + double* pY = new double [NUMBER_HISTOGRAM_BINS]; + double dBinWidth = (dMax - dMin) / NUMBER_HISTOGRAM_BINS; + + for (int i = 0; i < NUMBER_HISTOGRAM_BINS; i++) { + pX[i] = dMin + (i + 0.5) * dBinWidth; + pY[i] = 0; + } + for (int j = 0; j < nView; j++) { + pdDetval = rProj.getDetectorArray(j).detValues(); + for (int id = 0; id < nDet; id++) { + int iBin = nearest ((pdDetval[id] - dMin) / dBinWidth); + if (iBin >= 0 && iBin < NUMBER_HISTOGRAM_BINS) + pY[iBin] += 1; + } + } + PlotFile& rPlotFile = pPlotDoc->getPlotFile(); + std::ostringstream os; + os << "Histogram"; + std::string title("title "); + title += os.str(); + rPlotFile.addEzsetCommand (title.c_str()); + rPlotFile.addEzsetCommand ("xlabel Detector Value"); + rPlotFile.addEzsetCommand ("ylabel Count"); + rPlotFile.addEzsetCommand ("box"); + rPlotFile.addEzsetCommand ("grid"); + rPlotFile.setCurveSize (2, NUMBER_HISTOGRAM_BINS); + rPlotFile.addColumn (0, pX); + rPlotFile.addColumn (1, pY); + rPlotFile.addDescription (rProj.remark()); + os << " plot of " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str(); + *theApp->getLog() << os.str().c_str() << "\n"; + rPlotFile.addDescription (os.str().c_str()); + delete pX; + delete pY; + if (theApp->getAskDeleteNewDocs()) + pPlotDoc->Modify (true); + pPlotDoc->getView()->getFrame()->Show(true); + pPlotDoc->UpdateAllViews (); + pPlotDoc->Activate(); +} + + +void +ProjectionFileView::OnConvertParallel (wxCommandEvent& event) +{ + Projections& rProj = GetDocument()->getProjections(); + if (rProj.geometry() == Scanner::GEOMETRY_PARALLEL) { + wxMessageBox ("Projections are already parallel", "Error"); + return; + } + wxProgressDialog dlgProgress (wxString("Convert to Parallel"), wxString("Conversion Progress"), 1, getFrameForChild(), wxPD_APP_MODAL); + Projections* pProjNew = rProj.interpolateToParallel(); + ProjectionFileDocument* pProjDocNew = theApp->newProjectionDoc(); + pProjDocNew->setProjections (pProjNew); + + if (ProjectionFileView* projView = pProjDocNew->getView()) { + projView->OnUpdate (projView, NULL); + if (projView->getCanvas()) + projView->getCanvas()->SetClientSize (pProjNew->nDet(), pProjNew->nView()); + if (wxFrame* pFrame = projView->getFrame()) { + pFrame->Show(true); + pFrame->SetFocus(); + pFrame->Raise(); + } + GetDocumentManager()->ActivateView (projView, true, false); + } + if (theApp->getAskDeleteNewDocs()) + pProjDocNew-> Modify(true); + pProjDocNew->UpdateAllViews (this); + pProjDocNew->Activate(); } void ProjectionFileView::OnReconstructFourier (wxCommandEvent& event) { - wxMessageBox ("Fourier Reconstruction is not yet supported", "Unimplemented function"); + Projections& rProj = GetDocument()->getProjections(); + DialogGetConvertPolarParameters dialogPolar (getFrameForChild(), "Fourier Reconstruction", m_iDefaultPolarNX, m_iDefaultPolarNY, + m_iDefaultPolarInterpolation, m_iDefaultPolarZeropad, IDH_DLG_RECON_FOURIER); + if (dialogPolar.ShowModal() == wxID_OK) { + wxProgressDialog dlgProgress (wxString("Reconstruction Fourier"), wxString("Reconstruction Progress"), 1, getFrameForChild(), wxPD_APP_MODAL); + wxString strInterpolation (dialogPolar.getInterpolationName()); + m_iDefaultPolarNX = dialogPolar.getXSize(); + m_iDefaultPolarNY = dialogPolar.getYSize(); + m_iDefaultPolarZeropad = dialogPolar.getZeropad(); + ImageFile* pIF = new ImageFile (m_iDefaultPolarNX, m_iDefaultPolarNY); + + m_iDefaultPolarInterpolation = Projections::convertInterpNameToID (strInterpolation.c_str()); + if (! rProj.convertFFTPolar (*pIF, m_iDefaultPolarInterpolation, m_iDefaultPolarZeropad)) { + delete pIF; + *theApp->getLog() << "Error converting to polar\n"; + return; + } +#ifdef HAVE_FFT + pIF->ifft(*pIF); +#endif + pIF->magnitude(*pIF); + Fourier::shuffleFourierToNaturalOrder (*pIF); + + ImageFileDocument* pPolarDoc = theApp->newImageDoc(); + if (! pPolarDoc) { + sys_error (ERR_SEVERE, "Unable to create image file"); + return; + } + pPolarDoc->setImageFile (pIF); + pIF->labelAdd (rProj.getLabel().getLabelString().c_str(), rProj.calcTime()); + std::ostringstream os; + os << "Reconstruct Fourier " << GetFrame()->GetTitle().c_str() << ": xSize=" + << m_iDefaultPolarNX << ", ySize=" << m_iDefaultPolarNY << ", interpolation=" + << strInterpolation.c_str() << ", zeropad=" << m_iDefaultPolarZeropad; + *theApp->getLog() << os.str().c_str() << "\n"; + pIF->labelAdd (os.str().c_str()); + if (theApp->getAskDeleteNewDocs()) + pPolarDoc->Modify (true); + pPolarDoc->getView()->getFrame()->Show(true); + pPolarDoc->UpdateAllViews (); + pPolarDoc->Activate(); + } +} + +void +ProjectionFileView::OnReconstructFBPRebin (wxCommandEvent& event) +{ + Projections& rProj = GetDocument()->getProjections(); + doReconstructFBP (rProj, true); } void ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) { - DialogGetReconstructionParameters dialogReconstruction (getFrameForChild(), m_iDefaultNX, m_iDefaultNY, m_iDefaultFilter, m_dDefaultFilterParam, m_iDefaultFilterMethod, m_iDefaultFilterGeneration, m_iDefaultZeropad, m_iDefaultInterpolation, m_iDefaultInterpParam, m_iDefaultBackprojector, m_iDefaultTrace); + Projections& rProj = GetDocument()->getProjections(); + doReconstructFBP (rProj, false); +} + +void +ProjectionFileView::doReconstructFBP (const Projections& rProj, bool bRebinToParallel) +{ + ReconstructionROI defaultROI; + defaultROI.m_dXMin = -rProj.phmLen() / 2; + defaultROI.m_dXMax = defaultROI.m_dXMin + rProj.phmLen(); + defaultROI.m_dYMin = -rProj.phmLen() / 2; + defaultROI.m_dYMax = defaultROI.m_dYMin + rProj.phmLen(); + + DialogGetReconstructionParameters dialogReconstruction (getFrameForChild(), m_iDefaultNX, m_iDefaultNY, + m_iDefaultFilter, m_dDefaultFilterParam, m_iDefaultFilterMethod, m_iDefaultFilterGeneration, + m_iDefaultZeropad, m_iDefaultInterpolation, m_iDefaultInterpParam, m_iDefaultBackprojector, + m_iDefaultTrace, &defaultROI); int retVal = dialogReconstruction.ShowModal(); - if (retVal == wxID_OK) { - m_iDefaultNX = dialogReconstruction.getXSize(); - m_iDefaultNY = dialogReconstruction.getYSize(); - wxString optFilterName = dialogReconstruction.getFilterName(); - m_iDefaultFilter = SignalFilter::convertFilterNameToID (optFilterName.c_str()); - m_dDefaultFilterParam = dialogReconstruction.getFilterParam(); - wxString optFilterMethodName = dialogReconstruction.getFilterMethodName(); - m_iDefaultFilterMethod = ProcessSignal::convertFilterMethodNameToID(optFilterMethodName.c_str()); - m_iDefaultZeropad = dialogReconstruction.getZeropad(); - wxString optFilterGenerationName = dialogReconstruction.getFilterGenerationName(); - m_iDefaultFilterGeneration = ProcessSignal::convertFilterGenerationNameToID (optFilterGenerationName.c_str()); - wxString optInterpName = dialogReconstruction.getInterpName(); - m_iDefaultInterpolation = Backprojector::convertInterpNameToID (optInterpName.c_str()); - m_iDefaultInterpParam = dialogReconstruction.getInterpParam(); - wxString optBackprojectName = dialogReconstruction.getBackprojectName(); - m_iDefaultBackprojector = Backprojector::convertBackprojectNameToID (optBackprojectName.c_str()); - m_iDefaultTrace = dialogReconstruction.getTrace(); - if (m_iDefaultNX > 0 && m_iDefaultNY > 0) { - ImageFileDocument* pReconDoc = theApp->newImageDoc(); - if (! pReconDoc) { - sys_error (ERR_SEVERE, "Unable to create image file"); + if (retVal != wxID_OK) + return; + + m_iDefaultNX = dialogReconstruction.getXSize(); + m_iDefaultNY = dialogReconstruction.getYSize(); + wxString optFilterName = dialogReconstruction.getFilterName(); + m_iDefaultFilter = SignalFilter::convertFilterNameToID (optFilterName.c_str()); + m_dDefaultFilterParam = dialogReconstruction.getFilterParam(); + wxString optFilterMethodName = dialogReconstruction.getFilterMethodName(); + m_iDefaultFilterMethod = ProcessSignal::convertFilterMethodNameToID(optFilterMethodName.c_str()); + m_iDefaultZeropad = dialogReconstruction.getZeropad(); + wxString optFilterGenerationName = dialogReconstruction.getFilterGenerationName(); + m_iDefaultFilterGeneration = ProcessSignal::convertFilterGenerationNameToID (optFilterGenerationName.c_str()); + wxString optInterpName = dialogReconstruction.getInterpName(); + m_iDefaultInterpolation = Backprojector::convertInterpNameToID (optInterpName.c_str()); + m_iDefaultInterpParam = dialogReconstruction.getInterpParam(); + wxString optBackprojectName = dialogReconstruction.getBackprojectName(); + m_iDefaultBackprojector = Backprojector::convertBackprojectNameToID (optBackprojectName.c_str()); + m_iDefaultTrace = dialogReconstruction.getTrace(); + dialogReconstruction.getROI (&defaultROI); + + if (m_iDefaultNX <= 0 && m_iDefaultNY <= 0) + return; + + 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(); + if (bRebinToParallel) + os << "; Interpolate to Parallel"; + + Timer timerRecon; + ImageFile* pImageFile = NULL; + if (m_iDefaultTrace > Trace::TRACE_CONSOLE) { + pImageFile = new ImageFile (m_iDefaultNX, m_iDefaultNY); + Reconstructor* pReconstructor = new Reconstructor (rProj, *pImageFile, optFilterName.c_str(), + m_dDefaultFilterParam, optFilterMethodName.c_str(), m_iDefaultZeropad, optFilterGenerationName.c_str(), + optInterpName.c_str(), m_iDefaultInterpParam, optBackprojectName.c_str(), m_iDefaultTrace, + &defaultROI, bRebinToParallel); + + ReconstructDialog* pDlgReconstruct = new ReconstructDialog (*pReconstructor, rProj, *pImageFile, m_iDefaultTrace, getFrameForChild()); + for (int iView = 0; iView < rProj.nView(); iView++) { + ::wxYield(); + if (pDlgReconstruct->isCancelled() || ! pDlgReconstruct->reconstructView (iView, true)) { + delete pDlgReconstruct; + delete pReconstructor; return; } - ImageFile& imageFile = pReconDoc->getImageFile(); - const Projections& rProj = GetDocument()->getProjections(); - imageFile.setArraySize (m_iDefaultNX, m_iDefaultNY); - - Reconstructor* pReconstruct = new Reconstructor (rProj, imageFile, optFilterName.c_str(), m_dDefaultFilterParam, optFilterMethodName.c_str(), m_iDefaultZeropad, optFilterGenerationName.c_str(), optInterpName.c_str(), m_iDefaultInterpParam, optBackprojectName.c_str(), m_iDefaultTrace); + ::wxYield(); + ::wxYield(); + while (pDlgReconstruct->isPaused()) { + ::wxYield(); + ::wxUsleep(50); + } + } + pReconstructor->postProcessing(); + delete pDlgReconstruct; + delete pReconstructor; + } else { +#if HAVE_WXTHREADS + if (theApp->getUseBackgroundTasks()) { + ReconstructorSupervisorThread* pReconstructor = new ReconstructorSupervisorThread (this, m_iDefaultNX, + m_iDefaultNY, optFilterName.c_str(), m_dDefaultFilterParam, optFilterMethodName.c_str(), + m_iDefaultZeropad, optFilterGenerationName.c_str(), optInterpName.c_str(), m_iDefaultInterpParam, + optBackprojectName.c_str(), os.str().c_str(), &defaultROI, bRebinToParallel); + if (pReconstructor->Create() != wxTHREAD_NO_ERROR) { + sys_error (ERR_SEVERE, "Error creating reconstructor thread"); + delete pReconstructor; + return; + } + pReconstructor->SetPriority (60); + pReconstructor->Run(); + return; + } else +#endif + { + pImageFile = new ImageFile (m_iDefaultNX, m_iDefaultNY); + wxProgressDialog dlgProgress (wxString("Reconstruction"), wxString("Reconstruction Progress"), rProj.nView() + 1, getFrameForChild(), wxPD_CAN_ABORT ); + Reconstructor* pReconstructor = new Reconstructor (rProj, *pImageFile, optFilterName.c_str(), + m_dDefaultFilterParam, optFilterMethodName.c_str(), m_iDefaultZeropad, optFilterGenerationName.c_str(), + optInterpName.c_str(), m_iDefaultInterpParam, optBackprojectName.c_str(), m_iDefaultTrace, + &defaultROI, bRebinToParallel); - Timer timerRecon; - if (m_iDefaultTrace > Trace::TRACE_CONSOLE) { - ReconstructDialog* pDlgReconstruct = new ReconstructDialog (*pReconstruct, rProj, imageFile, m_iDefaultTrace, getFrameForChild()); - for (int iView = 0; iView < rProj.nView(); iView++) { - ::wxYield(); - ::wxYield(); - if (pDlgReconstruct->isCancelled() || ! pDlgReconstruct->reconstructView (iView)) { - delete pDlgReconstruct; - delete pReconstruct; - pReconDoc->Close(); - //pReconDoc->DeleteAllViews(); - return; - } - ::wxYield(); - ::wxYield(); - while (pDlgReconstruct->isPaused()) { - ::wxYield(); - ::wxUsleep(50); - } - } - delete pDlgReconstruct; - } else { - 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)) { - delete pReconstruct; - pReconDoc->Close(); - //pReconDoc->DeleteAllViews(); - return; - } + for (int iView = 0; iView < rProj.nView(); iView++) { + pReconstructor->reconstructView (iView, 1); + if (! dlgProgress.Update (iView + 1)) { + delete pReconstructor; + return; // don't make new window, thread will do this } } - 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(); - rasterView->OnUpdate (rasterView, NULL); - } - 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(); - *theApp->getLog() << os.str().c_str() << "\n"; - imageFile.labelAdd (rProj.getLabel()); - imageFile.labelAdd (os.str().c_str(), timerRecon.timerEnd()); + pReconstructor->postProcessing(); + delete pReconstructor; } } + ImageFileDocument* pReconDoc = theApp->newImageDoc(); + if (! pReconDoc) { + sys_error (ERR_SEVERE, "Unable to create image file"); + return; + } + pReconDoc->setImageFile (pImageFile); + if (theApp->getAskDeleteNewDocs()) + pReconDoc->Modify (true); + *theApp->getLog() << os.str().c_str() << "\n"; + pImageFile->labelAdd (rProj.getLabel()); + pImageFile->labelAdd (os.str().c_str(), timerRecon.timerEnd()); + + // if (ImageFileView* rasterView = pReconDoc->getView()) { + // rasterView->getFrame()->Show(true); + // rasterView->getFrame()->SetFocus(); + // rasterView->OnUpdate (rasterView, NULL); + // } + // causes loss of frame in wxGTK + pReconDoc->GetFirstView()->GetFrame()->Show(true); + pReconDoc->UpdateAllViews (); + // pReconDoc->Activate(); +} + + +void +ProjectionFileView::OnArtifactReduction (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); @@ -2350,7 +3005,7 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view) #endif theApp->setIconForFrame (subframe); - wxMenu *m_pFileMenu = new wxMenu; + m_pFileMenu = new wxMenu; m_pFileMenu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...\tCtrl-P"); m_pFileMenu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...\tCtrl-F"); @@ -2360,55 +3015,69 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view) m_pFileMenu->Append(wxID_CLOSE, "&Close\tCtrl-W"); m_pFileMenu->AppendSeparator(); - m_pFileMenu->Append(PJMENU_FILE_PROPERTIES, "P&roperties"); + m_pFileMenu->Append(PJMENU_FILE_PROPERTIES, "P&roperties\tCtrl-I"); m_pFileMenu->AppendSeparator(); m_pFileMenu->Append(wxID_PRINT, "&Print..."); m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup..."); m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view"); + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(MAINMENU_IMPORT, "&Import...\tCtrl-M"); #ifdef CTSIM_MDI m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces..."); 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_RECTANGULAR, "&Rectangular Image"); convert_menu->Append (PJMENU_CONVERT_POLAR, "&Polar Image...\tCtrl-L"); - convert_menu->Append (PJMENU_CONVERT_FFT_POLAR, "&FFT->Polar Image...\tCtrl-I"); + convert_menu->Append (PJMENU_CONVERT_FFT_POLAR, "FF&T->Polar Image...\tCtrl-T"); + convert_menu->AppendSeparator(); + convert_menu->Append (PJMENU_CONVERT_PARALLEL, "&Interpolate to Parallel"); + // wxMenu* filter_menu = new wxMenu; + // filter_menu->Append (PJMENU_ARTIFACT_REDUCTION, "&Artifact Reduction"); + + wxMenu* analyze_menu = new wxMenu; + analyze_menu->Append (PJMENU_PLOT_HISTOGRAM, "&Plot Histogram"); + analyze_menu->Append (PJMENU_PLOT_TTHETA_SAMPLING, "Plot T-T&heta Sampling...\tCtrl-H"); + 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_FBP_REBIN, "Filtered &Backprojection (Rebin to Parallel)...\tCtrl-B", "Reconstruct image using filtered backprojection"); + // still buggy + // reconstruct_menu->Append (PJMENU_RECONSTRUCT_FOURIER, "&Fourier...\tCtrl-E", "Reconstruct image using inverse Fourier"); wxMenu *help_menu = new wxMenu; help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1"); - help_menu->Append(MAINMENU_HELP_TOPICS, "&Topics\tCtrl-H"); + help_menu->Append (MAINMENU_HELP_TIPS, "&Tips"); + help_menu->Append (IDH_QUICKSTART, "&Quick Start"); help_menu->Append(MAINMENU_HELP_ABOUT, "&About"); wxMenuBar *menu_bar = new wxMenuBar; menu_bar->Append (m_pFileMenu, "&File"); menu_bar->Append (convert_menu, "&Convert"); + // menu_bar->Append (filter_menu, "Fi<er"); + menu_bar->Append (analyze_menu, "&Analyze"); menu_bar->Append (reconstruct_menu, "&Reconstruct"); menu_bar->Append (help_menu, "&Help"); subframe->SetMenuBar(menu_bar); subframe->Centre(wxBOTH); - wxAcceleratorEntry accelEntries[11]; - accelEntries[0].Set (wxACCEL_CTRL, static_cast('O'), wxID_OPEN); - accelEntries[1].Set (wxACCEL_CTRL, static_cast('S'), wxID_SAVE); - accelEntries[2].Set (wxACCEL_CTRL, static_cast('W'), wxID_CLOSE); - accelEntries[3].Set (wxACCEL_CTRL, static_cast('H'), MAINMENU_HELP_TOPICS); - accelEntries[4].Set (wxACCEL_CTRL, static_cast('P'), MAINMENU_FILE_CREATE_PHANTOM); - accelEntries[5].Set (wxACCEL_CTRL, static_cast('F'), MAINMENU_FILE_CREATE_FILTER); - accelEntries[6].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS); - accelEntries[7].Set (wxACCEL_CTRL, static_cast('L'), PJMENU_CONVERT_POLAR); - accelEntries[8].Set (wxACCEL_CTRL, static_cast('I'), PJMENU_CONVERT_FFT_POLAR); - accelEntries[9].Set (wxACCEL_CTRL, static_cast('R'), PJMENU_RECONSTRUCT_FBP); - accelEntries[10].Set (wxACCEL_CTRL, static_cast('E'), PJMENU_RECONSTRUCT_FOURIER); - wxAcceleratorTable accelTable (11, accelEntries); + wxAcceleratorEntry accelEntries[7]; + accelEntries[0].Set (wxACCEL_CTRL, static_cast('L'), PJMENU_CONVERT_POLAR); + accelEntries[1].Set (wxACCEL_CTRL, static_cast('T'), PJMENU_CONVERT_FFT_POLAR); + accelEntries[2].Set (wxACCEL_CTRL, static_cast('R'), PJMENU_RECONSTRUCT_FBP); + accelEntries[3].Set (wxACCEL_CTRL, static_cast('B'), PJMENU_RECONSTRUCT_FBP_REBIN); + accelEntries[4].Set (wxACCEL_CTRL, static_cast('E'), PJMENU_RECONSTRUCT_FOURIER); + accelEntries[5].Set (wxACCEL_CTRL, static_cast('I'), PJMENU_FILE_PROPERTIES); + accelEntries[6].Set (wxACCEL_CTRL, static_cast('H'), PJMENU_PLOT_TTHETA_SAMPLING); + wxAcceleratorTable accelTable (7, accelEntries); subframe->SetAcceleratorTable (accelTable); return subframe; @@ -2422,9 +3091,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 @@ -2453,7 +3122,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(); @@ -2475,6 +3144,10 @@ ProjectionFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) } unsigned char* imageData = new unsigned char [nDet * nView * 3]; + if (! imageData) { + sys_error (ERR_SEVERE, "Unable to allocate memory for image display"); + return; + } double scale = (max - min) / 255; for (int iy2 = 0; iy2 < nView; iy2++) { const DetectorArray& detarray = rProj.getDetectorArray (iy2); @@ -2504,28 +3177,28 @@ ProjectionFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) bool ProjectionFileView::OnClose (bool deleteWindow) { + //GetDocumentManager()->ActivateView (this, false, true); if (! GetDocument() || ! GetDocument()->Close()) return false; + Activate(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); + SetFrame(NULL); if (deleteWindow) { - m_pFrame->Show(false); - m_pFrame->Destroy(); -// delete m_pFrame; + delete m_pFrame; m_pFrame = NULL; + if (GetDocument() && GetDocument()->getBadFileOpen()) + ::wxYield(); // wxWindows bug workaround } + return true; } @@ -2540,7 +3213,7 @@ PlotFileCanvas::PlotFileCanvas (PlotFileView* v, wxFrame *frame, const wxPoint& PlotFileCanvas::~PlotFileCanvas () { - m_pView = NULL; + m_pView = NULL; } void @@ -2556,7 +3229,7 @@ PlotFileCanvas::OnDraw(wxDC& dc) IMPLEMENT_DYNAMIC_CLASS(PlotFileView, wxView) BEGIN_EVENT_TABLE(PlotFileView, wxView) -EVT_MENU(PJMENU_FILE_PROPERTIES, PlotFileView::OnProperties) +EVT_MENU(PLOTMENU_FILE_PROPERTIES, PlotFileView::OnProperties) EVT_MENU(PLOTMENU_VIEW_SCALE_MINMAX, PlotFileView::OnScaleMinMax) EVT_MENU(PLOTMENU_VIEW_SCALE_AUTO, PlotFileView::OnScaleAuto) EVT_MENU(PLOTMENU_VIEW_SCALE_FULL, PlotFileView::OnScaleFull) @@ -2571,8 +3244,8 @@ PlotFileView::~PlotFileView() { if (m_pEZPlot) delete m_pEZPlot; - - theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu); + + GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu); } void @@ -2582,9 +3255,10 @@ PlotFileView::OnProperties (wxCommandEvent& event) std::ostringstream os; os << "Columns: " << rPlot.getNumColumns() << ", Records: " << rPlot.getNumRecords() << "\n"; rPlot.printHeadersBrief (os); - *theApp->getLog() << os.str().c_str(); + *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<<\n"; wxMessageDialog dialogMsg (getFrameForChild(), os.str().c_str(), "Plot File Properties", wxOK | wxICON_INFORMATION); dialogMsg.ShowModal(); + GetDocument()->Activate(); } @@ -2607,6 +3281,7 @@ PlotFileView::OnScaleAuto (wxCommandEvent& event) OnUpdate (this, NULL); } } + GetDocument()->Activate(); } void @@ -2637,6 +3312,7 @@ PlotFileView::OnScaleMinMax (wxCommandEvent& event) m_dMaxPixel = dialogMinMax.getMaximum(); OnUpdate (this, NULL); } + GetDocument()->Activate(); } void @@ -2647,17 +3323,18 @@ PlotFileView::OnScaleFull (wxCommandEvent& event) m_bMaxSpecified = false; OnUpdate (this, NULL); } + GetDocument()->Activate(); } 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(); @@ -2679,7 +3356,7 @@ PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view) #endif theApp->setIconForFrame (subframe); - wxMenu *m_pFileMenu = new wxMenu; + m_pFileMenu = new wxMenu; m_pFileMenu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...\tCtrl-P"); m_pFileMenu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...\tCtrl-F"); @@ -2689,18 +3366,21 @@ PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view) m_pFileMenu->Append(wxID_CLOSE, "&Close\tCtrl-W"); m_pFileMenu->AppendSeparator(); - m_pFileMenu->Append(PJMENU_FILE_PROPERTIES, "P&roperties"); + m_pFileMenu->Append(PLOTMENU_FILE_PROPERTIES, "P&roperties\tCtrl-I"); m_pFileMenu->AppendSeparator(); m_pFileMenu->Append(wxID_PRINT, "&Print..."); m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup..."); m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view"); + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(MAINMENU_IMPORT, "&Import...\tCtrl-M"); #ifdef CTSIM_MDI m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces..."); 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"); @@ -2709,7 +3389,8 @@ PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view) wxMenu *help_menu = new wxMenu; help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1"); - help_menu->Append(MAINMENU_HELP_TOPICS, "&Topics\tCtrl-H"); + help_menu->Append (MAINMENU_HELP_TIPS, "&Tips"); + help_menu->Append (IDH_QUICKSTART, "&Quick Start"); help_menu->Append(MAINMENU_HELP_ABOUT, "&About"); wxMenuBar *menu_bar = new wxMenuBar; @@ -2721,18 +3402,12 @@ PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view) subframe->SetMenuBar(menu_bar); subframe->Centre(wxBOTH); - wxAcceleratorEntry accelEntries[10]; - accelEntries[0].Set (wxACCEL_CTRL, static_cast('O'), wxID_OPEN); - accelEntries[1].Set (wxACCEL_CTRL, static_cast('S'), wxID_SAVE); - accelEntries[2].Set (wxACCEL_CTRL, static_cast('W'), wxID_CLOSE); - accelEntries[3].Set (wxACCEL_CTRL, static_cast('H'), MAINMENU_HELP_TOPICS); - accelEntries[4].Set (wxACCEL_CTRL, static_cast('P'), MAINMENU_FILE_CREATE_PHANTOM); - accelEntries[5].Set (wxACCEL_CTRL, static_cast('F'), MAINMENU_FILE_CREATE_FILTER); - accelEntries[6].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS); - accelEntries[7].Set (wxACCEL_CTRL, static_cast('E'), PLOTMENU_VIEW_SCALE_MINMAX); - accelEntries[8].Set (wxACCEL_CTRL, static_cast('A'), PLOTMENU_VIEW_SCALE_AUTO); - accelEntries[9].Set (wxACCEL_CTRL, static_cast('U'), PLOTMENU_VIEW_SCALE_FULL); - wxAcceleratorTable accelTable (10, accelEntries); + wxAcceleratorEntry accelEntries[4]; + accelEntries[0].Set (wxACCEL_CTRL, static_cast('E'), PLOTMENU_VIEW_SCALE_MINMAX); + accelEntries[1].Set (wxACCEL_CTRL, static_cast('A'), PLOTMENU_VIEW_SCALE_AUTO); + accelEntries[2].Set (wxACCEL_CTRL, static_cast('U'), PLOTMENU_VIEW_SCALE_FULL); + accelEntries[3].Set (wxACCEL_CTRL, static_cast('I'), PLOTMENU_FILE_PROPERTIES); + wxAcceleratorTable accelTable (4, accelEntries); subframe->SetAcceleratorTable (accelTable); return subframe; @@ -2752,7 +3427,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 @@ -2790,6 +3465,7 @@ PlotFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) const PlotFile& rPlotFile = GetDocument()->getPlotFile(); const int iNColumns = rPlotFile.getNumColumns(); const int iNRecords = rPlotFile.getNumRecords(); + const bool bScatterPlot = rPlotFile.getIsScatterPlot(); if (iNColumns > 0 && iNRecords > 0) { if (m_pEZPlot) @@ -2814,16 +3490,21 @@ PlotFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) m_pEZPlot->ezset("box"); m_pEZPlot->ezset("grid"); - double* pdXaxis = new double [iNRecords]; - rPlotFile.getColumn (0, pdXaxis); - + double* pdX = new double [iNRecords]; double* pdY = new double [iNRecords]; - for (int iCol = 1; iCol < iNColumns; iCol++) { - rPlotFile.getColumn (iCol, pdY); - m_pEZPlot->addCurve (pdXaxis, pdY, iNRecords); + if (! bScatterPlot) { + rPlotFile.getColumn (0, pdX); + + for (int iCol = 1; iCol < iNColumns; iCol++) { + rPlotFile.getColumn (iCol, pdY); + m_pEZPlot->addCurve (pdX, pdY, iNRecords); + } + } else { + rPlotFile.getColumn (0, pdX); + rPlotFile.getColumn (1, pdY); + m_pEZPlot->addCurve (pdX, pdY, iNRecords); } - - delete pdXaxis; + delete pdX; delete pdY; } @@ -2834,28 +3515,27 @@ PlotFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) bool PlotFileView::OnClose (bool deleteWindow) { + //GetDocumentManager()->ActivateView (this, false, true); if (! GetDocument() || ! GetDocument()->Close()) return false; + Activate(false); if (m_pCanvas) { - m_pCanvas->Clear(); m_pCanvas->setView (NULL); - m_pCanvas->Show(false); m_pCanvas = NULL; } wxString s(wxTheApp->GetAppName()); if (m_pFrame) m_pFrame->SetTitle(s); - SetFrame(NULL); - - Activate(false); + SetFrame(NULL); if (deleteWindow) { - m_pFrame->Show(false); - m_pFrame->Destroy(); -// delete m_pFrame; + delete m_pFrame; m_pFrame = NULL; + if (GetDocument() && GetDocument()->getBadFileOpen()) + ::wxYield(); // wxWindows bug workaround } + return true; } @@ -2867,7 +3547,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) ) @@ -2899,29 +3580,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 (! theApp->getMainFrame()->getShuttingDown()) + return false; + Activate(false); + //GetDocumentManager()->ActivateView (this, false, true); if (! GetDocument() || ! GetDocument()->Close()) return false; - - m_pCanvas->Show(false); - Activate(false); + SetFrame(NULL); if (deleteWindow) { - m_pFrame->Show(false); - m_pFrame->Destroy(); -// delete m_pFrame; - m_pFrame = NULL; - + delete m_pFrame; + m_pFrame = NULL; + if (GetDocument() && GetDocument()->getBadFileOpen()) + ::wxYield(); // wxWindows bug workaround } + return TRUE; } @@ -2933,13 +3614,13 @@ wxDocChildFrame* TextFileView::CreateChildFrame (wxDocument *doc, wxView *view) { #if CTSIM_MDI - wxDocMDIChildFrame* subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile 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(0,0), wxDEFAULT_FRAME_STYLE, "Log"); #else - wxDocChildFrame* subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile 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, "Log"); #endif theApp->setIconForFrame (subframe); - wxMenu *m_pFileMenu = new wxMenu; + m_pFileMenu = new wxMenu; m_pFileMenu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...\tCtrl-P"); m_pFileMenu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...\tCtrl-F"); @@ -2952,16 +3633,20 @@ TextFileView::CreateChildFrame (wxDocument *doc, wxView *view) m_pFileMenu->Append(wxID_PRINT, "&Print..."); m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup..."); m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view"); + m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append(MAINMENU_IMPORT, "&Import...\tCtrl-M"); #ifdef CTSIM_MDI m_pFileMenu->AppendSeparator(); + m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces..."); 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"); - help_menu->Append(MAINMENU_HELP_TOPICS, "&Topics\tCtrl-H"); + help_menu->Append (MAINMENU_HELP_TIPS, "&Tips"); + help_menu->Append (IDH_QUICKSTART, "&Quick Start"); help_menu->Append(MAINMENU_HELP_ABOUT, "&About"); wxMenuBar *menu_bar = new wxMenuBar; @@ -2972,26 +3657,17 @@ TextFileView::CreateChildFrame (wxDocument *doc, wxView *view) subframe->SetMenuBar(menu_bar); subframe->Centre(wxBOTH); - wxAcceleratorEntry accelEntries[5]; - accelEntries[0].Set (wxACCEL_CTRL, static_cast('O'), wxID_OPEN); - accelEntries[1].Set (wxACCEL_CTRL, static_cast('S'), wxID_SAVE); - accelEntries[2].Set (wxACCEL_CTRL, static_cast('W'), wxID_CLOSE); - accelEntries[3].Set (wxACCEL_CTRL, static_cast('H'), MAINMENU_HELP_TOPICS); - accelEntries[4].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS); - wxAcceleratorTable accelTable (5, accelEntries); - subframe->SetAcceleratorTable (accelTable); - return subframe; } // 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; }