Skip to content

Commit f15aa50

Browse files
DreamSourceLabDreamSourceLab
committed
Improve usb transfer and othre minor issues
1 parent 4cc02c8 commit f15aa50

File tree

264 files changed

+36454
-2061
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

264 files changed

+36454
-2061
lines changed

‎DSView/CMakeLists.txt

+137-95
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ find_package(Threads)
9393

9494
find_package(Boost 1.42 COMPONENTS filesystem system thread REQUIRED)
9595
find_package(libusb-1.0 REQUIRED)
96+
find_package(FFTW REQUIRED)
9697

9798
#===============================================================================
9899
#= Config Header
@@ -118,107 +119,147 @@ configure_file (
118119
#-------------------------------------------------------------------------------
119120

120121
set(DSView_SOURCES
121-
main.cpp
122-
pv/devicemanager.cpp
123-
pv/mainwindow.cpp
124-
pv/sigsession.cpp
125-
pv/storesession.cpp
126-
pv/data/analog.cpp
127-
pv/data/analogsnapshot.cpp
128-
pv/data/dso.cpp
129-
pv/data/dsosnapshot.cpp
130-
pv/data/group.cpp
131-
pv/data/groupsnapshot.cpp
132-
pv/data/logic.cpp
133-
pv/data/logicsnapshot.cpp
134-
pv/data/signaldata.cpp
135-
pv/data/snapshot.cpp
136-
pv/device/devinst.cpp
137-
pv/device/device.cpp
138-
pv/device/file.cpp
139-
pv/device/inputfile.cpp
140-
pv/device/sessionfile.cpp
141-
pv/dialogs/about.cpp
142-
pv/dialogs/deviceoptions.cpp
143-
pv/dialogs/search.cpp
144-
pv/dialogs/storeprogress.cpp
145-
pv/dialogs/streamoptions.cpp
146-
pv/dialogs/waitingdialog.cpp
147-
pv/dialogs/dsomeasure.cpp
148-
pv/dock/dsotriggerdock.cpp
149-
pv/dock/measuredock.cpp
150-
pv/dock/searchdock.cpp
151-
pv/dock/triggerdock.cpp
152-
pv/prop/bool.cpp
153-
pv/prop/double.cpp
154-
pv/prop/enum.cpp
155-
pv/prop/int.cpp
156-
pv/prop/property.cpp
157-
pv/prop/string.cpp
158-
pv/prop/binding/binding.cpp
159-
pv/prop/binding/binding_deviceoptions.cpp
160-
pv/toolbars/filebar.cpp
161-
pv/toolbars/logobar.cpp
162-
pv/toolbars/samplingbar.cpp
163-
pv/toolbars/trigbar.cpp
164-
pv/view/analogsignal.cpp
165-
pv/view/cursor.cpp
166-
pv/view/devmode.cpp
167-
pv/view/dsldial.cpp
168-
pv/view/dsosignal.cpp
169-
pv/view/groupsignal.cpp
170-
pv/view/header.cpp
171-
pv/view/logicsignal.cpp
172-
pv/view/ruler.cpp
173-
pv/view/selectableitem.cpp
174-
pv/view/signal.cpp
175-
pv/view/timemarker.cpp
176-
pv/view/trace.cpp
177-
pv/view/view.cpp
178-
pv/view/viewport.cpp
179-
pv/widgets/fakelineedit.cpp
122+
main.cpp
123+
pv/sigsession.cpp
124+
pv/mainwindow.cpp
125+
pv/devicemanager.cpp
126+
pv/data/snapshot.cpp
127+
pv/data/signaldata.cpp
128+
pv/data/logicsnapshot.cpp
129+
pv/data/logic.cpp
130+
pv/data/analogsnapshot.cpp
131+
pv/data/analog.cpp
132+
pv/dialogs/deviceoptions.cpp
133+
pv/prop/property.cpp
134+
pv/prop/int.cpp
135+
pv/prop/enum.cpp
136+
pv/prop/double.cpp
137+
pv/prop/bool.cpp
138+
pv/prop/binding/binding.cpp
139+
pv/toolbars/samplingbar.cpp
140+
pv/view/viewport.cpp
141+
pv/view/view.cpp
142+
pv/view/timemarker.cpp
143+
pv/view/signal.cpp
144+
pv/view/ruler.cpp
145+
pv/view/logicsignal.cpp
146+
pv/view/header.cpp
147+
pv/view/cursor.cpp
148+
pv/view/analogsignal.cpp
149+
pv/prop/binding/binding_deviceoptions.cpp
150+
pv/toolbars/trigbar.cpp
151+
pv/toolbars/filebar.cpp
152+
pv/dock/protocoldock.cpp
153+
pv/dock/triggerdock.cpp
154+
pv/dock/measuredock.cpp
155+
pv/dock/searchdock.cpp
156+
pv/toolbars/logobar.cpp
157+
pv/data/groupsnapshot.cpp
158+
pv/view/groupsignal.cpp
159+
pv/data/group.cpp
160+
pv/dialogs/about.cpp
161+
pv/dialogs/search.cpp
162+
pv/data/dsosnapshot.cpp
163+
pv/data/dso.cpp
164+
pv/view/dsosignal.cpp
165+
pv/view/dsldial.cpp
166+
pv/dock/dsotriggerdock.cpp
167+
pv/view/trace.cpp
168+
pv/view/selectableitem.cpp
169+
pv/data/decoderstack.cpp
170+
pv/data/decode/rowdata.cpp
171+
pv/data/decode/row.cpp
172+
pv/data/decode/decoder.cpp
173+
pv/data/decode/annotation.cpp
174+
pv/view/decodetrace.cpp
175+
pv/prop/binding/decoderoptions.cpp
176+
pv/widgets/fakelineedit.cpp
177+
pv/widgets/decodermenu.cpp
178+
pv/widgets/decodergroupbox.cpp
179+
pv/prop/string.cpp
180+
pv/device/sessionfile.cpp
181+
pv/device/inputfile.cpp
182+
pv/device/file.cpp
183+
pv/device/devinst.cpp
184+
pv/dialogs/storeprogress.cpp
185+
pv/storesession.cpp
186+
pv/view/devmode.cpp
187+
pv/device/device.cpp
188+
pv/dialogs/waitingdialog.cpp
189+
pv/dialogs/dsomeasure.cpp
190+
pv/dialogs/calibration.cpp
191+
pv/data/decodermodel.cpp
192+
pv/dialogs/protocollist.cpp
193+
pv/dialogs/protocolexp.cpp
194+
pv/dialogs/fftoptions.cpp
195+
pv/data/mathstack.cpp
196+
pv/view/mathtrace.cpp
197+
dsapplication.cpp
198+
pv/widgets/viewstatus.cpp
199+
pv/toolbars/titlebar.cpp
200+
pv/mainframe.cpp
201+
pv/widgets/border.cpp
202+
pv/dialogs/dsmessagebox.cpp
203+
pv/dialogs/shadow.cpp
204+
pv/dialogs/dsdialog.cpp
180205
)
181206

182207
set(DSView_HEADERS
183-
pv/mainwindow.h
184-
pv/sigsession.h
185-
pv/storesession.h
186-
pv/device/devinst.h
187-
pv/dialogs/about.h
188-
pv/dialogs/deviceoptions.h
189-
pv/dialogs/search.h
190-
pv/dialogs/storeprogress.h
191-
pv/dialogs/streamoptions.h
192-
pv/dialogs/waitingdialog.h
193-
pv/dialogs/dsomeasure.h
194-
pv/dock/dsotriggerdock.h
195-
pv/dock/measuredock.h
196-
pv/dock/searchdock.h
197-
pv/dock/triggerdock.h
198-
pv/prop/bool.h
199-
pv/prop/double.h
200-
pv/prop/enum.h
201-
pv/prop/int.h
202-
pv/prop/property.h
203-
pv/prop/string.h
204-
pv/toolbars/filebar.h
205-
pv/toolbars/logobar.h
206-
pv/toolbars/samplingbar.h
207-
pv/toolbars/trigbar.h
208-
pv/view/cursor.h
209-
pv/view/devmode.h
210-
pv/view/header.h
211-
pv/view/ruler.h
212-
pv/view/selectableitem.h
213-
pv/view/timemarker.h
214-
pv/view/trace.h
215-
pv/view/view.h
216-
pv/view/viewport.h
217-
pv/widgets/fakelineedit.h
208+
pv/sigsession.h
209+
pv/mainwindow.h
210+
pv/dialogs/deviceoptions.h
211+
pv/prop/property.h
212+
pv/prop/int.h
213+
pv/prop/enum.h
214+
pv/prop/double.h
215+
pv/prop/bool.h
216+
pv/toolbars/samplingbar.h
217+
pv/view/viewport.h
218+
pv/view/view.h
219+
pv/view/timemarker.h
220+
pv/view/ruler.h
221+
pv/view/header.h
222+
pv/view/cursor.h
223+
pv/toolbars/trigbar.h
224+
pv/toolbars/filebar.h
225+
pv/dock/protocoldock.h
226+
pv/dock/triggerdock.h
227+
pv/dock/measuredock.h
228+
pv/dock/searchdock.h
229+
pv/toolbars/logobar.h
230+
pv/dialogs/about.h
231+
pv/dialogs/search.h
232+
pv/dock/dsotriggerdock.h
233+
pv/view/trace.h
234+
pv/view/selectableitem.h
235+
pv/data/decoderstack.h
236+
pv/view/decodetrace.h
237+
pv/widgets/fakelineedit.h
238+
pv/widgets/decodermenu.h
239+
pv/widgets/decodergroupbox.h
240+
pv/prop/string.h
241+
pv/device/devinst.h
242+
pv/dialogs/storeprogress.h
243+
pv/storesession.h
244+
pv/view/devmode.h
245+
pv/dialogs/waitingdialog.h
246+
pv/dialogs/dsomeasure.h
247+
pv/dialogs/calibration.h
248+
pv/dialogs/protocollist.h
249+
pv/dialogs/protocolexp.h
250+
pv/dialogs/fftoptions.h
251+
pv/data/mathstack.h
252+
pv/view/mathtrace.h
253+
pv/widgets/viewstatus.h
254+
pv/toolbars/titlebar.h
255+
pv/mainframe.h
256+
pv/widgets/border.h
257+
pv/dialogs/dsmessagebox.h
258+
pv/dialogs/shadow.h
259+
pv/dialogs/dsdialog.h
218260
)
219261

220262
set(DSView_FORMS
221-
pv/dialogs/about.ui
222263
)
223264

224265
set(DSView_RESOURCES
@@ -310,6 +351,7 @@ set(DSVIEW_LINK_LIBS
310351
${CMAKE_THREAD_LIBS_INIT}
311352
${QT_LIBRARIES}
312353
${LIBUSB_1_LIBRARIES}
354+
${FFTW_LIBRARIES}
313355
)
314356

315357
if(STATIC_PKGDEPS_LIBS)

‎DSView/darkstyle/style.qss

+1-1
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ QAbstractSpinBox {
662662
background-color: #201F1F;
663663
color: silver;
664664
border-radius: 2px;
665-
min-width: 50px;
665+
min-width: 60px;
666666
}
667667

668668
QAbstractSpinBox:up-button

‎DSView/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ int main(int argc, char *argv[])
137137
// Initialise the main frame
138138
pv::MainFrame w(device_manager, open_file);
139139
//QFile qss(":/stylesheet.qss");
140-
QFile qss(":qdarkstyle/style.qss");
140+
QFile qss(":darkstyle/style.qss");
141141
qss.open(QFile::ReadOnly);
142142
a.setStyleSheet(qss.readAll());
143143
qss.close();

‎DSView/pv/data/decoderstack.cpp

+3-7
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ void DecoderStack::remove(boost::shared_ptr<Decoder> &decoder)
117117
{
118118
// Find the decoder in the stack
119119
list< shared_ptr<Decoder> >::iterator iter = _stack.begin();
120-
for(int i = 0; i < _stack.size(); i++, iter++)
120+
for(unsigned int i = 0; i < _stack.size(); i++, iter++)
121121
if ((*iter) == decoder)
122122
break;
123123

@@ -285,7 +285,6 @@ uint64_t DecoderStack::list_annotation_size() const
285285
{
286286
lock_guard<boost::recursive_mutex> lock(_output_mutex);
287287
uint64_t max_annotation_size = 0;
288-
int row = 0;
289288
for (map<const Row, RowData>::const_iterator i = _rows.begin();
290289
i != _rows.end(); i++) {
291290
map<const Row, bool>::const_iterator iter = _rows_lshow.find((*i).first);
@@ -316,7 +315,6 @@ bool DecoderStack::list_annotation(pv::data::decode::Annotation &ann,
316315
uint16_t row_index, uint64_t col_index) const
317316
{
318317
//lock_guard<mutex> lock(_output_mutex);
319-
int row = 0;
320318
for (map<const Row, RowData>::const_iterator i = _rows.begin();
321319
i != _rows.end(); i++) {
322320
map<const Row, bool>::const_iterator iter = _rows_lshow.find((*i).first);
@@ -334,7 +332,6 @@ bool DecoderStack::list_annotation(pv::data::decode::Annotation &ann,
334332
bool DecoderStack::list_row_title(int row, QString &title) const
335333
{
336334
//lock_guard<mutex> lock(_output_mutex);
337-
int index = 0;
338335
for (map<const Row, RowData>::const_iterator i = _rows.begin();
339336
i != _rows.end(); i++) {
340337
map<const Row, bool>::const_iterator iter = _rows_lshow.find((*i).first);
@@ -574,8 +571,8 @@ void DecoderStack::decode_proc()
574571
optional<uint64_t> sample_count;
575572
srd_session *session;
576573
srd_decoder_inst *prev_di = NULL;
577-
uint64_t decode_start;
578-
uint64_t decode_end;
574+
uint64_t decode_start = 0;
575+
uint64_t decode_end = 0;
579576

580577
assert(_snapshot);
581578

@@ -726,7 +723,6 @@ int DecoderStack::list_rows_size()
726723
{
727724
//lock_guard<mutex> lock(_output_mutex);
728725
int rows_size = 0;
729-
int row = 0;
730726
for (map<const Row, RowData>::const_iterator i = _rows.begin();
731727
i != _rows.end(); i++) {
732728
map<const Row, bool>::const_iterator iter = _rows_lshow.find((*i).first);

‎DSView/pv/data/decoderstack.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
#include <QObject>
3333
#include <QString>
3434

35-
#include <../data/decode/row.h>
36-
#include <../data/decode/rowdata.h>
37-
#include <../data/signaldata.h>
35+
#include "../data/decode/row.h"
36+
#include "../data/decode/rowdata.h"
37+
#include "../data/signaldata.h"
3838

3939
namespace DecoderStackTest {
4040
class TwoDecoderStack;

‎DSView/pv/data/dsosnapshot.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ void DsoSnapshot::enable_envelope(bool enable)
166166
const uint8_t *DsoSnapshot::get_samples(
167167
int64_t start_sample, int64_t end_sample, uint16_t index) const
168168
{
169-
(void)end_sample;
169+
(void)end_sample;
170170

171171
assert(start_sample >= 0);
172172
assert(start_sample < (int64_t)get_sample_count());
@@ -202,9 +202,9 @@ void DsoSnapshot::get_envelope_section(EnvelopeSection &s,
202202

203203
s.start = start << scale_power;
204204
s.scale = 1 << scale_power;
205-
//if (_envelope_levels[probe_index][min_level].length < get_sample_count() / EnvelopeScaleFactor)
206-
// s.length = 0;
207-
//else
205+
if (_envelope_levels[probe_index][min_level].length == 0)
206+
s.length = 0;
207+
else
208208
s.length = end - start;
209209
// s.samples = new EnvelopeSample[s.length];
210210
// memcpy(s.samples, _envelope_levels[min_level].samples + start,

‎DSView/pv/data/mathstack.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ void MathStack::calc_fft()
205205
const uint16_t step = _snapshot->get_channel_num() * _sample_interval;
206206
const uint8_t *const samples = _snapshot->get_samples(0, _sample_num*_sample_interval-1, _index);
207207
double wsum = 0;
208-
for (int i = 0; i < _sample_num; i++) {
208+
for (unsigned int i = 0; i < _sample_num; i++) {
209209
double w = window(i, _windows_index);
210210
_xn[i] = ((double)samples[i*step] - offset) * vscale * w;
211211
wsum += w;
@@ -216,7 +216,7 @@ void MathStack::calc_fft()
216216

217217
// calculate power spectrum
218218
_power_spectrum[0] = abs(_xk[0])/wsum; /* DC component */
219-
for (int k = 1; k < (_sample_num + 1) / 2; ++k) /* (k < N/2 rounded up) */
219+
for (unsigned int k = 1; k < (_sample_num + 1) / 2; ++k) /* (k < N/2 rounded up) */
220220
_power_spectrum[k] = sqrt((_xk[k]*_xk[k] + _xk[_sample_num-k]*_xk[_sample_num-k]) * 2) / wsum;
221221
if (_sample_num % 2 == 0) /* N is even */
222222
_power_spectrum[_sample_num/2] = abs(_xk[_sample_num/2])/wsum; /* Nyquist freq. */

0 commit comments

Comments
 (0)