* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "cursorpair.hpp"
+#include "pv/util.hpp"
#include "ruler.hpp"
#include "view.hpp"
-#include "pv/util.hpp"
-#include <cassert>
#include <algorithm>
+#include <cassert>
using std::max;
using std::make_pair;
using std::pair;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const int CursorPair::DeltaPadding = 8;
const QColor CursorPair::ViewportFillColour(220, 231, 243);
}
}
-void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp)
+void CursorPair::paint_back(QPainter &p, ViewItemPaintParams &pp)
{
if (!enabled())
return;
assert(first_);
assert(second_);
- return pair<float, float>(
- ((first_->time() - view_.offset()) / view_.scale()).convert_to<float>(),
- ((second_->time() - view_.offset()) / view_.scale()).convert_to<float>());
+ return pair<float, float>(first_->get_x(), second_->get_x());
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv