From c6f2bb52c598291d61d31a3eba54b84ebb338580 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Fri, 2 Feb 2001 23:04:21 +0000 Subject: [PATCH] r482: no message --- doc/ctsim-gui.tex | 16 ++++++++++++++++ msvc/ctsim/ctsim.plg | 36 +++++++++++++++++++++++++++++++----- src/ctsim.cpp | 16 +++++++++------- src/graph3dview.cpp | 10 +++++----- src/graph3dview.h | 4 ++-- src/views.cpp | 4 ++-- 6 files changed, 65 insertions(+), 21 deletions(-) diff --git a/doc/ctsim-gui.tex b/doc/ctsim-gui.tex index a8df9fe..b0852a4 100644 --- a/doc/ctsim-gui.tex +++ b/doc/ctsim-gui.tex @@ -21,8 +21,24 @@ ctsim [OPTIONS] [files to open...] \section{Phantom Menus} +\subsection{Rasterize Dialog} +\subsection{Projection Dialog} + \section{Image Menus} \section{Projection Menus} +\subsection{Convert Polar Dialog} +\subsection{Convert FFT Polar Dialog} +\subsection{Filtered Backprojection Dialog} + \section{Plot Menus} +\subsection{File Menu} +\subsubsection{Save} +Plot files can be saved. They are saved in an ASCII text format. + +\subsection{View Menu} +\subsubsection{Set} +\subsubsection{Auto} +\subsubsection{Full} + diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg index 2f87449..1cf9051 100644 --- a/msvc/ctsim/ctsim.plg +++ b/msvc/ctsim/ctsim.plg @@ -6,13 +6,22 @@ --------------------Configuration: ctsim - Win32 Debug--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPF.tmp" with contents +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP51.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" +"C:\ctsim\src\dialogs.cpp" +"C:\ctsim\src\docs.cpp" +"C:\ctsim\src\views.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPF.tmp" -Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP10.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP51.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP52.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\RSP52.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP53.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 +42,33 @@ 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\RSP10.tmp" +Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP53.tmp"

Output Window

Compiling... ctsim.cpp +dialogs.cpp +docs.cpp +views.cpp +Compiling... +graph3dview.cpp +C:\ctsim\src\graph3dview.cpp(287) : warning C4101: 'n2' : unreferenced local variable +C:\ctsim\src\graph3dview.cpp(287) : warning C4101: 'n3' : unreferenced local variable +C:\ctsim\src\graph3dview.cpp(287) : warning C4101: 'n4' : unreferenced local variable +C:\ctsim\src\graph3dview.cpp(424) : warning C4305: 'initializing' : truncation from 'const double' to 'float' +C:\ctsim\src\graph3dview.cpp(424) : warning C4305: 'initializing' : truncation from 'const double' to 'float' +C:\ctsim\src\graph3dview.cpp(424) : warning C4305: 'initializing' : truncation from 'const double' to 'float' +C:\ctsim\src\graph3dview.cpp(433) : warning C4305: 'initializing' : truncation from 'const double' to 'float' +C:\ctsim\src\graph3dview.cpp(433) : warning C4305: 'initializing' : truncation from 'const double' to 'float' +C:\ctsim\src\graph3dview.cpp(433) : 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' Linking...

Results

-ctsim.exe - 0 error(s), 0 warning(s) +ctsim.exe - 0 error(s), 12 warning(s) diff --git a/src/ctsim.cpp b/src/ctsim.cpp index d9e3171..c024c6e 100644 --- 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.65 2001/02/02 21:50:18 kevin Exp $ +** $Id: ctsim.cpp,v 1.66 2001/02/02 23:04:06 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.65 2001/02/02 21:50:18 kevin Exp $"; +static const char* rcsindent = "$Id: ctsim.cpp,v 1.66 2001/02/02 23:04:06 kevin Exp $"; struct option CTSimApp::ctsimOptions[] = { @@ -385,21 +385,23 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const MainFrame::~MainFrame() { m_bShuttingDown = true; // Currently used so that Log Window will close - +#if 0 // delete all non-modified documents wxList& rListDocs = theApp->getDocManager()->GetDocuments(); for (wxNode* pNode = rListDocs.GetFirst(); pNode != NULL; pNode = pNode->GetNext()) { - wxDocument* pDoc = static_cast(pNode->GetData()); - if (! pDoc->IsModified()) { - GetDocumentManager()->RemoveDocument(pDoc); + wxDocument* pDoc = dynamic_cast(pNode->GetData()); + if (pDoc && ! pDoc->IsModified()) { + theApp->getDocManager()->RemoveDocument(pDoc); delete pDoc; } } +#endif ::wxYield(); if (theApp->getConfig()) - GetDocumentManager()->FileHistorySave (*theApp->getConfig()); + theApp->getDocManager()->FileHistorySave (*theApp->getConfig()); ::wxYield(); delete theApp->getDocManager(); + } void diff --git a/src/graph3dview.cpp b/src/graph3dview.cpp index 74f51de..03c2399 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.6 2001/02/02 21:50:18 kevin Exp $ +** $Id: graph3dview.cpp,v 1.7 2001/02/02 23:04:06 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 @@ -395,7 +395,7 @@ Graph3dFileView::OnDraw (wxDC* dc) Draw(); std::ostringstream os; os << "Xangle=" << m_dXRotate << ", Yangle=" << m_dYRotate << ", Zangle=" << m_dZRotate; - m_statusBar.SetStatusText (os.str().c_str()); + m_pStatusBar->SetStatusText (os.str().c_str()); m_pCanvas->SwapBuffers(); } @@ -614,7 +614,7 @@ Graph3dFileView::OnClose (bool deleteWindow) if (deleteWindow) { // m_pFrame->Show(false); - delete m_pFrame; //->Destroy(); + delete m_pFrame; m_pFrame = NULL; // if (GetDocument() && GetDocument()->getBadFileOpen()) // ::wxYield(); // wxWindows bug workaround @@ -637,8 +637,8 @@ Graph3dFileView::CreateChildFrame (wxDocument *doc, wxView *view) #endif theApp->setIconForFrame (subframe); - m_statusBar.Create (subframe, -1); - subframe->SetStatusBar (&m_statusBar); + m_pStatusBar = new wxStatusBar (subframe, -1); + subframe->SetStatusBar (m_pStatusBar); m_pFileMenu = new wxMenu; diff --git a/src/graph3dview.h b/src/graph3dview.h index 1cb68cf..ed43815 100644 --- a/src/graph3dview.h +++ b/src/graph3dview.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: graph3dview.h,v 1.3 2001/02/02 00:46:38 kevin Exp $ +** $Id: graph3dview.h,v 1.4 2001/02/02 23:04:06 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 @@ -47,7 +47,7 @@ private: wxMenu* m_pFileMenu; wxMenu *m_pViewMenu; - wxStatusBar m_statusBar; + wxStatusBar* m_pStatusBar; GLfloat m_dXRotate; GLfloat m_dYRotate; diff --git a/src/views.cpp b/src/views.cpp index 9352b4c..6f71f01 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.95 2001/02/02 00:46:38 kevin Exp $ +** $Id: views.cpp,v 1.96 2001/02/02 23:04:06 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 @@ -1032,7 +1032,7 @@ ImageFileView::OnClose (bool deleteWindow) SetFrame(NULL); if (deleteWindow) { - m_pFrame->Destroy(); + delete m_pFrame; m_pFrame = NULL; if (GetDocument() && GetDocument()->getBadFileOpen()) ::wxYield(); // wxWindows bug workaround -- 2.34.1