projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove use of autoreconf from rules
[ctsim.git]
/
src
/
graph3dview.h
diff --git
a/src/graph3dview.h
b/src/graph3dview.h
index ed438154ce9c6f4f296b1cf1dd5e3118af17d1a5..a8b3e8c59fd83b63939a55b02b222354c9e63b36 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$
**
** 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
@@
-37,34
+37,46
@@
class Graph3dFileCanvas;
class Graph3dFileCanvas;
-class Graph3dFileView : public wxView
+class Graph3dFileView : public wxView
{
{
- friend Graph3dFileCanvas;
+ friend
class
Graph3dFileCanvas;
private:
private:
- DECLARE_DYNAMIC_CLASS(Graph3dFileView)
+ DECLARE_DYNAMIC_CLASS(Graph3dFileView)
DECLARE_EVENT_TABLE()
DECLARE_EVENT_TABLE()
-
+
wxMenu* m_pFileMenu;
wxMenu *m_pViewMenu;
wxStatusBar* m_pStatusBar;
wxMenu* m_pFileMenu;
wxMenu *m_pViewMenu;
wxStatusBar* m_pStatusBar;
+ Graph3dFileCanvas* m_pCanvas;
GLfloat m_dXRotate;
GLfloat m_dYRotate;
GLfloat m_dZRotate;
GLfloat m_dXRotate;
GLfloat m_dYRotate;
GLfloat m_dZRotate;
- bool m_bUseVertexArrays;
bool m_bDoubleBuffer;
bool m_bSmooth;
bool m_bDoubleBuffer;
bool m_bSmooth;
+ bool m_bWireframe;
bool m_bLighting;
bool m_bLighting;
- bool m_bSurface;
bool m_bColor;
bool m_bColor;
+ bool m_bUseVertexArrays;
+ bool m_bColorScaleMinSet;
+ bool m_bColorScaleMaxSet;
+ enum {
+ DISPLAYLIST_COLOR = 1,
+ DISPLAYLIST_NO_COLOR = 2,
+ };
+
+ double m_dGraphMin;
+ double m_dGraphMax;
+ double m_dColorScaleMin;
+ double m_dColorScaleMax;
void Draw();
void DrawSurface();
void Draw();
void DrawSurface();
+ void CreateDisplayList();
void InitMaterials();
void InitGL();
void InitMaterials();
void InitGL();
- Graph3dFileCanvas* m_pCanvas;
Graph3dFileCanvas *CreateCanvas (wxFrame* parent);
#if CTSIM_MDI
Graph3dFileCanvas *CreateCanvas (wxFrame* parent);
#if CTSIM_MDI
@@
-75,13
+87,15
@@
private:
wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
#endif
wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
#endif
- wxWindow* getFrameForChild()
+ wxWindow* getFrameForChild()
#if CTSIM_MDI
{ return theApp->getMainFrame(); }
#else
{ return m_pFrame; }
#endif
#if CTSIM_MDI
{ return theApp->getMainFrame(); }
#else
{ return m_pFrame; }
#endif
+ void intensityToColor (double dIntensity, GLfloat* vecColor);
+
public:
Graph3dFileView();
virtual ~Graph3dFileView();
public:
Graph3dFileView();
virtual ~Graph3dFileView();
@@
-94,9
+108,14
@@
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);
+
+ void setInitialClientSize();
#if CTSIM_MDI
wxDocMDIChildFrame* getFrame() { return m_pFrame; }
#if CTSIM_MDI
wxDocMDIChildFrame* getFrame() { return m_pFrame; }
@@
-104,7
+123,7
@@
public:
wxDocChildFrame* getFrame() { return m_pFrame; }
#endif
Graph3dFileCanvas* getCanvas() { return m_pCanvas; }
wxDocChildFrame* getFrame() { return m_pFrame; }
#endif
Graph3dFileCanvas* getCanvas() { return m_pCanvas; }
- Graph3dFileDocument* GetDocument()
+ Graph3dFileDocument* GetDocument()
{ return dynamic_cast<Graph3dFileDocument*>(wxView::GetDocument()); }
};
{ return dynamic_cast<Graph3dFileDocument*>(wxView::GetDocument()); }
};
@@
-119,10
+138,11
@@
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 ~Graph3dFileCanvas();
- virtual void OnDraw(wxDC& dc);
+ void OnPaint(wxPaintEvent& event);
+ virtual wxSize GetBestSize() const;
void OnSize(wxSizeEvent& event);
void OnEraseBackground(wxEraseEvent& event);
void OnChar(wxKeyEvent& event);
void OnSize(wxSizeEvent& event);
void OnEraseBackground(wxEraseEvent& event);
void OnChar(wxKeyEvent& event);