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

Merge branch 'dev-1.3' of https://github.com/dreamsourcelab/DSView into dev-1.3

Browse Source
This commit is contained in:
dreamsourcelabTAI
2022-12-09 17:33:19 +08:00
parent 54bcfa56f2 d2654ba797
commit 2c07623bfa
6 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DSView/pv/data/spectrumstack.cpp
View File

@@ -175,7 +175,7 @@ void SpectrumStack::calc_fft()
for(auto s : _session->get_signals()) {
if (s->signal_type() == DSO_SIGNAL) {
view::DsoSignal *dsoSig = (view::DsoSignal*)s;
dsoSig = (view::DsoSignal*)s;
if (dsoSig->get_index() == _index && dsoSig->enabled()) {
data = dsoSig->dso_data();
break;

2
DSView/pv/dialogs/calibration.cpp
View File

@@ -126,7 +126,7 @@ void Calibration::retranslateUi()
void Calibration::update_device_info()
{
if (_device_agent->have_instance()){
if (_device_agent->have_instance() == false){
assert(false);
}

2
DSView/pv/dock/triggerdock.cpp
View File

@@ -188,7 +188,7 @@ void TriggerDock::simple_trigger()
void TriggerDock::adv_trigger()
{
if (_session->get_device()->name() == "DSLogic") {
if (_session->get_device()->driver_name() == "DSLogic") {
bool stream = false;
GVariant *gvar = _session->get_device()->get_config(NULL, NULL, SR_CONF_STREAM);
if (gvar != NULL) {

7
DSView/pv/mainwindow.cpp
View File

@@ -97,6 +97,7 @@
#include <stdlib.h>
#include "ZipMaker.h"
#include "ui/langresource.h"
#include "mainframe.h"
#define BASE_SESSION_VERSION 3
@@ -520,6 +521,12 @@ namespace pv
int h = parentWidget()->frameGeometry().height();
QDesktopWidget *desktop = QApplication::desktop();
QPixmap pixmap = QGuiApplication::primaryScreen()->grabWindow(desktop->winId(), x, y, w, h);
#elif __APPLE__
int x = parentWidget()->pos().x() + MainFrame::Margin;
int y = parentWidget()->pos().y() + MainFrame::Margin;
int w = parentWidget()->geometry().width() - MainFrame::Margin * 2;
int h = parentWidget()->geometry().height() - MainFrame::Margin * 2;
QPixmap pixmap = QGuiApplication::primaryScreen()->grabWindow(winId(), x, y, w, h);
#else
QPixmap pixmap = QGuiApplication::primaryScreen()->grabWindow(winId());
#endif

3
libsigrokdecode4DSL/decoders/ieee488/pd.py
View File

@@ -620,7 +620,8 @@ class Decoder(srd.Decoder):
# re-use 'iec' decoder logic. Turn ATN to positive logic for
# easier processing. The data bits get handled during byte
# accumulation.
pins = self.wait(step_wait_conds[step])
(dio1,dio2,dio3,dio4,dio5,dio6,dio7,dio8,eoi,dav,nrfd,ndac,ifc,srq,atn,ren,clk)= self.wait(step_wait_conds[step])
pins = (dio1,dio2,dio3,dio4,dio5,dio6,dio7,dio8,eoi,dav,nrfd,ndac,ifc,srq,atn,ren,clk)
data, clk = pins[PIN_DATA], pins[PIN_CLK]
atn, = self.invert_pins([pins[PIN_ATN]])

3
libsigrokdecode4DSL/decoders/sle44xx/pd.py
View File

@@ -492,8 +492,7 @@ class Decoder(srd.Decoder):
is_outgoing = self.state == 'OUT'
is_processing = self.state == 'PROC'
pins = self.wait(conditions)
io = pins[Pin.IO]
(rst,clk,io) = self.wait(conditions)
# Handle RESET conditions, including an optional CLK pulse
# while RST is asserted.