projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
INSTALL: Mention both asciidoctor and asciidoctor-pdf.
[pulseview.git]
/
test
/
view
/
ruler.cpp
diff --git
a/test/view/ruler.cpp
b/test/view/ruler.cpp
index a6dd1c9aad19d92d7148101580f0a8c7f890a304..5cef38d5ce20211c1ca8e329ca8e05f0a62629a1 100644
(file)
--- a/
test/view/ruler.cpp
+++ b/
test/view/ruler.cpp
@@
-14,17
+14,16
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* 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 <boost/test/unit_test.hpp>
#include <boost/test/floating_point_comparison.hpp>
#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/unit_test.hpp>
-#include "pv/view/ruler.hpp"
+#include "pv/view
s/trace
/ruler.hpp"
#include "test/test.hpp"
#include "test/test.hpp"
-using namespace pv::view;
+using namespace pv::view
s::trace
;
namespace {
QString format(const pv::util::Timestamp& t)
namespace {
QString format(const pv::util::Timestamp& t)
@@
-43,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(
- major_period, offset, scale, width, format);
+ const TickPositions ts = Ruler::calculate_tick_positions(
+ major_period, offset, scale, width,
minor_tick_count,
format);
BOOST_REQUIRE_EQUAL(ts.major.size(), 6);
BOOST_REQUIRE_EQUAL(ts.major.size(), 6);
@@
-89,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(
- major_period, offset, scale, width, format);
+ const TickPositions ts = Ruler::calculate_tick_positions(
+ major_period, offset, scale, width,
minor_tick_count,
format);
BOOST_REQUIRE_EQUAL(ts.major.size(), 5);
BOOST_REQUIRE_EQUAL(ts.major.size(), 5);
@@
-133,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(
- major_period, offset, scale, width, format);
+ const TickPositions ts = Ruler::calculate_tick_positions(
+ 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;