From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Sat, 15 Mar 2003 14:53:11 +0000 (+0000)
Subject: r4205: *** empty log message ***
X-Git-Tag: debian-4.5.3-3~88
X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=40ef0ef58e4d5617d7ddb7b1d145e8981b61215f;hp=23ea03c25eb95a915f6ece3f6912eb95beb40882

r4205: *** empty log message ***
---

diff --git a/configure.ac b/configure.ac
index 87ba96a..b46a7f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl CDPATH=
 
 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.
diff --git a/debian/changelog b/debian/changelog
index dcb5eba..f061657 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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
diff --git a/include/phantom.h b/include/phantom.h
index 66f400e..ca13f36 100644
--- a/include/phantom.h
+++ b/include/phantom.h
@@ -9,7 +9,7 @@
 **  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
@@ -100,8 +100,8 @@ class PhantomElement
     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 ();
 
diff --git a/libctsim/phantom.cpp b/libctsim/phantom.cpp
index 8d02d11..9d9a537 100644
--- a/libctsim/phantom.cpp
+++ b/libctsim/phantom.cpp
@@ -9,7 +9,7 @@
 **  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
@@ -239,8 +239,13 @@ Phantom::fileWrite (const char* const fname)
 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
@@ -599,8 +604,6 @@ PhantomElement::convertNameToType (const char* const typeName)
     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);
 }
@@ -732,7 +735,7 @@ PhantomElement::makeVectorOutline ()
     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;
   }
   
diff --git a/libctsupport/syserror.cpp b/libctsupport/syserror.cpp
index 0823ea2..4aca185 100644
--- a/libctsupport/syserror.cpp
+++ b/libctsupport/syserror.cpp
@@ -2,7 +2,7 @@
 **  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
@@ -59,7 +59,7 @@ void sys_error (int severity, const char *msg, ...)
       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));