SW/DSView
2
0
Fork 0
forked from Ivasoft/DSView
Code Pull Requests Activity

Fix spell and other minor issues

Browse Source
This commit is contained in:
DreamSourceLab
2020-01-16 22:24:46 +08:00
parent ba34aeb95f
commit 21704f5565
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
DSView/pv/dialogs/about.cpp
View File

@@ -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: <a href=\"%1\" style=\"color:#C0C0C0\">%1</a><br />"
"Gitbub: <a href=\"%2\" style=\"color:#C0C0C0\">%2</a><br />"
"Copyright：<a href=\"%3\" style=\"color:#C0C0C0\">%3</a><br />"
"Github: <a href=\"%2\" style=\"color:#C0C0C0\">%2</a><br />"
"Copyright:<a href=\"%3\" style=\"color:#C0C0C0\">%3</a><br />"
"<br /><br />")
.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()

4
DSView/pv/dock/dsotriggerdock.cpp
View File

@@ -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)));

10
DSView/pv/view/dsosignal.cpp
View File

@@ -73,7 +73,7 @@ DsoSignal::DsoSignal(boost::shared_ptr<pv::device::DevInst> 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<uint64_t> 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;