diff base/Clipboard.cpp @ 383:94fc0591ea43 1.2-stable

* merge from trunk (1.2 ended up being tracked from trunk, but we may want this branch for fixes later)
author Chris Cannam
date Wed, 27 Feb 2008 10:32:45 +0000
parents 516819f2b97b
children
line wrap: on
line diff
--- a/base/Clipboard.cpp	Fri Nov 30 17:36:14 2007 +0000
+++ b/base/Clipboard.cpp	Wed Feb 27 10:32:45 2008 +0000
@@ -177,6 +177,12 @@
     return m_haveReferenceFrame;
 }
 
+bool
+Clipboard::Point::referenceFrameDiffers() const
+{
+    return m_haveReferenceFrame && (m_referenceFrame != m_frame);
+}
+
 long
 Clipboard::Point::getReferenceFrame() const
 {
@@ -186,7 +192,7 @@
 void
 Clipboard::Point::setReferenceFrame(long f) 
 {
-    if (f != m_frame) m_haveReferenceFrame = true;
+    m_haveReferenceFrame = true;
     m_referenceFrame = f;
 }
 
@@ -233,3 +239,13 @@
     return false;
 }
 
+bool
+Clipboard::referenceFramesDiffer() const
+{
+    for (PointList::const_iterator i = m_points.begin();
+         i != m_points.end(); ++i) {
+        if (i->referenceFrameDiffers()) return true;
+    } 
+    return false;
+}
+