X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=be715ec104385576b3c66042325e51ddc14d982a;hb=00f6bae935837b38b0d03a5928ba8175d460413f;hp=5f7b1f67faade83e7d3acf388e8230d26a7d07fa;hpb=c677193dc6e691493081fe87476a04e1674093a5;p=pulseview.git
diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 5f7b1f6..be715ec 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -14,8 +14,7 @@
* 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 .
*/
#include
@@ -33,12 +32,13 @@ using std::shared_ptr;
using std::vector;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
-const float Ruler::RulerHeight = 2.5f; // x Text Height
+const float Ruler::RulerHeight = 2.5f; // x Text Height
const int Ruler::MinorTickSubdivision = 4;
-const float Ruler::HoverArrowSize = 0.5f; // x Text Height
+const float Ruler::HoverArrowSize = 0.5f; // x Text Height
Ruler::Ruler(View &parent) :
MarginWidget(parent)
@@ -77,6 +77,38 @@ QSize Ruler::extended_size_hint() const
ViewItem::HighlightRadius);
}
+QString Ruler::format_time_with_distance(
+ const pv::util::Timestamp& distance,
+ const pv::util::Timestamp& t,
+ pv::util::SIPrefix prefix,
+ pv::util::TimeUnit unit,
+ unsigned precision,
+ bool sign)
+{
+ const unsigned limit = 60;
+
+ if (t.is_zero())
+ return "0";
+
+ // If we have to use samples then we have no alternative formats
+ if (unit == pv::util::TimeUnit::Samples)
+ return pv::util::format_time_si_adjusted(t, prefix, precision, "sa", sign);
+
+ // View zoomed way out -> low precision (0), big distance (>=60s)
+ // -> DD:HH:MM
+ if ((precision == 0) && (distance >= limit))
+ return pv::util::format_time_minutes(t, 0, sign);
+
+ // View in "normal" range -> medium precision, medium step size
+ // -> HH:MM:SS.mmm... or xxxx (si unit) if less than limit seconds
+ // View zoomed way in -> high precision (>3), low step size (<1s)
+ // -> HH:MM:SS.mmm... or xxxx (si unit) if less than limit seconds
+ if (abs(t) < limit)
+ return pv::util::format_time_si_adjusted(t, prefix, precision, "s", sign);
+ else
+ return pv::util::format_time_minutes(t, precision, sign);
+}
+
vector< shared_ptr > Ruler::items()
{
const vector< shared_ptr > time_items(view_.time_items());
@@ -96,21 +128,21 @@ shared_ptr Ruler::get_mouse_over_item(const QPoint &pt)
void Ruler::paintEvent(QPaintEvent*)
{
if (!tick_position_cache_) {
- auto ffunc = [this](const pv::util::Timestamp& t)
- {
- return util::format_time(
+ auto ffunc = [this](const pv::util::Timestamp& t) {
+ return format_time_with_distance(
+ this->view_.tick_period(),
t,
this->view_.tick_prefix(),
this->view_.time_unit(),
this->view_.tick_precision());
};
- tick_position_cache_.emplace(calculate_tick_positions(
+ tick_position_cache_ = calculate_tick_positions(
view_.tick_period(),
view_.offset(),
view_.scale(),
width(),
- ffunc));
+ ffunc);
}
const int ValueMargin = 3;
@@ -121,7 +153,6 @@ void Ruler::paintEvent(QPaintEvent*)
const int minor_tick_y1 = (major_tick_y1 + ruler_height) / 2;
QPainter p(this);
- p.setRenderHint(QPainter::Antialiasing);
// Draw the tick marks
p.setPen(palette().color(foregroundRole()));
@@ -141,6 +172,8 @@ void Ruler::paintEvent(QPaintEvent*)
// Draw the hover mark
draw_hover_mark(p, text_height);
+ p.setRenderHint(QPainter::Antialiasing);
+
// The cursor labels are not drawn with the arrows exactly on the
// bottom line of the widget, because then the selection shadow
// would be clipped away.
@@ -164,8 +197,7 @@ Ruler::TickPositions Ruler::calculate_tick_positions(
{
TickPositions tp;
- const double minor_period =
- (major_period / MinorTickSubdivision).convert_to();
+ const pv::util::Timestamp minor_period = major_period / MinorTickSubdivision;
const pv::util::Timestamp first_major_division = floor(offset / major_period);
const pv::util::Timestamp first_minor_division = ceil(offset / minor_period);
const pv::util::Timestamp t0 = first_major_division * major_period;
@@ -180,7 +212,7 @@ Ruler::TickPositions Ruler::calculate_tick_positions(
x = ((t - offset) / scale).convert_to();
if (division % MinorTickSubdivision == 0) {
- // Recalculate 't' without using 'minor_period' which is of type double.
+ // Recalculate 't' without using 'minor_period' which is a fraction
t = t0 + division / MinorTickSubdivision * major_period;
tp.major.emplace_back(x, format_function(t));
} else {
@@ -193,9 +225,9 @@ Ruler::TickPositions Ruler::calculate_tick_positions(
return tp;
}
-void Ruler::mouseDoubleClickEvent(QMouseEvent *e)
+void Ruler::mouseDoubleClickEvent(QMouseEvent *event)
{
- view_.add_flag(view_.offset() + ((double)e->x() + 0.5) * view_.scale());
+ view_.add_flag(view_.offset() + ((double)event->x() + 0.5) * view_.scale());
}
void Ruler::draw_hover_mark(QPainter &p, int text_height)
@@ -239,5 +271,6 @@ void Ruler::resizeEvent(QResizeEvent*)
invalidate_tick_position_cache();
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv