--------------------Configuration: libctsim - Win32 Debug--------------------
</h3>
<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1470.tmp" with contents
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1490.tmp" with contents
[
/nologo /G6 /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\zlib" /I "..\..\INCLUDE" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2\include" /D "_DEBUG" /D "HAVE_WXWIN" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "WIN32" /D "_MBCS" /D "_LIB" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /FR"Debug/" /Fp"Debug/libctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
+"D:\ctsim\libctsim\backprojectors.cpp"
"D:\ctsim\libctgraphics\dlgezplot.cpp"
+"D:\ctsim\libctsim\filter.cpp"
+"D:\ctsim\libctsim\fourier.cpp"
"D:\ctsim\libctsim\globalvars.cpp"
+"D:\ctsim\libctsupport\hashtable.cpp"
+"D:\ctsim\libctsim\imagefile.cpp"
+"D:\ctsim\libctsim\phantom.cpp"
+"D:\ctsim\libctsupport\plotfile.cpp"
+"D:\ctsim\libctgraphics\pol.cpp"
+"D:\ctsim\libctsim\procsignal.cpp"
+"D:\ctsim\libctsim\projections.cpp"
+"D:\ctsim\libctsim\reconstruct.cpp"
+"D:\ctsim\libctsim\scanner.cpp"
"D:\ctsim\libctsupport\syserror.cpp"
+"D:\ctsim\libctsim\trace.cpp"
]
-Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1470.tmp"
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1471.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1490.tmp"
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1491.tmp" with contents
[
/nologo /out:"Debug\libctsim.lib"
.\Debug\array2dfile.obj
.\Debug\transformmatrix.obj
.\Debug\xform.obj
]
-Creating command line "link.exe -lib @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1471.tmp"
+Creating command line "link.exe -lib @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1491.tmp"
<h3>Output Window</h3>
Compiling...
+backprojectors.cpp
dlgezplot.cpp
+filter.cpp
+fourier.cpp
globalvars.cpp
+hashtable.cpp
+imagefile.cpp
+phantom.cpp
+plotfile.cpp
+pol.cpp
+procsignal.cpp
+projections.cpp
+reconstruct.cpp
+scanner.cpp
syserror.cpp
+trace.cpp
Creating library...
<h3>
--------------------Configuration: ctsim - Win32 Debug--------------------
</h3>
<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1472.tmp" with contents
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1492.tmp" with contents
[
/nologo /G6 /MTd /W3 /Gm /GR /GX /Zi /Od /I "\wx2\include" /I "." /I "..\..\include" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\zlib" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /D VERSION=\"2.5.0\" /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
"D:\ctsim\src\ctsim.cpp"
"D:\ctsim\src\docs.cpp"
"D:\ctsim\src\views.cpp"
]
-Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1472.tmp"
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1473.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1492.tmp"
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1493.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 ..\..\..\lpng108\msvc\win32\libpng\lib_dbg\libpng.lib ..\..\..\lpng108\msvc\win32\zlib\lib_dbg\zlib.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib ../../../wx2/lib/wxd.lib xpmd.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/ctsim.pdb" /debug /machine:I386 /out:"Debug/ctsim.exe" /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" /libpath:"..\..\..\wx2\lib"
.\Debug\ctsim.obj
\wx2\lib\wxd.lib
\wx2\lib\xpmd.lib
]
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1473.tmp"
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP1493.tmp"
<h3>Output Window</h3>
Compiling...
+views.cpp
+ctsim.cpp
dialogs.cpp
dlgprojections.cpp
dlgreconstruct.cpp
docs.cpp
-views.cpp
-ctsim.cpp
Linking...
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: views.cpp,v 1.84 2001/01/28 19:10:18 kevin Exp $
+** $Id: views.cpp,v 1.85 2001/01/28 20:05:17 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
<< os.str().c_str();
differenceImage.labelAdd (os.str().c_str());
if (theApp->getSetModifyNewDocs())
- pDifferenceDoc->Modify(true);
- pDifferenceDoc->UpdateAllViews(this);
+ pDifferenceDoc->Modify (true);
+ pDifferenceDoc->UpdateAllViews (this);
pDifferenceDoc->getView()->OnUpdate (this, NULL);
pDifferenceDoc->getView()->getFrame()->Show(true);
}
rIF.labelAdd ("Invert Pixel Values");
if (theApp->getSetModifyNewDocs())
GetDocument()->Modify(TRUE);
- GetDocument()->UpdateAllViews(this);
+ GetDocument()->UpdateAllViews (this);
}
void
rIF.labelAdd ("Square Pixel Values");
if (theApp->getSetModifyNewDocs())
GetDocument()->Modify(TRUE);
- GetDocument()->UpdateAllViews(this);
+ GetDocument()->UpdateAllViews (this);
}
void
rIF.labelAdd ("Square-root Pixel Values");
if (theApp->getSetModifyNewDocs())
GetDocument()->Modify(TRUE);
- GetDocument()->UpdateAllViews(this);
+ GetDocument()->UpdateAllViews (this);
}
void
rIF.labelAdd ("Logrithm base-e Pixel Values");
if (theApp->getSetModifyNewDocs())
GetDocument()->Modify(TRUE);
- GetDocument()->UpdateAllViews(this);
+ GetDocument()->UpdateAllViews (this);
}
void
rIF.labelAdd ("Exponent base-e Pixel Values");
if (theApp->getSetModifyNewDocs())
GetDocument()->Modify(TRUE);
- GetDocument()->UpdateAllViews(this);
+ GetDocument()->UpdateAllViews (this);
}
void
*theApp->getLog() << os.str().c_str() << "\n";
if (theApp->getSetModifyNewDocs())
pNewDoc->Modify(TRUE);
- pNewDoc->UpdateAllViews(this);
+ pNewDoc->UpdateAllViews (this);
pNewDoc->getView()->OnUpdate (this, NULL);
pNewDoc->getView()->getFrame()->Show(true);
}
*theApp->getLog() << os.str().c_str() << "\n";
if (theApp->getSetModifyNewDocs())
pNewDoc->Modify(TRUE);
- pNewDoc->UpdateAllViews(this);
+ pNewDoc->UpdateAllViews (this);
pNewDoc->getView()->OnUpdate (this, NULL);
pNewDoc->getView()->getFrame()->Show(true);
}
*theApp->getLog() << os.str().c_str() << "\n";
if (theApp->getSetModifyNewDocs())
pNewDoc->Modify(TRUE);
- pNewDoc->UpdateAllViews(this);
+ pNewDoc->UpdateAllViews (this);
pNewDoc->getView()->OnUpdate (this, NULL);
pNewDoc->getView()->getFrame()->Show(true);
}
*theApp->getLog() << os.str().c_str() << "\n";
if (theApp->getSetModifyNewDocs())
pNewDoc->Modify(TRUE);
- pNewDoc->UpdateAllViews(this);
+ pNewDoc->UpdateAllViews (this);
pNewDoc->getView()->OnUpdate (this, NULL);
pNewDoc->getView()->getFrame()->Show(true);
}
m_bMaxSpecified = false;
if (theApp->getSetModifyNewDocs())
GetDocument()->Modify(TRUE);
- GetDocument()->UpdateAllViews(this);
+ GetDocument()->UpdateAllViews (this);
}
void
m_bMaxSpecified = false;
if (theApp->getSetModifyNewDocs())
GetDocument()->Modify(TRUE);
- GetDocument()->UpdateAllViews(this);
+ GetDocument()->UpdateAllViews (this);
}
void
m_bMaxSpecified = false;
if (theApp->getSetModifyNewDocs())
GetDocument()->Modify(TRUE);
- GetDocument()->UpdateAllViews(this);
+ GetDocument()->UpdateAllViews (this);
}
void
m_bMaxSpecified = false;
if (theApp->getSetModifyNewDocs())
GetDocument()->Modify(TRUE);
- GetDocument()->UpdateAllViews(this);
+ GetDocument()->UpdateAllViews (this);
}
void
m_bMaxSpecified = false;
if (theApp->getSetModifyNewDocs())
GetDocument()->Modify(TRUE);
- GetDocument()->UpdateAllViews(this);
+ GetDocument()->UpdateAllViews (this);
}
void
m_bMaxSpecified = false;
if (theApp->getSetModifyNewDocs())
GetDocument()->Modify(TRUE);
- GetDocument()->UpdateAllViews(this);
+ GetDocument()->UpdateAllViews (this);
}
#endif
m_bMaxSpecified = false;
if (theApp->getSetModifyNewDocs())
GetDocument()->Modify(TRUE);
- GetDocument()->UpdateAllViews(this);
+ GetDocument()->UpdateAllViews (this);
}
void
m_bMaxSpecified = false;
if (theApp->getSetModifyNewDocs())
GetDocument()->Modify(TRUE);
- GetDocument()->UpdateAllViews(this);
+ GetDocument()->UpdateAllViews (this);
}
void
m_bMaxSpecified = false;
if (theApp->getSetModifyNewDocs())
GetDocument()->Modify(TRUE);
- GetDocument()->UpdateAllViews(this);
+ GetDocument()->UpdateAllViews (this);
}
void
m_bMaxSpecified = false;
if (theApp->getSetModifyNewDocs())
GetDocument()->Modify(TRUE);
- GetDocument()->UpdateAllViews(this);
+ GetDocument()->UpdateAllViews (this);
}
void
m_bMaxSpecified = false;
if (theApp->getSetModifyNewDocs())
GetDocument()->Modify(TRUE);
- GetDocument()->UpdateAllViews(this);
+ GetDocument()->UpdateAllViews (this);
}
}
m_bMaxSpecified = false;
if (theApp->getSetModifyNewDocs())
GetDocument()->Modify(TRUE);
- GetDocument()->UpdateAllViews(this);
+ GetDocument()->UpdateAllViews (this);
}
}
}
if (theApp->getSetModifyNewDocs())
pPlotDoc->Modify(true);
- pPlotDoc->UpdateAllViews();
+ pPlotDoc->UpdateAllViews ();
}
}
}
if (theApp->getSetModifyNewDocs())
pPlotDoc->Modify(true);
- pPlotDoc->UpdateAllViews();
+ pPlotDoc->UpdateAllViews ();
}
}
if (theApp->getSetModifyNewDocs())
pPlotDoc->Modify(true);
- pPlotDoc->UpdateAllViews();
+ pPlotDoc->UpdateAllViews ();
}
}
if (theApp->getSetModifyNewDocs())
pPlotDoc->Modify(true);
- pPlotDoc->UpdateAllViews();
+ pPlotDoc->UpdateAllViews ();
}
}
#endif
delete pY2;
if (theApp->getSetModifyNewDocs())
pPlotDoc->Modify(true);
- pPlotDoc->UpdateAllViews();
+ pPlotDoc->UpdateAllViews ();
}
}
}
delete pY2;
if (theApp->getSetModifyNewDocs())
pPlotDoc->Modify(true);
- pPlotDoc->UpdateAllViews();
+ pPlotDoc->UpdateAllViews ();
}
}
}
delete pY;
if (theApp->getSetModifyNewDocs())
pPlotDoc->Modify(true);
- pPlotDoc->UpdateAllViews();
+ pPlotDoc->UpdateAllViews ();
}
}
for (int i = 0; i < rProj.nView(); i++) {
theScanner.collectProjections (rProj, rPhantom, i, 1, true, m_iDefaultTrace);
if (! dlgProgress.Update (i+1)) {
- pProjectionDoc->getView()->getFrame()->Close(true);
+ pProjectionDoc->getView()->OnClose(true);
+ delete pProjectionDoc;
return;
}
}
rProj.setRemark (os.str());
*theApp->getLog() << os.str().c_str() << "\n";
- m_pFrame->Lower();
::wxYield();
ProjectionFileView* projView = pProjectionDoc->getView();
if (projView) {
::wxYield();
if (theApp->getSetModifyNewDocs())
pProjectionDoc->Modify(true);
- pProjectionDoc->UpdateAllViews(this);
+ pProjectionDoc->UpdateAllViews (this);
}
}
}
}
ImageFile& imageFile = pRasterDoc->getImageFile();
- imageFile.setArraySize (m_iDefaultRasterNX, m_iDefaultRasterNX);
+ imageFile.setArraySize (m_iDefaultRasterNX, m_iDefaultRasterNY);
wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"), imageFile.nx() + 1, getFrameForChild(), wxPD_CAN_ABORT);
Timer timer;
for (unsigned int i = 0; i < imageFile.nx(); i++) {
rPhantom.convertToImagefile (imageFile, m_iDefaultRasterNSamples, Trace::TRACE_NONE, i, 1, true);
- if (! dlgProgress.Update(i+1)) {
+ if (! dlgProgress.Update (i+1)) {
pRasterDoc->Close();
- pRasterDoc->getView()->getFrame()->Close(true);
+ pRasterDoc->getView()->OnClose(true);
+ delete pRasterDoc;
return;
}
}
if (theApp->getSetModifyNewDocs())
pRasterDoc->Modify(true);
- pRasterDoc->UpdateAllViews(this);
+ pRasterDoc->UpdateAllViews (this);
pRasterDoc->getView()->getFrame()->Show(true);
std::ostringstream os;
os << "Rasterize Phantom " << rPhantom.name() << ": XSize=" << m_iDefaultRasterNX << ", YSize="
}
void
-PhantomFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
+PhantomFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
{
if (m_pCanvas)
m_pCanvas->Refresh();
rIF.labelAdd (os.str().c_str());
if (theApp->getSetModifyNewDocs())
pPolarDoc->Modify(true);
- pPolarDoc->UpdateAllViews();
+ pPolarDoc->UpdateAllViews ();
pPolarDoc->getView()->OnUpdate (this, NULL);
pPolarDoc->getView()->getFrame()->Show(true);
}
rIF.labelAdd (os.str().c_str());
if (theApp->getSetModifyNewDocs())
pPolarDoc->Modify(true);
- pPolarDoc->UpdateAllViews();
+ pPolarDoc->UpdateAllViews ();
pPolarDoc->getView()->OnUpdate (this, NULL);
pPolarDoc->getView()->getFrame()->Show(true);
}
wxProgressDialog dlgProgress (wxString("Reconstruction"), wxString("Reconstruction Progress"), rProj.nView() + 1, getFrameForChild(), wxPD_CAN_ABORT);
for (int i = 0; i < rProj.nView(); i++) {
pReconstruct->reconstructView (i, 1);
- if (! dlgProgress.Update(i + 1)) {
+ if (! dlgProgress.Update (i + 1)) {
delete pReconstruct;
- pReconDoc->getView()->getFrame()->Close(true);
+ pReconDoc->getView()->OnClose(true);
+ delete pReconDoc;
return;
}
}
delete pReconstruct;
if (theApp->getSetModifyNewDocs())
pReconDoc->Modify(true);
- pReconDoc->UpdateAllViews(this);
+ pReconDoc->UpdateAllViews (this);
if (ImageFileView* rasterView = pReconDoc->getView()) {
rasterView->OnUpdate (rasterView, NULL);
rasterView->getFrame()->SetFocus();
void
-ProjectionFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
+ProjectionFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
{
const Projections& rProj = GetDocument()->getProjections();
const int nDet = rProj.nDet();
{
}
-void TextFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
+void TextFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
{
}