X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fviews.h;h=8a4a78a33a8e710cf592c51f09faaee2057a7a4b;hp=9fcf8f8bfe5986b09f6ac6347717dfc1e58706dd;hb=c953cbb6ffc2fd50e736230f4e6976a025983cff;hpb=ba8635d790ee847d9746c6da24b60bd4cb6d9116

diff --git a/src/views.h b/src/views.h
index 9fcf8f8..8a4a78a 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.42 2001/01/30 07:32:13 kevin Exp $
+**  $Id: views.h,v 1.47 2001/03/01 07:30:49 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,7 +35,11 @@
 #include "wx/wx.h"
 #include "docs.h"
 #include "imagefile.h"
+#include "threadrecon.h"
+
+#if wxUSE_GLCANVAS
 #include "graph3dview.h"
+#endif
 
 class ImageFileCanvas;
 class ImageFileView : public wxView
@@ -106,7 +110,10 @@ public:
   void OnInverseFourier (wxCommandEvent& event);
   void OnShuffleNaturalToFourierOrder (wxCommandEvent& event);
   void OnShuffleFourierToNaturalOrder (wxCommandEvent& event);
-  
+#if wxUSE_GLCANVAS
+  void OnConvert3d (wxCommandEvent& event);
+#endif
+
 #ifdef HAVE_FFT
   void OnFFT (wxCommandEvent& event);
   void OnIFFT (wxCommandEvent& event);
@@ -176,12 +183,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;
@@ -193,7 +200,7 @@ private:
   
   ProjectionFileCanvas *m_pCanvas;
   wxMenu* m_pFileMenu;
-  
+
   int m_iDefaultNX;
   int m_iDefaultNY;
   int m_iDefaultFilter;
@@ -290,11 +297,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
@@ -337,6 +347,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);