projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r574: no message
[ctsim.git]
/
src
/
graph3dview.h
diff --git
a/src/graph3dview.h
b/src/graph3dview.h
index ed438154ce9c6f4f296b1cf1dd5e3118af17d1a5..f5ae3e4afc19f78ecb175cb2ef0b384c2897269b 100644
(file)
--- a/
src/graph3dview.h
+++ b/
src/graph3dview.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: graph3dview.h,v 1.
4 2001/02/02 23:04:06
kevin Exp $
+** $Id: graph3dview.h,v 1.
6 2001/02/04 22:58: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
@@
-58,9
+58,20
@@
private:
bool m_bLighting;
bool m_bSurface;
bool m_bColor;
bool m_bLighting;
bool m_bSurface;
bool m_bColor;
+ enum {
+ DISPLAYLIST_SURFACE = 1,
+ };
+
+ double m_dGraphMin;
+ double m_dGraphMax;
+ double m_dColorScaleMin;
+ double m_dColorScaleMax;
+ bool m_bColorScaleMinSet;
+ bool m_bColorScaleMaxSet;
void Draw();
void DrawSurface();
void Draw();
void DrawSurface();
+ void CreateDisplayList();
void InitMaterials();
void InitGL();
void InitMaterials();
void InitGL();
@@
-82,6
+93,8
@@
private:
{ return m_pFrame; }
#endif
{ return m_pFrame; }
#endif
+ void intensityToColor (double dIntensity, GLfloat* vecColor);
+
public:
Graph3dFileView();
virtual ~Graph3dFileView();
public:
Graph3dFileView();
virtual ~Graph3dFileView();
@@
-97,6
+110,9
@@
public:
void OnSurface (wxCommandEvent& event);
void OnColor (wxCommandEvent& event);
void OnSmooth (wxCommandEvent& event);
void OnSurface (wxCommandEvent& event);
void OnColor (wxCommandEvent& event);
void OnSmooth (wxCommandEvent& event);
+ void OnScaleSet (wxCommandEvent& event);
+ void OnScaleAuto (wxCommandEvent& event);
+ void OnScaleFull (wxCommandEvent& event);
#if CTSIM_MDI
wxDocMDIChildFrame* getFrame() { return m_pFrame; }
#if CTSIM_MDI
wxDocMDIChildFrame* getFrame() { return m_pFrame; }
@@
-119,7
+135,7
@@
private:
public:
Graph3dFileCanvas (Graph3dFileView* view, wxWindow *parent, const wxPoint& pos = wxDefaultPosition,
public:
Graph3dFileCanvas (Graph3dFileView* view, wxWindow *parent, const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize, long style = 0
, int* gl_attrib = NULL
);
+ const wxSize& size = wxDefaultSize, long style = 0);
virtual ~Graph3dFileCanvas();
virtual void OnDraw(wxDC& dc);
virtual ~Graph3dFileCanvas();
virtual void OnDraw(wxDC& dc);