r475: no message

diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg
index 20f98420d7f9466bfd7a114e56963eae1698c440..b0ee1d31d0a2b806d0d7861ec13cb02120ca6591 100644 (file)
--- a/msvc/ctsim/ctsim.plg
+++ b/msvc/ctsim/ctsim.plg
@@ -6,13 +6,13 @@
 --------------------Configuration: ctsim - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPB6F.tmp" with contents
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP27.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.0alpha5\" /FR"Debug/" /Fp"Debug/ctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
-"C:\ctsim\src\ctsim.cpp"
+/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\RSPB6F.tmp" 
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPB70.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP27.tmp" 
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP28.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,16 +33,27 @@ 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\RSPB70.tmp"
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP28.tmp"
 <h3>Output Window</h3>
 Compiling...
-ctsim.cpp
+graph3dview.cpp
+C:\ctsim\src\graph3dview.cpp(230) : warning C4101: 'n2' : unreferenced local variable
+C:\ctsim\src\graph3dview.cpp(230) : warning C4101: 'n3' : unreferenced local variable
+C:\ctsim\src\graph3dview.cpp(230) : warning C4101: 'n4' : unreferenced local variable
+C:\ctsim\src\graph3dview.cpp(296) : warning C4305: 'initializing' : truncation from 'const double' to 'float'
+C:\ctsim\src\graph3dview.cpp(296) : warning C4305: 'initializing' : truncation from 'const double' to 'float'
+C:\ctsim\src\graph3dview.cpp(296) : warning C4305: 'initializing' : truncation from 'const double' to 'float'
+C:\ctsim\src\graph3dview.cpp(301) : warning C4305: 'initializing' : truncation from 'const double' to 'float'
+C:\ctsim\src\graph3dview.cpp(301) : warning C4305: 'initializing' : truncation from 'const double' to 'float'
+C:\ctsim\src\graph3dview.cpp(301) : warning C4305: 'initializing' : truncation from 'const double' to 'float'
+C:\ctsim\src\graph3dview.cpp(302) : warning C4305: 'initializing' : truncation from 'const double' to 'float'
+C:\ctsim\src\graph3dview.cpp(302) : warning C4305: 'initializing' : truncation from 'const double' to 'float'
 Linking...
 
 
 
 <h3>Results</h3>
-ctsim.exe - 0 error(s), 0 warning(s)
+ctsim.exe - 0 error(s), 11 warning(s)
 </pre>
 </body>
 </html>

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index a9966b390ebffc9f03380f00e9c89c9545733769..6a1e1117abff5458f4284552796b6ce0e3c86f68 100644 (file)
--- a/src/ctsim.cpp
+++ b/src/ctsim.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ctsim.cpp,v 1.63 2001/01/30 13:47:46 kevin Exp $
+**  $Id: ctsim.cpp,v 1.64 2001/01/31 01:01:22 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
@@ -70,7 +70,7 @@
 #endif
 #endif
 
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.63 2001/01/30 13:47:46 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.64 2001/01/31 01:01:22 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -138,8 +138,10 @@ CTSimApp::OnInit()
        m_pDocTemplPhantom = new wxDocTemplate (m_docManager, "PhantomFile", "*.phm", "", "phm", "PhantomFile", "PhantomView", CLASSINFO(PhantomFileDocument), CLASSINFO(PhantomFileView));
        m_pDocTemplPlot = new wxDocTemplate (m_docManager, "PlotFile", "*.plt", "", "plt", "PlotFile", "PlotView", CLASSINFO(PlotFileDocument), CLASSINFO(PlotFileView));
        m_pDocTemplText = new wxDocTemplate (m_docManager, "TextFile", "*.txt", "", "txt", "TextFile", "TextView", CLASSINFO(TextFileDocument), CLASSINFO(TextFileView), wxTEMPLATE_INVISIBLE);
+#if wxUSE_GLCANVAS
        m_pDocTemplGraph3d = new wxDocTemplate (m_docManager, "Graph3dFile", "*.g3d", "", "g3d", "Graph3dFile", "Graph3dView", CLASSINFO(Graph3dFileDocument), CLASSINFO(Graph3dFileView), wxTEMPLATE_INVISIBLE);
-       
+#endif
+
 #if wxUSE_GIF
        wxImage::AddHandler(new wxGIFHandler);     // Required for images in the online documentation
 #endif
@@ -887,6 +889,7 @@ CTSimApp::newPhantomDoc()
        return newDoc;
 }
 
+#if wxUSE_GLCANVAS
 
 Graph3dFileDocument*
 CTSimApp::newGraph3dDoc()
@@ -906,3 +909,4 @@ CTSimApp::newGraph3dDoc()
        
        return newDoc;
 }
+#endif

diff --git a/src/ctsim.h b/src/ctsim.h
index 2577849c4eecd6c78299466f6d5f2b900dd15c3e..412fccaf3c792b90b337c71ebd27e975af52edf2 100644 (file)
--- a/src/ctsim.h
+++ b/src/ctsim.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: ctsim.h,v 1.38 2001/01/30 10:58:13 kevin Exp $
+**  $Id: ctsim.h,v 1.39 2001/01/31 01:01:22 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
@@ -59,7 +59,9 @@ class ProjectionFileDocument;
 class PhantomFileDocument;
 class PlotFileDocument;
 class TextFileDocument;
+#if wxUSE_GLCANVAS
 class Graph3dFileDocument;
+#endif
 
 #include <vector>
 #include "wx/docview.h"
@@ -185,7 +187,10 @@ private:
   wxDocTemplate* m_pDocTemplPhantom;
   wxDocTemplate* m_pDocTemplPlot;
   wxDocTemplate* m_pDocTemplText;
+#if wxUSE_GLCANVAS
   wxDocTemplate* m_pDocTemplGraph3d;
+#endif
+  
   TextFileDocument* m_pLogDoc;
 
   void usage (const char* program);
@@ -219,7 +224,9 @@ public:
   wxDocTemplate* getDocTemplPhantom() { return m_pDocTemplPhantom; }
   wxDocTemplate* getDocTemplPlot() { return m_pDocTemplPlot; }
   wxDocTemplate* getDocTemplText() { return m_pDocTemplText; }
+#if wxUSE_GLCANVAS
   wxDocTemplate* getDocTemplGraph3d() { return m_pDocTemplGraph3d; }
+#endif
   TextFileDocument* getLogDoc() { return m_pLogDoc; }
 
   ProjectionFileDocument* newProjectionDoc();
@@ -227,7 +234,9 @@ public:
   PhantomFileDocument* newPhantomDoc();
   PlotFileDocument* newPlotDoc();
   TextFileDocument* newTextDoc();
+#if wxUSE_GLCANVAS
   Graph3dFileDocument* newGraph3dDoc();
+#endif
 };
 
 DECLARE_APP(CTSimApp)
@@ -272,8 +281,10 @@ enum {
     IFMENU_IMAGE_SUBTRACT,
     IFMENU_IMAGE_MULTIPLY,
     IFMENU_IMAGE_DIVIDE,
+#if wxUSE_GLCANVAS
     IFMENU_IMAGE_CONVERT3D,
-    
+#endif
+
     IFMENU_FILTER_INVERTVALUES,
     IFMENU_FILTER_SQRT,
     IFMENU_FILTER_SQUARE,

diff --git a/src/docs.cpp b/src/docs.cpp
index 59371ab10fd589eb751a63fedf19e43c2f91494e..f82fc6061da92d1f9df042bf48169841ae992236 100644 (file)
--- 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.20 2001/01/30 10:58:13 kevin Exp $
+**  $Id: docs.cpp,v 1.21 2001/01/31 01:01:22 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
@@ -371,6 +371,8 @@ TextFileDocument::getTextCtrl()
 //
 //////////////////////////////////////////////////////////////////////////
 
+#if wxUSE_GLCANVAS
+
 IMPLEMENT_DYNAMIC_CLASS(Graph3dFileDocument, wxDocument)
 
 Graph3dFileDocument::Graph3dFileDocument(void) 
@@ -443,3 +445,5 @@ Graph3dFileDocument::createFromImageFile (const ImageFile& rImageFile)
 #endif
   return true;
 }
+
+#endif // wxUSE_GLCANVAS
\ No newline at end of file

diff --git a/src/docs.h b/src/docs.h
index 9b54e37c53928c81852e0885bb79f9170591b2cb..86f6cce7f7c8c2be4aea9bd86e80107f06bb21df 100644 (file)
--- a/src/docs.h
+++ b/src/docs.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: docs.h,v 1.19 2001/01/30 10:58:13 kevin Exp $
+**  $Id: docs.h,v 1.20 2001/01/31 01:01:22 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
@@ -219,7 +219,7 @@ class TextFileDocument: public wxDocument
 };
 
 
-
+#if wxUSE_GLCANVAS
 #include <GL/gl.h>
 #include <GL/glu.h>
 
@@ -252,5 +252,7 @@ class Graph3dFileDocument: public wxDocument
   void setBadFileOpen()       { m_bBadFileOpen = true; }
   bool createFromImageFile (const ImageFile& rImageFile);
 };
+#endif // wxUSE_GLCANVAS
+
 
 #endif

diff --git a/src/graph3dview.cpp b/src/graph3dview.cpp
index a29089a7162daf5f4ac3cbdc8807cd56d9d8a743..eb5cbf4a8afd8a72dfa5c9c989e3e158b7fae250 100644 (file)
--- 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.3 2001/01/30 13:47:46 kevin Exp $
+**  $Id: graph3dview.cpp,v 1.4 2001/01/31 01:01:22 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
@@ -25,7 +25,6 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
-
 #ifdef __GNUG__
 #pragma implementation
 #pragma interface
@@ -42,6 +41,8 @@
 #include "wx/wx.h"
 #endif
 
+#if wxUSE_GLCANVAS
+
 #if !wxUSE_GLCANVAS
 #error Please set wxUSE_GLCANVAS to 1 in setup.h.
 #endif
@@ -620,3 +621,4 @@ Graph3dFileCanvas::OnEraseBackground(wxEraseEvent& event)
 
 
 
+#endif // wxUSE_GLCANVAS

diff --git a/src/views.cpp b/src/views.cpp
index a8cb6e401156268a3b544818f249ddac715ab006..ba400e708a4cf336038b2d2bc07dcdbe3276b3fd 100644 (file)
--- 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.93 2001/01/30 10:58:13 kevin Exp $
+**  $Id: views.cpp,v 1.94 2001/01/31 01:01:22 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
@@ -226,7 +226,9 @@ EVT_MENU(IFMENU_IMAGE_SUBTRACT, ImageFileView::OnSubtract)
 EVT_MENU(IFMENU_IMAGE_MULTIPLY, ImageFileView::OnMultiply)
 EVT_MENU(IFMENU_IMAGE_DIVIDE, ImageFileView::OnDivide)
 EVT_MENU(IFMENU_IMAGE_SCALESIZE, ImageFileView::OnScaleSize)
+#if wxUSE_GLCANVAS
 EVT_MENU(IFMENU_IMAGE_CONVERT3D, ImageFileView::OnConvert3d)
+#endif
 #ifdef HAVE_FFT
 EVT_MENU(IFMENU_FILTER_FFT, ImageFileView::OnFFT)
 EVT_MENU(IFMENU_FILTER_IFFT, ImageFileView::OnIFFT)
@@ -862,7 +864,9 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   image_menu->Append (IFMENU_IMAGE_DIVIDE, "&Divide...");
   image_menu->AppendSeparator();
   image_menu->Append (IFMENU_IMAGE_SCALESIZE, "S&cale Size...");
+#if wxUSE_GLCANVAS
   image_menu->Append (IFMENU_IMAGE_CONVERT3D, "Convert &3-D\tCtrl-3");
+#endif
   
   m_pMenuAnalyze = new wxMenu;
   m_pMenuAnalyze->Append (IFMENU_PLOT_ROW, "Plot &Row");
@@ -911,8 +915,13 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   accelEntries[7].Set (wxACCEL_CTRL, static_cast<int>('A'), IFMENU_VIEW_SCALE_AUTO);
   accelEntries[8].Set (wxACCEL_CTRL, static_cast<int>('U'), IFMENU_VIEW_SCALE_FULL);
   accelEntries[9].Set (wxACCEL_CTRL, static_cast<int>('E'), IFMENU_VIEW_SCALE_MINMAX);
-  accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('3'), IFMENU_IMAGE_CONVERT3D);
+#if wxUSE_GLCANVAS
+  accelEntries[10].Set (wxACCEL_CTRL, static_cast<int>('3'), IFMENU_IMAGE_CONVERT3D);
   wxAcceleratorTable accelTable (11, accelEntries);
+#else
+  wxAcceleratorTable accelTable (10, accelEntries);
+#endif
+
   subframe->SetAcceleratorTable (accelTable);
   
   return subframe;
@@ -1108,6 +1117,7 @@ ImageFileView::OnScaleSize (wxCommandEvent& event)
   }
 }
 
+#if wxUSE_GLCANVAS
 void
 ImageFileView::OnConvert3d (wxCommandEvent& event)
 {
@@ -1118,7 +1128,8 @@ ImageFileView::OnConvert3d (wxCommandEvent& event)
   pGraph3d->getView()->getFrame()->SetClientSize (200, 200);
   pGraph3d->getView()->getFrame()->Show (true);
 }
-  
+#endif
+
 void
 ImageFileView::OnPlotRow (wxCommandEvent& event)
 {

diff --git a/src/views.h b/src/views.h
index 88f0e2145bbea15a4f231883d2565fcee329a041..e3eb560f7b2a28c97370f4461ad0fe09e4dea311 100644 (file)
--- a/src/views.h
+++ b/src/views.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: views.h,v 1.43 2001/01/30 10:58:14 kevin Exp $
+**  $Id: views.h,v 1.44 2001/01/31 01:01:22 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
@@ -35,7 +35,10 @@
 #include "wx/wx.h"
 #include "docs.h"
 #include "imagefile.h"
+
+#if wxUSE_GLCANVAS
 #include "graph3dview.h"
+#endif
 
 class ImageFileCanvas;
 class ImageFileView : public wxView
@@ -106,8 +109,10 @@ public:
   void OnInverseFourier (wxCommandEvent& event);
   void OnShuffleNaturalToFourierOrder (wxCommandEvent& event);
   void OnShuffleFourierToNaturalOrder (wxCommandEvent& event);
+#if wxUSE_GLCANVAS
   void OnConvert3d (wxCommandEvent& event);
-  
+#endif
+
 #ifdef HAVE_FFT
   void OnFFT (wxCommandEvent& event);
   void OnIFFT (wxCommandEvent& event);