projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r445: no message
[ctsim.git]
/
src
/
views.h
diff --git
a/src/views.h
b/src/views.h
index 81cf6a7ccc1b214fa3fb3a7dfd42089107308ac4..94b41fec60547e9285c10de55d8cb476ef64c185 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
**
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: views.h,v 1.3
3 2001/01/27 01:51:47
kevin Exp $
+** $Id: views.h,v 1.3
4 2001/01/27 02:01:41
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
@@
-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;
@@
-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; }
@@
-182,7
+182,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;
@@
-213,7
+213,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);
@@
-266,7
+266,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;
@@
-293,7
+293,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);
@@
-330,7
+330,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
+338,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,6
+348,7
@@
private:
double m_dMaxPixel;
double m_dAutoScaleFactor;
double m_dMaxPixel;
double m_dAutoScaleFactor;
+ PlotFileCanvas *CreateCanvas(wxView *view, wxFrame *parent);
wxWindow* getFrameForChild()
#if CTSIM_MDI
{ return theApp->getMainFrame()->GetClientWindow(); }
wxWindow* getFrameForChild()
#if CTSIM_MDI
{ return theApp->getMainFrame()->GetClientWindow(); }
@@
-360,7
+360,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);