From 97806f8d59c470140da6ce75359d3219c05d9fd4 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 18 Dec 2000 12:29:41 +0000 Subject: [PATCH] r303: *** empty log message *** --- Makefile.am | 3 ++- Makefile.in | 5 ++-- NEWS | 2 +- configure | 2 +- rpm/ctsim.spec | 2 +- src/dlgprojections.cpp | 8 +++--- src/dlgreconstruct.cpp | 8 +++--- tools/Makefile.in | 56 +++++++++++++++++++++--------------------- 8 files changed, 46 insertions(+), 40 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8555d66..0afa27e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,8 @@ endif SUBDIRS=$(EXTRA_DIRS1) $(EXTRA_DIRS2) libctsupport libctsim man doc html cgi-bin include tools $(EXTRA_DIRS3) -EXTRA_DIST=acsite.m4 make.bat msvc/ctsim.dsw mswvc/ctsimplg +EXTRA_DIST=acsite.m4 make.bat msvc/ctsim.dsw msvc/pjrec/pjrec.dsp msvc/libctsim/libctsim.dsp msvc/ctsim/ctsim.dsp + diff --git a/Makefile.in b/Makefile.in index 277c8e9..35031e4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -98,7 +98,7 @@ wxlibs = @wxlibs@ SUBDIRS = $(EXTRA_DIRS1) $(EXTRA_DIRS2) libctsupport libctsim man doc html cgi-bin include tools $(EXTRA_DIRS3) -EXTRA_DIST = acsite.m4 make.bat msvc/ctsim.dsw mswvc/ctsimplg +EXTRA_DIST = acsite.m4 make.bat msvc/ctsim.dsw msvc/pjrec/pjrec.dsp msvc/libctsim/libctsim.dsp msvc/ctsim/ctsim.dsp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h @@ -292,7 +292,8 @@ distdir: $(DISTFILES) distdir=`cd $(distdir) && pwd`; \ cd $(top_srcdir) \ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile - $(mkinstalldirs) $(distdir)/msvc $(distdir)/mswvc + $(mkinstalldirs) $(distdir)/msvc $(distdir)/msvc/ctsim \ + $(distdir)/msvc/libctsim $(distdir)/msvc/pjrec @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff --git a/NEWS b/NEWS index 0e66821..efabc37 100644 --- a/NEWS +++ b/NEWS @@ -6,7 +6,7 @@ New Features of CTSim version 2.5: - First Microsoft Windows graphical user interface -- Bug Fixes and modest documentation and program improvements over version 2.0 +- Bug fixes and modest documentation and program improvements over version 2.0 diff --git a/configure b/configure index 0682253..95fdf28 100755 --- a/configure +++ b/configure @@ -715,7 +715,7 @@ fi PACKAGE=ctsim -VERSION=2.0.7 +VERSION=2.5.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } diff --git a/rpm/ctsim.spec b/rpm/ctsim.spec index 6be0351..d4e1118 100644 --- a/rpm/ctsim.spec +++ b/rpm/ctsim.spec @@ -34,7 +34,7 @@ install -s -m 755 -o 0 -g 0 tools/if1 /usr/local/bin/ifinfo install -m 755 -o 0 -g 0 tools/sample-ctsim.sh /usr/local/bin/sample-ctsim.sh %files -%doc README COPYING ChangeLog INSTALL +%doc NEWS README COPYING ChangeLog INSTALL /usr/local/bin/ctsim /usr/local/bin/pjrec diff --git a/src/dlgprojections.cpp b/src/dlgprojections.cpp index 870f13b..a169de8 100644 --- a/src/dlgprojections.cpp +++ b/src/dlgprojections.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: dlgprojections.cpp,v 1.12 2000/12/18 06:47:13 kevin Exp $ +** $Id: dlgprojections.cpp,v 1.13 2000/12/18 12:29:41 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 @@ -147,8 +147,10 @@ ProjectionsDialog::showView (int iViewNumber) if ( iViewNumber < m_rProjections.nView() ) { m_iLastView = iViewNumber; ::wxYield(); // update the display - m_pSGP->eraseWindow(); - Refresh(); + m_pSGP->eraseWindow(); + m_btnPause->Refresh(); + m_btnStep->Refresh(); + m_btnAbort->Refresh(); if (m_iTrace >= Trace::TRACE_PLOT) m_pSGP->setViewport (0, 0, 0.66, 1); diff --git a/src/dlgreconstruct.cpp b/src/dlgreconstruct.cpp index 7fb47d2..3dcd74a 100644 --- a/src/dlgreconstruct.cpp +++ b/src/dlgreconstruct.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: dlgreconstruct.cpp,v 1.11 2000/12/18 06:32:13 kevin Exp $ +** $Id: dlgreconstruct.cpp,v 1.12 2000/12/18 12:29:41 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 @@ -157,8 +157,10 @@ ReconstructDialog::showView (int iViewNumber, bool bBackprojectView) m_iLastView = iViewNumber; ::wxYield(); // update the display m_pSGP->eraseWindow(); - Refresh(); - + m_btnPause->Refresh(); + m_btnStep->Refresh(); + m_btnAbort->Refresh(); + char szProgress [256]; snprintf (szProgress, sizeof(szProgress), "Reconstructing View %d (%.1f%%)", iViewNumber, 100 * iViewNumber / static_cast(m_rProjections.nView())); m_pSGP->setViewport (0, 0, 1, 1); diff --git a/tools/Makefile.in b/tools/Makefile.in index dbfd186..550e9e1 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -90,7 +90,7 @@ wxcflags = @wxcflags@ wxconfig = @wxconfig@ wxlibs = @wxlibs@ -bin_PROGRAMS = pjrec phm2pj pj2if @lamprograms@ ifinfo phm2if if-1 if-2 if2img pjinfo +bin_PROGRAMS = pjrec phm2pj pj2if @lamprograms@ ifinfo phm2if if1 if2 ifexport pjinfo bin_SCRIPTS = sample-ctsim.sh EXTRA_PROGRAMS = pjrec-lam phm2pj-lam phm2if-lam INCLUDES = @my_includes@ @@ -107,21 +107,21 @@ phm2pj_DEPENDENCIES = $(SOURCE_DEPEND) phm2if_SOURCES = phm2if.cpp phm2if_LDADD = @ctlibs@ phm2if_DEPENDENCIES = $(SOURCE_DEPEND) -if2img_SOURCES = if2img.cpp -if2img_LDADD = @ctlibs@ -if2img_DEPENDENCIES = $(SOURCE_DEPEND) +ifexport_SOURCES = ifexport.cpp +ifexport_LDADD = @ctlibs@ +ifexport_DEPENDENCIES = $(SOURCE_DEPEND) pj2if_SOURCES = pj2if.cpp pj2if_LDADD = @ctlibs@ pj2if_DEPENDENCIES = $(SOURCE_DEPEND) pjinfo_SOURCES = pjinfo.cpp pjinfo_LDADD = @ctlibs@ pjinfo_DEPENDENCIES = $(SOURCE_DEPEND) -if_1_SOURCES = if-1.cpp -if_1_LDADD = @ctlibs@ -if_1_DEPENDENCIES = $(SOURCE_DEPEND) -if_2_SOURCES = if-2.cpp -if_2_LDADD = @ctlibs@ -if_2_DEPENDENCIES = $(SOURCE_DEPEND) +if1_SOURCES = if1.cpp +if1_LDADD = @ctlibs@ +if1_DEPENDENCIES = $(SOURCE_DEPEND) +if2_SOURCES = if2.cpp +if2_LDADD = @ctlibs@ +if2_DEPENDENCIES = $(SOURCE_DEPEND) ifinfo_SOURCES = ifinfo.cpp ifinfo_LDADD = @ctlibs@ ifinfo_DEPENDENCIES = $(SOURCE_DEPEND) @@ -164,12 +164,12 @@ ifinfo_OBJECTS = ifinfo.o ifinfo_LDFLAGS = phm2if_OBJECTS = phm2if.o phm2if_LDFLAGS = -if_1_OBJECTS = if-1.o -if_1_LDFLAGS = -if_2_OBJECTS = if-2.o -if_2_LDFLAGS = -if2img_OBJECTS = if2img.o -if2img_LDFLAGS = +if1_OBJECTS = if1.o +if1_LDFLAGS = +if2_OBJECTS = if2.o +if2_LDFLAGS = +ifexport_OBJECTS = ifexport.o +ifexport_LDFLAGS = pjinfo_OBJECTS = pjinfo.o pjinfo_LDFLAGS = SCRIPTS = $(bin_SCRIPTS) @@ -185,11 +185,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = gtar GZIP_ENV = --best -DEP_FILES = .deps/if-1.P .deps/if-2.P .deps/if2img.P .deps/ifinfo.P \ +DEP_FILES = .deps/if1.P .deps/if2.P .deps/ifexport.P .deps/ifinfo.P \ .deps/phm2if.P .deps/phm2pj.P .deps/pj2if.P .deps/pjinfo.P \ .deps/pjrec.P -SOURCES = $(pjrec_lam_SOURCES) $(phm2pj_lam_SOURCES) $(phm2if_lam_SOURCES) $(pjrec_SOURCES) $(phm2pj_SOURCES) $(pj2if_SOURCES) $(ifinfo_SOURCES) $(phm2if_SOURCES) $(if_1_SOURCES) $(if_2_SOURCES) $(if2img_SOURCES) $(pjinfo_SOURCES) -OBJECTS = $(pjrec_lam_OBJECTS) $(phm2pj_lam_OBJECTS) $(phm2if_lam_OBJECTS) $(pjrec_OBJECTS) $(phm2pj_OBJECTS) $(pj2if_OBJECTS) $(ifinfo_OBJECTS) $(phm2if_OBJECTS) $(if_1_OBJECTS) $(if_2_OBJECTS) $(if2img_OBJECTS) $(pjinfo_OBJECTS) +SOURCES = $(pjrec_lam_SOURCES) $(phm2pj_lam_SOURCES) $(phm2if_lam_SOURCES) $(pjrec_SOURCES) $(phm2pj_SOURCES) $(pj2if_SOURCES) $(ifinfo_SOURCES) $(phm2if_SOURCES) $(if1_SOURCES) $(if2_SOURCES) $(ifexport_SOURCES) $(pjinfo_SOURCES) +OBJECTS = $(pjrec_lam_OBJECTS) $(phm2pj_lam_OBJECTS) $(phm2if_lam_OBJECTS) $(pjrec_OBJECTS) $(phm2pj_OBJECTS) $(pj2if_OBJECTS) $(ifinfo_OBJECTS) $(phm2if_OBJECTS) $(if1_OBJECTS) $(if2_OBJECTS) $(ifexport_OBJECTS) $(pjinfo_OBJECTS) all: all-redirect .SUFFIXES: @@ -265,17 +265,17 @@ phm2if: $(phm2if_OBJECTS) $(phm2if_DEPENDENCIES) @rm -f phm2if $(CXXLINK) $(phm2if_LDFLAGS) $(phm2if_OBJECTS) $(phm2if_LDADD) $(LIBS) -if-1: $(if_1_OBJECTS) $(if_1_DEPENDENCIES) - @rm -f if-1 - $(CXXLINK) $(if_1_LDFLAGS) $(if_1_OBJECTS) $(if_1_LDADD) $(LIBS) +if1: $(if1_OBJECTS) $(if1_DEPENDENCIES) + @rm -f if1 + $(CXXLINK) $(if1_LDFLAGS) $(if1_OBJECTS) $(if1_LDADD) $(LIBS) -if-2: $(if_2_OBJECTS) $(if_2_DEPENDENCIES) - @rm -f if-2 - $(CXXLINK) $(if_2_LDFLAGS) $(if_2_OBJECTS) $(if_2_LDADD) $(LIBS) +if2: $(if2_OBJECTS) $(if2_DEPENDENCIES) + @rm -f if2 + $(CXXLINK) $(if2_LDFLAGS) $(if2_OBJECTS) $(if2_LDADD) $(LIBS) -if2img: $(if2img_OBJECTS) $(if2img_DEPENDENCIES) - @rm -f if2img - $(CXXLINK) $(if2img_LDFLAGS) $(if2img_OBJECTS) $(if2img_LDADD) $(LIBS) +ifexport: $(ifexport_OBJECTS) $(ifexport_DEPENDENCIES) + @rm -f ifexport + $(CXXLINK) $(ifexport_LDFLAGS) $(ifexport_OBJECTS) $(ifexport_LDADD) $(LIBS) pjinfo: $(pjinfo_OBJECTS) $(pjinfo_DEPENDENCIES) @rm -f pjinfo -- 2.34.1