X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fviews.cpp;h=93d49b336da6917fd89d3ffce46677b70a07754b;hp=8c53e4ced61bf734570a557db7ee14d1fd75f7ff;hb=7ec2cd66921180a624813dff9f8bac76c6b268cc;hpb=5c6b29ab4885308cc3381af6e0a68f4804956d2e diff --git a/src/views.cpp b/src/views.cpp index 8c53e4c..93d49b3 100644 --- a/src/views.cpp +++ b/src/views.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: views.cpp,v 1.40 2000/12/29 15:45:06 kevin Exp $ +** $Id: views.cpp,v 1.43 2001/01/01 10:14:34 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 @@ -87,7 +87,6 @@ void ImageFileCanvas::DrawRubberBandCursor (wxDC& dc, int x, int y) { const ImageFile& rIF = m_pView->GetDocument()->getImageFile(); - ImageFileArrayConst v = rIF.getArray(); int nx = rIF.nx(); int ny = rIF.ny(); @@ -130,7 +129,16 @@ ImageFileCanvas::OnMouseEvent(wxMouseEvent& event) if (event.RightIsDown()) { if (pt.x >= 0 && pt.x < nx && pt.y >= 0 && pt.y < ny) { std::ostringstream os; - os << "Image value (" << pt.x << "," << yPt << ") = " << v[pt.x][yPt] << "\n"; + os << "Image value (" << pt.x << "," << yPt << ") = " << v[pt.x][yPt]; + if (rIF.isComplex()) { + double dImag = rIF.getImaginaryArray()[pt.x][yPt]; + if (dImag < 0) + os << " - " << -dImag; + else + os << " + " << dImag; + os << "i\n"; + } else + os << "\n"; *theApp->getLog() << os.str().c_str(); } else *theApp->getLog() << "Mouse out of image range (" << pt.x << "," << yPt << ")\n"; @@ -169,8 +177,14 @@ EVT_MENU(IFMENU_PROCESS_SQUARE, ImageFileView::OnSquare) EVT_MENU(IFMENU_PROCESS_SQRT, ImageFileView::OnSquareRoot) EVT_MENU(IFMENU_PROCESS_LOG, ImageFileView::OnLog) EVT_MENU(IFMENU_PROCESS_EXP, ImageFileView::OnExp) -EVT_MENU(IFMENU_PROCESS_FFT_MAGNITUDE, ImageFileView::OnFFTMagnitude) -EVT_MENU(IFMENU_PROCESS_FFT_PHASE, ImageFileView::OnFFTPhase) +EVT_MENU(IFMENU_PROCESS_FOURIER, ImageFileView::OnFourier) +EVT_MENU(IFMENU_PROCESS_INVERSE_FOURIER, ImageFileView::OnInverseFourier) +#ifdef HAVE_FFTW +EVT_MENU(IFMENU_PROCESS_FFT, ImageFileView::OnFFT) +EVT_MENU(IFMENU_PROCESS_IFFT, ImageFileView::OnIFFT) +#endif +EVT_MENU(IFMENU_PROCESS_MAGNITUDE, ImageFileView::OnMagnitude) +EVT_MENU(IFMENU_PROCESS_PHASE, ImageFileView::OnPhase) EVT_MENU(IFMENU_PLOT_ROW, ImageFileView::OnPlotRow) EVT_MENU(IFMENU_PLOT_COL, ImageFileView::OnPlotCol) END_EVENT_TABLE() @@ -187,15 +201,26 @@ ImageFileView::~ImageFileView(void) void ImageFileView::OnProperties (wxCommandEvent& event) { - double min, max, mean, mode, median, stddev; const ImageFile& rIF = GetDocument()->getImageFile(); if (rIF.nx() == 0 || rIF.ny() == 0) *theApp->getLog() << "Properties: empty imagefile\n"; else { const std::string& rFilename = rIF.getFilename(); - rIF.statistics (min, max, mean, mode, median, stddev); std::ostringstream os; - os << "file: " << rFilename << "\nmin: "<getLog() << os.str().c_str(); wxMessageDialog dialogMsg (m_frame, os.str().c_str(), "Imagefile Properties", wxOK | wxICON_INFORMATION); dialogMsg.ShowModal(); @@ -267,7 +292,7 @@ ImageFileView::OnCompare (wxCommandEvent& event) rIF.statistics (min, max, mean, mode, median, stddev); os << rIF.getFilename() << ": minimum=" << min << ", maximum=" << max << ", mean=" << mean << ", mode=" << mode << ", median=" << median << ", stddev=" << stddev << "\n"; rCompareIF.statistics (min, max, mean, mode, median, stddev); - os << rCompareIF.getFilename() << ": minimum=" << min << ", maximum=" << max << ", mean=" << mean << ", mode=" << mode << ", median=" << median << ", stddev=" << stddev << "\n"; + os << pCompareDoc->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); @@ -348,20 +373,78 @@ ImageFileView::OnExp (wxCommandEvent& event) } void -ImageFileView::OnFFTMagnitude (wxCommandEvent& event) +ImageFileView::OnFourier (wxCommandEvent& event) { ImageFile& rIF = GetDocument()->getImageFile(); - rIF.FFTMagnitude (rIF); + wxProgressDialog dlgProgress (wxString("Fourier"), wxString("Fourier Progress"), 1, m_frame, wxPD_APP_MODAL); + rIF.fourier (rIF); + m_bMinSpecified = false; + m_bMaxSpecified = false; if (theApp->getSetModifyNewDocs()) GetDocument()->Modify(TRUE); GetDocument()->UpdateAllViews(this); } +#ifdef HAVE_FFTW void -ImageFileView::OnFFTPhase (wxCommandEvent& event) +ImageFileView::OnFFT (wxCommandEvent& event) { ImageFile& rIF = GetDocument()->getImageFile(); - rIF.FFTPhase (rIF); + wxProgressDialog dlgProgress (wxString("FFT"), wxString("FFT Progress"), 1, m_frame, wxPD_APP_MODAL); + rIF.fft (rIF); + m_bMinSpecified = false; + m_bMaxSpecified = false; + if (theApp->getSetModifyNewDocs()) + GetDocument()->Modify(TRUE); + GetDocument()->UpdateAllViews(this); +} + +void +ImageFileView::OnIFFT (wxCommandEvent& event) +{ + ImageFile& rIF = GetDocument()->getImageFile(); + wxProgressDialog dlgProgress (wxString("IFFT"), wxString("IFFT Progress"), 1, m_frame, wxPD_APP_MODAL); + rIF.ifft (rIF); + m_bMinSpecified = false; + m_bMaxSpecified = false; + if (theApp->getSetModifyNewDocs()) + GetDocument()->Modify(TRUE); + GetDocument()->UpdateAllViews(this); +} +#endif + +void +ImageFileView::OnInverseFourier (wxCommandEvent& event) +{ + ImageFile& rIF = GetDocument()->getImageFile(); + wxProgressDialog dlgProgress (wxString("Inverse Fourier"), wxString("Inverse Fourier Progress"), 1, m_frame, wxPD_APP_MODAL); + rIF.inverseFourier (rIF); + m_bMinSpecified = false; + m_bMaxSpecified = false; + if (theApp->getSetModifyNewDocs()) + GetDocument()->Modify(TRUE); + GetDocument()->UpdateAllViews(this); +} + +void +ImageFileView::OnMagnitude (wxCommandEvent& event) +{ + ImageFile& rIF = GetDocument()->getImageFile(); + rIF.magnitude (rIF); + m_bMinSpecified = false; + m_bMaxSpecified = false; + if (theApp->getSetModifyNewDocs()) + GetDocument()->Modify(TRUE); + GetDocument()->UpdateAllViews(this); +} + +void +ImageFileView::OnPhase (wxCommandEvent& event) +{ + ImageFile& rIF = GetDocument()->getImageFile(); + rIF.phase (rIF); + m_bMinSpecified = false; + m_bMaxSpecified = false; if (theApp->getSetModifyNewDocs()) GetDocument()->Modify(TRUE); GetDocument()->UpdateAllViews(this); @@ -391,7 +474,8 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) wxMenu *file_menu = new wxMenu; - file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom..."); + file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom..."); + file_menu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter..."); file_menu->Append(wxID_OPEN, "&Open..."); file_menu->Append(wxID_SAVE, "&Save"); file_menu->Append(wxID_SAVEAS, "Save &As..."); @@ -415,8 +499,18 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) process_menu->Append (IFMENU_PROCESS_SQRT, "Square &Root"); process_menu->Append (IFMENU_PROCESS_LOG, "&Log"); process_menu->Append (IFMENU_PROCESS_EXP, "&Exp"); - process_menu->Append (IFMENU_PROCESS_FFT_MAGNITUDE, "&FFT Magnitude"); - process_menu->Append (IFMENU_PROCESS_FFT_PHASE, "FFT &Phase"); + process_menu->AppendSeparator(); +#ifdef HAVE_FFTW + process_menu->Append (IFMENU_PROCESS_FFT, "&FFT"); + process_menu->Append (IFMENU_PROCESS_IFFT, "&IFFT"); + process_menu->Append (IFMENU_PROCESS_FOURIER, "F&ourier"); + process_menu->Append (IFMENU_PROCESS_INVERSE_FOURIER, "Inverse Fo&urier"); +#else + process_menu->Append (IFMENU_PROCESS_FOURIER, "&Fourier"); + process_menu->Append (IFMENU_PROCESS_INVERSE_FOURIER, "&Inverse Fourier"); +#endif + process_menu->Append (IFMENU_PROCESS_MAGNITUDE, "&Magnitude"); + process_menu->Append (IFMENU_PROCESS_PHASE, "&Phase"); wxMenu *plot_menu = new wxMenu; plot_menu->Append (IFMENU_PLOT_ROW, "Plot &Row"); @@ -1007,6 +1101,7 @@ PhantomView::CreateChildFrame(wxDocument *doc, wxView *view) wxMenu *file_menu = new wxMenu; file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom..."); + file_menu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter..."); file_menu->Append(wxID_OPEN, "&Open..."); file_menu->Append(wxID_CLOSE, "&Close"); @@ -1296,6 +1391,7 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view) wxMenu *file_menu = new wxMenu; file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom..."); + file_menu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter..."); file_menu->Append(wxID_OPEN, "&Open..."); file_menu->Append(wxID_SAVE, "&Save"); file_menu->Append(wxID_SAVEAS, "Save &As..."); @@ -1558,6 +1654,7 @@ PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view) wxMenu *file_menu = new wxMenu; file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom..."); + file_menu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter..."); file_menu->Append(wxID_OPEN, "&Open..."); file_menu->Append(wxID_SAVE, "&Save"); file_menu->Append(wxID_SAVEAS, "Save &As..."); @@ -1652,7 +1749,7 @@ PlotFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) delete m_pEZPlot; m_pEZPlot = new EZPlot; - for (int iEzset = 0; iEzset < rPlotFile.getNumEzsetCommands(); iEzset++) + for (unsigned int iEzset = 0; iEzset < rPlotFile.getNumEzsetCommands(); iEzset++) m_pEZPlot->ezset (rPlotFile.getEzsetCommand (iEzset)); if (m_bMinSpecified) {