X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fviews.h;h=c36ad23f3eb58d71a90d762fef2a7d178a66f258;hb=5f4aaf9a5ecff050f19a405bd274353a1b935163;hp=81cf6a7ccc1b214fa3fb3a7dfd42089107308ac4;hpb=0c4d286b980e2d617b926f9dbea7572eaf1897cd;p=ctsim.git

diff --git a/src/views.h b/src/views.h
index 81cf6a7..c36ad23 100644
--- a/src/views.h
+++ b/src/views.h
@@ -7,9 +7,9 @@
 **   Date Started:  July 2000
 **
 **  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
+**  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: views.h,v 1.33 2001/01/27 01:51:47 kevin Exp $
+**  $Id: views.h,v 1.38 2001/01/28 22:45:54 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
@@ -44,8 +44,9 @@ private:
     
   wxMemoryDC m_memoryDC;
   wxBitmap m_bitmap;
+  wxMenu* m_pMenuAnalyze;
   
-  ImageFileCanvas *CreateCanvas(wxView *view, wxFrame *parent);
+  ImageFileCanvas *CreateCanvas (wxFrame* parent);
 #if CTSIM_MDI
   wxDocMDIChildFrame* m_pFrame;
   wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
@@ -53,9 +54,9 @@ private:
   wxDocChildFrame* m_pFrame;
   wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
 #endif
-  wxMenu* m_pFileMenu;
   
-  ImageFileCanvas *m_canvas;
+  ImageFileCanvas *m_pCanvas;
+  wxMenu* m_pFileMenu;
   bool m_bMinSpecified;
   bool m_bMaxSpecified;
   double m_dMinPixel;
@@ -66,7 +67,7 @@ private:
 
   wxWindow* getFrameForChild() 
 #if CTSIM_MDI
-  { return theApp->getMainFrame()->GetClientWindow(); }
+  { return theApp->getMainFrame(); }
 #else
   { return m_pFrame; }
 #endif
@@ -75,7 +76,7 @@ public:
   ImageFileView();
   virtual ~ImageFileView();
   void canvasClosed()
-  { m_canvas = NULL; m_pFrame = NULL; }
+  { m_pCanvas = NULL; m_pFrame = NULL; }
 
   wxMenu* getFileMenu()
   { return m_pFileMenu; }
@@ -130,9 +131,14 @@ public:
   void OnCompareRow (wxCommandEvent& event);
   void OnCompareCol (wxCommandEvent& event);
   
-  wxFrame* getFrame()
-  { return m_pFrame; }
-  
+#if CTSIM_MDI
+  wxDocMDIChildFrame* getFrame() { return m_pFrame; }
+#else
+  wxDocChildFrame* getFrame() { return m_pFrame; }
+#endif
+
+  wxMenu* getMenuAnalyze() { return m_pMenuAnalyze; }
+
   ImageFileDocument* GetDocument() 
   { return dynamic_cast<ImageFileDocument*>(wxView::GetDocument()); }
   
@@ -143,6 +149,7 @@ class ImageFileCanvas: public wxScrolledWindow
 {
 private:
   ImageFileView* m_pView;
+
   int m_xCursor;
   int m_yCursor;
   
@@ -173,7 +180,7 @@ class ProjectionFileView : public wxView
   wxBitmap m_bitmap;
   
 private:
-  ProjectionFileCanvas *CreateCanvas(wxView *view, wxFrame *parent);
+  ProjectionFileCanvas *CreateCanvas (wxFrame* parent);
 #if CTSIM_MDI
   wxDocMDIChildFrame* m_pFrame;
   wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
@@ -182,7 +189,7 @@ private:
   wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
 #endif
   
-  ProjectionFileCanvas *m_canvas;
+  ProjectionFileCanvas *m_pCanvas;
   wxMenu* m_pFileMenu;
   
   int m_iDefaultNX;
@@ -204,7 +211,7 @@ private:
 
   wxWindow* getFrameForChild() 
 #if CTSIM_MDI
-  { return theApp->getMainFrame()->GetClientWindow(); }
+  { return theApp->getMainFrame(); }
 #else
   { return m_pFrame; }
 #endif
@@ -213,7 +220,7 @@ public:
   ProjectionFileView();
   virtual ~ProjectionFileView();
   void canvasClosed()
-  { m_canvas = NULL; m_pFrame = NULL; }
+  { m_pCanvas = NULL; m_pFrame = NULL; }
   
   bool OnCreate(wxDocument *doc, long flags);
   void OnDraw(wxDC* dc);
@@ -225,8 +232,13 @@ public:
   void OnConvertPolar (wxCommandEvent& event);
   void OnConvertFFTPolar (wxCommandEvent& event);
   
-  wxFrame* getFrame ()   { return m_pFrame; }
-  
+#if CTSIM_MDI
+  wxDocMDIChildFrame* getFrame() { return m_pFrame; }
+#else
+  wxDocChildFrame* getFrame() { return m_pFrame; }
+#endif
+  ProjectionFileCanvas* getCanvas() { return m_pCanvas; }
+
   wxMenu* getFileMenu()  { return m_pFileMenu; }
 
   ProjectionFileDocument* GetDocument() 
@@ -257,7 +269,7 @@ private:
   DECLARE_DYNAMIC_CLASS(PhantomFileView)
   DECLARE_EVENT_TABLE()
     
-  PhantomCanvas *CreateCanvas(wxView *view, wxFrame *parent);
+  PhantomCanvas *CreateCanvas (wxFrame* parent);
 #if CTSIM_MDI
   wxDocMDIChildFrame* m_pFrame;
   wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
@@ -266,7 +278,7 @@ private:
   wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
 #endif
   
-  PhantomCanvas *m_canvas;
+  PhantomCanvas *m_pCanvas;
   wxMenu* m_pFileMenu;
   
   int m_iDefaultNDet;
@@ -284,7 +296,7 @@ private:
 
   wxWindow* getFrameForChild() 
 #if CTSIM_MDI
-  { return theApp->getMainFrame()->GetClientWindow(); }
+  { return theApp->getMainFrame(); }
 #else
   { return m_pFrame; }
 #endif
@@ -293,7 +305,7 @@ public:
   PhantomFileView();
   virtual ~PhantomFileView();
   void canvasClosed()
-  { m_canvas = NULL; m_pFrame = NULL; }
+  { m_pCanvas = NULL; m_pFrame = NULL; }
   
   bool OnCreate(wxDocument *doc, long flags);
   void OnUpdate(wxView *sender, wxObject *hint = NULL);
@@ -307,7 +319,11 @@ public:
   { return dynamic_cast<PhantomFileDocument*>(wxView::GetDocument()); }
   
   wxMenu* getFileMenu() { return m_pFileMenu; }
-  wxFrame* getFrame() { return m_pFrame; }
+#if CTSIM_MDI
+  wxDocMDIChildFrame* getFrame() { return m_pFrame; }
+#else
+  wxDocChildFrame* getFrame() { return m_pFrame; }
+#endif
 };
 
 class PhantomCanvas: public wxScrolledWindow
@@ -330,7 +346,6 @@ class PlotFileView : public wxView
   DECLARE_DYNAMIC_CLASS(PlotFileView)
     
 private:
-  PlotFileCanvas *CreateCanvas(wxView *view, wxFrame *parent);
 #if CTSIM_MDI
   wxDocMDIChildFrame* m_pFrame;
   wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
@@ -339,9 +354,9 @@ private:
   wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
 #endif
   
-  PlotFileCanvas *m_canvas;
-  wxMenu* m_pFileMenu;
+  PlotFileCanvas *m_pCanvas;
   EZPlot* m_pEZPlot;
+  wxMenu* m_pFileMenu;
   
   bool m_bMinSpecified;
   bool m_bMaxSpecified;
@@ -349,9 +364,10 @@ private:
   double m_dMaxPixel;
   double m_dAutoScaleFactor;
   
+  PlotFileCanvas *CreateCanvas (wxFrame* parent);
   wxWindow* getFrameForChild() 
 #if CTSIM_MDI
-  { return theApp->getMainFrame()->GetClientWindow(); }
+  { return theApp->getMainFrame(); }
 #else
   { return m_pFrame; }
 #endif
@@ -360,7 +376,7 @@ public:
   PlotFileView();
   virtual ~PlotFileView();
   void canvasClosed()
-  { m_canvas = NULL; m_pFrame = NULL; }
+  { m_pCanvas = NULL; m_pFrame = NULL; }
   
   bool OnCreate(wxDocument *doc, long flags);
   void OnDraw(wxDC* dc);
@@ -372,8 +388,11 @@ public:
   void OnScaleAuto (wxCommandEvent& event);
   void OnScaleFull (wxCommandEvent& event);
   
-  wxFrame* getFrame ()
-  { return m_pFrame; }
+#if CTSIM_MDI
+  wxDocMDIChildFrame* getFrame() { return m_pFrame; }
+#else
+  wxDocChildFrame* getFrame() { return m_pFrame; }
+#endif
   
   wxMenu* getFileMenu() { return m_pFileMenu; }
   PlotFileDocument* GetDocument() 
@@ -428,8 +447,12 @@ public:
     bool OnClose (bool deleteWindow = TRUE);
 
     TextFileCanvas* getTextCtrl() { return m_pCanvas; }
-    wxFrame* getFrame() { return m_pFrame; }
     wxMenu* getFileMenu() { return m_pFileMenu; }
+#if CTSIM_MDI
+  wxDocMDIChildFrame* getFrame() { return m_pFrame; }
+#else
+  wxDocChildFrame* getFrame() { return m_pFrame; }
+#endif
 };
 
 class TextFileCanvas: public wxTextCtrl