r187: *** empty log message ***

[ctsim.git] / src / views.h

diff --git a/src/views.h b/src/views.h
index 99ae2756280488f801487289ccd98f180c1f90bc..f82d5066c16558f41eb31e4d44e13c356fc24065 100644 (file)
--- a/src/views.h
+++ b/src/views.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: views.h,v 1.4 2000/07/18 14:51:06 kevin Exp $
+**  $Id: views.h,v 1.9 2000/09/02 05:10:39 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
@@ -54,18 +54,19 @@ private:
     bool m_bMaxSpecified;
     double m_dMinPixel;
     double m_dMaxPixel;
+    double m_dAutoScaleFactor;
 
 public:
     ImageFileView(void);
-    ~ImageFileView(void);
+    virtual ~ImageFileView(void);
 
     bool OnCreate(wxDocument *doc, long flags);
     void OnDraw(wxDC* dc);
     void OnUpdate(wxView *sender, wxObject *hint = NULL);
     bool OnClose (bool deleteWindow = true);
     void OnProperties (wxCommandEvent& event);
-    void OnWindowAuto (wxCommandEvent& event);
-    void OnWindowMinMax (wxCommandEvent& event);
+    void OnScaleAuto (wxCommandEvent& event);
+    void OnScaleMinMax (wxCommandEvent& event);
 
     ImageFileDocument* GetDocument(void) 
        { return dynamic_cast<ImageFileDocument*>(wxView::GetDocument()); }
@@ -103,7 +104,7 @@ private:
 
 public:
     ProjectionFileView(void);
-    ~ProjectionFileView(void);
+    virtual ~ProjectionFileView(void);
 
     bool OnCreate(wxDocument *doc, long flags);
     void OnDraw(wxDC* dc);
@@ -139,14 +140,23 @@ private:
     PhantomCanvas *m_canvas;
     wxFrame *m_frame;
 
+    int m_iDefaultNDet;
+    int m_iDefaultNView;
+    int m_iDefaultNSample;
+    int m_iDefaultGeometry;
+    int m_iDefaultTrace;
+    double m_dDefaultRotation;
+    double m_dDefaultFocalLength;
+    double m_dDefaultFieldOfView;
+
 public:
     PhantomView(void);
-    ~PhantomView(void);
+    virtual ~PhantomView(void);
 
     bool OnCreate(wxDocument *doc, long flags);
-    void OnDraw(wxDC* dc);
     void OnUpdate(wxView *sender, wxObject *hint = NULL);
     bool OnClose (bool deleteWindow = true);
+    void OnDraw(wxDC* dc);
     void OnProperties (wxCommandEvent& event);
     void OnRasterize (wxCommandEvent& event);
     void OnProjections (wxCommandEvent& event);
@@ -157,12 +167,13 @@ public:
     DECLARE_EVENT_TABLE()
 };
 
-class PhantomCanvas: public wxPanel
+class PhantomCanvas: public wxScrolledWindow
 {
 public:
     PhantomView* m_pView;
     
     PhantomCanvas (PhantomView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style);
+
     virtual void OnDraw(wxDC& dc);
 
 };