From 2d7966bd04e3d56b9c9cc9651b029a8b6196458b Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Fri, 3 May 2002 01:01:15 +0000 Subject: [PATCH] r1865: *** empty log message *** --- ChangeLog | 4 ---- NEWS | 7 +++---- debian/.cvsignore | 6 +++--- debian/control | 4 ++-- debian/dirs | 1 + debian/rules | 3 +++ src/ctsim.cpp | 6 +++--- src/views.cpp | 9 +++++---- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7270572..c5db37d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,10 +2,6 @@ New Features: - -- ctsim: Added direct Fourier reconstructions (Thanks to - Edgar Angeles for help with understanding FFT symmetry of - the projections) - -- ctsim: Added tips to be displayed at startup and via the help menu. -- ctsim: Added center-detector concept. Allow for detector array to be any arbitrary distance from center of scanner. As a result, diff --git a/NEWS b/NEWS index ffbf507..a456501 100644 --- a/NEWS +++ b/NEWS @@ -1,13 +1,12 @@ Version 3.5 New Features -* New reconstruction method: Direct Fourier! +* New reconstruction technique: Interpolate divergent beams to + parallel beams for faster reconstructions. * Multithreading for running length processes in background. Also takes advantage of multiple-CPU's in SMP systems for speed improvements with parallel processing. -* Interpolate divergent beams to parallel beams for faster reconstructions. - * Region of interest can be specified for reconstruction zooming. * Import PNG, PPM, and PGM images @@ -18,7 +17,7 @@ Version 3.5 New Features * Can read and reconstruct SIEMENS AR.STAR DICOM raw data files -* Scattergram of T-Theta sampling. Useful for understand divergent beam +* Scattergram of T-Theta sampling. Useful for understanding divergent beam scanning. * Startup-tips to help new users learn features. diff --git a/debian/.cvsignore b/debian/.cvsignore index 7102496..1f0ebdb 100644 --- a/debian/.cvsignore +++ b/debian/.cvsignore @@ -1,4 +1,4 @@ -cl-uffi +ctsim files -cl-uffi.prerm.debhelper -cl-uffi.postinst.debhelper +ctsim.prerm.debhelper +ctsim.postinst.debhelper diff --git a/debian/control b/debian/control index e3fb721..f8792df 100644 --- a/debian/control +++ b/debian/control @@ -2,11 +2,11 @@ Source: ctsim Section: science Priority: optional Maintainer: Kevin Rosenberg -Build-Depends: debhelper (>> 3.0.0), wxwin2.2-headers, fftw-dev, libreadline4-dev +Build-Depends: debhelper (>> 3.0.0), wxwin2.2-headers, fftw-dev, libreadline4-dev, xlibmesa-dev, libwxgtk2.2-dev , glutg3-dev Standards-Version: 3.5.2 Package: ctsim Architecture: any -Depends: fftw2, libwxgtk2.2, libreadline4 +Depends: fftw2, libwxgtk2.2, libreadline4, glutg3, xlibmesa3 Description: Computed Tomograpy Simulator CTSim provides an interactive computed tomography simulator. diff --git a/debian/dirs b/debian/dirs index d42d3c0..d33a979 100644 --- a/debian/dirs +++ b/debian/dirs @@ -3,3 +3,4 @@ /usr/share /usr/share/doc /usr/share/man +/usr/share/ctsim diff --git a/debian/rules b/debian/rules index 3b1475b..e076c2a 100755 --- a/debian/rules +++ b/debian/rules @@ -11,6 +11,7 @@ export DH_COMPAT=3 pkg := ctsim prefix := debian/$(pkg) DESTDIR := `pwd`/$(prefix) +SHAREDOCDIR := $(DESTDIR)/usr/share/$(pkg) INSTALL := install INSTALLFLAGS := -g root -o root -m 0644 @@ -30,6 +31,7 @@ build-stamp: configure-stamp dh_testdir # Add here commands to compile the package. $(MAKE) + (cd doc; $(MAKE) htmlhelp) touch build-stamp clean: @@ -51,6 +53,7 @@ install: build # Add here commands to install the package into debian/ctsim. # install ${INSTALLDIRFLAGS} ${MAKE} install + $(INSTALL) $(INSTALLFLAGS) $(shell echo src/*.htb) $(SHAREDOCDIR) # Build architecture-independent files here. binary-indep: build install diff --git a/src/ctsim.cpp b/src/ctsim.cpp index d8b0737..ab1271c 100644 --- a/src/ctsim.cpp +++ b/src/ctsim.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: ctsim.cpp,v 1.105 2002/05/03 00:40:30 kevin Exp $ +** $Id: ctsim.cpp,v 1.106 2002/05/03 01:01:15 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.105 2002/05/03 00:40:30 kevin Exp $"; +static const char* rcsindent = "$Id: ctsim.cpp,v 1.106 2002/05/03 01:01:15 kevin Exp $"; struct option CTSimApp::ctsimOptions[] = { @@ -202,7 +202,7 @@ CTSimApp::OnInit() *m_pLog << "Cannot initialize the Windows Help system" << "\n"; #else if (! m_pFrame->getHtmlHelpController().Initialize(helpDir + "/ctsim") && - ! m_pFrame->getHtmlHelpController().Initialize("/usr/local/man/ctsim")) + ! m_pFrame->getHtmlHelpController().Initialize("/usr/share/ctsim")) *m_pLog << "Cannot initialize the HTML Help system" << "\n"; else { if (::wxDirExists ("/tmp")) diff --git a/src/views.cpp b/src/views.cpp index 1ce18db..03d366d 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.151 2002/05/03 00:40:30 kevin Exp $ +** $Id: views.cpp,v 1.152 2002/05/03 01:01:15 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 @@ -2256,7 +2256,7 @@ PhantomFileView::OnRasterize (wxCommandEvent& event) *theApp->getLog() << os.str().c_str() << "\n"; pImageFile->labelAdd (os.str().c_str(), timer.timerEnd()); - pRasterDoc->UpdateAllViews(); + pRasterDoc->UpdateAllViews(this); pRasterDoc->getView()->setInitialClientSize(); pRasterDoc->Activate(); } @@ -2542,6 +2542,7 @@ ProjectionFileView::OnConvertRectangular (wxCommandEvent& event) pIF->labelAdd (os.str().c_str()); if (theApp->getAskDeleteNewDocs()) pRectDoc->Modify (true); + pRectDoc->UpdateAllViews(); pRectDoc->getView()->setInitialClientSize(); pRectDoc->Activate(); } @@ -2623,7 +2624,7 @@ ProjectionFileView::OnConvertFFTPolar (wxCommandEvent& event) pIF->labelAdd (os.str().c_str()); if (theApp->getAskDeleteNewDocs()) pPolarDoc->Modify (true); - pPolarDoc->UpdateAllViews (); + pPolarDoc->UpdateAllViews (this); pPolarDoc->getView()->setInitialClientSize(); pPolarDoc->Activate(); } @@ -3673,7 +3674,7 @@ TextFileCanvas::~TextFileCanvas () } wxSize -PlotFileCanvas::GetBestSize() const +TextFileCanvas::GetBestSize() const { int xSize, ySize; theApp->getMainFrame()->GetClientSize (&xSize, &ySize); -- 2.34.1