X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fviews.h;h=ddc1d0a9b26b053ae00302d99fbcac570f95762c;hp=f395c94df6cde30da3e1835648dcdae10743542b;hb=cbcb02ba9b76a82c9a09ce1c7712431bb215575a;hpb=91fb88e205c5bc7b771faf601db8489a9278c1ab diff --git a/src/views.h b/src/views.h index f395c94..ddc1d0a 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.31 2001/01/26 21:33:06 kevin Exp $ +** $Id: views.h,v 1.40 2001/01/30 02:20:50 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,13 +44,19 @@ private: wxMemoryDC m_memoryDC; wxBitmap m_bitmap; + wxMenu* m_pMenuAnalyze; - ImageFileCanvas *CreateCanvas(wxView *view, wxFrame *parent); - wxFrame *CreateChildFrame(wxDocument *doc, wxView *view); - wxMenu* m_pFileMenu; + ImageFileCanvas *CreateCanvas (wxFrame* parent); +#if CTSIM_MDI + wxDocMDIChildFrame* m_pFrame; + wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); +#else + wxDocChildFrame* m_pFrame; + wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); +#endif - ImageFileCanvas *m_canvas; - wxFrame *m_frame; + ImageFileCanvas *m_pCanvas; + wxMenu* m_pFileMenu; bool m_bMinSpecified; bool m_bMaxSpecified; double m_dMinPixel; @@ -61,16 +67,16 @@ private: wxWindow* getFrameForChild() #if CTSIM_MDI - { return theApp->getMainFrame()->GetClientWindow(); } + { return theApp->getMainFrame(); } #else - { return m_frame; } + { return m_pFrame; } #endif public: ImageFileView(); virtual ~ImageFileView(); void canvasClosed() - { m_canvas = NULL; m_frame = NULL; } + { m_pCanvas = NULL; m_pFrame = NULL; } wxMenu* getFileMenu() { return m_pFileMenu; } @@ -125,9 +131,14 @@ public: void OnCompareRow (wxCommandEvent& event); void OnCompareCol (wxCommandEvent& event); - wxFrame* getFrame() - { return m_frame; } - +#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(wxView::GetDocument()); } @@ -137,16 +148,17 @@ public: class ImageFileCanvas: public wxScrolledWindow { private: - + ImageFileView* m_pView; + int m_xCursor; int m_yCursor; - ImageFileView* m_pView; public: ImageFileCanvas (ImageFileView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style); virtual ~ImageFileCanvas(); virtual void OnDraw(wxDC& dc); + void OnChar(wxKeyEvent& event); void OnMouseEvent(wxMouseEvent& event); void DrawRubberBandCursor (wxDC& dc, int x, int y); bool GetCurrentCursor (int& x, int& y); @@ -169,11 +181,16 @@ class ProjectionFileView : public wxView wxBitmap m_bitmap; private: - ProjectionFileCanvas *CreateCanvas(wxView *view, wxFrame *parent); - wxFrame *CreateChildFrame(wxDocument *doc, wxView *view); + ProjectionFileCanvas *CreateCanvas (wxFrame* parent); +#if CTSIM_MDI + wxDocMDIChildFrame* m_pFrame; + wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); +#else + wxDocChildFrame* m_pFrame; + wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); +#endif - ProjectionFileCanvas *m_canvas; - wxFrame *m_frame; + ProjectionFileCanvas *m_pCanvas; wxMenu* m_pFileMenu; int m_iDefaultNX; @@ -195,16 +212,16 @@ private: wxWindow* getFrameForChild() #if CTSIM_MDI - { return theApp->getMainFrame()->GetClientWindow(); } + { return theApp->getMainFrame(); } #else - { return m_frame; } + { return m_pFrame; } #endif public: ProjectionFileView(); virtual ~ProjectionFileView(); void canvasClosed() - { m_canvas = NULL; m_frame = NULL; } + { m_pCanvas = NULL; m_pFrame = NULL; } bool OnCreate(wxDocument *doc, long flags); void OnDraw(wxDC* dc); @@ -216,8 +233,13 @@ public: void OnConvertPolar (wxCommandEvent& event); void OnConvertFFTPolar (wxCommandEvent& event); - wxFrame* getFrame () { return m_frame; } - +#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() @@ -248,11 +270,16 @@ private: DECLARE_DYNAMIC_CLASS(PhantomFileView) DECLARE_EVENT_TABLE() - PhantomCanvas *CreateCanvas(wxView *view, wxFrame *parent); - wxFrame *CreateChildFrame(wxDocument *doc, wxView *view); + PhantomCanvas *CreateCanvas (wxFrame* parent); +#if CTSIM_MDI + wxDocMDIChildFrame* m_pFrame; + wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); +#else + wxDocChildFrame* m_pFrame; + wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); +#endif - PhantomCanvas *m_canvas; - wxFrame *m_frame; + PhantomCanvas *m_pCanvas; wxMenu* m_pFileMenu; int m_iDefaultNDet; @@ -270,16 +297,16 @@ private: wxWindow* getFrameForChild() #if CTSIM_MDI - { return theApp->getMainFrame()->GetClientWindow(); } + { return theApp->getMainFrame(); } #else - { return m_frame; } + { return m_pFrame; } #endif public: PhantomFileView(); virtual ~PhantomFileView(); void canvasClosed() - { m_canvas = NULL; m_frame = NULL; } + { m_pCanvas = NULL; m_pFrame = NULL; } bool OnCreate(wxDocument *doc, long flags); void OnUpdate(wxView *sender, wxObject *hint = NULL); @@ -293,7 +320,11 @@ public: { return dynamic_cast(wxView::GetDocument()); } wxMenu* getFileMenu() { return m_pFileMenu; } - wxFrame* getFrame() { return m_frame; } +#if CTSIM_MDI + wxDocMDIChildFrame* getFrame() { return m_pFrame; } +#else + wxDocChildFrame* getFrame() { return m_pFrame; } +#endif }; class PhantomCanvas: public wxScrolledWindow @@ -316,13 +347,17 @@ class PlotFileView : public wxView DECLARE_DYNAMIC_CLASS(PlotFileView) private: - PlotFileCanvas *CreateCanvas(wxView *view, wxFrame *parent); - wxFrame *CreateChildFrame(wxDocument *doc, wxView *view); +#if CTSIM_MDI + wxDocMDIChildFrame* m_pFrame; + wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); +#else + wxDocChildFrame* m_pFrame; + wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); +#endif - PlotFileCanvas *m_canvas; - wxFrame *m_frame; - wxMenu* m_pFileMenu; + PlotFileCanvas *m_pCanvas; EZPlot* m_pEZPlot; + wxMenu* m_pFileMenu; bool m_bMinSpecified; bool m_bMaxSpecified; @@ -330,18 +365,19 @@ 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_frame; } + { return m_pFrame; } #endif public: PlotFileView(); virtual ~PlotFileView(); void canvasClosed() - { m_canvas = NULL; m_frame = NULL; } + { m_pCanvas = NULL; m_pFrame = NULL; } bool OnCreate(wxDocument *doc, long flags); void OnDraw(wxDC* dc); @@ -353,8 +389,11 @@ public: void OnScaleAuto (wxCommandEvent& event); void OnScaleFull (wxCommandEvent& event); - wxFrame* getFrame () - { return m_frame; } +#if CTSIM_MDI + wxDocMDIChildFrame* getFrame() { return m_pFrame; } +#else + wxDocChildFrame* getFrame() { return m_pFrame; } +#endif wxMenu* getFileMenu() { return m_pFileMenu; } PlotFileDocument* GetDocument() @@ -385,7 +424,13 @@ class TextFileView: public wxView private: DECLARE_DYNAMIC_CLASS(TextFileView) - wxFrame *m_pFrame; +#if CTSIM_MDI + wxDocMDIChildFrame* m_pFrame; + wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); +#else + wxDocChildFrame* m_pFrame; + wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); +#endif wxMenu* m_pFileMenu; TextFileCanvas *m_pCanvas; @@ -397,16 +442,21 @@ public: void canvasClosed() { m_pFrame = NULL; } - wxFrame *CreateChildFrame(wxDocument *doc, wxView *view); - bool OnCreate (wxDocument *doc, long flags); void OnDraw (wxDC *dc); void OnUpdate (wxView *sender, wxObject *hint = (wxObject *) NULL); bool OnClose (bool deleteWindow = TRUE); + TextFileDocument* GetDocument() + { return dynamic_cast(wxView::GetDocument()); } + 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