diff --git a/DSView/pv/dialogs/about.cpp b/DSView/pv/dialogs/about.cpp
index 9d813a9f..836de5aa 100755
--- a/DSView/pv/dialogs/about.cpp
+++ b/DSView/pv/dialogs/about.cpp
@@ -38,7 +38,8 @@ namespace dialogs {
About::About(QWidget *parent) :
DSDialog(parent, true)
{
- setFixedHeight(360);
+ setFixedHeight(600);
+ setFixedWidth(800);
#if defined(__x86_64__) || defined(_M_X64)
QString arch = "x64";
@@ -57,8 +58,8 @@ About::About(QWidget *parent) :
.arg(arch);
QString url = tr("Website: %1
"
- "Gitbub: %2
"
- "Copyright:%3
"
+ "Github: %2
"
+ "Copyright:%3
"
"
")
.arg(QApplication::organizationDomain())
.arg("https://github.com/DreamSourceLab/DSView")
@@ -109,7 +110,6 @@ About::About(QWidget *parent) :
layout()->addLayout(xlayout);
setTitle(tr("About"));
- setFixedWidth(500);
}
About::~About()
diff --git a/DSView/pv/dock/dsotriggerdock.cpp b/DSView/pv/dock/dsotriggerdock.cpp
index f646f357..5766e15b 100755
--- a/DSView/pv/dock/dsotriggerdock.cpp
+++ b/DSView/pv/dock/dsotriggerdock.cpp
@@ -53,10 +53,10 @@ DsoTriggerDock::DsoTriggerDock(QWidget *parent, SigSession &session) :
_position_label = new QLabel(_widget);
_position_spinBox = new QSpinBox(_widget);
- _position_spinBox->setRange(0, 99);
+ _position_spinBox->setRange(1, 99);
_position_spinBox->setButtonSymbols(QAbstractSpinBox::NoButtons);
_position_slider = new QSlider(Qt::Horizontal, _widget);
- _position_slider->setRange(0, 99);
+ _position_slider->setRange(1, 99);
connect(_position_slider, SIGNAL(valueChanged(int)), _position_spinBox, SLOT(setValue(int)));
connect(_position_spinBox, SIGNAL(valueChanged(int)), _position_slider, SLOT(setValue(int)));
connect(_position_slider, SIGNAL(valueChanged(int)), this, SLOT(pos_changed(int)));
diff --git a/DSView/pv/view/dsosignal.cpp b/DSView/pv/view/dsosignal.cpp
index ea510127..3be0d94e 100755
--- a/DSView/pv/view/dsosignal.cpp
+++ b/DSView/pv/view/dsosignal.cpp
@@ -73,7 +73,7 @@ DsoSignal::DsoSignal(boost::shared_ptr dev_inst,
_auto_cnt(0),
_hover_en(false),
_hover_index(0),
- _hover_point(QPointF(0, 0)),
+ _hover_point(QPointF(-1, -1)),
_hover_value(0)
{
QVector vValue;
@@ -1307,7 +1307,7 @@ void DsoSignal::paint_hover_measure(QPainter &p, QColor fore, QColor back)
{
const int hw_offset = get_hw_offset();
// Hover measure
- if (_hover_en) {
+ if (_hover_en && _hover_point != QPointF(-1, -1)) {
QString hover_str = get_voltage(hw_offset - _hover_value, 2);
const int hover_width = p.boundingRect(0, 0, INT_MAX, INT_MAX,
Qt::AlignLeft | Qt::AlignTop, hover_str).width() + 10;
@@ -1331,6 +1331,10 @@ void DsoSignal::paint_hover_measure(QPainter &p, QColor fore, QColor back)
while (i != _view->get_cursorList().end()) {
float pt_value;
const QPointF pt = get_point((*i)->index(), pt_value);
+ if (pt == QPointF(-1, -1)) {
+ i++;
+ continue;
+ }
QString pt_str = get_voltage(hw_offset - pt_value, 2);
const int pt_width = p.boundingRect(0, 0, INT_MAX, INT_MAX,
Qt::AlignLeft | Qt::AlignTop, pt_str).width() + 10;
@@ -1500,7 +1504,7 @@ bool DsoSignal::get_hover(uint64_t &index, QPointF &p, double &value)
QPointF DsoSignal::get_point(uint64_t index, float &value)
{
- QPointF pt = QPointF(0, 0);
+ QPointF pt = QPointF(-1, -1);
if (!enabled())
return pt;