X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fviews.cpp;h=0a8f4c8b7472f9c4c9850ea9c01bf130d39efcb4;hp=8c53e4ced61bf734570a557db7ee14d1fd75f7ff;hb=e3776d3d7bf82adfea545c1f06c8b4ce660190b0;hpb=5c6b29ab4885308cc3381af6e0a68f4804956d2e

diff --git a/src/views.cpp b/src/views.cpp
index 8c53e4c..0a8f4c8 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.45 2001/01/02 06:29:23 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";
@@ -157,27 +165,42 @@ ImageFileCanvas::OnMouseEvent(wxMouseEvent& event)
 
 IMPLEMENT_DYNAMIC_CLASS(ImageFileView, wxView)
 
-BEGIN_EVENT_TABLE(ImageFileView, wxView)
+BEGIN_EVENT_TABLE(ImageFileView, wxView)
+EVT_MENU(IFMENU_FILE_EXPORT, ImageFileView::OnExport)
 EVT_MENU(IFMENU_FILE_PROPERTIES, ImageFileView::OnProperties)
 EVT_MENU(IFMENU_VIEW_SCALE_MINMAX, ImageFileView::OnScaleMinMax)
 EVT_MENU(IFMENU_VIEW_SCALE_AUTO, ImageFileView::OnScaleAuto)
 EVT_MENU(IFMENU_COMPARE_IMAGES, ImageFileView::OnCompare)
 EVT_MENU(IFMENU_COMPARE_ROW, ImageFileView::OnCompareRow)
 EVT_MENU(IFMENU_COMPARE_COL, ImageFileView::OnCompareCol)
-EVT_MENU(IFMENU_PROCESS_INVERTVALUES, ImageFileView::OnInvertValues)
-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_FILTER_INVERTVALUES, ImageFileView::OnInvertValues)
+EVT_MENU(IFMENU_FILTER_SQUARE, ImageFileView::OnSquare)
+EVT_MENU(IFMENU_FILTER_SQRT, ImageFileView::OnSquareRoot)
+EVT_MENU(IFMENU_FILTER_LOG, ImageFileView::OnLog)
+EVT_MENU(IFMENU_FILTER_EXP, ImageFileView::OnExp)
+EVT_MENU(IFMENU_FILTER_FOURIER, ImageFileView::OnFourier)
+EVT_MENU(IFMENU_FILTER_INVERSE_FOURIER, ImageFileView::OnInverseFourier)
+EVT_MENU(IFMENU_FILTER_SHUFFLEFOURIERTONATURALORDER, ImageFileView::OnShuffleFourierToNaturalOrder)
+EVT_MENU(IFMENU_FILTER_SHUFFLENATURALTOFOURIERORDER, ImageFileView::OnShuffleNaturalToFourierOrder)
+EVT_MENU(IFMENU_IMAGE_ADD, ImageFileView::OnAdd)
+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)
+#ifdef HAVE_FFTW
+EVT_MENU(IFMENU_FILTER_FFT, ImageFileView::OnFFT)
+EVT_MENU(IFMENU_FILTER_IFFT, ImageFileView::OnIFFT)
+#endif
+EVT_MENU(IFMENU_FILTER_MAGNITUDE, ImageFileView::OnMagnitude)
+EVT_MENU(IFMENU_FILTER_PHASE, ImageFileView::OnPhase)
 EVT_MENU(IFMENU_PLOT_ROW, ImageFileView::OnPlotRow)
 EVT_MENU(IFMENU_PLOT_COL, ImageFileView::OnPlotCol)
 END_EVENT_TABLE()
 
 ImageFileView::ImageFileView(void) 
 : wxView(), m_canvas(NULL), m_frame(NULL), m_bMinSpecified(false), m_bMaxSpecified(false)
-{
+{
+  m_iDefaultExportFormatID = ImageFile::FORMAT_PNG;
 }
 
 ImageFileView::~ImageFileView(void)
@@ -187,15 +210,30 @@ 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: "<<min<<"\nmax: "<<max<<"\nmean: "<<mean<<"\nmedian: "<<median<<"\nmode: "<<mode<<"\nstddev: "<<stddev << "\n";
+    double 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.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.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";
+    }
+    if (rIF.nLabels() > 0) {
+      os << "\n";
+      rIF.printLabelsBrief (os);
+    }
     *theApp->getLog() << os.str().c_str();
     wxMessageDialog dialogMsg (m_frame, os.str().c_str(), "Imagefile Properties", wxOK | wxICON_INFORMATION);
     dialogMsg.ShowModal();
@@ -267,7 +305,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->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);
@@ -287,6 +325,15 @@ ImageFileView::OnCompare (wxCommandEvent& event)
           return;
         }
         
+        wxString s = GetDocument()->GetFirstView()->GetFrame()->GetTitle() + ": ";
+        differenceImage.labelsCopy (rIF, s.c_str());
+        s = pCompareDoc->GetFirstView()->GetFrame()->GetTitle() + ": ";
+        differenceImage.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);
@@ -302,6 +349,7 @@ 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);
@@ -312,6 +360,7 @@ 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);
@@ -322,6 +371,7 @@ 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);
@@ -332,6 +382,7 @@ 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);
@@ -342,31 +393,286 @@ 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);
+}
+
+void
+ImageFileView::OnAdd (wxCommandEvent& event)
+{
+  std::vector<ImageFileDocument*> vecIF;
+  theApp->getCompatibleImages (GetDocument(), vecIF);
+  
+  if (vecIF.size() == 0) {
+    wxMessageBox ("There are no compatible image files open for comparision", "No comparison images");
+  } else {
+    DialogGetComparisonImage dialogGetCompare (m_frame, "Get Image to Add", vecIF, false);
+    
+    if (dialogGetCompare.ShowModal() == wxID_OK) {
+      ImageFile& rIF = GetDocument()->getImageFile();
+      ImageFileDocument* pRHSDoc = dialogGetCompare.getImageFileDocument();
+      const ImageFile& rRHSIF = pRHSDoc->getImageFile();
+      ImageFileDocument* pNewDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
+        if (! pNewDoc) {
+          sys_error (ERR_SEVERE, "Unable to create image file");
+          return;
+        }
+      ImageFile& newImage = pNewDoc->getImageFile();  
+      newImage.setArraySize (rIF.nx(), rIF.ny());
+      rIF.addImages (rRHSIF, newImage);
+      std::ostringstream os;
+      os << "Add image " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str() << " and " 
+        << pRHSDoc->GetFirstView()->GetFrame()->GetTitle().c_str();
+      wxString s = GetDocument()->GetFirstView()->GetFrame()->GetTitle() + ": ";
+      newImage.labelsCopy (rIF, s.c_str());
+      s = pRHSDoc->GetFirstView()->GetFrame()->GetTitle() + ": ";
+      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->GetFirstView()->OnUpdate (this, NULL);
+    }
+  }
+}
+
+void
+ImageFileView::OnSubtract (wxCommandEvent& event)
+{
+  std::vector<ImageFileDocument*> vecIF;
+  theApp->getCompatibleImages (GetDocument(), vecIF);
+  
+  if (vecIF.size() == 0) {
+    wxMessageBox ("There are no compatible image files open for comparision", "No comparison images");
+  } else {
+    DialogGetComparisonImage dialogGetCompare (m_frame, "Get Image to Subtract", vecIF, false);
+    
+    if (dialogGetCompare.ShowModal() == wxID_OK) {
+      ImageFile& rIF = GetDocument()->getImageFile();
+      ImageFileDocument* pRHSDoc = dialogGetCompare.getImageFileDocument();
+      const ImageFile& rRHSIF = pRHSDoc->getImageFile();
+      ImageFileDocument* pNewDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
+        if (! pNewDoc) {
+          sys_error (ERR_SEVERE, "Unable to create image file");
+          return;
+        }
+      ImageFile& newImage = pNewDoc->getImageFile();  
+      newImage.setArraySize (rIF.nx(), rIF.ny());
+      rIF.subtractImages (rRHSIF, newImage);
+      std::ostringstream os;
+      os << "Subtract image " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str() << " and " 
+        << pRHSDoc->GetFirstView()->GetFrame()->GetTitle().c_str();
+      wxString s = GetDocument()->GetFirstView()->GetFrame()->GetTitle() + ": ";
+      newImage.labelsCopy (rIF, s.c_str());
+      s = pRHSDoc->GetFirstView()->GetFrame()->GetTitle() + ": ";
+      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->GetFirstView()->OnUpdate (this, NULL);
+    }
+  }
+}
+
+void
+ImageFileView::OnMultiply (wxCommandEvent& event)
+{
+  std::vector<ImageFileDocument*> vecIF;
+  theApp->getCompatibleImages (GetDocument(), vecIF);
+  
+  if (vecIF.size() == 0) {
+    wxMessageBox ("There are no compatible image files open for comparision", "No comparison images");
+  } else {
+    DialogGetComparisonImage dialogGetCompare (m_frame, "Get Image to Multiply", vecIF, false);
+    
+    if (dialogGetCompare.ShowModal() == wxID_OK) {
+      ImageFile& rIF = GetDocument()->getImageFile();
+      ImageFileDocument* pRHSDoc = dialogGetCompare.getImageFileDocument();
+      const ImageFile& rRHSIF = pRHSDoc->getImageFile();
+      ImageFileDocument* pNewDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
+        if (! pNewDoc) {
+          sys_error (ERR_SEVERE, "Unable to create image file");
+          return;
+        }
+      ImageFile& newImage = pNewDoc->getImageFile();  
+      newImage.setArraySize (rIF.nx(), rIF.ny());
+      rIF.multiplyImages (rRHSIF, newImage);
+      std::ostringstream os;
+      os << "Multiply image " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str() << " and " 
+        << pRHSDoc->GetFirstView()->GetFrame()->GetTitle().c_str();
+      wxString s = GetDocument()->GetFirstView()->GetFrame()->GetTitle() + ": ";
+      newImage.labelsCopy (rIF, s.c_str());
+      s = pRHSDoc->GetFirstView()->GetFrame()->GetTitle() + ": ";
+      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->GetFirstView()->OnUpdate (this, NULL);
+    }
+  }
+}
+
+void
+ImageFileView::OnDivide (wxCommandEvent& event)
+{
+  std::vector<ImageFileDocument*> vecIF;
+  theApp->getCompatibleImages (GetDocument(), vecIF);
+  
+  if (vecIF.size() == 0) {
+    wxMessageBox ("There are no compatible image files open for comparision", "No comparison images");
+  } else {
+    DialogGetComparisonImage dialogGetCompare (m_frame, "Get Image to Divide", vecIF, false);
+    
+    if (dialogGetCompare.ShowModal() == wxID_OK) {
+      ImageFile& rIF = GetDocument()->getImageFile();
+      ImageFileDocument* pRHSDoc = dialogGetCompare.getImageFileDocument();
+      const ImageFile& rRHSIF = pRHSDoc->getImageFile();
+      ImageFileDocument* pNewDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
+        if (! pNewDoc) {
+          sys_error (ERR_SEVERE, "Unable to create image file");
+          return;
+        }
+      ImageFile& newImage = pNewDoc->getImageFile();  
+      newImage.setArraySize (rIF.nx(), rIF.ny());
+      rIF.divideImages (rRHSIF, newImage);
+      std::ostringstream os;
+      os << "Divide image " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str() << " by " 
+        << pRHSDoc->GetFirstView()->GetFrame()->GetTitle().c_str();
+      wxString s = GetDocument()->GetFirstView()->GetFrame()->GetTitle() + ": ";
+      newImage.labelsCopy (rIF, s.c_str());
+      s = pRHSDoc->GetFirstView()->GetFrame()->GetTitle() + ": ";
+      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->GetFirstView()->OnUpdate (this, NULL);
+    }
+  }
+}
+
+
+#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);
+  rIF.labelAdd ("FFT Image");
+  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);
+  rIF.labelAdd ("IFFT Image");
+  m_bMinSpecified = false;
+  m_bMaxSpecified = false;
   if (theApp->getSetModifyNewDocs())
     GetDocument()->Modify(TRUE);
   GetDocument()->UpdateAllViews(this);
 }
+#endif
 
 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);
+  rIF.labelAdd ("Fourier Image");
+  m_bMinSpecified = false;
+  m_bMaxSpecified = false;
+  if (theApp->getSetModifyNewDocs())
+    GetDocument()->Modify(TRUE);
+  GetDocument()->UpdateAllViews(this);
+}
+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);
+  rIF.labelAdd ("Inverse Fourier Image");
+  m_bMinSpecified = false;
+  m_bMaxSpecified = false;
   if (theApp->getSetModifyNewDocs())
     GetDocument()->Modify(TRUE);
   GetDocument()->UpdateAllViews(this);
 }
 
 void
-ImageFileView::OnFFTPhase (wxCommandEvent& event)
+ImageFileView::OnShuffleNaturalToFourierOrder (wxCommandEvent& event)
 {
   ImageFile& rIF = GetDocument()->getImageFile();
-  rIF.FFTPhase (rIF);
+  Fourier::shuffleNaturalToFourierOrder (rIF);
+  rIF.labelAdd ("Shuffle Natural To Fourier Order");
+  m_bMinSpecified = false;
+  m_bMaxSpecified = false;
   if (theApp->getSetModifyNewDocs())
     GetDocument()->Modify(TRUE);
   GetDocument()->UpdateAllViews(this);
 }
 
+void
+ImageFileView::OnShuffleFourierToNaturalOrder (wxCommandEvent& event)
+{
+  ImageFile& rIF = GetDocument()->getImageFile();
+  Fourier::shuffleFourierToNaturalOrder (rIF);
+  rIF.labelAdd ("Shuffle Fourier To Natural Order");
+  m_bMinSpecified = false;
+  m_bMaxSpecified = false;
+  if (theApp->getSetModifyNewDocs())
+    GetDocument()->Modify(TRUE);
+  GetDocument()->UpdateAllViews(this);
+}
+
+void
+ImageFileView::OnMagnitude (wxCommandEvent& event)
+{
+  ImageFile& rIF = GetDocument()->getImageFile();
+  if (rIF.isComplex()) {
+    rIF.magnitude (rIF);
+    rIF.labelAdd ("Magnitude of complex-image");
+  m_bMinSpecified = false;
+  m_bMaxSpecified = false;
+  if (theApp->getSetModifyNewDocs())
+    GetDocument()->Modify(TRUE);
+  GetDocument()->UpdateAllViews(this);
+  }
+}
+
+void
+ImageFileView::OnPhase (wxCommandEvent& event)
+{
+  ImageFile& rIF = GetDocument()->getImageFile();
+  if (rIF.isComplex()) {
+    rIF.phase (rIF);
+    rIF.labelAdd ("Phase of complex-image");
+  m_bMinSpecified = false;
+  m_bMaxSpecified = false;
+  if (theApp->getSetModifyNewDocs())
+    GetDocument()->Modify(TRUE);
+  GetDocument()->UpdateAllViews(this);
+  }
+}
+
 
 ImageFileCanvas* 
 ImageFileView::CreateCanvas (wxView *view, wxFrame *parent)
@@ -391,14 +697,16 @@ 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...");
   file_menu->Append(wxID_CLOSE, "&Close");
   
-  file_menu->AppendSeparator();
+  file_menu->AppendSeparator();
   file_menu->Append(IFMENU_FILE_PROPERTIES, "P&roperties");
+  file_menu->Append(IFMENU_FILE_EXPORT, "&Export...");
   
   file_menu->AppendSeparator();
   file_menu->Append(wxID_PRINT, "&Print...");
@@ -409,14 +717,35 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   view_menu->Append(IFMENU_VIEW_SCALE_MINMAX, "Display Scale &Set...");
   view_menu->Append(IFMENU_VIEW_SCALE_AUTO, "Display Scale &Auto...");
   
-  wxMenu* process_menu = new wxMenu;
-  process_menu->Append (IFMENU_PROCESS_INVERTVALUES, "&Invert Values");
-  process_menu->Append (IFMENU_PROCESS_SQUARE, "&Square");
-  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");
+  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();
+#ifdef HAVE_FFTW
+  filter_menu->Append (IFMENU_FILTER_FFT, "&FFT");
+  filter_menu->Append (IFMENU_FILTER_IFFT, "&IFFT");
+  filter_menu->Append (IFMENU_FILTER_FOURIER, "F&ourier");
+  filter_menu->Append (IFMENU_FILTER_INVERSE_FOURIER, "Inverse Fo&urier");
+#else
+  filter_menu->Append (IFMENU_FILTER_FOURIER, "&Fourier");
+  filter_menu->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");
+  
+  wxMenu* image_menu = new wxMenu;
+  filter_menu->AppendSeparator();
+  image_menu->Append (IFMENU_IMAGE_ADD, "&Add...");
+  image_menu->Append (IFMENU_IMAGE_SUBTRACT, "&Subtract...");
+  image_menu->Append (IFMENU_IMAGE_MULTIPLY, "&Multiply...");
+  image_menu->Append (IFMENU_IMAGE_DIVIDE, "&Divide...");
+  image_menu->AppendSeparator();
+  image_menu->Append (IFMENU_IMAGE_SCALESIZE, "S&cale Size...");
 
   wxMenu *plot_menu = new wxMenu;
   plot_menu->Append (IFMENU_PLOT_ROW, "Plot &Row");
@@ -434,7 +763,8 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   
   menu_bar->Append(file_menu, "&File");
   menu_bar->Append(view_menu, "&View");
-  menu_bar->Append(process_menu, "&Process");
+  menu_bar->Append(image_menu, "&Image");
+  menu_bar->Append(filter_menu, "Fi&lter");
   menu_bar->Append(plot_menu, "P&lot");
   menu_bar->Append(compare_menu, "&Compare");
   menu_bar->Append(help_menu, "&Help");
@@ -448,7 +778,7 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
 
 
 bool 
-ImageFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
+ImageFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) )
 {
   m_frame = CreateChildFrame(doc, this);
   SetFrame (m_frame);
@@ -551,6 +881,80 @@ ImageFileView::OnClose (bool deleteWindow)
   return true;
 }
 
+void
+ImageFileView::OnExport (wxCommandEvent& event)
+{
+  ImageFile& rIF = dynamic_cast<ImageFileDocument*>(GetDocument())->getImageFile();
+  ImageFileArrayConst v = rIF.getArray();
+  int nx = rIF.nx();
+  int ny = rIF.ny();
+  if (v != NULL && nx != 0 && ny != 0) {
+    if (! m_bMinSpecified || ! m_bMaxSpecified) {
+      double min, max;
+      rIF.getMinMax (min, max);
+      if (! m_bMinSpecified)
+        m_dMinPixel = min;
+      if (! m_bMaxSpecified)
+        m_dMaxPixel = max;
+    }
+
+    DialogExportParameters dialogExport (m_frame, m_iDefaultExportFormatID);
+    if (dialogExport.ShowModal() == wxID_OK) {
+      wxString strFormatName (dialogExport.getFormatName ());
+      m_iDefaultExportFormatID = ImageFile::convertFormatNameToID (strFormatName.c_str());
+
+      wxString strExt;
+      wxString strWildcard;
+      if (m_iDefaultExportFormatID == ImageFile::FORMAT_PGM || m_iDefaultExportFormatID == ImageFile::FORMAT_PGMASCII) {
+        strExt = ".pgm";
+        strWildcard = "PGM Files (*.pgm)|*.pgm";
+      }
+#ifdef HAVE_PNG
+      else if (m_iDefaultExportFormatID == ImageFile::FORMAT_PNG || m_iDefaultExportFormatID == ImageFile::FORMAT_PNG16) {
+        strExt = ".png";
+        strWildcard = "PNG Files (*.png)|*.png";
+      }
+#endif
+
+      const wxString& strFilename = wxFileSelector (wxString("Export Filename"), wxString(""), 
+        wxString(""), strExt, strWildcard, wxOVERWRITE_PROMPT | wxHIDE_READONLY | wxSAVE);
+      if (strFilename) {
+        rIF.exportImage (strFormatName.c_str(), strFilename.c_str(), 1, 1, m_dMinPixel, m_dMaxPixel);
+        *theApp->getLog() << "Exported file " << strFilename << "\n";
+      }
+    }
+  }
+}
+
+void
+ImageFileView::OnScaleSize (wxCommandEvent& event)
+{
+  ImageFile& rIF = GetDocument()->getImageFile();
+  unsigned int iOldNX = rIF.nx();
+  unsigned int iOldNY = rIF.ny();
+
+  DialogGetXYSize dialogGetXYSize (m_frame, "Set New X & Y Dimensions", iOldNX, iOldNY);
+  if (dialogGetXYSize.ShowModal() == wxID_OK) {
+    unsigned int iNewNX = dialogGetXYSize.getXSize();
+    unsigned int iNewNY = dialogGetXYSize.getYSize();
+    std::ostringstream os;
+    os << "Scale Size from (" << iOldNX << "," << iOldNY << ") to (" << iNewNX << "," << iNewNY << ")";
+    ImageFileDocument* pScaledDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
+    if (! pScaledDoc) {
+      sys_error (ERR_SEVERE, "Unable to create image file");
+      return;
+    }
+    ImageFile& rScaledIF = pScaledDoc->getImageFile();
+    rScaledIF.setArraySize (iNewNX, iNewNY);
+    rScaledIF.labelAdd (os.str().c_str());
+    rIF.scaleImage (rScaledIF);
+    *theApp->getLog() << os.str().c_str() << "\n";
+    if (theApp->getSetModifyNewDocs())
+      pScaledDoc->Modify(TRUE);
+    pScaledDoc->UpdateAllViews (this);
+    pScaledDoc->GetFirstView()->OnUpdate (this, NULL);
+  }
+}
 
 void
 ImageFileView::OnPlotRow (wxCommandEvent& event)
@@ -802,7 +1206,7 @@ PhantomCanvas::PhantomCanvas (PhantomView* v, wxFrame *frame, const wxPoint& pos
 }
 
 void 
-PhantomCanvas::OnDraw(wxDC& dc)
+PhantomCanvas::OnDraw (wxDC& dc)
 {
   if (m_pView)
     m_pView->OnDraw(& dc);
@@ -842,12 +1246,14 @@ PhantomView::OnProperties (wxCommandEvent& event)
   const int idPhantom = GetDocument()->getPhantomID();
   const wxString& namePhantom = GetDocument()->getPhantomName();
   std::ostringstream os;
-  os << "Phantom " << namePhantom.c_str() << " (" << idPhantom << ")\n";
-  *theApp->getLog() << os.str().c_str();
+  os << "Phantom " << namePhantom.c_str() << " (" << idPhantom << ")" << "\n";
+  const Phantom& rPhantom = GetDocument()->getPhantom();
+  rPhantom.printDefinitions (os);
 #if DEBUG
-  const Phantom& rPhantom = GetDocument()->getPhantom();
-  rPhantom.print();
+  rPhantom.print (os);
 #endif
+  *theApp->getLog() << os.str().c_str() << "\n";
+  wxMessageBox (os.str().c_str(), "Phantom Properties");
 }
 
 
@@ -946,7 +1352,7 @@ PhantomView::OnRasterize (wxCommandEvent& event)
   if (retVal == wxID_OK) {
     int xSize = dialogRaster.getXSize();
     int ySize = dialogRaster.getYSize();
-    int nSamples = dialogRaster.getNSamples();
+    int nSamples = dialogRaster.getNSamples();
     if (nSamples < 1)
       nSamples = 1;
     if (xSize > 0 && ySize > 0) {
@@ -959,7 +1365,8 @@ PhantomView::OnRasterize (wxCommandEvent& event)
       ImageFile& imageFile = pRasterDoc->getImageFile();
       
       imageFile.setArraySize (xSize, ySize);
-      wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"), imageFile.nx() + 1, m_frame, wxPD_CAN_ABORT);
+      wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"), imageFile.nx() + 1, m_frame, wxPD_CAN_ABORT);
+      Timer timer;
       for (unsigned int i = 0; i < imageFile.nx(); i++) {
         rPhantom.convertToImagefile (imageFile, nSamples, Trace::TRACE_NONE, i, 1, true);
         if (! dlgProgress.Update(i+1)) {
@@ -969,16 +1376,17 @@ PhantomView::OnRasterize (wxCommandEvent& event)
       }
       if (theApp->getSetModifyNewDocs())
         pRasterDoc->Modify(true);
-      pRasterDoc->UpdateAllViews(this);
+      pRasterDoc->UpdateAllViews(this);
+      std::ostringstream os;
+      os << "Rasterize Phantom " << rPhantom.name() << ": XSize=" << xSize << ", YSize=" << ySize << ", nSamples=" << nSamples;
+      *theApp->getLog() << os.str().c_str() << "\n";
+      imageFile.labelAdd (os.str().c_str(), timer.timerEnd());
       ImageFileView* rasterView = dynamic_cast<ImageFileView*>(pRasterDoc->GetFirstView());
       if (rasterView) {
         rasterView->getFrame()->SetFocus();
         rasterView->OnUpdate (rasterView, NULL);
       }
       
-      std::ostringstream os;
-      os << "Rasterize Phantom " << rPhantom.name() << ": XSize=" << xSize << ", YSize=" << ySize << ", nSamples=" << nSamples << "\n";
-      *theApp->getLog() << os.str().c_str();
     }
   }
 }
@@ -1007,7 +1415,9 @@ PhantomView::CreateChildFrame(wxDocument *doc, wxView *view)
   wxMenu *file_menu = new wxMenu;
   
   file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...");
-  file_menu->Append(wxID_OPEN, "&Open...");
+  file_menu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...");
+  file_menu->Append(wxID_OPEN, "&Open...");
+  file_menu->Append(wxID_SAVEAS, "Save &As...");
   file_menu->Append(wxID_CLOSE, "&Close");
   
   file_menu->AppendSeparator();
@@ -1204,24 +1614,9 @@ ProjectionFileView::OnReconstruct (wxCommandEvent& event)
         wxMessageBox ("Sorry!\nCurrently, frequency-based filtering with direct filter generation is not support for geometries other than parallel.\nAborting command.", "Not Supported", wxOK | wxICON_WARNING, m_frame);
         return;
       }
-#if 0
-      SGPDriver* pSGPDriver = NULL;
-      SGP* pSGP = NULL;
-      wxMemoryDC* pDCPlot = NULL;
-      wxBitmap bitmap;
-      if (m_iDefaultTrace >= Trace::TRACE_PLOT) {
-        bitmap.Create (500, 500);
-        pDCPlot = new wxMemoryDC;
-        pDCPlot->SelectObject (bitmap);
-        pSGPDriver = new SGPDriver (dynamic_cast<wxDC*>pDCPlot, 500, 500);
-        pSGP = new SGP (*pSGPDriver);
-      }
-      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, pSGP);
-      delete pSGP;
-#else
+
       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);
-#endif
-      
+
       Timer timerRecon;
       if (m_iDefaultTrace > Trace::TRACE_CONSOLE) {
         ReconstructDialog* pDlgReconstruct = new ReconstructDialog (*pReconstruct, rProj, imageFile, m_iDefaultTrace, m_frame);
@@ -1266,7 +1661,7 @@ ProjectionFileView::OnReconstruct (wxCommandEvent& event)
       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 (Array2dFileLabel::L_HISTORY, os.str().c_str(), timerRecon.timerEnd());
+      imageFile.labelAdd (os.str().c_str(), timerRecon.timerEnd());
     }
   }
 }
@@ -1296,6 +1691,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...");
@@ -1475,9 +1871,10 @@ PlotFileView::~PlotFileView(void)
 void
 PlotFileView::OnProperties (wxCommandEvent& event)
 {
-  const PlotFile& rProj = GetDocument()->getPlotFile();
+  const PlotFile& rPlot = GetDocument()->getPlotFile();
   std::ostringstream os;
-  os << "Columns: " << rProj.getNumColumns() << ", Records: " << rProj.getNumRecords() << "\n";
+  os << "Columns: " << rPlot.getNumColumns() << ", Records: " << rPlot.getNumRecords() << "\n";
+  rPlot.printHeaders (os);
   *theApp->getLog() << os.str().c_str();
   wxMessageDialog dialogMsg (m_frame, os.str().c_str(), "Plot File Properties", wxOK | wxICON_INFORMATION);
   dialogMsg.ShowModal();
@@ -1509,9 +1906,10 @@ void
 PlotFileView::OnScaleMinMax (wxCommandEvent& event)
 {
   const PlotFile& rPlotFile = GetDocument()->getPlotFile();
-  double min, max;
-  
-  if (! m_bMinSpecified && ! m_bMaxSpecified) {
+  double min;
+  double max;
+
+  if (! m_bMinSpecified || ! m_bMaxSpecified) {
     if (! rPlotFile.getMinMax (1, min, max)) {
       *theApp->getLog() << "Error: unable to find Min/Max\n";
       return;
@@ -1558,6 +1956,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...");
@@ -1642,7 +2041,6 @@ PlotFileView::OnDraw (wxDC* dc)
 void 
 PlotFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
 {
-  if (m_canvas) {
     const PlotFile& rPlotFile = GetDocument()->getPlotFile();
     const int iNColumns = rPlotFile.getNumColumns();
     const int iNRecords = rPlotFile.getNumRecords();
@@ -1652,7 +2050,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) {
@@ -1682,9 +2080,9 @@ PlotFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
       delete pdXaxis;
       delete pdY;
     }
-    
-    m_canvas->Refresh();
-  }
+
+    if (m_canvas)
+      m_canvas->Refresh();
 }
 
 bool