X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fgraph3dview.h;h=2d2da5e2b2443a881a76c324af9500eaf8b28c15;hp=44adb86c4bc51da0317c98eb8654f0e1648d35f4;hb=8a7697ce57b56cdc43698cd1241ad98d49f9b5ac;hpb=d16eb37cbc73f67fc29a60645e0b1ac7fe32767e

diff --git a/src/graph3dview.h b/src/graph3dview.h
index 44adb86..2d2da5e 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.7 2001/03/18 18:08:26 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
@@ -39,7 +39,7 @@
 class Graph3dFileCanvas;
 class Graph3dFileView : public wxView 
 {
-  friend Graph3dFileCanvas;
+  friend class Graph3dFileCanvas;
 
 private:
   DECLARE_DYNAMIC_CLASS(Graph3dFileView)   
@@ -49,15 +49,18 @@ private:
   wxMenu *m_pViewMenu;
   wxStatusBar* m_pStatusBar;
 
+  Graph3dFileCanvas* m_pCanvas;
   GLfloat m_dXRotate;
   GLfloat m_dYRotate;
   GLfloat m_dZRotate;
-  bool m_bUseVertexArrays;
   bool m_bDoubleBuffer;
   bool m_bSmooth;
+  bool m_bWireframe;
   bool m_bLighting;
-  bool m_bSurface;
   bool m_bColor;
+  bool m_bUseVertexArrays;
+  bool m_bColorScaleMinSet;
+  bool m_bColorScaleMaxSet;
   enum {
     DISPLAYLIST_COLOR = 1,
     DISPLAYLIST_NO_COLOR = 2,
@@ -67,9 +70,6 @@ private:
   double m_dGraphMax;
   double m_dColorScaleMin;
   double m_dColorScaleMax;
-  bool m_bColorScaleMinSet;
-  bool m_bColorScaleMaxSet;
-  bool m_bCalculatedSurfaceBackground;
 
   void Draw();
   void DrawSurface();
@@ -77,7 +77,6 @@ private:
   void InitMaterials();
   void InitGL();
 
-  Graph3dFileCanvas* m_pCanvas;
   Graph3dFileCanvas *CreateCanvas (wxFrame* parent);
 
 #if CTSIM_MDI
@@ -109,13 +108,14 @@ public:
   bool OnClose (bool deleteWindow = true);
   void OnProperties (wxCommandEvent& event);
   void OnLighting (wxCommandEvent& event);
-  void OnSurface (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 calculateSurfaceBackground();
+  
+  void setInitialClientSize();
 
 #if CTSIM_MDI
   wxDocMDIChildFrame* getFrame() { return m_pFrame; }
@@ -141,7 +141,8 @@ public:
       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);