projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r486: no message
[ctsim.git]
/
src
/
ctsim.h
diff --git
a/src/ctsim.h
b/src/ctsim.h
index 9c4278f1e01ef19844993fe916e4c4d9e451ebc5..f2bac543d00c82144bca305c4c8a69c0a9a607c2 100644
(file)
--- a/
src/ctsim.h
+++ b/
src/ctsim.h
@@
-9,7
+9,7
@@
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: ctsim.h,v 1.
34 2001/01/29 00:42:26
kevin Exp $
+** $Id: ctsim.h,v 1.
41 2001/02/04 21:28:19
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
@@
-59,6
+59,9
@@
class ProjectionFileDocument;
class PhantomFileDocument;
class PlotFileDocument;
class TextFileDocument;
class PhantomFileDocument;
class PlotFileDocument;
class TextFileDocument;
+#if wxUSE_GLCANVAS
+class Graph3dFileDocument;
+#endif
#include <vector>
#include "wx/docview.h"
#include <vector>
#include "wx/docview.h"
@@
-84,8
+87,10
@@
private:
DECLARE_CLASS(MainFrame)
DECLARE_EVENT_TABLE()
DECLARE_CLASS(MainFrame)
DECLARE_EVENT_TABLE()
+#ifndef CTSIM_MDI
wxMenu* m_pWindowMenu;
wxMenu* m_pWindowMenu;
-
+#endif
+
enum { MAX_WINDOW_MENUITEMS = 20 };
wxMenuItem* m_apWindowMenuItems[MAX_WINDOW_MENUITEMS];
wxDocument* m_apWindowMenuData[MAX_WINDOW_MENUITEMS];
enum { MAX_WINDOW_MENUITEMS = 20 };
wxMenuItem* m_apWindowMenuItems[MAX_WINDOW_MENUITEMS];
wxDocument* m_apWindowMenuData[MAX_WINDOW_MENUITEMS];
@@
-100,6
+105,8
@@
private:
double m_dDefaultFilterInputScale;
double m_dDefaultFilterOutputScale;
double m_dDefaultFilterInputScale;
double m_dDefaultFilterOutputScale;
+ bool m_bShuttingDown;
+
#if CTSIM_WINHELP
wxWinHelpController m_winHelp;
#endif
#if CTSIM_WINHELP
wxWinHelpController m_winHelp;
#endif
@@
-159,6
+166,8
@@
public:
void OnWindowMenu19 (wxCommandEvent& event);
void DoWindowMenu (int iMenuPosition, wxCommandEvent& event);
void OnWindowMenu19 (wxCommandEvent& event);
void DoWindowMenu (int iMenuPosition, wxCommandEvent& event);
+
+ bool getShuttingDown() const { return m_bShuttingDown; }
};
};
@@
-178,6
+187,10
@@
private:
wxDocTemplate* m_pDocTemplPhantom;
wxDocTemplate* m_pDocTemplPlot;
wxDocTemplate* m_pDocTemplText;
wxDocTemplate* m_pDocTemplPhantom;
wxDocTemplate* m_pDocTemplPlot;
wxDocTemplate* m_pDocTemplText;
+#if wxUSE_GLCANVAS
+ wxDocTemplate* m_pDocTemplGraph3d;
+#endif
+
TextFileDocument* m_pLogDoc;
void usage (const char* program);
TextFileDocument* m_pLogDoc;
void usage (const char* program);
@@
-202,9
+215,6
@@
public:
void getCompatibleImages (const ImageFileDocument* pIFDoc, std::vector<ImageFileDocument*>& vecIF);
void getCompatibleImages (const ImageFileDocument* pIFDoc, std::vector<ImageFileDocument*>& vecIF);
- bool getSetModifyNewDocs() const
- { return true; }
-
void setIconForFrame (wxFrame* pFrame);
wxConfig* getConfig()
{ return m_pConfig; }
void setIconForFrame (wxFrame* pFrame);
wxConfig* getConfig()
{ return m_pConfig; }
@@
-214,6
+224,9
@@
public:
wxDocTemplate* getDocTemplPhantom() { return m_pDocTemplPhantom; }
wxDocTemplate* getDocTemplPlot() { return m_pDocTemplPlot; }
wxDocTemplate* getDocTemplText() { return m_pDocTemplText; }
wxDocTemplate* getDocTemplPhantom() { return m_pDocTemplPhantom; }
wxDocTemplate* getDocTemplPlot() { return m_pDocTemplPlot; }
wxDocTemplate* getDocTemplText() { return m_pDocTemplText; }
+#if wxUSE_GLCANVAS
+ wxDocTemplate* getDocTemplGraph3d() { return m_pDocTemplGraph3d; }
+#endif
TextFileDocument* getLogDoc() { return m_pLogDoc; }
ProjectionFileDocument* newProjectionDoc();
TextFileDocument* getLogDoc() { return m_pLogDoc; }
ProjectionFileDocument* newProjectionDoc();
@@
-221,7
+234,9
@@
public:
PhantomFileDocument* newPhantomDoc();
PlotFileDocument* newPlotDoc();
TextFileDocument* newTextDoc();
PhantomFileDocument* newPhantomDoc();
PlotFileDocument* newPlotDoc();
TextFileDocument* newTextDoc();
-
+#if wxUSE_GLCANVAS
+ Graph3dFileDocument* newGraph3dDoc();
+#endif
};
DECLARE_APP(CTSimApp)
};
DECLARE_APP(CTSimApp)
@@
-266,7
+281,10
@@
enum {
IFMENU_IMAGE_SUBTRACT,
IFMENU_IMAGE_MULTIPLY,
IFMENU_IMAGE_DIVIDE,
IFMENU_IMAGE_SUBTRACT,
IFMENU_IMAGE_MULTIPLY,
IFMENU_IMAGE_DIVIDE,
-
+#if wxUSE_GLCANVAS
+ IFMENU_IMAGE_CONVERT3D,
+#endif
+
IFMENU_FILTER_INVERTVALUES,
IFMENU_FILTER_SQRT,
IFMENU_FILTER_SQUARE,
IFMENU_FILTER_INVERTVALUES,
IFMENU_FILTER_SQRT,
IFMENU_FILTER_SQUARE,
@@
-292,6
+310,14
@@
enum {
PLOTMENU_VIEW_SCALE_MINMAX,
PLOTMENU_VIEW_SCALE_AUTO,
PLOTMENU_VIEW_SCALE_FULL,
PLOTMENU_VIEW_SCALE_MINMAX,
PLOTMENU_VIEW_SCALE_AUTO,
PLOTMENU_VIEW_SCALE_FULL,
+
+ GRAPH3D_VIEW_SURFACE,
+ GRAPH3D_VIEW_COLOR,
+ GRAPH3D_VIEW_LIGHTING,
+ GRAPH3D_VIEW_SMOOTH,
+ GRAPH3D_VIEW_SCALE_AUTO,
+ GRAPH3D_VIEW_SCALE_MINMAX,
+ GRAPH3D_VIEW_SCALE_FULL,
};
#endif
};
#endif