AC_INIT
AC_CONFIG_SRCDIR([src/ctsim.cpp])
-AM_INIT_AUTOMAKE(ctsim,4.2.0)
+AM_INIT_AUTOMAKE(ctsim,4.2.1)
AM_CONFIG_HEADER(config.h)
dnl Checks for programs.
+ctsim (4.2.1-1) unstable; urgency=low
+
+ * New upstream, minor fixes
+
+ -- Kevin M. Rosenberg <kmr@debian.org> Sat, 15 Mar 2003 07:21:56 -0700
+
ctsim (4.2.0-1) unstable; urgency=low
* New feature: Direct inverse Fourier reconstructions
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: phantom.h,v 1.25 2001/02/27 03:59:30 kevin Exp $
+** $Id: phantom.h,v 1.26 2003/03/15 14:52:36 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
static const int POINTS_PER_CIRCLE;
static const double SCALE_PELEM_EXTENT; // increase pelem limits by 0.5%
- static PhmElemType convertNameToType (const char* const typeName);
static const char* const convertTypeToName (PhmElemType iType);
+ static PhmElemType convertNameToType (const char* const typeName);
void makeTransformMatrices ();
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: phantom.cpp,v 1.32 2002/05/28 18:43:16 kevin Exp $
+** $Id: phantom.cpp,v 1.33 2003/03/15 14:52:36 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
void
Phantom::addPElem (const char *type, const double cx, const double cy, const double u, const double v, const double rot, const double atten)
{
- PhantomElement *pelem = new PhantomElement (type, cx, cy, u, v, rot, atten);
+ PhmElemType pe_type = PhantomElement::convertNameToType (type);
+ if (pe_type == PELEM_INVALID) {
+ sys_error (ERR_WARNING, "Unknown PhantomElement type %s [PhantomElement::PhantomElement]", type);
+ return;
+ }
+ PhantomElement *pelem = new PhantomElement (type, cx, cy, u, v, rot, atten);
m_listPElem.push_front (pelem);
// update phantom limits
type = PELEM_SECTOR;
else if (strcasecmp (typeName, "segment") == 0)
type = PELEM_SEGMENT;
- else
- sys_error (ERR_WARNING, "Unknown PhantomElement type %s [PhantomElement::PhantomElement]", type);
return (type);
}
m_yOutline[cpts] = 0.0;
break;
default:
- sys_error(ERR_WARNING, "illegal pelem type %d [makeVectorOutline]", m_type);
+ sys_error(ERR_WARNING, "Illegal phantom element type %d [makeVectorOutline]", m_type);
return;
}
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: syserror.cpp,v 1.23 2002/05/05 10:54:34 kevin Exp $
+** $Id: syserror.cpp,v 1.24 2003/03/15 14:52:36 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
wxString msg (strOutput.c_str());
msg += "\n";
eventLog.SetString( msg );
- // wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event, thread safe
+ wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event, thread safe
} else {
wxMutexGuiEnter();
wxLog::OnLog (wxLOG_Message, strOutput.c_str(), time(NULL));