X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fgraph3dview.cpp;fp=src%2Fgraph3dview.cpp;h=f704e7992b60ad11a0dc04db59279144b70f1aed;hp=01e17bb843c966c5e02ed14932ff575d2e4e7d6c;hb=06066d9192936b4c4cc69847cd4c1f5aa7017829;hpb=77b54dcec77e80f1d8a6d32fd9320579b64f5f4d

diff --git a/src/graph3dview.cpp b/src/graph3dview.cpp
index 01e17bb..f704e79 100644
--- a/src/graph3dview.cpp
+++ b/src/graph3dview.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: graph3dview.cpp,v 1.32 2003/01/23 23:35:58 kevin Exp $
+**  $Id: graph3dview.cpp,v 1.33 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
@@ -161,34 +161,33 @@ bool
 Graph3dFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) )
 {
   m_pFrame = CreateChildFrame(doc, this);
+  SetFrame (m_pFrame);
   m_pCanvas = CreateCanvas (m_pFrame);
 
   m_pFrame->SetClientSize (m_pCanvas->GetBestSize());
-  SetFrame (m_pFrame);
   m_pCanvas->SetClientSize (m_pCanvas->GetBestSize());
   m_pFrame->SetTitle("Graph3dFileView");
 
-  m_pCanvas->SetCurrent();
-  
-  InitGL();
-  
-  m_pFrame->SetFocus();
-  m_pFrame->Show(true);
-  Activate(true);
-  
+  m_pCanvas->SetCurrent();  
+  InitGL();  
+  m_pCanvas->SwapBuffers();
+
   m_pViewMenu->Check (GRAPH3D_VIEW_COLOR, m_bColor);
   m_pViewMenu->Check (GRAPH3D_VIEW_LIGHTING, m_bLighting);
   m_pViewMenu->Check (GRAPH3D_VIEW_SMOOTH, m_bSmooth);
   m_pViewMenu->Check (GRAPH3D_VIEW_WIREFRAME, m_bWireframe);
+
+  m_pFrame->SetFocus();
+  m_pFrame->Show(true);
+  Activate(true);
+  
   return true;
 } 
 
 Graph3dFileCanvas* 
 Graph3dFileView::CreateCanvas (wxFrame* parent)
 {
-  Graph3dFileCanvas* pCanvas;
-  
-  pCanvas = new Graph3dFileCanvas (this, parent, wxPoint(-1,-1), wxSize(-1,-1), 0);
+  Graph3dFileCanvas* pCanvas = new Graph3dFileCanvas (this, parent, wxPoint(-1,-1), wxSize(-1,-1), 0);
   
   pCanvas->SetBackgroundColour(*wxWHITE);
   pCanvas->Clear();
@@ -403,6 +402,9 @@ Graph3dFileView::OnDraw (wxDC* dc)
 {
   if (m_pCanvas) {
     m_pCanvas->SetCurrent();
+//#ifdef DEBUG
+	*theApp->getLog() << "Drawing 3d surface\n";
+//#endif
     Draw();
     m_pCanvas->SwapBuffers();
   }
@@ -605,6 +607,10 @@ Graph3dFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
         m_dColorScaleMax = max;  
   }
   double dRadius = maxValue<int> (nx, ny) * SQRT2 / 2;
+
+  if (m_pCanvas)
+    m_pCanvas->SetCurrent();
+
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
   glOrtho (-dRadius, dRadius, -dRadius, dRadius, dRadius*5, -dRadius*5);
@@ -620,9 +626,11 @@ Graph3dFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
 #endif
   
   CreateDisplayList();
-  
-  if (m_pCanvas)
+
+  if (m_pCanvas) {
+	m_pCanvas->SwapBuffers();
     m_pCanvas->Refresh();
+  }
 }
 
 bool 
@@ -645,11 +653,25 @@ Graph3dFileView::OnClose (bool deleteWindow)
   if (deleteWindow) {
     delete m_pFrame;
     m_pFrame = NULL;
+    if (GetDocument() && GetDocument()->getBadFileOpen())
+      ::wxYield();  // wxWindows bug workaround
   }
   
   return true;
 }
 
+void 
+Graph3dFileView::setInitialClientSize ()
+{
+  if (m_pFrame && m_pCanvas) {
+    wxSize bestSize = m_pCanvas->GetBestSize();
+
+    m_pFrame->SetClientSize (bestSize);
+    m_pFrame->Show (true);
+    m_pFrame->SetFocus();
+  }
+}  
+
 void 
 Graph3dFileView::OnScaleAuto (wxCommandEvent& event)
 {
@@ -803,7 +825,7 @@ Graph3dFileView::CreateChildFrame (wxDocument *doc, wxView *view)
 
 
 BEGIN_EVENT_TABLE(Graph3dFileCanvas, wxGLCanvas)
-EVT_PAINT(Graph3dFileCanvas::OnDraw)
+EVT_PAINT(Graph3dFileCanvas::OnPaint)
 EVT_SIZE(Graph3dFileCanvas::OnSize)
 EVT_CHAR(Graph3dFileCanvas::OnChar)
 EVT_MOUSE_EVENTS(Graph3dFileCanvas::OnMouseEvent)
@@ -812,14 +834,11 @@ END_EVENT_TABLE()
 
 
 
-
 Graph3dFileCanvas::Graph3dFileCanvas (Graph3dFileView* view, wxWindow *parent, const wxPoint& pos, 
-                                      const wxSize& size, long style):
-wxGLCanvas (parent, -1, pos, size, style, _T("Graph3dCanvas")
-			), m_pView(view)
+                                      const wxSize& size, long style)
+  : wxGLCanvas (parent, -1, pos, size, style), m_pView(view)
 {
-  parent->Show (true);
-  SetCurrent();
+//  parent->Show (true);
 #if 0
   // Make sure server supports the vertex array extension 
   char* extensions = (char *) glGetString( GL_EXTENSIONS );
@@ -835,8 +854,9 @@ Graph3dFileCanvas::~Graph3dFileCanvas()
 }
 
 void 
-Graph3dFileCanvas::OnDraw (wxDC& dc)
+Graph3dFileCanvas::OnPaint (wxPaintEvent& event)
 {
+  wxPaintDC dc(this);
   if (m_pView)
     m_pView->OnDraw(& dc);
 }
@@ -852,10 +872,9 @@ void
 Graph3dFileCanvas::OnSize (wxSizeEvent& event)
 {
 #ifndef __WXMOTIF__
-  if (!GetContext()) return;
+  // if (!GetContext()) return;
 #endif
   
-  SetCurrent();
   int width, height;
   GetClientSize (&width, &height);
   Reshape (width, height);
@@ -914,7 +933,9 @@ Graph3dFileCanvas::OnChar(wxKeyEvent& event)
 void
 Graph3dFileCanvas::Reshape (int width, int height)
 {
+  SetCurrent();
   glViewport (0, 0, (GLint)width, (GLint)height);
+  SwapBuffers();
 }