projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop unused boost-thread dependency.
[pulseview.git]
/
pv
/
view
/
cursor.cpp
diff --git
a/pv/view/cursor.cpp
b/pv/view/cursor.cpp
index e4704be497500fd3323ef254ca2dc6c35086d06f..408eb311e9a57a15c2432ee3307207e8fce779e3 100644
(file)
--- a/
pv/view/cursor.cpp
+++ b/
pv/view/cursor.cpp
@@
-14,14
+14,14
@@
* 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 "cursor.hpp"
*/
#include "cursor.hpp"
-#include "view.hpp"
#include "pv/util.hpp"
#include "pv/util.hpp"
+#include "ruler.hpp"
+#include "view.hpp"
#include <QApplication>
#include <QBrush>
#include <QApplication>
#include <QBrush>
@@
-34,12
+34,12
@@
#include <cstdio>
#include <limits>
#include <cstdio>
#include <limits>
-using std::abs;
+using std::abs;
// Force usage of std::abs() instead of C's abs().
using std::shared_ptr;
using std::shared_ptr;
-using std::numeric_limits;
namespace pv {
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const QColor Cursor::FillColour(52, 101, 164);
const QColor Cursor::FillColour(52, 101, 164);
@@
-55,8
+55,11
@@
bool Cursor::enabled() const
QString Cursor::get_text() const
{
QString Cursor::get_text() const
{
- return util::format_time(time_, view_.tick_prefix(),
- view_.time_unit(), 2);
+ const shared_ptr<Cursor> other = get_other_cursor();
+ const pv::util::Timestamp& diff = abs(time_ - other->time_);
+
+ return Ruler::format_time_with_distance(
+ diff, time_, view_.tick_prefix(), view_.time_unit(), view_.tick_precision());
}
QRectF Cursor::label_rect(const QRectF &rect) const
}
QRectF Cursor::label_rect(const QRectF &rect) const
@@
-93,5
+96,6
@@
shared_ptr<Cursor> Cursor::get_other_cursor() const
cursors->second() : cursors->first();
}
cursors->second() : cursors->first();
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv