[Csp-commits] svn:csp r1493 - in trunk/CSP/CSPSim: . Include

[<sv...@ww...>]

Author: mkrose
Date: 2005-03-11 22:11:26 -0800 (Fri, 11 Mar 2005)
New Revision: 1493

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Include/DataRecorder.h
Log:
Fix an exception in the DataRecorder.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1493

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-03-12 05:28:45 UTC (rev 1492)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-03-12 06:11:26 UTC (rev 1493)
@@ -1,6 +1,9 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2005-03-11: onsight
+ * Fix an exception in the DataRecorder.
+
 2005-03-05: onsight
  * Fix a couple minor warnings under gcc.
 

Modified: trunk/CSP/CSPSim/Include/DataRecorder.h
===================================================================
--- trunk/CSP/CSPSim/Include/DataRecorder.h	2005-03-12 05:28:45 UTC (rev 1492)
+++ trunk/CSP/CSPSim/Include/DataRecorder.h	2005-03-12 06:11:26 UTC (rev 1493)
@@ -152,13 +152,13 @@
 
 	bool addSource(simdata::Ref<const DataChannelBase> channel) {
 		if (!channel) return false;
-		DataChannel<double>::CRef dchannel = channel;
-		if (dchannel.valid()) {
+		DataChannel<double>::CRef dchannel;
+		if (dchannel.tryAssign(channel)) {
 			m_Sources.push_back(new SingleSource(dchannel));
 			return true;
 		} else {
-			DataChannel<simdata::Vector3>::CRef vchannel = channel;
-			if (vchannel.valid()) {
+			DataChannel<simdata::Vector3>::CRef vchannel;
+			if (vchannel.tryAssign(channel)) {
 				m_Sources.push_back(new VectorSource(vchannel, 0));
 				m_Sources.push_back(new VectorSource(vchannel, 1));
 				m_Sources.push_back(new VectorSource(vchannel, 2));