projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RowItemOwner: Added depth() method
[pulseview.git]
/
pv
/
view
/
timemarker.cpp
diff --git
a/pv/view/timemarker.cpp
b/pv/view/timemarker.cpp
index 4c3645b4cd2b19e529efd0a2c8f43348b10fac6c..5434203507fb63823e8f78fb760c5ec84b331539 100644
(file)
--- a/
pv/view/timemarker.cpp
+++ b/
pv/view/timemarker.cpp
@@
-22,12
+22,11
@@
#include "view.h"
#include "view.h"
+#include <QFormLayout>
#include <QPainter>
#include <pv/widgets/popup.h>
#include <QPainter>
#include <pv/widgets/popup.h>
-using namespace std;
-
namespace pv {
namespace view {
namespace pv {
namespace view {
@@
-51,6
+50,11
@@
float TimeMarker::get_x() const
return (_time - _view.offset()) / _view.scale();
}
return (_time - _view.offset()) / _view.scale();
}
+QPoint TimeMarker::point() const
+{
+ return QPoint(get_x(), 0);
+}
+
void TimeMarker::set_time(double time)
{
_time = time;
void TimeMarker::set_time(double time)
{
_time = time;
@@
-80,10
+84,10
@@
pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
popup->setLayout(form);
_value_widget = new QDoubleSpinBox(parent);
popup->setLayout(form);
_value_widget = new QDoubleSpinBox(parent);
- _value_widget->setValue(_time);
- _value_widget->setDecimals(6);
+ _value_widget->setDecimals(9);
_value_widget->setSuffix("s");
_value_widget->setSingleStep(1e-6);
_value_widget->setSuffix("s");
_value_widget->setSingleStep(1e-6);
+ _value_widget->setValue(_time);
connect(_value_widget, SIGNAL(valueChanged(double)),
this, SLOT(on_value_changed(double)));
connect(_value_widget, SIGNAL(valueChanged(double)),
this, SLOT(on_value_changed(double)));