Commit 17c20781 authored by DreamSourceLab's avatar DreamSourceLab

Merge branch 'develop' of https://github.com/DreamSourceLab/DSView into develop

parents 13dd644f 01e1c8af
DSView/icons/about.png

5.95 KB | W: | H:

DSView/icons/about.png

954 Bytes | W: | H:

DSView/icons/about.png
DSView/icons/about.png
DSView/icons/about.png
DSView/icons/about.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/add.png

198 Bytes | W: | H:

DSView/icons/add.png

260 Bytes | W: | H:

DSView/icons/add.png
DSView/icons/add.png
DSView/icons/add.png
DSView/icons/add.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/capture.png

5.87 KB | W: | H:

DSView/icons/capture.png

860 Bytes | W: | H:

DSView/icons/capture.png
DSView/icons/capture.png
DSView/icons/capture.png
DSView/icons/capture.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/decoder-hidden.png

1.41 KB | W: | H:

DSView/icons/decoder-hidden.png

1.25 KB | W: | H:

DSView/icons/decoder-hidden.png
DSView/icons/decoder-hidden.png
DSView/icons/decoder-hidden.png
DSView/icons/decoder-hidden.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/decoder-shown.png

1.02 KB | W: | H:

DSView/icons/decoder-shown.png

883 Bytes | W: | H:

DSView/icons/decoder-shown.png
DSView/icons/decoder-shown.png
DSView/icons/decoder-shown.png
DSView/icons/decoder-shown.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/del.png

566 Bytes | W: | H:

DSView/icons/del.png

624 Bytes | W: | H:

DSView/icons/del.png
DSView/icons/del.png
DSView/icons/del.png
DSView/icons/del.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/down-arrow.png

165 Bytes | W: | H:

DSView/icons/down-arrow.png

248 Bytes | W: | H:

DSView/icons/down-arrow.png
DSView/icons/down-arrow.png
DSView/icons/down-arrow.png
DSView/icons/down-arrow.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/dsl_logo.png

16.4 KB | W: | H:

DSView/icons/dsl_logo.png

16 KB | W: | H:

DSView/icons/dsl_logo.png
DSView/icons/dsl_logo.png
DSView/icons/dsl_logo.png
DSView/icons/dsl_logo.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/file.png

1.16 KB | W: | H:

DSView/icons/file.png

1012 Bytes | W: | H:

DSView/icons/file.png
DSView/icons/file.png
DSView/icons/file.png
DSView/icons/file.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/file_dis.png

811 Bytes | W: | H:

DSView/icons/file_dis.png

641 Bytes | W: | H:

DSView/icons/file_dis.png
DSView/icons/file_dis.png
DSView/icons/file_dis.png
DSView/icons/file_dis.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/gear.png

1.54 KB | W: | H:

DSView/icons/gear.png

1.97 KB | W: | H:

DSView/icons/gear.png
DSView/icons/gear.png
DSView/icons/gear.png
DSView/icons/gear.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/instant.png

1.22 KB | W: | H:

DSView/icons/instant.png

1.06 KB | W: | H:

DSView/icons/instant.png
DSView/icons/instant.png
DSView/icons/instant.png
DSView/icons/instant.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/logo.png

15.8 KB | W: | H:

DSView/icons/logo.png

15.6 KB | W: | H:

DSView/icons/logo.png
DSView/icons/logo.png
DSView/icons/logo.png
DSView/icons/logo.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/logo_color.png

2.34 KB | W: | H:

DSView/icons/logo_color.png

2.15 KB | W: | H:

DSView/icons/logo_color.png
DSView/icons/logo_color.png
DSView/icons/logo_color.png
DSView/icons/logo_color.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/logo_noColor.png

1.86 KB | W: | H:

DSView/icons/logo_noColor.png

1.68 KB | W: | H:

DSView/icons/logo_noColor.png
DSView/icons/logo_noColor.png
DSView/icons/logo_noColor.png
DSView/icons/logo_noColor.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/measure.png

1.26 KB | W: | H:

DSView/icons/measure.png

1.11 KB | W: | H:

DSView/icons/measure.png
DSView/icons/measure.png
DSView/icons/measure.png
DSView/icons/measure.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/measure_dis.png

1.14 KB | W: | H:

DSView/icons/measure_dis.png

1002 Bytes | W: | H:

DSView/icons/measure_dis.png
DSView/icons/measure_dis.png
DSView/icons/measure_dis.png
DSView/icons/measure_dis.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/next.png

5.73 KB | W: | H:

DSView/icons/next.png

699 Bytes | W: | H:

DSView/icons/next.png
DSView/icons/next.png
DSView/icons/next.png
DSView/icons/next.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/open.png

5.67 KB | W: | H:

DSView/icons/open.png

692 Bytes | W: | H:

DSView/icons/open.png
DSView/icons/open.png
DSView/icons/open.png
DSView/icons/open.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/params.png

1.35 KB | W: | H:

DSView/icons/params.png

1.18 KB | W: | H:

DSView/icons/params.png
DSView/icons/params.png
DSView/icons/params.png
DSView/icons/params.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/params_dis.png

1.31 KB | W: | H:

DSView/icons/params_dis.png

1.13 KB | W: | H:

DSView/icons/params_dis.png
DSView/icons/params_dis.png
DSView/icons/params_dis.png
DSView/icons/params_dis.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/pre.png

5.71 KB | W: | H:

DSView/icons/pre.png

681 Bytes | W: | H:

DSView/icons/pre.png
DSView/icons/pre.png
DSView/icons/pre.png
DSView/icons/pre.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/protocol.png

1.11 KB | W: | H:

DSView/icons/protocol.png

967 Bytes | W: | H:

DSView/icons/protocol.png
DSView/icons/protocol.png
DSView/icons/protocol.png
DSView/icons/protocol.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/protocol_dis.png

1.06 KB | W: | H:

DSView/icons/protocol_dis.png

931 Bytes | W: | H:

DSView/icons/protocol_dis.png
DSView/icons/protocol_dis.png
DSView/icons/protocol_dis.png
DSView/icons/protocol_dis.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/save.png

5.53 KB | W: | H:

DSView/icons/save.png

502 Bytes | W: | H:

DSView/icons/save.png
DSView/icons/save.png
DSView/icons/save.png
DSView/icons/save.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/search-bar.png

1.65 KB | W: | H:

DSView/icons/search-bar.png

1.48 KB | W: | H:

DSView/icons/search-bar.png
DSView/icons/search-bar.png
DSView/icons/search-bar.png
DSView/icons/search-bar.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/search-bar_dis.png

1.53 KB | W: | H:

DSView/icons/search-bar_dis.png

1.36 KB | W: | H:

DSView/icons/search-bar_dis.png
DSView/icons/search-bar_dis.png
DSView/icons/search-bar_dis.png
DSView/icons/search-bar_dis.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/search.png

251 Bytes | W: | H:

DSView/icons/search.png

313 Bytes | W: | H:

DSView/icons/search.png
DSView/icons/search.png
DSView/icons/search.png
DSView/icons/search.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/slider-handle.png

1.15 KB | W: | H:

DSView/icons/slider-handle.png

1.18 KB | W: | H:

DSView/icons/slider-handle.png
DSView/icons/slider-handle.png
DSView/icons/slider-handle.png
DSView/icons/slider-handle.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/start.png

1.21 KB | W: | H:

DSView/icons/start.png

1.05 KB | W: | H:

DSView/icons/start.png
DSView/icons/start.png
DSView/icons/start.png
DSView/icons/start.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/stop.png

789 Bytes | W: | H:

DSView/icons/stop.png

628 Bytes | W: | H:

DSView/icons/stop.png
DSView/icons/stop.png
DSView/icons/stop.png
DSView/icons/stop.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/trigger.png

1007 Bytes | W: | H:

DSView/icons/trigger.png

840 Bytes | W: | H:

DSView/icons/trigger.png
DSView/icons/trigger.png
DSView/icons/trigger.png
DSView/icons/trigger.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/trigger_dis.png

978 Bytes | W: | H:

DSView/icons/trigger_dis.png

820 Bytes | W: | H:

DSView/icons/trigger_dis.png
DSView/icons/trigger_dis.png
DSView/icons/trigger_dis.png
DSView/icons/trigger_dis.png
  • 2-up
  • Swipe
  • Onion skin
DSView/icons/wiki.png

2.55 KB | W: | H:

DSView/icons/wiki.png

2.72 KB | W: | H:

DSView/icons/wiki.png
DSView/icons/wiki.png
DSView/icons/wiki.png
DSView/icons/wiki.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -40,7 +40,7 @@ Annotation::Annotation(const srd_proto_data *const pdata) :
(const srd_proto_data_annotation*)pdata->data;
assert(pda);
_format = pda->ann_class;
_format = pda->ann_format;
const char *const *annotations = (char**)pda->ann_text;
while(*annotations) {
......
......@@ -738,8 +738,8 @@ bool MainWindow::store_session(QString name)
s_obj["strigger"] = s->get_trig();
boost::shared_ptr<view::DsoSignal> dsoSig;
if (dsoSig = dynamic_pointer_cast<view::DsoSignal>(s)) {
s_obj["vdiv"] = QJsonValue::fromVariant(dsoSig->get_vDialValue());
s_obj["vfactor"] = QJsonValue::fromVariant(dsoSig->get_factor());
s_obj["vdiv"] = QJsonValue::fromVariant(static_cast<qulonglong>(dsoSig->get_vDialValue()));
s_obj["vfactor"] = QJsonValue::fromVariant(static_cast<qulonglong>(dsoSig->get_factor()));
s_obj["coupling"] = dsoSig->get_acCoupling();
s_obj["trigValue"] = dsoSig->get_trigRate();
s_obj["zeroPos"] = dsoSig->get_zeroRate();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment