X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fviews.h;h=541287fc2eace4bf83b5ce0b1a76594397ecb151;hb=79b656146b04b1d57d1ac27f9f2e5474e17c4936;hp=69c2a1424ee4f3dfe4b67481fc3ed3fecbeddae5;hpb=4433641931aa27fd6a2b5ecd0102e6c5bbbccc46;p=ctsim.git

diff --git a/src/views.h b/src/views.h
index 69c2a14..541287f 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.51 2001/03/13 08:24:41 kevin Exp $
+**  $Id$
 **
 **  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
@@ -25,10 +25,6 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
-#ifdef __GNUG__
-// #pragma interface
-#endif
-
 #ifndef __VIEWSH__
 #define __VIEWSH__
 
@@ -48,7 +44,7 @@ private:
   DECLARE_DYNAMIC_CLASS(ImageFileView)
     
   wxMemoryDC m_memoryDC;
-  wxBitmap m_bitmap;
+  wxBitmap* m_pBitmap;
   wxMenu* m_pMenuAnalyze;
   
   ImageFileCanvas *CreateCanvas (wxFrame* parent);
@@ -62,6 +58,7 @@ private:
   
   ImageFileCanvas *m_pCanvas;
   wxMenu* m_pFileMenu;
+  wxMenu* m_pFilterMenu;
   bool m_bMinSpecified;
   bool m_bMaxSpecified;
   double m_dMinPixel;
@@ -129,6 +126,8 @@ public:
   
   void OnMagnitude (wxCommandEvent& event);
   void OnPhase (wxCommandEvent& event);
+  void OnReal (wxCommandEvent& event);
+  void OnImaginary (wxCommandEvent& event);
   
   void OnScaleAuto (wxCommandEvent& event);
   void OnScaleMinMax (wxCommandEvent& event);
@@ -148,6 +147,7 @@ public:
 #else
   wxDocChildFrame* getFrame() { return m_pFrame; }
 #endif
+  void setInitialClientSize();
 
   wxMenu* getMenuAnalyze() { return m_pMenuAnalyze; }
 
@@ -191,7 +191,7 @@ private:
   DECLARE_DYNAMIC_CLASS(ProjectionFileView)
     
   wxMemoryDC m_memoryDC;
-  wxBitmap m_bitmap;
+  wxBitmap* m_pBitmap;
   
   ProjectionFileCanvas *CreateCanvas (wxFrame* parent);
 #if CTSIM_MDI
@@ -204,6 +204,8 @@ private:
   
   ProjectionFileCanvas *m_pCanvas;
   wxMenu* m_pFileMenu;
+  wxMenu* m_pReconstructMenu;
+  wxMenu* m_pConvertMenu;
 
   int m_iDefaultNX;
   int m_iDefaultNY;
@@ -243,9 +245,11 @@ public:
   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);
 
@@ -257,8 +261,10 @@ public:
   wxDocChildFrame* getFrame() { return m_pFrame; }
 #endif
   ProjectionFileCanvas* getCanvas() { return m_pCanvas; }
+  void setInitialClientSize();
 
   wxMenu* getFileMenu()  { return m_pFileMenu; }
+  wxMenu* getReconstructMenu()  { return m_pReconstructMenu; }
 
   ProjectionFileDocument* GetDocument() 
   { return dynamic_cast<ProjectionFileDocument*>(wxView::GetDocument()); }
@@ -302,6 +308,7 @@ private:
   
   int m_iDefaultNDet;
   int m_iDefaultNView;
+  int m_iDefaultOffsetView;
   int m_iDefaultNSample;
   int m_iDefaultGeometry;
   int m_iDefaultTrace;
@@ -417,6 +424,7 @@ public:
   wxDocChildFrame* getFrame() { return m_pFrame; }
 #endif
   
+  void setInitialClientSize();
   wxMenu* getFileMenu() { return m_pFileMenu; }
   PlotFileDocument* GetDocument() 
   { return dynamic_cast<PlotFileDocument*>(wxView::GetDocument()); }
@@ -434,6 +442,7 @@ public:
   virtual ~PlotFileCanvas();
  
   virtual void OnDraw(wxDC& dc);
+  virtual wxSize GetBestSize() const;
 
   void setView (PlotFileView* pView)
   { m_pView = pView; }
@@ -488,6 +497,7 @@ class TextFileCanvas: public wxTextCtrl
 public:    
     TextFileCanvas (TextFileView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, long style);
     ~TextFileCanvas ();
+    virtual wxSize GetBestSize() const;
 };