From c520dfabff204ef486c22fe1e3ff75746af22f39 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sat, 13 Jan 2001 05:06:47 +0000 Subject: [PATCH] r393: *** empty log message *** --- ChangeLog | 5 +++-- Makefile.in | 4 ++-- configure | 2 +- src/Makefile.in | 2 +- tools/ctsimtext.cpp | 18 +++--------------- 5 files changed, 10 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6d86ff..210c5ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,10 @@ -3.0.0alpha5 - Released +3.0.0alpha5 - Released 1/12/00 * ctsim: Added EZPlotDialog, used by debugging plots in procsignal.cpp - * ctsimtext: Fixed bugs for MSVC and with empty input lines + * ctsimtext: Fixed bugs for MSVC and with empty input lines. Fixed + bug in parsing command-line parameters. * views.cpp: Fixed bug in copying of labels from images to plotfiles diff --git a/Makefile.in b/Makefile.in index 35031e4..c4ecf25 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 msvc/pjrec/pjrec.dsp msvc/libctsim/libctsim.dsp msvc/ctsim/ctsim.dsp +EXTRA_DIST = acsite.m4 make.bat msvc/ctsim.dsw msvc/ctsimtext/ctsimtext.dsp msvc/libctsim/libctsim.dsp msvc/ctsim/ctsim.dsp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h @@ -293,7 +293,7 @@ distdir: $(DISTFILES) cd $(top_srcdir) \ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile $(mkinstalldirs) $(distdir)/msvc $(distdir)/msvc/ctsim \ - $(distdir)/msvc/libctsim $(distdir)/msvc/pjrec + $(distdir)/msvc/ctsimtext $(distdir)/msvc/libctsim @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff --git a/configure b/configure index 5e9bfeb..0ee33b0 100755 --- a/configure +++ b/configure @@ -715,7 +715,7 @@ fi PACKAGE=ctsim -VERSION=3.0.0alpha4 +VERSION=3.0.0alpha5 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/src/Makefile.in b/src/Makefile.in index f2d76fa..935cf30 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -92,7 +92,7 @@ wxlibs = @wxlibs@ bin_PROGRAMS = ctsim -ctsim_SOURCES = ctsim.cpp docs.cpp views.cpp dialogs.cpp ctsim.h docs.h views.h dialogs.h dlgprojections.cpp dlgprojections.h dlgreconstruct.cpp dlgreconstruct.h +ctsim_SOURCES = ctsim.cpp docs.cpp views.cpp dialogs.cpp ctsim.h docs.h views.h dialogs.h dlgprojections.cpp dlgprojections.h dlgreconstruct.cpp dlgreconstruct.h ctsim_DEPENDENCIES = ../libctgraphics/libctgraphics.a ../libctsupport/libctsupport.a ../libctsim/libctsim.a ../include/ct.h ctsim_LDADD = -L../libctgraphics -L../libctsupport -L../libctsim @ctlibs@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/tools/ctsimtext.cpp b/tools/ctsimtext.cpp index a6f6966..76596b6 100644 --- a/tools/ctsimtext.cpp +++ b/tools/ctsimtext.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ctsimtext.cpp,v 1.12 2001/01/13 05:02:20 kevin Exp $ +** $Id: ctsimtext.cpp,v 1.13 2001/01/13 05:06:18 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 @@ -45,7 +45,7 @@ extern "C" { // If linked to ctsimtext, but executed as another name, eg pjrec, then program will use that // linked name as name of function. -static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.12 2001/01/13 05:02:20 kevin Exp $"; +static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.13 2001/01/13 05:06:18 kevin Exp $"; static const char* const s_szProgramName = "ctsimtext"; static const char* const s_szProgramName2 = "ctsimtext.exe"; @@ -104,10 +104,9 @@ ctsimtext_main (int argc, char * argv[]) { int iReturn = 0; - if (argc > 1 && (strcmp(argv[0], fileBasename (s_szProgramName)) == 0 || strcmp(argv[0], fileBasename (s_szProgramName2)) == 0)) { + if (argc > 1 && (strcmp(s_szProgramName, fileBasename (argv[0])) == 0 || strcmp(s_szProgramName2, fileBasename (argv[0])) == 0)) { argv++; argc--; - } iReturn = processCommand (argc, argv); } else if (argc > 1){ iReturn = processCommand (argc, argv); @@ -282,14 +281,3 @@ wxDialog::OnCtlColor(unsigned long a,unsigned long b,unsigned int c,unsigned int {return 0;} #endif -#if 0 -#include "../src/dlgezplot.h" - -EZPlotDialog::EZPlotDialog (wxWindow* parent) - : wxDialog(), m_pEZPlotCtrl(NULL) -{} - -EZPlotDialog::~EZPlotDialog() -{} - -#endif -- 2.34.1