projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r460: no message
[ctsim.git]
/
src
/
views.h
diff --git
a/src/views.h
b/src/views.h
index 81cf6a7ccc1b214fa3fb3a7dfd42089107308ac4..5f8214998616e7a048076ca8f8047aef272ed0c1 100644
(file)
--- a/
src/views.h
+++ b/
src/views.h
@@
-7,9
+7,9
@@
** Date Started: July 2000
**
** This is part of the CTSim program
** 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.3
3 2001/01/27 01:51:47
kevin Exp $
+** $Id: views.h,v 1.3
7 2001/01/28 19:10:18
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
**
** 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
@@
-45,7
+45,7
@@
private:
wxMemoryDC m_memoryDC;
wxBitmap m_bitmap;
wxMemoryDC m_memoryDC;
wxBitmap m_bitmap;
- ImageFileCanvas *CreateCanvas
(wxView *view, wxFrame *
parent);
+ ImageFileCanvas *CreateCanvas
(wxFrame*
parent);
#if CTSIM_MDI
wxDocMDIChildFrame* m_pFrame;
wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
#if CTSIM_MDI
wxDocMDIChildFrame* m_pFrame;
wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
@@
-53,9
+53,9
@@
private:
wxDocChildFrame* m_pFrame;
wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
#endif
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;
bool m_bMinSpecified;
bool m_bMaxSpecified;
double m_dMinPixel;
@@
-66,7
+66,7
@@
private:
wxWindow* getFrameForChild()
#if CTSIM_MDI
wxWindow* getFrameForChild()
#if CTSIM_MDI
- { return theApp->getMainFrame()
->GetClientWindow()
; }
+ { return theApp->getMainFrame(); }
#else
{ return m_pFrame; }
#endif
#else
{ return m_pFrame; }
#endif
@@
-75,7
+75,7
@@
public:
ImageFileView();
virtual ~ImageFileView();
void canvasClosed()
ImageFileView();
virtual ~ImageFileView();
void canvasClosed()
- { m_
c
anvas = NULL; m_pFrame = NULL; }
+ { m_
pC
anvas = NULL; m_pFrame = NULL; }
wxMenu* getFileMenu()
{ return m_pFileMenu; }
wxMenu* getFileMenu()
{ return m_pFileMenu; }
@@
-130,8
+130,11
@@
public:
void OnCompareRow (wxCommandEvent& event);
void OnCompareCol (wxCommandEvent& event);
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
ImageFileDocument* GetDocument()
{ return dynamic_cast<ImageFileDocument*>(wxView::GetDocument()); }
ImageFileDocument* GetDocument()
{ return dynamic_cast<ImageFileDocument*>(wxView::GetDocument()); }
@@
-173,7
+176,7
@@
class ProjectionFileView : public wxView
wxBitmap m_bitmap;
private:
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);
#if CTSIM_MDI
wxDocMDIChildFrame* m_pFrame;
wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
@@
-182,7
+185,7
@@
private:
wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
#endif
wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
#endif
- ProjectionFileCanvas *m_
c
anvas;
+ ProjectionFileCanvas *m_
pC
anvas;
wxMenu* m_pFileMenu;
int m_iDefaultNX;
wxMenu* m_pFileMenu;
int m_iDefaultNX;
@@
-204,7
+207,7
@@
private:
wxWindow* getFrameForChild()
#if CTSIM_MDI
wxWindow* getFrameForChild()
#if CTSIM_MDI
- { return theApp->getMainFrame()
->GetClientWindow()
; }
+ { return theApp->getMainFrame(); }
#else
{ return m_pFrame; }
#endif
#else
{ return m_pFrame; }
#endif
@@
-213,7
+216,7
@@
public:
ProjectionFileView();
virtual ~ProjectionFileView();
void canvasClosed()
ProjectionFileView();
virtual ~ProjectionFileView();
void canvasClosed()
- { m_
c
anvas = NULL; m_pFrame = NULL; }
+ { m_
pC
anvas = NULL; m_pFrame = NULL; }
bool OnCreate(wxDocument *doc, long flags);
void OnDraw(wxDC* dc);
bool OnCreate(wxDocument *doc, long flags);
void OnDraw(wxDC* dc);
@@
-225,8
+228,13
@@
public:
void OnConvertPolar (wxCommandEvent& event);
void OnConvertFFTPolar (wxCommandEvent& event);
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()
wxMenu* getFileMenu() { return m_pFileMenu; }
ProjectionFileDocument* GetDocument()
@@
-257,7
+265,7
@@
private:
DECLARE_DYNAMIC_CLASS(PhantomFileView)
DECLARE_EVENT_TABLE()
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);
#if CTSIM_MDI
wxDocMDIChildFrame* m_pFrame;
wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
@@
-266,7
+274,7
@@
private:
wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
#endif
wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
#endif
- PhantomCanvas *m_
c
anvas;
+ PhantomCanvas *m_
pC
anvas;
wxMenu* m_pFileMenu;
int m_iDefaultNDet;
wxMenu* m_pFileMenu;
int m_iDefaultNDet;
@@
-284,7
+292,7
@@
private:
wxWindow* getFrameForChild()
#if CTSIM_MDI
wxWindow* getFrameForChild()
#if CTSIM_MDI
- { return theApp->getMainFrame()
->GetClientWindow()
; }
+ { return theApp->getMainFrame(); }
#else
{ return m_pFrame; }
#endif
#else
{ return m_pFrame; }
#endif
@@
-293,7
+301,7
@@
public:
PhantomFileView();
virtual ~PhantomFileView();
void canvasClosed()
PhantomFileView();
virtual ~PhantomFileView();
void canvasClosed()
- { m_
c
anvas = NULL; m_pFrame = NULL; }
+ { m_
pC
anvas = NULL; m_pFrame = NULL; }
bool OnCreate(wxDocument *doc, long flags);
void OnUpdate(wxView *sender, wxObject *hint = NULL);
bool OnCreate(wxDocument *doc, long flags);
void OnUpdate(wxView *sender, wxObject *hint = NULL);
@@
-307,7
+315,11
@@
public:
{ return dynamic_cast<PhantomFileDocument*>(wxView::GetDocument()); }
wxMenu* getFileMenu() { return m_pFileMenu; }
{ 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
};
class PhantomCanvas: public wxScrolledWindow
@@
-330,7
+342,6
@@
class PlotFileView : public wxView
DECLARE_DYNAMIC_CLASS(PlotFileView)
private:
DECLARE_DYNAMIC_CLASS(PlotFileView)
private:
- PlotFileCanvas *CreateCanvas(wxView *view, wxFrame *parent);
#if CTSIM_MDI
wxDocMDIChildFrame* m_pFrame;
wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
#if CTSIM_MDI
wxDocMDIChildFrame* m_pFrame;
wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
@@
-339,9
+350,9
@@
private:
wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
#endif
wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
#endif
- PlotFileCanvas *m_canvas;
- wxMenu* m_pFileMenu;
+ PlotFileCanvas *m_pCanvas;
EZPlot* m_pEZPlot;
EZPlot* m_pEZPlot;
+ wxMenu* m_pFileMenu;
bool m_bMinSpecified;
bool m_bMaxSpecified;
bool m_bMinSpecified;
bool m_bMaxSpecified;
@@
-349,9
+360,10
@@
private:
double m_dMaxPixel;
double m_dAutoScaleFactor;
double m_dMaxPixel;
double m_dAutoScaleFactor;
+ PlotFileCanvas *CreateCanvas (wxFrame* parent);
wxWindow* getFrameForChild()
#if CTSIM_MDI
wxWindow* getFrameForChild()
#if CTSIM_MDI
- { return theApp->getMainFrame()
->GetClientWindow()
; }
+ { return theApp->getMainFrame(); }
#else
{ return m_pFrame; }
#endif
#else
{ return m_pFrame; }
#endif
@@
-360,7
+372,7
@@
public:
PlotFileView();
virtual ~PlotFileView();
void canvasClosed()
PlotFileView();
virtual ~PlotFileView();
void canvasClosed()
- { m_
c
anvas = NULL; m_pFrame = NULL; }
+ { m_
pC
anvas = NULL; m_pFrame = NULL; }
bool OnCreate(wxDocument *doc, long flags);
void OnDraw(wxDC* dc);
bool OnCreate(wxDocument *doc, long flags);
void OnDraw(wxDC* dc);
@@
-372,8
+384,11
@@
public:
void OnScaleAuto (wxCommandEvent& event);
void OnScaleFull (wxCommandEvent& event);
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()
wxMenu* getFileMenu() { return m_pFileMenu; }
PlotFileDocument* GetDocument()
@@
-428,8
+443,12
@@
public:
bool OnClose (bool deleteWindow = TRUE);
TextFileCanvas* getTextCtrl() { return m_pCanvas; }
bool OnClose (bool deleteWindow = TRUE);
TextFileCanvas* getTextCtrl() { return m_pCanvas; }
- wxFrame* getFrame() { return m_pFrame; }
wxMenu* getFileMenu() { return m_pFileMenu; }
wxMenu* getFileMenu() { return m_pFileMenu; }
+#if CTSIM_MDI
+ wxDocMDIChildFrame* getFrame() { return m_pFrame; }
+#else
+ wxDocChildFrame* getFrame() { return m_pFrame; }
+#endif
};
class TextFileCanvas: public wxTextCtrl
};
class TextFileCanvas: public wxTextCtrl