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
7fdb2d48
Commit
7fdb2d48
authored
Jul 29, 2017
by
DreamSourceLab
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix sample depth issue for single capture @ osc mode
parent
c180b108
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
5 deletions
+8
-5
DSView/pv/view/dsosignal.cpp
DSView/pv/view/dsosignal.cpp
+6
-3
DSView/pv/view/dsosignal.h
DSView/pv/view/dsosignal.h
+1
-1
DSView/pv/view/view.cpp
DSView/pv/view/view.cpp
+1
-1
No files found.
DSView/pv/view/dsosignal.cpp
View file @
7fdb2d48
...
...
@@ -211,7 +211,7 @@ void DsoSignal::set_enable(bool enable)
g_variant_new_boolean
(
enable
));
if
(
running
)
{
update_capture
();
update_capture
(
_view
->
session
().
get_instant
()
);
_view
->
session
().
repeat_resume
();
}
...
...
@@ -333,7 +333,7 @@ bool DsoSignal::go_hDialPre(bool setted)
}
}
bool
DsoSignal
::
update_capture
()
bool
DsoSignal
::
update_capture
(
bool
instant
)
{
int
ch_num
=
_view
->
session
().
get_ch_num
(
SR_CHANNEL_DSO
);
if
(
ch_num
==
0
)
...
...
@@ -350,7 +350,10 @@ bool DsoSignal::update_capture()
qDebug
()
<<
"ERROR: config_get SR_CONF_MAX_DSO_SAMPLERATE failed."
;
return
false
;
}
gvar
=
_dev_inst
->
get_config
(
NULL
,
NULL
,
SR_CONF_MAX_DSO_SAMPLELIMITS
);
if
(
instant
)
gvar
=
_dev_inst
->
get_config
(
NULL
,
NULL
,
SR_CONF_HW_DEPTH
);
else
gvar
=
_dev_inst
->
get_config
(
NULL
,
NULL
,
SR_CONF_MAX_DSO_SAMPLELIMITS
);
if
(
gvar
!=
NULL
)
{
max_sample_limit
=
g_variant_get_uint64
(
gvar
);
g_variant_unref
(
gvar
);
...
...
DSView/pv/view/dsosignal.h
View file @
7fdb2d48
...
...
@@ -115,7 +115,7 @@ public:
bool
go_vDialNext
();
bool
go_hDialPre
(
bool
setted
);
bool
go_hDialNext
(
bool
setted
);
bool
update_capture
();
bool
update_capture
(
bool
instant
);
uint64_t
get_vDialValue
()
const
;
uint64_t
get_hDialValue
()
const
;
uint16_t
get_vDialSel
()
const
;
...
...
DSView/pv/view/view.cpp
View file @
7fdb2d48
...
...
@@ -253,7 +253,7 @@ void View::update_sample(bool instant)
BOOST_FOREACH
(
const
boost
::
shared_ptr
<
pv
::
view
::
Signal
>
s
,
_session
.
get_signals
())
{
boost
::
shared_ptr
<
pv
::
view
::
DsoSignal
>
dsoSig
;
if
(
dsoSig
=
dynamic_pointer_cast
<
pv
::
view
::
DsoSignal
>
(
s
))
{
dsoSig
->
update_capture
();
dsoSig
->
update_capture
(
instant
);
break
;
}
}
...
...
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