X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fviews.cpp;h=6f6222086c7bf72adb8cabdf0391656dcb8cedc9;hb=67e0b59f7b40b2c2f1d0587b24b4ecf4881b3824;hp=4de349ef9166d95ddb071674fd1f94bae0cb87fc;hpb=3ea498d51ce4597e9649cd21f155b51175ea0bea;p=ctsim.git

diff --git a/src/views.cpp b/src/views.cpp
index 4de349e..6f62220 100644
--- a/src/views.cpp
+++ b/src/views.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 ** FILE IDENTIFICATION
 **
-**   Name:          view.cpp
+**   Name:          views.cpp
 **   Purpose:       View & Canvas routines for CTSim program
 **   Programmer:    Kevin Rosenberg
 **   Date Started:  July 2000
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: views.cpp,v 1.140 2001/03/21 21:45:31 kevin Exp $
+**  $Id: views.cpp,v 1.157 2002/06/02 17:57:02 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
@@ -58,6 +58,8 @@
 #include <sstream_subst>
 #endif
 
+// Used to reduce calls to progress bar update function
+const short int ITER_PER_UPDATE = 10;
 
 // ImageFileCanvas
 
@@ -73,9 +75,7 @@ ImageFileCanvas::ImageFileCanvas (ImageFileView* v, wxFrame *frame, const wxPoin
 }
 
 ImageFileCanvas::~ImageFileCanvas()
-{
-  m_pView = NULL;
-}
+{}
 
 void 
 ImageFileCanvas::OnDraw(wxDC& dc)
@@ -190,11 +190,26 @@ ImageFileCanvas::OnChar (wxKeyEvent& event)
 wxSize
 ImageFileCanvas::GetBestSize() const
 {
-  if (! m_pView)
-    return wxSize(0,0);
+  const int iMinX = 50;
+  const int iMinY = 20;
+  wxSize bestSize (iMinX,iMinY);
+
+  if (m_pView) {
+    const ImageFile& rIF = m_pView->GetDocument()->getImageFile();
+    bestSize.Set  (rIF.nx(), rIF.ny());
+  }
+
+  if (bestSize.x > 800)
+    bestSize.x = 800;
+  if (bestSize.y > 800)
+    bestSize.y = 800;
   
-  const ImageFile& rIF = m_pView->GetDocument()->getImageFile();
-  return wxSize (rIF.nx(), rIF.ny());
+  if (bestSize.y < iMinY)
+    bestSize.y = iMinY;
+  if (bestSize.x < iMinX)
+    bestSize.x = iMinX;
+  
+  return bestSize;
 }
 
 
@@ -408,9 +423,8 @@ ImageFileView::OnCompare (wxCommandEvent& event)
         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->UpdateAllViews(this);
+	pDifferenceDoc->getView()->setInitialClientSize();
         pDifferenceDoc->Activate();
       }
       wxMessageBox(os.str().c_str(), "Image Comparison");
@@ -513,7 +527,7 @@ ImageFileView::OnAdd (wxCommandEvent& event)
       if (theApp->getAskDeleteNewDocs())
         pNewDoc->Modify (true);
       pNewDoc->UpdateAllViews (this);
-      pNewDoc->getView()->getFrame()->Show(true);
+      pNewDoc->getView()->setInitialClientSize();
       pNewDoc->Activate();
     }
   }
@@ -554,7 +568,7 @@ ImageFileView::OnSubtract (wxCommandEvent& event)
       if (theApp->getAskDeleteNewDocs())
         pNewDoc->Modify (true);
       pNewDoc->UpdateAllViews (this);
-      pNewDoc->getView()->getFrame()->Show(true);
+      pNewDoc->getView()->setInitialClientSize();
       pNewDoc->Activate();
     }
   }
@@ -595,7 +609,7 @@ ImageFileView::OnMultiply (wxCommandEvent& event)
       if (theApp->getAskDeleteNewDocs())
         pNewDoc->Modify (true);
       pNewDoc->UpdateAllViews (this);
-      pNewDoc->getView()->getFrame()->Show(true);
+      pNewDoc->getView()->setInitialClientSize();
       pNewDoc->Activate();
     }
   }
@@ -636,7 +650,7 @@ ImageFileView::OnDivide (wxCommandEvent& event)
       if (theApp->getAskDeleteNewDocs())
         pNewDoc->Modify (true);
       pNewDoc->UpdateAllViews (this);
-      pNewDoc->getView()->getFrame()->Show(true);
+      pNewDoc->getView()->setInitialClientSize();
       pNewDoc->Activate();
     }
   }
@@ -791,15 +805,13 @@ 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->getAskDeleteNewDocs())
-      GetDocument()->Modify (true);
-    GetDocument()->UpdateAllViews (this);
-  }
+  rIF.magnitude (rIF);
+  rIF.labelAdd ("Magnitude");
+  m_bMinSpecified = false;
+  m_bMaxSpecified = false;
+  if (theApp->getAskDeleteNewDocs())
+    GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
   GetDocument()->Activate();
 }
 
@@ -855,13 +867,8 @@ ImageFileView::OnImaginary (wxCommandEvent& event)
 ImageFileCanvas* 
 ImageFileView::CreateCanvas (wxFrame* parent)
 {
-  ImageFileCanvas* pCanvas;
-  int width, height;
-  parent->GetClientSize(&width, &height);
-  
-  pCanvas = new ImageFileCanvas (this, parent, wxPoint(0, 0), wxSize(width, height), 0);
-  
-  pCanvas->SetScrollbars(20, 20, 50, 50);
+  ImageFileCanvas* pCanvas = new ImageFileCanvas (this, parent, wxPoint(0, 0), 
+						  wxSize(0,0), 0);
   pCanvas->SetBackgroundColour(*wxWHITE);
   pCanvas->Clear();
   
@@ -876,12 +883,12 @@ wxDocChildFrame*
 ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
 {
 #if CTSIM_MDI
-  wxDocMDIChildFrame* subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "ImageFile Frame", wxPoint(-1, -1), wxSize(0, 0), wxDEFAULT_FRAME_STYLE);
+  wxDocMDIChildFrame* subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "ImageFile Frame", wxPoint(10,10), wxSize(0, 0), wxDEFAULT_FRAME_STYLE);
 #else
-  wxDocChildFrame* subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "ImageFile Frame", wxPoint(-1, -1), wxSize(0, 0), wxDEFAULT_FRAME_STYLE);
+  wxDocChildFrame* subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "ImageFile Frame", wxPoint(10, 10), wxSize(0, 0), wxDEFAULT_FRAME_STYLE);
 #endif
   theApp->setIconForFrame (subframe);
-  
+
   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");
@@ -1009,7 +1016,7 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   accelEntries[iEntry++].Set (wxACCEL_CTRL, static_cast<int>('2'), IFMENU_FILTER_FFT);
   accelEntries[iEntry++].Set (wxACCEL_ALT,  static_cast<int>('2'), IFMENU_FILTER_IFFT);
 #endif
-#ifdef wxUSE_GLCANVAS
+#if wxUSE_GLCANVAS
   accelEntries[iEntry++].Set (wxACCEL_CTRL, static_cast<int>('3'), IFMENU_IMAGE_CONVERT3D);
 #endif
   wxAcceleratorTable accelTable (iEntry, accelEntries);
@@ -1023,35 +1030,38 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
 bool 
 ImageFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) )
 {
-  m_pFrame = CreateChildFrame(doc, this);
-  
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
   m_dAutoScaleFactor = 1.;
   
-  int width, height;
-  m_pFrame->GetClientSize (&width, &height);
-  m_pFrame->SetTitle("ImageFileView");
+  m_pFrame = CreateChildFrame(doc, this);
+  SetFrame (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);
-  m_pFrame->SetFocus();
+  m_pFrame->SetClientSize (m_pCanvas->GetBestSize());
+  m_pCanvas->SetClientSize (m_pCanvas->GetBestSize());
+  m_pFrame->SetTitle("ImageFileView");
+
   m_pFrame->Show(true);
   Activate(true);
   
   return true;
 }
 
+void 
+ImageFileView::setInitialClientSize ()
+{
+  if (m_pFrame && m_pCanvas) {
+    wxSize bestSize = m_pCanvas->GetBestSize();
+    
+    m_pFrame->SetClientSize (bestSize);
+    m_pFrame->Show (true);
+    m_pFrame->SetFocus();
+  }
+}  
+
 void 
 ImageFileView::OnDraw (wxDC* dc)
 {
-  wxSize sizeWindow = m_pFrame->GetClientSize();
-  wxSize sizeBest = m_pCanvas->GetBestSize();
-  if (sizeWindow.x > sizeBest.x || sizeWindow.y > sizeBest.y)
-    m_pFrame->SetClientSize (sizeBest);
-  
   if (m_bitmap.Ok())
     dc->DrawBitmap(m_bitmap, 0, 0, false);
   
@@ -1069,12 +1079,10 @@ ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
     m_pFilterMenu->Enable(IFMENU_FILTER_REAL, true);
     m_pFilterMenu->Enable(IFMENU_FILTER_IMAGINARY, true);
     m_pFilterMenu->Enable(IFMENU_FILTER_PHASE, true);
-    m_pFilterMenu->Enable(IFMENU_FILTER_MAGNITUDE, true);
   } else {
     m_pFilterMenu->Enable(IFMENU_FILTER_REAL, false);
     m_pFilterMenu->Enable(IFMENU_FILTER_IMAGINARY, false);
     m_pFilterMenu->Enable(IFMENU_FILTER_PHASE, false);
-    m_pFilterMenu->Enable(IFMENU_FILTER_MAGNITUDE, false);
   }
   ImageFileArrayConst v = rIF.getArray();
   int nx = rIF.nx();
@@ -1107,10 +1115,6 @@ ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
     wxImage image (nx, ny, imageData, true);
     m_bitmap = image.ConvertToBitmap();
     delete imageData;
-    int xSize = nx;
-    int ySize = ny;
-    ySize = clamp (ySize, 0, 800);
-    m_pFrame->SetClientSize (xSize, ySize);
     m_pCanvas->SetScrollbars(20, 20, nx/20, ny/20);
     m_pCanvas->SetBackgroundColour(*wxWHITE);
   } 
@@ -1122,7 +1126,6 @@ ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
 bool 
 ImageFileView::OnClose (bool deleteWindow)
 {
-  //GetDocumentManager()->ActivateView (this, false, true);
   if (! GetDocument() || ! GetDocument()->Close())
     return false;
   
@@ -1199,8 +1202,8 @@ ImageFileView::OnEditPaste (wxCommandEvent& event)
       double dScale3 = 3 * 255;
       unsigned char* pixels = image.GetData();
       ImageFileArray v = rIF.getArray();
-      for (int ix = 0; ix < rIF.nx(); ix++) {
-        for (int iy = 0; iy < rIF.ny(); iy++) {
+      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;
@@ -1308,7 +1311,7 @@ ImageFileView::OnScaleSize (wxCommandEvent& event)
     if (theApp->getAskDeleteNewDocs())
       pScaledDoc->Modify (true);
     pScaledDoc->UpdateAllViews (this);
-    pScaledDoc->getView()->getFrame()->Show(true);
+    pScaledDoc->getView()->setInitialClientSize();
     pScaledDoc->Activate();
   }
 }
@@ -1953,9 +1956,8 @@ ImageFileView::OnPlotHistogram (wxCommandEvent& event)
 // PhantomCanvas
 
 PhantomCanvas::PhantomCanvas (PhantomFileView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style)
-: wxScrolledWindow(frame, -1, pos, size, style)
+  : wxScrolledWindow(frame, -1, pos, size, style), m_pView(v)
 {
-  m_pView = v;
 }
 
 PhantomCanvas::~PhantomCanvas ()
@@ -1979,7 +1981,12 @@ PhantomCanvas::GetBestSize() const
   int xSize, ySize;
   theApp->getMainFrame()->GetClientSize (&xSize, &ySize);
   xSize = maxValue<int> (xSize, ySize);
+#ifdef CTSIM_MDI
   ySize = xSize = (xSize / 4);
+#else
+  xSize = ySize = static_cast<int>(ySize * .7);
+#endif
+
   return wxSize (xSize, ySize);
 }
 
@@ -2007,6 +2014,7 @@ PhantomFileView::PhantomFileView()
   m_iDefaultNView = 320;
   m_iDefaultNSample = 2;
 #endif
+  m_iDefaultOffsetView = 0;
   m_dDefaultRotation = 1;
   m_dDefaultFocalLength = 2;
   m_dDefaultCenterDetectorLength = 2;
@@ -2055,7 +2063,7 @@ void
 PhantomFileView::OnProjections (wxCommandEvent& event)
 {
   DialogGetProjectionParameters dialogProjection (getFrameForChild(), 
-    m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample, m_dDefaultRotation, 
+    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();
@@ -2064,6 +2072,7 @@ PhantomFileView::OnProjections (wxCommandEvent& event)
   
   m_iDefaultNDet = dialogProjection.getNDet();
   m_iDefaultNView = dialogProjection.getNView();
+  m_iDefaultOffsetView = dialogProjection.getOffsetView();
   m_iDefaultNSample = dialogProjection.getNSamples();
   m_iDefaultTrace = dialogProjection.getTrace();
   m_dDefaultRotation = dialogProjection.getRotAngle();
@@ -2080,7 +2089,7 @@ PhantomFileView::OnProjections (wxCommandEvent& event)
     return;
   
   const Phantom& rPhantom = GetDocument()->getPhantom();
-  Scanner theScanner (rPhantom, sGeometry.c_str(), m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample, 
+  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";
@@ -2091,13 +2100,18 @@ PhantomFileView::OnProjections (wxCommandEvent& event)
   }
   
   std::ostringstream os;
-  os << "Projections for " << rPhantom.name() << ": nDet=" << m_iDefaultNDet 
-    << ", nView=" << m_iDefaultNView << ", nSamples=" << m_iDefaultNSample 
-    << ", RotAngle=" << m_dDefaultRotation << ", FocalLengthRatio=" << m_dDefaultFocalLength 
+  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());
+    << ", ViewRatio=" << m_dDefaultViewRatio 
+	<< ", ScanRatio=" << m_dDefaultScanRatio 
+    << ", Geometry=" << sGeometry.c_str() 
+	<< ", FanBeamAngle=" << convertRadiansToDegrees (theScanner.fanBeamAngle());
   
   Timer timer;
   Projections* pProj = NULL;
@@ -2122,7 +2136,7 @@ PhantomFileView::OnProjections (wxCommandEvent& event)
 #if HAVE_WXTHREADS
     if (theApp->getUseBackgroundTasks()) {
       ProjectorSupervisorThread* pProjector = new ProjectorSupervisorThread (this, m_iDefaultNDet,
-        m_iDefaultNView, sGeometry.c_str(), m_iDefaultNSample, dRotationRadians,
+        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");
@@ -2139,11 +2153,13 @@ PhantomFileView::OnProjections (wxCommandEvent& event)
       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);
-        if (! dlgProgress.Update (i+1)) {
-          delete pProj;
-          return;
-        }
+        //theScanner.collectProjections (*pProj, rPhantom, i, 1, true, m_iDefaultTrace);
+        theScanner.collectProjections (*pProj, rPhantom, i, 1, theScanner.offsetView(), true, m_iDefaultTrace);
+	if ((i + 1) % ITER_PER_UPDATE == 0)
+	  if (! dlgProgress.Update (i+1)) {
+	    delete pProj;
+	    return;
+	  }
       }
     }
   }
@@ -2158,21 +2174,10 @@ PhantomFileView::OnProjections (wxCommandEvent& event)
     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->getView()->setInitialClientSize();
   pProjectionDoc->Activate();
 }
 
@@ -2217,15 +2222,22 @@ PhantomFileView::OnRasterize (wxCommandEvent& event)
 #endif
   {
     ImageFile* pImageFile = new ImageFile (m_iDefaultRasterNX, m_iDefaultRasterNY);
-    wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"), 
-      pImageFile->nx() + 1, getFrameForChild(), wxPD_CAN_ABORT );
+
+    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;
-      }
+      rPhantom.convertToImagefile (*pImageFile, m_dDefaultRasterViewRatio, 
+				   m_iDefaultRasterNSamples, Trace::TRACE_NONE,
+				   i, 1, true);
+      if ((i + 1) % ITER_PER_UPDATE == 0) 
+	if (! dlgProgress.Update (i+1)) {
+	  delete pImageFile;
+	  return;
+	}
     }
     
     ImageFileDocument* pRasterDoc = theApp->newImageDoc();
@@ -2236,15 +2248,11 @@ PhantomFileView::OnRasterize (wxCommandEvent& event)
     pRasterDoc->setImageFile (pImageFile);
     if (theApp->getAskDeleteNewDocs())
       pRasterDoc->Modify (true);
-    pRasterDoc->UpdateAllViews (this);
-    pRasterDoc->getView()->getFrame()->Show(true);
     *theApp->getLog() << os.str().c_str() << "\n";
     pImageFile->labelAdd (os.str().c_str(), timer.timerEnd());
-    ImageFileView* rasterView = pRasterDoc->getView();
-    if (rasterView) {
-      rasterView->getFrame()->SetFocus();
-      rasterView->OnUpdate (rasterView, NULL);
-    }
+
+    pRasterDoc->UpdateAllViews(this);
+    pRasterDoc->getView()->setInitialClientSize();
     pRasterDoc->Activate();
   }
 }
@@ -2253,9 +2261,8 @@ PhantomFileView::OnRasterize (wxCommandEvent& event)
 PhantomCanvas* 
 PhantomFileView::CreateCanvas (wxFrame *parent)
 {
-  PhantomCanvas* pCanvas;
-  
-  pCanvas = new PhantomCanvas (this, parent, wxPoint(0, 0), wxSize(0,0), 0);
+  PhantomCanvas* pCanvas = new PhantomCanvas (this, parent, wxPoint(0, 0), 
+					      wxSize(0,0), 0);
   pCanvas->SetBackgroundColour(*wxWHITE);
   pCanvas->Clear();
   
@@ -2339,15 +2346,8 @@ PhantomFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
   m_pCanvas = CreateCanvas (m_pFrame);
   m_pFrame->SetClientSize (m_pCanvas->GetBestSize());
   m_pCanvas->SetClientSize (m_pCanvas->GetBestSize());
-  
   m_pFrame->SetTitle ("PhantomFileView");
-  
-#ifdef __X__
-  int x, y;  // X requires a forced resize
-  m_pFrame->GetSize(&x, &y);
-  m_pFrame->SetSize(-1, -1, x, y);
-#endif
-  
+
   m_pFrame->Show(true);
   Activate(true);
   
@@ -2364,7 +2364,6 @@ PhantomFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
 bool 
 PhantomFileView::OnClose (bool deleteWindow)
 {
-  //GetDocumentManager()->ActivateView (this, false, true);
   if (! GetDocument() || ! GetDocument()->Close())
     return false;
   
@@ -2424,13 +2423,21 @@ ProjectionFileCanvas::OnDraw(wxDC& dc)
 wxSize
 ProjectionFileCanvas::GetBestSize () const
 {
-  wxSize best (0, 0);
+  const int iMinX = 50;
+  const int iMinY = 20;
+  wxSize bestSize (iMinX,iMinY);
+
   if (m_pView) {
     Projections& rProj = m_pView->GetDocument()->getProjections();
-    best.Set (rProj.nDet(), rProj.nView());
+    bestSize.Set (rProj.nDet(), rProj.nView());
   }
   
-  return best;
+  if (bestSize.y < iMinY)
+    bestSize.y = iMinY;
+  if (bestSize.x < iMinX)
+    bestSize.x = iMinX;
+
+  return bestSize;
 }
 
 
@@ -2449,7 +2456,7 @@ 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)
+  // EVT_MENU(PJMENU_ARTIFACT_REDUCTION, ProjectionFileView::OnArtifactReduction)
 END_EVENT_TABLE()
 
 
@@ -2533,8 +2540,8 @@ ProjectionFileView::OnConvertRectangular (wxCommandEvent& event)
   pIF->labelAdd (os.str().c_str());
   if (theApp->getAskDeleteNewDocs())
     pRectDoc->Modify (true);
-  pRectDoc->getView()->getFrame()->Show(true);
-  pRectDoc->UpdateAllViews ();
+  pRectDoc->UpdateAllViews();
+  pRectDoc->getView()->setInitialClientSize();
   pRectDoc->Activate();
 }
 
@@ -2543,7 +2550,7 @@ 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());
@@ -2574,8 +2581,8 @@ ProjectionFileView::OnConvertPolar (wxCommandEvent& event)
     pIF->labelAdd (os.str().c_str());
     if (theApp->getAskDeleteNewDocs())
       pPolarDoc->Modify (true);
-    pPolarDoc->getView()->getFrame()->Show(true);
     pPolarDoc->UpdateAllViews ();
+    pPolarDoc->getView()->setInitialClientSize();
     pPolarDoc->Activate();
   }
 }
@@ -2585,7 +2592,7 @@ 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());
@@ -2615,8 +2622,8 @@ ProjectionFileView::OnConvertFFTPolar (wxCommandEvent& event)
     pIF->labelAdd (os.str().c_str());
     if (theApp->getAskDeleteNewDocs())
       pPolarDoc->Modify (true);
-    pPolarDoc->getView()->getFrame()->Show(true);
-    pPolarDoc->UpdateAllViews ();
+    pPolarDoc->UpdateAllViews (this);
+    pPolarDoc->getView()->setInitialClientSize();
     pPolarDoc->Activate();
   }
 }
@@ -2764,13 +2771,55 @@ ProjectionFileView::OnConvertParallel (wxCommandEvent& event)
   if (theApp->getAskDeleteNewDocs())
     pProjDocNew-> Modify(true);
   pProjDocNew->UpdateAllViews (this);
+  pProjDocNew->getView()->setInitialClientSize();
   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->UpdateAllViews ();
+    pPolarDoc->getView()->setInitialClientSize();
+    pPolarDoc->Activate();
+  }
 }
 
 void
@@ -2885,10 +2934,11 @@ ProjectionFileView::doReconstructFBP (const Projections& rProj, bool bRebinToPar
       
       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
-        }
+	if ((iView + 1) % ITER_PER_UPDATE == 0) 
+	  if (! dlgProgress.Update (iView + 1)) {
+	    delete pReconstructor;
+	    return; // don't make new window, thread will do this
+	  }
       }
       pReconstructor->postProcessing();
       delete pReconstructor;
@@ -2899,19 +2949,16 @@ ProjectionFileView::doReconstructFBP (const Projections& rProj, bool bRebinToPar
     sys_error (ERR_SEVERE, "Unable to create image file");
     return;
   }
+  *theApp->getLog() << os.str().c_str() << "\n";
+  pImageFile->labelAdd (rProj.getLabel());
+  pImageFile->labelAdd (os.str().c_str(), timerRecon.timerEnd());    
+
   pReconDoc->setImageFile (pImageFile);
   if (theApp->getAskDeleteNewDocs())
     pReconDoc->Modify (true);
-  pReconDoc->UpdateAllViews (this);
+  pReconDoc->UpdateAllViews();
+  pReconDoc->getView()->setInitialClientSize();
   pReconDoc->Activate();
-  if (ImageFileView* rasterView = pReconDoc->getView()) {
-    rasterView->OnUpdate (rasterView, NULL);
-    rasterView->getFrame()->SetFocus();
-    rasterView->getFrame()->Show(true);
-  }
-  *theApp->getLog() << os.str().c_str() << "\n";
-  pImageFile->labelAdd (rProj.getLabel());
-  pImageFile->labelAdd (os.str().c_str(), timerRecon.timerEnd());    
 }
 
 
@@ -2984,8 +3031,8 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   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* 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");
@@ -2994,8 +3041,8 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   wxMenu *reconstruct_menu = new wxMenu;
   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");
-  reconstruct_menu->Append (PJMENU_RECONSTRUCT_FOURIER, "&Fourier...\tCtrl-E", "Reconstruct image using inverse Fourier");
-  reconstruct_menu->Enable (PJMENU_RECONSTRUCT_FOURIER, false);
+  // 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");
@@ -3007,7 +3054,7 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   
   menu_bar->Append (m_pFileMenu, "&File");
   menu_bar->Append (convert_menu, "&Convert");
-  menu_bar->Append (filter_menu, "Fi&lter");
+  //  menu_bar->Append (filter_menu, "Fi&lter");
   menu_bar->Append (analyze_menu, "&Analyze");
   menu_bar->Append (reconstruct_menu, "&Reconstruct");
   menu_bar->Append (help_menu, "&Help");
@@ -3041,12 +3088,6 @@ ProjectionFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
   m_pFrame->SetTitle ("ProjectionFileView");
   m_pCanvas = CreateCanvas (m_pFrame);
   
-#ifdef __X__
-  int x, y;  // X requires a forced resize
-  m_pFrame->GetSize(&x, &y);
-  m_pFrame->SetSize(-1, -1, x, y);
-#endif
-  
   m_pFrame->Show(true);
   Activate(true);
   
@@ -3056,17 +3097,26 @@ ProjectionFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
 void 
 ProjectionFileView::OnDraw (wxDC* dc)
 {
-  wxSize clientSize = m_pFrame->GetClientSize();
-  wxSize bestSize = m_pCanvas->GetBestSize();
-  
-  if (clientSize.x > bestSize.x || clientSize.y > bestSize.y)
-    m_pFrame->SetClientSize (bestSize);
-  
   if (m_bitmap.Ok())
     dc->DrawBitmap (m_bitmap, 0, 0, false);
 }
 
 
+void 
+ProjectionFileView::setInitialClientSize ()
+{
+  wxSize bestSize = m_pCanvas->GetBestSize();
+
+  if (bestSize.x > 800)
+    bestSize.x = 800;
+  if (bestSize.y > 800)
+    bestSize.y = 800;
+
+  m_pFrame->SetClientSize (bestSize);
+  m_pFrame->Show (true);
+  m_pFrame->SetFocus();
+}  
+
 void 
 ProjectionFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
 {
@@ -3108,16 +3158,13 @@ ProjectionFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint)
     wxImage image (nDet, nView, imageData, true);
     m_bitmap = image.ConvertToBitmap();
     delete imageData;
-    int xSize = nDet;
-    int ySize = nView;
-    xSize = clamp (xSize, 0, 800);
-    ySize = clamp (ySize, 0, 800);
-    m_pFrame->SetClientSize (xSize, ySize);
-    m_pCanvas->SetScrollbars (20, 20, nDet/20, nView/20);
   }
   
-  if (m_pCanvas)
-    m_pCanvas->Refresh();
+    m_pCanvas->SetScrollbars(20, 20, nDet/20, nView/20);
+    m_pCanvas->SetBackgroundColour(*wxWHITE);
+
+    if (m_pCanvas)
+      m_pCanvas->Refresh();
 }
 
 bool 
@@ -3157,6 +3204,23 @@ PlotFileCanvas::PlotFileCanvas (PlotFileView* v, wxFrame *frame, const wxPoint&
   m_pView = v;
 }
 
+wxSize
+PlotFileCanvas::GetBestSize() const
+{
+  if (! m_pView)
+    return wxSize(0,0);
+  
+  int xSize, ySize;
+  theApp->getMainFrame()->GetClientSize (&xSize, &ySize);
+  xSize = maxValue<int> (xSize, ySize);
+#ifdef CTSIM_MDI
+  ySize = xSize = (xSize / 4);
+#else
+  ySize = xSize;
+#endif
+  return wxSize (xSize, ySize);
+}
+
 PlotFileCanvas::~PlotFileCanvas ()
 {
   m_pView = NULL;
@@ -3375,12 +3439,6 @@ PlotFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) )
   m_pFrame->SetTitle ("Plot File");
   m_pCanvas = CreateCanvas (m_pFrame);
   
-#ifdef __X__
-  int x, y;  // X requires a forced resize
-  m_pFrame->GetSize(&x, &y);
-  m_pFrame->SetSize(-1, -1, x, y);
-#endif
-  
   m_pFrame->Show(true);
   Activate(true);
   
@@ -3508,13 +3566,6 @@ bool TextFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
   m_pCanvas = new TextFileCanvas (this, m_pFrame, wxPoint(0, 0), wxSize(width, height), wxTE_MULTILINE | wxTE_READONLY);
   m_pFrame->SetTitle("Log");
   
-#ifdef __X__
-  // X seems to require a forced resize
-  int x, y;
-  frame->GetSize(&x, &y);
-  frame->SetSize(-1, -1, x, y);
-#endif
-  
   m_pFrame->Show (true);
   Activate (true);
   
@@ -3617,3 +3668,17 @@ TextFileCanvas::~TextFileCanvas ()
 {
   m_pView = NULL;
 }
+
+wxSize
+TextFileCanvas::GetBestSize() const
+{
+  int xSize, ySize;
+  theApp->getMainFrame()->GetClientSize (&xSize, &ySize);
+  xSize = maxValue<int> (xSize, ySize);
+#ifdef CTSIM_MDI
+  ySize = xSize = (xSize / 4);
+#else
+  ySize = xSize;
+#endif
+  return wxSize (xSize, ySize);
+}