X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fviews.h;h=14a7e0c93913d80b271d0391408b722c42231c7d;hb=ca7c001fce978b680543f8338a404b8c0701a935;hp=ddc1d0a9b26b053ae00302d99fbcac570f95762c;hpb=cbcb02ba9b76a82c9a09ce1c7712431bb215575a;p=ctsim.git

diff --git a/src/views.h b/src/views.h
index ddc1d0a..14a7e0c 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.40 2001/01/30 02:20:50 kevin Exp $
+**  $Id: views.h,v 1.45 2001/02/08 06:25:07 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
@@ -36,6 +36,10 @@
 #include "docs.h"
 #include "imagefile.h"
 
+#if wxUSE_GLCANVAS
+#include "graph3dview.h"
+#endif
+
 class ImageFileCanvas;
 class ImageFileView : public wxView
 {
@@ -86,12 +90,12 @@ public:
   void OnUpdate(wxView *sender, wxObject *hint = NULL);
   bool OnClose (bool deleteWindow = true);
   
-  void OnScaleSize (wxCommandEvent& event);
-  void OnExport (wxCommandEvent& event);
-  
+  void OnRevert (wxCommandEvent& event);
+  void OnExport (wxCommandEvent& event);  
   void OnProperties (wxCommandEvent& event);
-  void OnCompare (wxCommandEvent& event);
-  
+
+  void OnCompare (wxCommandEvent& event);  
+  void OnScaleSize (wxCommandEvent& event);
   void OnInvertValues (wxCommandEvent& event);
   void OnSquare (wxCommandEvent& event);
   void OnSquareRoot (wxCommandEvent& event);
@@ -105,7 +109,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);
@@ -289,11 +296,13 @@ private:
   int m_iDefaultTrace;
   double m_dDefaultRotation;
   double m_dDefaultFocalLength;
-  double m_dDefaultFieldOfView;
+  double m_dDefaultViewRatio;
+  double m_dDefaultScanRatio;
   
   int m_iDefaultRasterNX;
   int m_iDefaultRasterNY;
   int m_iDefaultRasterNSamples;
+  double m_dDefaultRasterViewRatio;
 
   wxWindow* getFrameForChild() 
 #if CTSIM_MDI
@@ -336,6 +345,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);