X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fviews.cpp;h=93d49b336da6917fd89d3ffce46677b70a07754b;hp=86e0cf56b2a265b60922ef6f4ac06a215d29e09d;hb=7ec2cd66921180a624813dff9f8bac76c6b268cc;hpb=bc5a9ca28bc4da3691fb859945d2862f6155835b

diff --git a/src/views.cpp b/src/views.cpp
index 86e0cf5..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.42 2000/12/29 20:18:59 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
@@ -129,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";
@@ -170,6 +179,10 @@ EVT_MENU(IFMENU_PROCESS_LOG, ImageFileView::OnLog)
 EVT_MENU(IFMENU_PROCESS_EXP, ImageFileView::OnExp)
 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)
@@ -195,16 +208,16 @@ ImageFileView::OnProperties (wxCommandEvent& event)
     const std::string& rFilename = rIF.getFilename();
     std::ostringstream os;
     double min, max, mean, mode, median, stddev;
-    rIF.statistics (min, max, mean, mode, median, stddev);
+    rIF.statistics (rIF.getArray(), min, max, mean, mode, median, stddev);
     os << "Filename: " << rFilename << "\n";
     os << "Size: (" << rIF.nx() << "," << rIF.ny() << ")\n";
     os << "Data type: ";
-    if (rIF.dataType() == Array2dFile::DATA_TYPE_COMPLEX)
+    if (rIF.isComplex())
       os << "Complex\n";
     else
       os << "Real\n";
     os << "\nMinimum: "<<min<<"\nMaximum: "<<max<<"\nMean: "<<mean<<"\nMedian: "<<median<<"\nMode: "<<mode<<"\nStandard Deviation: "<<stddev << "\n";
-    if (rIF.dataType() == Array2dFile::DATA_TYPE_COMPLEX) {
+    if (rIF.isComplex()) {
       rIF.statistics (rIF.getImaginaryArray(), min, max, mean, mode, median, stddev);
       os << "\nImaginary: min: "<<min<<"\nmax: "<<max<<"\nmean: "<<mean<<"\nmedian: "<<median<<"\nmode: "<<mode<<"\nstddev: "<<stddev << "\n";
     }
@@ -279,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);
@@ -363,6 +376,7 @@ void
 ImageFileView::OnFourier (wxCommandEvent& event)
 {
   ImageFile& rIF = GetDocument()->getImageFile();
+  wxProgressDialog dlgProgress (wxString("Fourier"), wxString("Fourier Progress"), 1, m_frame, wxPD_APP_MODAL);
   rIF.fourier (rIF);
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
@@ -371,10 +385,39 @@ ImageFileView::OnFourier (wxCommandEvent& event)
   GetDocument()->UpdateAllViews(this);
 }
 
+#ifdef HAVE_FFTW
+void
+ImageFileView::OnFFT (wxCommandEvent& event)
+{
+  ImageFile& rIF = GetDocument()->getImageFile();
+  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;
@@ -431,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...");
@@ -456,8 +500,15 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   process_menu->Append (IFMENU_PROCESS_LOG, "&Log");
   process_menu->Append (IFMENU_PROCESS_EXP, "&Exp");
   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");
 
@@ -1050,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");
   
@@ -1339,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...");
@@ -1601,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...");