Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Raptor Engineering Public Development
dsview
Commits
21704f55
Commit
21704f55
authored
Jan 16, 2020
by
DreamSourceLab
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spell and other minor issues
parent
ba34aeb9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
9 deletions
+13
-9
DSView/pv/dialogs/about.cpp
DSView/pv/dialogs/about.cpp
+4
-4
DSView/pv/dock/dsotriggerdock.cpp
DSView/pv/dock/dsotriggerdock.cpp
+2
-2
DSView/pv/view/dsosignal.cpp
DSView/pv/view/dsosignal.cpp
+7
-3
No files found.
DSView/pv/dialogs/about.cpp
View file @
21704f55
...
...
@@ -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 />"
"Git
b
ub: <a href=
\"
%2
\"
style=
\"
color:#C0C0C0
\"
>%2</a><br />"
"Copyright
:
<a href=
\"
%3
\"
style=
\"
color:#C0C0C0
\"
>%3</a><br />"
"Git
h
ub: <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
()
...
...
DSView/pv/dock/dsotriggerdock.cpp
View file @
21704f55
...
...
@@ -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
)));
...
...
DSView/pv/view/dsosignal.cpp
View file @
21704f55
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment