projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r2096: *** empty log message ***
[ctsim.git]
/
src
/
graph3dview.h
diff --git
a/src/graph3dview.h
b/src/graph3dview.h
index 1cb68cf48d8d341ba94ee485728ca1e793087c25..90b6d44191f1df25788af53b65c1e2f666a8997e 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.
3 2001/02/02 00:46:38
kevin Exp $
+** $Id: graph3dview.h,v 1.
9 2002/05/28 18:43: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
@@
-39,7
+39,7
@@
class Graph3dFileCanvas;
class Graph3dFileView : public wxView
{
class Graph3dFileCanvas;
class Graph3dFileView : public wxView
{
- friend Graph3dFileCanvas;
+ friend
class
Graph3dFileCanvas;
private:
DECLARE_DYNAMIC_CLASS(Graph3dFileView)
private:
DECLARE_DYNAMIC_CLASS(Graph3dFileView)
@@
-47,7
+47,7
@@
private:
wxMenu* m_pFileMenu;
wxMenu *m_pViewMenu;
wxMenu* m_pFileMenu;
wxMenu *m_pViewMenu;
- wxStatusBar
m_s
tatusBar;
+ wxStatusBar
* m_pS
tatusBar;
GLfloat m_dXRotate;
GLfloat m_dYRotate;
GLfloat m_dXRotate;
GLfloat m_dYRotate;
@@
-56,11
+56,23
@@
private:
bool m_bDoubleBuffer;
bool m_bSmooth;
bool m_bLighting;
bool m_bDoubleBuffer;
bool m_bSmooth;
bool m_bLighting;
- bool m_b
Surfac
e;
+ bool m_b
Wirefram
e;
bool m_bColor;
bool m_bColor;
+ enum {
+ DISPLAYLIST_COLOR = 1,
+ DISPLAYLIST_NO_COLOR = 2,
+ };
+
+ 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
+94,8
@@
private:
{ return m_pFrame; }
#endif
{ return m_pFrame; }
#endif
+ void intensityToColor (double dIntensity, GLfloat* vecColor);
+
public:
Graph3dFileView();
virtual ~Graph3dFileView();
public:
Graph3dFileView();
virtual ~Graph3dFileView();
@@
-94,10
+108,13
@@
public:
bool OnClose (bool deleteWindow = true);
void OnProperties (wxCommandEvent& event);
void OnLighting (wxCommandEvent& event);
bool OnClose (bool deleteWindow = true);
void OnProperties (wxCommandEvent& event);
void OnLighting (wxCommandEvent& event);
- void On
Surfac
e (wxCommandEvent& event);
+ void On
Wirefram
e (wxCommandEvent& event);
void OnColor (wxCommandEvent& event);
void OnSmooth (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; }
#else
#if CTSIM_MDI
wxDocMDIChildFrame* getFrame() { return m_pFrame; }
#else
@@
-119,7
+136,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);