X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fviews.h;h=3f902cf27b81bb739e7cd1758022bd930b461f60;hp=e3eb560f7b2a28c97370f4461ad0fe09e4dea311;hb=d16eb37cbc73f67fc29a60645e0b1ac7fe32767e;hpb=56a484768937a8cb38203516f85106c778aaa97b

diff --git a/src/views.h b/src/views.h
index e3eb560..3f902cf 100644
--- a/src/views.h
+++ b/src/views.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: views.h,v 1.44 2001/01/31 01:01:22 kevin Exp $
+**  $Id: views.h,v 1.52 2001/03/18 18:08:26 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
@@ -35,6 +35,7 @@
 #include "wx/wx.h"
 #include "docs.h"
 #include "imagefile.h"
+#include "threadrecon.h"
 
 #if wxUSE_GLCANVAS
 #include "graph3dview.h"
@@ -90,6 +91,10 @@ public:
   void OnUpdate(wxView *sender, wxObject *hint = NULL);
   bool OnClose (bool deleteWindow = true);
   
+  void OnEditCopy (wxCommandEvent& event);
+  void OnEditCut (wxCommandEvent& event);
+  void OnEditPaste (wxCommandEvent& event);
+
   void OnRevert (wxCommandEvent& event);
   void OnExport (wxCommandEvent& event);  
   void OnProperties (wxCommandEvent& event);
@@ -182,12 +187,12 @@ public:
 class ProjectionFileCanvas;
 class ProjectionFileView : public wxView
 {
+private:
   DECLARE_DYNAMIC_CLASS(ProjectionFileView)
     
-    wxMemoryDC m_memoryDC;
+  wxMemoryDC m_memoryDC;
   wxBitmap m_bitmap;
   
-private:
   ProjectionFileCanvas *CreateCanvas (wxFrame* parent);
 #if CTSIM_MDI
   wxDocMDIChildFrame* m_pFrame;
@@ -199,7 +204,7 @@ private:
   
   ProjectionFileCanvas *m_pCanvas;
   wxMenu* m_pFileMenu;
-  
+
   int m_iDefaultNX;
   int m_iDefaultNY;
   int m_iDefaultFilter;
@@ -236,10 +241,18 @@ public:
   bool OnClose (bool deleteWindow = true);
   void OnProperties (wxCommandEvent& event);
   void OnReconstructFBP (wxCommandEvent& event);
+  void OnReconstructFBPRebin (wxCommandEvent& event);
   void OnReconstructFourier (wxCommandEvent& event);
+  void OnConvertRectangular (wxCommandEvent& event);
   void OnConvertPolar (wxCommandEvent& event);
   void OnConvertFFTPolar (wxCommandEvent& event);
-  
+  void OnPlotTThetaSampling (wxCommandEvent& event);
+  void OnPlotHistogram (wxCommandEvent& event);
+  void OnConvertParallel (wxCommandEvent& event);
+  void OnArtifactReduction (wxCommandEvent& event);
+
+  void doReconstructFBP (const Projections& rProj, bool bRebinToParallel);
+
 #if CTSIM_MDI
   wxDocMDIChildFrame* getFrame() { return m_pFrame; }
 #else
@@ -296,11 +309,14 @@ private:
   int m_iDefaultTrace;
   double m_dDefaultRotation;
   double m_dDefaultFocalLength;
-  double m_dDefaultFieldOfView;
+  double m_dDefaultCenterDetectorLength;
+  double m_dDefaultViewRatio;
+  double m_dDefaultScanRatio;
   
   int m_iDefaultRasterNX;
   int m_iDefaultRasterNY;
   int m_iDefaultRasterNSamples;
+  double m_dDefaultRasterViewRatio;
 
   wxWindow* getFrameForChild() 
 #if CTSIM_MDI
@@ -343,6 +359,7 @@ public:
   PhantomCanvas (PhantomFileView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style);
   virtual ~PhantomCanvas();
 
+  virtual wxSize GetBestSize() const;
   void setView(PhantomFileView* pView)
   { m_pView = pView; }
   virtual void OnDraw(wxDC& dc);