X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fgraph3dview.cpp;h=a6c9c034f184c0b217bf23ef9b22643e1851e891;hb=bf055865d682c7ff942b36315985711a2c5e5793;hp=7abec424082152bfdb0607f78b13c828a199e9ae;hpb=d27e3b0708ba2fb395944278486bf125e4f362a5;p=ctsim.git

diff --git a/src/graph3dview.cpp b/src/graph3dview.cpp
index 7abec42..a6c9c03 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.14 2001/02/20 22:11:27 kevin Exp $
+**  $Id: graph3dview.cpp,v 1.18 2001/03/08 17:37:09 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
@@ -30,13 +30,8 @@
 #pragma interface
 #endif
 
-// For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
@@ -197,7 +192,6 @@ bool
 Graph3dFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) )
 {
   m_pFrame = CreateChildFrame(doc, this);
-  (m_pFrame);
   
   int width, height;
   m_pFrame->GetClientSize (&width, &height);
@@ -301,14 +295,14 @@ Graph3dFileView::CreateDisplayList()
   
   double dXPos = -dXOffset;
   for (unsigned ix = 0; ix < nx - 1; ix++, dXPos++) {
-	double dYPos = -dYOffset;
+    double dYPos = -dYOffset;
     glBegin(GL_QUAD_STRIP);
-    double p1[3], p2[3], p3[3];
-    double n1[3]; 
+    double p1[3], p2[3], p3[3], n1[3]; 
     p1[0] = dXPos;  p1[1] = actScale * (v[ix][0] + actOffset); p1[2] = dYPos;
     p2[0] = dXPos+1; p2[1] = actScale * (v[ix+1][0] + actOffset); p2[2] = dYPos; 
     p3[0] = dXPos; p3[1] = actScale * (v[ix][1] + actOffset); p3[2] = dYPos + 1;
     CalculateVectorNormal (p1, p2, p3, &n1[0], &n1[1], &n1[2]);
+
     double dIntensity1, dIntensity2;
     if (m_bColor) {
       dIntensity1 = (v[ix][0] - dMin) / dIntensityScale;
@@ -585,8 +579,8 @@ Graph3dFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
   if (! GetDocument())
     return;
   
-  int nx = GetDocument()->nx();
-  int ny = GetDocument()->ny();
+  unsigned int nx = GetDocument()->nx();
+  unsigned int ny = GetDocument()->ny();
   const ImageFileArrayConst v = GetDocument()->getArray();
   if (v != NULL && nx != 0 && ny != 0) {
     double min = v[0][0];