From 806a6ed49930ae2bd8028eb7e3ffb79f017ef7f1 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sat, 3 Feb 2001 18:42:21 +0000 Subject: [PATCH] r484: no message --- msvc/ctsim/ctsim.plg | 20 ++++++++++---------- src/docs.cpp | 4 ++-- src/graph3dview.cpp | 33 ++++++++++++++++++++------------- src/views.cpp | 5 ++--- 4 files changed, 34 insertions(+), 28 deletions(-) diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg index 0cbdeba..268e5bd 100644 --- a/msvc/ctsim/ctsim.plg +++ b/msvc/ctsim/ctsim.plg @@ -6,13 +6,13 @@ --------------------Configuration: ctsim - Win32 Debug--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP2F.tmp" with contents +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP35.tmp" with contents [ /nologo /G6 /MTd /W3 /Gm /Gi /GR /GX /Zi /Od /Gy /I "\wx2.2.5\include" /I "..\..\..\fftw-2.1.3\fftw" /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\rfftw" /D VERSION=\"3.0.0beta1\" /D "_DEBUG" /D "__WXMSW__" /D "HAVE_SGP" /D "HAVE_PNG" /D "HAVE_WXWINDOWS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_FFTW" /D "HAVE_RFFTW" /D "HAVE_GETOPT_H" /D "MSVC" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D CTSIMVERSION=\"3.0.0beta1\" /FR"Debug/" /Fp"Debug/ctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c "C:\ctsim\src\graph3dview.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP2F.tmp" -Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP30.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP35.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP36.tmp" with contents [ comctl32.lib winmm.lib rpcrt4.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ../libctsim/Debug/libctsim.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib wxd.lib xpmd.lib tiffd.lib zlibd.lib pngd.lib opengl32.lib glu32.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/ctsim.pdb" /debug /machine:I386 /out:"Debug/ctsim.exe" /pdbtype:sept /libpath:"\wx2.2.5\lib" .\Debug\ctsim.obj @@ -33,22 +33,22 @@ comctl32.lib winmm.lib rpcrt4.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib w \wx2.2.5\lib\zlibd.lib \wx2.2.5\lib\tiffd.lib ] -Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP30.tmp" +Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP36.tmp"

Output Window

Compiling... graph3dview.cpp C:\ctsim\src\graph3dview.cpp(288) : warning C4101: 'n2' : unreferenced local variable C:\ctsim\src\graph3dview.cpp(288) : warning C4101: 'n3' : unreferenced local variable C:\ctsim\src\graph3dview.cpp(288) : warning C4101: 'n4' : unreferenced local variable -C:\ctsim\src\graph3dview.cpp(425) : warning C4305: 'initializing' : truncation from 'const double' to 'float' -C:\ctsim\src\graph3dview.cpp(425) : warning C4305: 'initializing' : truncation from 'const double' to 'float' -C:\ctsim\src\graph3dview.cpp(425) : warning C4305: 'initializing' : truncation from 'const double' to 'float' -C:\ctsim\src\graph3dview.cpp(434) : warning C4305: 'initializing' : truncation from 'const double' to 'float' -C:\ctsim\src\graph3dview.cpp(434) : warning C4305: 'initializing' : truncation from 'const double' to 'float' -C:\ctsim\src\graph3dview.cpp(434) : warning C4305: 'initializing' : truncation from 'const double' to 'float' +C:\ctsim\src\graph3dview.cpp(426) : warning C4305: 'initializing' : truncation from 'const double' to 'float' +C:\ctsim\src\graph3dview.cpp(426) : warning C4305: 'initializing' : truncation from 'const double' to 'float' +C:\ctsim\src\graph3dview.cpp(426) : warning C4305: 'initializing' : truncation from 'const double' to 'float' C:\ctsim\src\graph3dview.cpp(435) : warning C4305: 'initializing' : truncation from 'const double' to 'float' C:\ctsim\src\graph3dview.cpp(435) : warning C4305: 'initializing' : truncation from 'const double' to 'float' C:\ctsim\src\graph3dview.cpp(435) : warning C4305: 'initializing' : truncation from 'const double' to 'float' +C:\ctsim\src\graph3dview.cpp(436) : warning C4305: 'initializing' : truncation from 'const double' to 'float' +C:\ctsim\src\graph3dview.cpp(436) : warning C4305: 'initializing' : truncation from 'const double' to 'float' +C:\ctsim\src\graph3dview.cpp(436) : warning C4305: 'initializing' : truncation from 'const double' to 'float' Linking... diff --git a/src/docs.cpp b/src/docs.cpp index ae82675..88ad50f 100644 --- a/src/docs.cpp +++ b/src/docs.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: docs.cpp,v 1.22 2001/02/02 00:46:38 kevin Exp $ +** $Id: docs.cpp,v 1.23 2001/02/03 18:42:21 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 @@ -430,4 +430,4 @@ Graph3dFileDocument::createFromImageFile (const ImageFile& rImageFile) return true; } -#endif // wxUSE_GLCANVAS \ No newline at end of file +#endif // wxUSE_GLCANVAS diff --git a/src/graph3dview.cpp b/src/graph3dview.cpp index 03c2399..9526df4 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.7 2001/02/02 23:04:06 kevin Exp $ +** $Id: graph3dview.cpp,v 1.8 2001/02/03 18:38:42 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 @@ -242,13 +242,14 @@ Graph3dFileView::DrawSurface() if (nx == 0 || ny == 0 || ! v) return; - glRotatef( m_dXRotate, 1.0, 0.0, 0.0 ); - glRotatef( m_dZRotate, 0.0, 1.0, 0.0 ); - glRotatef( m_dYRotate, 0.0, 0.0, 1.0 ); - glTranslatef (-static_cast(nx) / 2., 0, -static_cast(ny) / 2.); - InitMaterials(); + glRotatef( m_dXRotate, 1.0, 0.0, 0.0 ); + glRotatef( m_dZRotate, 0.0, 1.0, 0.0 ); + glRotatef( m_dYRotate, 0.0, 0.0, 1.0 ); + glTranslatef (-static_cast(nx) / 2., 0., -static_cast(ny) / 2.); + + if (m_bSmooth) { glShadeModel (GL_SMOOTH); } else { @@ -392,6 +393,7 @@ Graph3dFileView::OnDraw (wxDC* dc) if (! m_pCanvas->GetContext()) return; #endif + m_pCanvas->SwapBuffers(); Draw(); std::ostringstream os; os << "Xangle=" << m_dXRotate << ", Yangle=" << m_dYRotate << ", Zangle=" << m_dZRotate; @@ -423,8 +425,8 @@ Graph3dFileView::InitMaterials() #if 1 static float ambient[] = {0.1, 0.1, 0.1, 1.0}; static float diffuse[] = {1.0, 1.0, 1.0, 1.0}; - static float position0[] = {0, 0, -nx/2, 0, 0.0}; - static float position1[] = {0, 0, nx/2, 0.0}; + static float position0[] = {-nx/2, -ny/2, -ny/2, 0, 0.0}; + static float position1[] = {-nx/2, -ny/2, ny/2, 0.0}; static float ambient1[] = {0.5, 0.5, 0.5, 1.0}; static float diffuse1[] = {1.0, 1.0, 1.0, 1.0}; // static float position0[] = {0.0, 0.0, 20.0, 0.0}; @@ -577,6 +579,11 @@ Graph3dFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) int maxDim = maxValue (nx, ny); glOrtho (-maxDim * 0.71, maxDim * 0.71, -maxDim * 0.71, maxDim * 0.71, maxDim * 0.71, -maxDim * 0.71); + GLfloat eyep[3], lookp[3], up[3]; + eyep[0] = -nx/2; eyep[1] = 0; eyep[2] = -ny/2; + lookp[1] = 0; lookp[1] = 0, lookp[2] = 0; + up[0] = 0; up[1] = 1; up[2] = 0; + //gluLookAt (eyep[0], eyep[1], eyep[2], lookp[0], lookp[1], lookp[2], up[0], up[1], up[2]); glMatrixMode(GL_MODELVIEW); glLoadIdentity(); @@ -602,7 +609,7 @@ Graph3dFileView::OnClose (bool deleteWindow) Activate (false); if (m_pCanvas) { -// m_pCanvas->Show(false); + // m_pCanvas->Show(false); m_pCanvas->setView(NULL); m_pCanvas = NULL; } @@ -613,11 +620,11 @@ Graph3dFileView::OnClose (bool deleteWindow) SetFrame(NULL); if (deleteWindow) { -// m_pFrame->Show(false); + // m_pFrame->Show(false); delete m_pFrame; m_pFrame = NULL; -// if (GetDocument() && GetDocument()->getBadFileOpen()) -// ::wxYield(); // wxWindows bug workaround + // if (GetDocument() && GetDocument()->getBadFileOpen()) + // ::wxYield(); // wxWindows bug workaround } return true; @@ -828,7 +835,7 @@ Graph3dFileCanvas::OnMouseEvent(wxMouseEvent& event) void Graph3dFileCanvas::OnEraseBackground(wxEraseEvent& event) { - // Do nothing: avoid flashing. + wxGLCanvas::OnEraseBackground(event); // Do nothing: avoid flashing. } diff --git a/src/views.cpp b/src/views.cpp index 6f71f01..a41efaa 100644 --- a/src/views.cpp +++ b/src/views.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: views.cpp,v 1.96 2001/02/02 23:04:06 kevin Exp $ +** $Id: views.cpp,v 1.97 2001/02/03 18:42:21 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 @@ -932,7 +932,6 @@ bool ImageFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) ) { m_pFrame = CreateChildFrame(doc, this); - (m_pFrame); m_bMinSpecified = false; m_bMaxSpecified = false; @@ -2170,7 +2169,7 @@ EVT_MENU(PJMENU_CONVERT_FFT_POLAR, ProjectionFileView::OnConvertFFTPolar) END_EVENT_TABLE() ProjectionFileView::ProjectionFileView() -: wxView(), m_pCanvas(NULL), m_pFrame(NULL), m_pFileMenu(0) +: wxView(), m_pFrame(NULL), m_pCanvas(NULL), m_pFileMenu(0) { #ifdef DEBUG m_iDefaultNX = 115; -- 2.34.1