X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fgraph3dview.cpp;h=a6c9c034f184c0b217bf23ef9b22643e1851e891;hb=d850a3477e9ccaecfa85e00bc619848fcc29bdb6;hp=4295f4c9a3da128a61901d449082c83f4207a343;hpb=8cce345df80fdbeea1c03a04a71d805951a87b74;p=ctsim.git diff --git a/src/graph3dview.cpp b/src/graph3dview.cpp index 4295f4c..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.16 2001/03/04 03:14:47 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 @@ -295,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; @@ -579,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];