X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fgraph3dview.h;h=eeade71763c32e72796c12f12ece2ac9ef958745;hp=2d2bc792159fbc1ba4cc825733fe16b3b6e50701;hb=f13a8c004b8f182b42d9e4df2bcd7c7f030bf1ad;hpb=ba8635d790ee847d9746c6da24b60bd4cb6d9116

diff --git a/src/graph3dview.h b/src/graph3dview.h
index 2d2bc79..eeade71 100644
--- a/src/graph3dview.h
+++ b/src/graph3dview.h
@@ -7,9 +7,7 @@
 **   Date Started:  Jan 2001
 **
 **  This is part of the CTSim program
-**  Copyright (c) 1983-2001 Kevin Rosenberg
-**
-**  $Id: graph3dview.h,v 1.1 2001/01/30 07:32:13 kevin Exp $
+**  Copyright (c) 1983-2009 Kevin Rosenberg
 **
 **  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
@@ -36,34 +34,47 @@
 #include <GL/glu.h>
 
 
-typedef GLfloat glTripleFloat[3];
-
 class Graph3dFileCanvas;
-class Graph3dFileView : public wxView 
+class Graph3dFileView : public wxView
 {
-  friend Graph3dFileCanvas;
+  friend class Graph3dFileCanvas;
 
 private:
-  DECLARE_DYNAMIC_CLASS(Graph3dFileView)   
+  DECLARE_DYNAMIC_CLASS(Graph3dFileView)
   DECLARE_EVENT_TABLE()
-   
+
   wxMenu* m_pFileMenu;
+  wxMenu *m_pViewMenu;
+  wxStatusBar* m_pStatusBar;
+
+  Graph3dFileCanvas* m_pCanvas;
   GLfloat m_dXRotate;
   GLfloat m_dYRotate;
-  std::vector<glTripleFloat> m_vecVerts;
-  std::vector<glTripleFloat> m_vecNorms;
-  GLint m_nVerts;
-  GLboolean m_bUseVertexArrays;
-  GLboolean m_bDoubleBuffer;
-  GLboolean m_bSmooth;
-  GLboolean m_bLighting;
+  GLfloat m_dZRotate;
+  bool m_bDoubleBuffer;
+  bool m_bSmooth;
+  bool m_bWireframe;
+  bool m_bLighting;
+  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 CreateDisplayList();
   void InitMaterials();
   void InitGL();
 
-  Graph3dFileCanvas* m_pCanvas;
   Graph3dFileCanvas *CreateCanvas (wxFrame* parent);
 
 #if CTSIM_MDI
@@ -74,13 +85,15 @@ private:
   wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
 #endif
 
-  wxWindow* getFrameForChild() 
+  wxWindow* getFrameForChild()
 #if CTSIM_MDI
   { return theApp->getMainFrame(); }
 #else
   { return m_pFrame; }
 #endif
 
+  void intensityToColor (double dIntensity, GLfloat* vecColor);
+
 public:
   Graph3dFileView();
   virtual ~Graph3dFileView();
@@ -92,14 +105,23 @@ public:
   void OnUpdate(wxView *sender, wxObject *hint = NULL);
   bool OnClose (bool deleteWindow = true);
   void OnProperties (wxCommandEvent& event);
+  void OnLighting (wxCommandEvent& event);
+  void OnWireframe (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; }
 #else
   wxDocChildFrame* getFrame() { return m_pFrame; }
 #endif
-
-  Graph3dFileDocument* GetDocument() 
+  Graph3dFileCanvas* getCanvas() { return m_pCanvas; }
+  Graph3dFileDocument* GetDocument()
   { return dynamic_cast<Graph3dFileDocument*>(wxView::GetDocument()); }
 };
 
@@ -114,10 +136,11 @@ private:
 
 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);
+   void OnPaint(wxPaintEvent& event);
+   virtual wxSize GetBestSize() const;
    void OnSize(wxSizeEvent& event);
    void OnEraseBackground(wxEraseEvent& event);
    void OnChar(wxKeyEvent& event);