X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fgraph3dview.h;h=d2dd6a4565f1b300d72c5d1d209f1ea40afaa21c;hb=06066d9192936b4c4cc69847cd4c1f5aa7017829;hp=6ae6e78783ddde408632715a4ef6966aa85d3e4b;hpb=31a835d9aebd8acb367a033cc92efb4c944a7b4d;p=ctsim.git

diff --git a/src/graph3dview.h b/src/graph3dview.h
index 6ae6e78..d2dd6a4 100644
--- 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
 **
-**  $Id: graph3dview.h,v 1.2 2001/01/30 10:58:13 kevin Exp $
+**  $Id: graph3dview.h,v 1.12 2003/01/30 21:53: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
@@ -39,26 +39,44 @@
 class Graph3dFileCanvas;
 class Graph3dFileView : public wxView 
 {
-  friend Graph3dFileCanvas;
+  friend class Graph3dFileCanvas;
 
 private:
   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;
-  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
@@ -76,6 +94,8 @@ private:
   { return m_pFrame; }
 #endif
 
+  void intensityToColor (double dIntensity, GLfloat* vecColor);
+
 public:
   Graph3dFileView();
   virtual ~Graph3dFileView();
@@ -87,13 +107,22 @@ 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
-
+  Graph3dFileCanvas* getCanvas() { return m_pCanvas; }
   Graph3dFileDocument* GetDocument() 
   { return dynamic_cast<Graph3dFileDocument*>(wxView::GetDocument()); }
 };
@@ -109,10 +138,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);