Mercurial > hg > svgui
comparison layer/TimeInstantLayer.cpp @ 1051:c02c51ae5238 3.0-plus-imaf
Merge branches 3.0-integration and imaf_enc to 3.0-plus-imaf
author | Chris Cannam |
---|---|
date | Wed, 20 Apr 2016 12:06:28 +0100 |
parents | 2adca8f05583 97ea68f62c1f |
children |
comparison
equal
deleted
inserted
replaced
1050:3691af49291c | 1051:c02c51ae5238 |
---|---|
234 RealTime rt = RealTime::frame2RealTime(useFrame, m_model->getSampleRate()); | 234 RealTime rt = RealTime::frame2RealTime(useFrame, m_model->getSampleRate()); |
235 | 235 |
236 QString text; | 236 QString text; |
237 | 237 |
238 if (points.begin()->label == "") { | 238 if (points.begin()->label == "") { |
239 text = QString(tr("Time:\t%1\nNo label")) | 239 text = QString(tr("Time:\t%1\nNo label")) |
240 .arg(rt.toText(true).c_str()); | 240 .arg(rt.toText(true).c_str()); |
241 } else { | 241 } else { |
242 text = QString(tr("Time:\t%1\nLabel:\t%2")) | 242 text = QString(tr("Time:\t%1\nLabel:\t%2")) |
243 .arg(rt.toText(true).c_str()) | 243 .arg(rt.toText(true).c_str()) |
244 .arg(points.begin()->label); | 244 .arg(points.begin()->label); |
245 } | 245 } |
246 | 246 |
247 pos = QPoint(v->getXForFrame(useFrame), pos.y()); | 247 pos = QPoint(v->getXForFrame(useFrame), pos.y()); |