projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r456: no message
[ctsim.git]
/
src
/
views.h
diff --git
a/src/views.h
b/src/views.h
index 9f57f5588ffa74bce8a213fd6814c1fcd9e18a2d..eca72d488c56603fdacdc54f9037037096876972 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.
29 2001/01/26 00:45:24
kevin Exp $
+** $Id: views.h,v 1.
35 2001/01/27 03:08:16
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);
- wxMenu* m_pFileMenu;
+#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_
c
anvas;
- wx
Frame *m_frame
;
+ ImageFileCanvas *m_
pC
anvas;
+ wx
Menu* m_pFileMenu
;
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_
pCanvas = NULL; m_pF
rame = NULL; }
wxMenu* getFileMenu()
{ return m_pFileMenu; }
wxMenu* getFileMenu()
{ return m_pFileMenu; }
@@
-125,10
+130,13
@@
public:
void OnCompareRow (wxCommandEvent& event);
void OnCompareCol (wxCommandEvent& event);
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
- 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
+145,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
+177,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;
- wxFrame *m_frame;
+ ProjectionFileCanvas *m_pCanvas;
wxMenu* m_pFileMenu;
int m_iDefaultNX;
wxMenu* m_pFileMenu;
int m_iDefaultNX;
@@
-197,14
+209,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_
pCanvas = 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
+228,14
@@
public:
void OnConvertPolar (wxCommandEvent& event);
void OnConvertFFTPolar (wxCommandEvent& event);
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
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()
};
@@
-242,17
+257,22
@@
public:
class PhantomCanvas;
class PhantomCanvas;
-class PhantomView : public wxView
+class Phantom
File
View : public wxView
{
private:
{
private:
- DECLARE_DYNAMIC_CLASS(PhantomView)
+ DECLARE_DYNAMIC_CLASS(Phantom
File
View)
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;
- wxFrame *m_frame;
+ PhantomCanvas *m_pCanvas;
wxMenu* m_pFileMenu;
int m_iDefaultNDet;
wxMenu* m_pFileMenu;
int m_iDefaultNDet;
@@
-272,14
+292,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:
- Phantom
View(void
);
- virtual ~Phantom
View(void
);
+ Phantom
FileView(
);
+ virtual ~Phantom
FileView(
);
void canvasClosed()
void canvasClosed()
- { m_
canvas = NULL; m_f
rame = NULL; }
+ { m_
pCanvas = 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,22
+309,27
@@
public:
void OnRasterize (wxCommandEvent& event);
void OnProjections (wxCommandEvent& event);
void OnRasterize (wxCommandEvent& event);
void OnProjections (wxCommandEvent& event);
- Phantom
Document* GetDocument(void
)
- { return dynamic_cast<PhantomDocument*>(wxView::GetDocument()); }
+ Phantom
FileDocument* GetDocument(
)
+ { return dynamic_cast<Phantom
File
Document*>(wxView::GetDocument()); }
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 PhantomCanvas: public wxScrolledWindow
{
private:
};
class PhantomCanvas: public wxScrolledWindow
{
private:
- PhantomView* m_pView;
+ Phantom
File
View* m_pView;
public:
public:
- PhantomCanvas (PhantomView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style);
+ PhantomCanvas (Phantom
File
View* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style);
virtual ~PhantomCanvas();
virtual ~PhantomCanvas();
- void setView(PhantomView* pView)
+ void setView(Phantom
File
View* pView)
{ m_pView = pView; }
virtual void OnDraw(wxDC& dc);
};
{ m_pView = pView; }
virtual void OnDraw(wxDC& dc);
};
@@
-315,13
+340,17
@@
class PlotFileView : public wxView
DECLARE_DYNAMIC_CLASS(PlotFileView)
private:
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;
EZPlot* m_pEZPlot;
+ wxMenu* m_pFileMenu;
bool m_bMinSpecified;
bool m_bMaxSpecified;
bool m_bMinSpecified;
bool m_bMaxSpecified;
@@
-329,18
+358,19
@@
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(); }
#else
wxWindow* getFrameForChild()
#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_
pCanvas = 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);
@@
-352,11
+382,14
@@
public:
void OnScaleAuto (wxCommandEvent& event);
void OnScaleFull (wxCommandEvent& event);
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; }
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()
@@
-378,43
+411,51
@@
public:
};
};
-class Text
Edit
Canvas;
-class Text
Edit
View: public wxView
+class Text
File
Canvas;
+class Text
File
View: public wxView
{
private:
{
private:
- DECLARE_DYNAMIC_CLASS(Text
Edit
View)
+ DECLARE_DYNAMIC_CLASS(Text
File
View)
- 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;
wxMenu* m_pFileMenu;
- Text
Edit
Canvas *m_pCanvas;
+ Text
File
Canvas *m_pCanvas;
public:
public:
- Text
Edit
View()
+ Text
File
View()
: wxView() , m_pFrame(0), m_pCanvas(0)
{}
: wxView() , m_pFrame(0), m_pCanvas(0)
{}
- ~Text
Edit
View();
+ ~Text
File
View();
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 OnClose (bool deleteWindow = TRUE);
bool OnCreate (wxDocument *doc, long flags);
void OnDraw (wxDC *dc);
void OnUpdate (wxView *sender, wxObject *hint = (wxObject *) NULL);
bool OnClose (bool deleteWindow = TRUE);
- TextEditCanvas* getTextCtrl() { return m_pCanvas; }
-
- wxMenu* getFileMenu() { return m_pFileMenu; }
+ TextFileCanvas* getTextCtrl() { return m_pCanvas; }
+ wxMenu* getFileMenu() { return m_pFileMenu; }
+#if CTSIM_MDI
+ wxDocMDIChildFrame* getFrame() { return m_pFrame; }
+#else
+ wxDocChildFrame* getFrame() { return m_pFrame; }
+#endif
};
};
-class Text
Edit
Canvas: public wxTextCtrl
+class Text
File
Canvas: public wxTextCtrl
{
{
- Text
Edit
View *m_pView;
+ Text
File
View *m_pView;
public:
public:
- Text
EditCanvas (TextEdit
View *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, long style);
- ~Text
Edit
Canvas ();
+ Text
FileCanvas (TextFile
View *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, long style);
+ ~Text
File
Canvas ();
};
};