Fix #1292/1294 by snapping to any edge when not hovering over a signal

[pulseview.git] / test / view / ruler.cpp

diff --git a/test/view/ruler.cpp b/test/view/ruler.cpp
index 9287975cae82cd6243fa26c9605258c9a66a836c..3984e973aa026af34fc8a3cfa1b66ce85eea3b50 100644 (file)
--- a/test/view/ruler.cpp
+++ b/test/view/ruler.cpp
@@ -23,7 +23,7 @@
 #include "pv/views/trace/ruler.hpp"
 #include "test/test.hpp"
 
 #include "pv/views/trace/ruler.hpp"
 #include "test/test.hpp"
 

-using namespace pv::views::TraceView;
+using namespace pv::views::trace;

 
 namespace {
        QString format(const pv::util::Timestamp& t)
 
 namespace {
        QString format(const pv::util::Timestamp& t)


@@ -42,9 +42,10 @@ BOOST_AUTO_TEST_CASE(tick_position_test_0)
        const pv::util::Timestamp offset("0");
        const double scale(0.001);
        const int width(500);
        const pv::util::Timestamp offset("0");
        const double scale(0.001);
        const int width(500);

+       const unsigned int minor_tick_count(4);

 
        const Ruler::TickPositions ts = Ruler::calculate_tick_positions(
 
        const Ruler::TickPositions ts = Ruler::calculate_tick_positions(

-               major_period, offset, scale, width, format);
+               major_period, offset, scale, width, minor_tick_count, format);

 
        BOOST_REQUIRE_EQUAL(ts.major.size(), 6);
 
 
        BOOST_REQUIRE_EQUAL(ts.major.size(), 6);
 


@@ -88,9 +89,10 @@ BOOST_AUTO_TEST_CASE(tick_position_test_1)
        const pv::util::Timestamp offset("-0.463");
        const double scale(0.001);
        const int width(500);
        const pv::util::Timestamp offset("-0.463");
        const double scale(0.001);
        const int width(500);

+       const unsigned int minor_tick_count(4);

 
        const Ruler::TickPositions ts = Ruler::calculate_tick_positions(
 
        const Ruler::TickPositions ts = Ruler::calculate_tick_positions(

-               major_period, offset, scale, width, format);
+               major_period, offset, scale, width, minor_tick_count, format);

 
        BOOST_REQUIRE_EQUAL(ts.major.size(), 5);
 
 
        BOOST_REQUIRE_EQUAL(ts.major.size(), 5);
 


@@ -132,9 +134,10 @@ BOOST_AUTO_TEST_CASE(tick_position_test_2)
        const pv::util::Timestamp offset("8");
        const double scale(0.129746);
        const int width(580);
        const pv::util::Timestamp offset("8");
        const double scale(0.129746);
        const int width(580);

+       const unsigned int minor_tick_count(4);

 
        const Ruler::TickPositions ts = Ruler::calculate_tick_positions(
 
        const Ruler::TickPositions ts = Ruler::calculate_tick_positions(

-               major_period, offset, scale, width, format);
+               major_period, offset, scale, width, minor_tick_count, format);

 
        const double mp = 5;
        const int off = 8;
 
        const double mp = 5;
        const int off = 8;