projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r443: no message
[ctsim.git]
/
src
/
views.h
diff --git
a/src/views.h
b/src/views.h
index 6cab7ab8e274d4f3790e0344f8ff27f281ca1592..81cf6a7ccc1b214fa3fb3a7dfd42089107308ac4 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
0 2001/01/26 05:37:24
kevin Exp $
+** $Id: views.h,v 1.3
3 2001/01/27 01:51:47
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
@@
-46,11
+46,16
@@
private:
wxBitmap m_bitmap;
ImageFileCanvas *CreateCanvas(wxView *view, wxFrame *parent);
wxBitmap m_bitmap;
ImageFileCanvas *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
wxMenu* m_pFileMenu;
ImageFileCanvas *m_canvas;
wxMenu* m_pFileMenu;
ImageFileCanvas *m_canvas;
- wxFrame *m_frame;
bool m_bMinSpecified;
bool m_bMaxSpecified;
double m_dMinPixel;
bool m_bMinSpecified;
bool m_bMaxSpecified;
double m_dMinPixel;
@@
-63,14
+68,14
@@
private:
#if CTSIM_MDI
{ return theApp->getMainFrame()->GetClientWindow(); }
#else
#if CTSIM_MDI
{ return theApp->getMainFrame()->GetClientWindow(); }
#else
- { return m_
f
rame; }
+ { return m_
pF
rame; }
#endif
public:
#endif
public:
- ImageFileView(
void
);
- virtual ~ImageFileView(
void
);
+ ImageFileView();
+ virtual ~ImageFileView();
void canvasClosed()
void canvasClosed()
- { m_canvas = NULL; m_
f
rame = NULL; }
+ { m_canvas = NULL; m_
pF
rame = NULL; }
wxMenu* getFileMenu()
{ return m_pFileMenu; }
wxMenu* getFileMenu()
{ return m_pFileMenu; }
@@
-126,9
+131,9
@@
public:
void OnCompareCol (wxCommandEvent& event);
wxFrame* getFrame()
void OnCompareCol (wxCommandEvent& event);
wxFrame* getFrame()
- { return m_
f
rame; }
+ { return m_
pF
rame; }
- ImageFileDocument* GetDocument(
void
)
+ ImageFileDocument* GetDocument()
{ return dynamic_cast<ImageFileDocument*>(wxView::GetDocument()); }
DECLARE_EVENT_TABLE()
{ return dynamic_cast<ImageFileDocument*>(wxView::GetDocument()); }
DECLARE_EVENT_TABLE()
@@
-137,10
+142,9
@@
public:
class ImageFileCanvas: public wxScrolledWindow
{
private:
class ImageFileCanvas: public wxScrolledWindow
{
private:
-
+ ImageFileView* m_pView;
int m_xCursor;
int m_yCursor;
int m_xCursor;
int m_yCursor;
- ImageFileView* m_pView;
public:
ImageFileCanvas (ImageFileView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style);
public:
ImageFileCanvas (ImageFileView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style);
@@
-170,10
+174,15
@@
class ProjectionFileView : public wxView
private:
ProjectionFileCanvas *CreateCanvas(wxView *view, wxFrame *parent);
private:
ProjectionFileCanvas *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
ProjectionFileCanvas *m_canvas;
ProjectionFileCanvas *m_canvas;
- wxFrame *m_frame;
wxMenu* m_pFileMenu;
int m_iDefaultNX;
wxMenu* m_pFileMenu;
int m_iDefaultNX;
@@
-197,14
+206,14
@@
private:
#if CTSIM_MDI
{ return theApp->getMainFrame()->GetClientWindow(); }
#else
#if CTSIM_MDI
{ return theApp->getMainFrame()->GetClientWindow(); }
#else
- { return m_
f
rame; }
+ { return m_
pF
rame; }
#endif
public:
#endif
public:
- ProjectionFileView(
void
);
- virtual ~ProjectionFileView(
void
);
+ ProjectionFileView();
+ virtual ~ProjectionFileView();
void canvasClosed()
void canvasClosed()
- { m_canvas = NULL; m_
f
rame = NULL; }
+ { m_canvas = NULL; m_
pF
rame = NULL; }
bool OnCreate(wxDocument *doc, long flags);
void OnDraw(wxDC* dc);
bool OnCreate(wxDocument *doc, long flags);
void OnDraw(wxDC* dc);
@@
-216,11
+225,11
@@
public:
void OnConvertPolar (wxCommandEvent& event);
void OnConvertFFTPolar (wxCommandEvent& event);
void OnConvertPolar (wxCommandEvent& event);
void OnConvertFFTPolar (wxCommandEvent& event);
- wxFrame* getFrame () { return m_
f
rame; }
+ wxFrame* getFrame () { return m_
pF
rame; }
wxMenu* getFileMenu() { return m_pFileMenu; }
wxMenu* getFileMenu() { return m_pFileMenu; }
- ProjectionFileDocument* GetDocument(
void
)
+ ProjectionFileDocument* GetDocument()
{ return dynamic_cast<ProjectionFileDocument*>(wxView::GetDocument()); }
DECLARE_EVENT_TABLE()
};
{ return dynamic_cast<ProjectionFileDocument*>(wxView::GetDocument()); }
DECLARE_EVENT_TABLE()
};
@@
-249,10
+258,15
@@
private:
DECLARE_EVENT_TABLE()
PhantomCanvas *CreateCanvas(wxView *view, wxFrame *parent);
DECLARE_EVENT_TABLE()
PhantomCanvas *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
PhantomCanvas *m_canvas;
PhantomCanvas *m_canvas;
- wxFrame *m_frame;
wxMenu* m_pFileMenu;
int m_iDefaultNDet;
wxMenu* m_pFileMenu;
int m_iDefaultNDet;
@@
-272,14
+286,14
@@
private:
#if CTSIM_MDI
{ return theApp->getMainFrame()->GetClientWindow(); }
#else
#if CTSIM_MDI
{ return theApp->getMainFrame()->GetClientWindow(); }
#else
- { return m_
f
rame; }
+ { return m_
pF
rame; }
#endif
public:
#endif
public:
- PhantomFileView(
void
);
- virtual ~PhantomFileView(
void
);
+ PhantomFileView();
+ virtual ~PhantomFileView();
void canvasClosed()
void canvasClosed()
- { m_canvas = NULL; m_
f
rame = NULL; }
+ { m_canvas = NULL; m_
pF
rame = 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);
@@
-289,11
+303,11
@@
public:
void OnRasterize (wxCommandEvent& event);
void OnProjections (wxCommandEvent& event);
void OnRasterize (wxCommandEvent& event);
void OnProjections (wxCommandEvent& event);
- PhantomFileDocument* GetDocument(
void
)
+ PhantomFileDocument* GetDocument()
{ 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_
f
rame; }
+ wxFrame* getFrame() { return m_
pF
rame; }
};
class PhantomCanvas: public wxScrolledWindow
};
class PhantomCanvas: public wxScrolledWindow
@@
-317,10
+331,15
@@
class PlotFileView : public wxView
private:
PlotFileCanvas *CreateCanvas(wxView *view, wxFrame *parent);
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;
PlotFileCanvas *m_canvas;
- wxFrame *m_frame;
wxMenu* m_pFileMenu;
EZPlot* m_pEZPlot;
wxMenu* m_pFileMenu;
EZPlot* m_pEZPlot;
@@
-334,14
+353,14
@@
private:
#if CTSIM_MDI
{ return theApp->getMainFrame()->GetClientWindow(); }
#else
#if CTSIM_MDI
{ return theApp->getMainFrame()->GetClientWindow(); }
#else
- { return m_
f
rame; }
+ { return m_
pF
rame; }
#endif
public:
#endif
public:
- PlotFileView(
void
);
- virtual ~PlotFileView(
void
);
+ PlotFileView();
+ virtual ~PlotFileView();
void canvasClosed()
void canvasClosed()
- { m_canvas = NULL; m_
f
rame = NULL; }
+ { m_canvas = NULL; m_
pF
rame = NULL; }
bool OnCreate(wxDocument *doc, long flags);
void OnDraw(wxDC* dc);
bool OnCreate(wxDocument *doc, long flags);
void OnDraw(wxDC* dc);
@@
-354,10
+373,10
@@
public:
void OnScaleFull (wxCommandEvent& event);
wxFrame* getFrame ()
void OnScaleFull (wxCommandEvent& event);
wxFrame* getFrame ()
- { return m_
f
rame; }
+ { return m_
pF
rame; }
wxMenu* getFileMenu() { return m_pFileMenu; }
wxMenu* getFileMenu() { return m_pFileMenu; }
- PlotFileDocument* GetDocument(
void
)
+ PlotFileDocument* GetDocument()
{ return dynamic_cast<PlotFileDocument*>(wxView::GetDocument()); }
DECLARE_EVENT_TABLE()
{ return dynamic_cast<PlotFileDocument*>(wxView::GetDocument()); }
DECLARE_EVENT_TABLE()
@@
-385,7
+404,13
@@
class TextFileView: public wxView
private:
DECLARE_DYNAMIC_CLASS(TextFileView)
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;
wxMenu* m_pFileMenu;
TextFileCanvas *m_pCanvas;
@@
-397,8
+422,6
@@
public:
void canvasClosed()
{ m_pFrame = NULL; }
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 OnCreate (wxDocument *doc, long flags);
void OnDraw (wxDC *dc);
void OnUpdate (wxView *sender, wxObject *hint = (wxObject *) NULL);