Add DSCope20 hardware support

DSView/dsapplication.cpp

@@ -2,7 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2016 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2016 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/dsapplication.h

@@ -2,7 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2016 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2016 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/extdef.h

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/analog.cpp

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/analog.h

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/analogsnapshot.cpp

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/analogsnapshot.h

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/decode/annotation.cpp

@@ -2,6 +2,7 @@
  * This file is part of the PulseView project.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2016 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/decode/annotation.h

@@ -2,6 +2,7 @@
  * This file is part of the PulseView project.
  *
  * Copyright (C) 2013 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2016 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/decode/decoder.cpp

@@ -2,6 +2,7 @@
  * This file is part of the PulseView project.
  *
  * Copyright (C) 2013 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2014 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/decode/decoder.h

@@ -2,6 +2,7 @@
  * This file is part of the PulseView project.
  *
  * Copyright (C) 2013 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2014 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/decode/rowdata.cpp

@@ -2,6 +2,7 @@
  * This file is part of the PulseView project.
  *
  * Copyright (C) 2014 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2016 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/decode/rowdata.h

@@ -2,6 +2,7 @@
  * This file is part of the PulseView project.
  *
  * Copyright (C) 2014 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2016 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/decodermodel.cpp

@@ -1,7 +1,7 @@
 /*
  * This file is part of the DSView project.
  *
- * Copyright (C) 2016 Andy Deng <andy@dreamsourcelab.com>
+ * Copyright (C) 2016 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/decodermodel.h

@@ -1,7 +1,7 @@
 /*
  * This file is part of the DSView project.
  *
- * Copyright (C) 2016 Andy Deng <andy@dreamsourcelab.com>
+ * Copyright (C) 2016 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/decoderstack.cpp

@@ -2,6 +2,7 @@
  * This file is part of the PulseView project.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2014 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/decoderstack.h

@@ -2,6 +2,7 @@
  * This file is part of the PulseView project.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2014 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/dso.cpp

@@ -2,7 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/dso.h

@@ -2,7 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/dsosnapshot.cpp

@@ -2,7 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/dsosnapshot.h

@@ -2,7 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/group.cpp

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/group.h

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/groupsnapshot.cpp

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/groupsnapshot.h

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/logic.cpp

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/logic.h

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/logicsnapshot.cpp

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/logicsnapshot.h

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/mathstack.cpp

@@ -1,7 +1,7 @@
 /*
  * This file is part of the PulseView project.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2016 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/mathstack.h

@@ -1,7 +1,7 @@
 /*
  * This file is part of the PulseView project.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2016 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/signaldata.cpp

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/signaldata.h

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/snapshot.cpp

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/data/snapshot.h

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/devicemanager.cpp

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/devicemanager.h

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/dialogs/about.cpp

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/dialogs/about.h

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/dialogs/calibration.cpp

@@ -0,0 +1,302 @@
+/*
+ * This file is part of the DSView project.
+ * DSView is based on PulseView.
+ *
+ * Copyright (C) 2016 DreamSourceLab <support@dreamsourcelab.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+
+#include "calibration.h"
+
+#include <boost/foreach.hpp>
+
+#include <QGridLayout>
+#include <QFuture>
+#include <QProgressDialog>
+#include <QtConcurrent/QtConcurrent>
+#include <QTime>
+
+#include "libsigrok4DSL/libsigrok.h"
+#include "../view/trace.h"
+
+using namespace boost;
+using namespace std;
+
+namespace pv {
+namespace dialogs {
+
+const QString Calibration::VGAIN = tr(" VGAIN");
+const QString Calibration::VOFF = tr(" VOFF");
+
+Calibration::Calibration(QWidget *parent) :
+    QDialog(parent)
+{
+    this->setFixedSize(400, 200);
+    this->setWindowOpacity(0.7);
+    this->setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
+    this->setModal(false);
+
+    _dev_inst = NULL;
+    _save_btn = new QPushButton(tr("Save"), this);
+    _reset_btn = new QPushButton(tr("Reset"), this);
+    _exit_btn = new QPushButton(tr("Exit"), this);
+
+    _flayout = new QFormLayout();
+    QGridLayout *glayout = new QGridLayout(this);
+    glayout->addLayout(_flayout, 0, 0, 1, 5);
+    glayout->addWidget(_save_btn, 1, 0);
+    glayout->addWidget(new QWidget(this), 1, 1);
+    glayout->setColumnStretch(1, 1);
+    glayout->addWidget(_reset_btn, 1, 2);
+    glayout->addWidget(new QWidget(this), 1, 3);
+    glayout->setColumnStretch(3, 1);
+    glayout->addWidget(_exit_btn, 1, 4);
+    setLayout(glayout);
+
+    connect(_save_btn, SIGNAL(clicked()), this, SLOT(on_save()));
+    connect(_reset_btn, SIGNAL(clicked()), this, SLOT(on_reset()));
+    connect(_exit_btn, SIGNAL(clicked()), this, SLOT(reject()));
+}
+
+void Calibration::set_device(boost::shared_ptr<device::DevInst> dev_inst)
+{
+    assert(dev_inst);
+    _dev_inst = dev_inst;
+
+    for(std::list<QSlider *>::const_iterator i = _slider_list.begin();
+        i != _slider_list.end(); i++) {
+        (*i)->setParent(NULL);
+        _flayout->removeWidget((*i));
+        delete (*i);
+    }
+    _slider_list.clear();
+    for(std::list<QLabel *>::const_iterator i = _label_list.begin();
+        i != _label_list.end(); i++) {
+        (*i)->setParent(NULL);
+        _flayout->removeWidget((*i));
+        delete (*i);
+    }
+    _label_list.clear();
+
+    for (const GSList *l = _dev_inst->dev_inst()->channels; l; l = l->next) {
+        sr_channel *const probe = (sr_channel*)l->data;
+        assert(probe);
+
+        uint64_t vgain, vgain_default;
+        uint16_t vgain_range;
+        GVariant* gvar = _dev_inst->get_config(probe, NULL, SR_CONF_VGAIN);
+        if (gvar != NULL) {
+            vgain = g_variant_get_uint64(gvar);
+            g_variant_unref(gvar);
+        }
+        gvar = _dev_inst->get_config(probe, NULL, SR_CONF_VGAIN_DEFAULT);
+        if (gvar != NULL) {
+            vgain_default = g_variant_get_uint64(gvar);
+            g_variant_unref(gvar);
+        }
+        gvar = _dev_inst->get_config(probe, NULL, SR_CONF_VGAIN_RANGE);
+        if (gvar != NULL) {
+            vgain_range = g_variant_get_uint16(gvar);
+            g_variant_unref(gvar);
+        }
+
+        QSlider *gain_slider = new QSlider(Qt::Horizontal, this);
+        gain_slider->setRange(-vgain_range/2, vgain_range/2);
+        gain_slider->setValue(vgain - vgain_default);
+        gain_slider->setObjectName(VGAIN+probe->index);
+        QString gain_string = "Channel" + QString::number(probe->index) + VGAIN;
+        QLabel *gain_label = new QLabel(gain_string, this);
+        _flayout->addRow(gain_label, gain_slider);
+        _slider_list.push_back(gain_slider);
+        _label_list.push_back(gain_label);
+
+        uint64_t voff, voff_default;
+        uint16_t voff_range;
+        gvar = _dev_inst->get_config(probe, NULL, SR_CONF_VOFF);
+        if (gvar != NULL) {
+            voff = g_variant_get_uint16(gvar);
+            g_variant_unref(gvar);
+        }
+        gvar = _dev_inst->get_config(probe, NULL, SR_CONF_VOFF_DEFAULT);
+        if (gvar != NULL) {
+            voff_default = g_variant_get_uint16(gvar);
+            g_variant_unref(gvar);
+        }
+        gvar = _dev_inst->get_config(probe, NULL, SR_CONF_VOFF_RANGE);
+        if (gvar != NULL) {
+            voff_range = g_variant_get_uint16(gvar);
+            g_variant_unref(gvar);
+        }
+        QSlider *off_slider = new QSlider(Qt::Horizontal, this);
+        off_slider->setRange(0, voff_range);
+        off_slider->setValue(voff);
+        off_slider->setObjectName(VOFF+probe->index);
+        QString off_string = "Channel" + QString::number(probe->index) + VOFF;
+        QLabel *off_label = new QLabel(off_string, this);
+        _flayout->addRow(off_label, off_slider);
+        _slider_list.push_back(off_slider);
+        _label_list.push_back(off_label);
+
+        connect(gain_slider, SIGNAL(valueChanged(int)), this, SLOT(set_value(int)));
+        connect(off_slider, SIGNAL(valueChanged(int)), this, SLOT(set_value(int)));
+    }
+
+    update();
+}
+
+void Calibration::accept()
+{
+    using namespace Qt;
+    _dev_inst->set_config(NULL, NULL, SR_CONF_CALI, g_variant_new_boolean(false));
+    QDialog::accept();
+}
+
+void Calibration::reject()
+{
+    using namespace Qt;
+    _dev_inst->set_config(NULL, NULL, SR_CONF_CALI, g_variant_new_boolean(false));
+    QDialog::reject();
+}
+
+void Calibration::set_value(int value)
+{
+    QSlider* sc = dynamic_cast<QSlider *>(sender());
+
+    for (const GSList *l = _dev_inst->dev_inst()->channels; l; l = l->next) {
+        sr_channel *const probe = (sr_channel*)l->data;
+        assert(probe);
+        if (sc->objectName() == VGAIN+probe->index) {
+            uint64_t vgain_default;
+            GVariant* gvar = _dev_inst->get_config(probe, NULL, SR_CONF_VGAIN_DEFAULT);
+            if (gvar != NULL) {
+                vgain_default = g_variant_get_uint64(gvar);
+                g_variant_unref(gvar);
+                _dev_inst->set_config(probe, NULL, SR_CONF_VGAIN,
+                                      g_variant_new_uint64(value+vgain_default));
+            }
+            break;
+        } else if (sc->objectName() == VOFF+probe->index) {
+            _dev_inst->set_config(probe, NULL, SR_CONF_VOFF,
+                                  g_variant_new_uint16(value));
+            break;
+        }
+    }
+}
+
+void Calibration::on_save()
+{
+    this->hide();
+    QFuture<void> future;
+    future = QtConcurrent::run([&]{
+        QTime dieTime = QTime::currentTime().addSecs(1);
+        _dev_inst->set_config(NULL, NULL, SR_CONF_ZERO_SET,
+                              g_variant_new_boolean(true));
+        while( QTime::currentTime() < dieTime );
+    });
+    Qt::WindowFlags flags = Qt::CustomizeWindowHint;
+    QProgressDialog dlg(tr("Save Calibration Result... It can take a while."),
+                        tr("Cancel"),0,0,this,flags);
+    dlg.setWindowModality(Qt::WindowModal);
+    dlg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint);
+    dlg.setCancelButton(NULL);
+
+    QFutureWatcher<void> watcher;
+    connect(&watcher,SIGNAL(finished()),&dlg,SLOT(cancel()));
+    watcher.setFuture(future);
+
+    dlg.exec();
+    this->show();
+}
+
+void Calibration::on_reset()
+{
+    this->hide();
+    QFuture<void> future;
+    future = QtConcurrent::run([&]{
+        QTime dieTime = QTime::currentTime().addSecs(1);
+        _dev_inst->set_config(NULL, NULL, SR_CONF_ZERO_LOAD,
+                              g_variant_new_boolean(true));
+        reload_value();
+        while( QTime::currentTime() < dieTime );
+    });
+    Qt::WindowFlags flags = Qt::CustomizeWindowHint;
+    QProgressDialog dlg(tr("Reset Calibration Result... It can take a while."),
+                        tr("Cancel"),0,0,this,flags);
+    dlg.setWindowModality(Qt::WindowModal);
+    dlg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint);
+    dlg.setCancelButton(NULL);
+
+    QFutureWatcher<void> watcher;
+    connect(&watcher,SIGNAL(finished()),&dlg,SLOT(cancel()));
+    watcher.setFuture(future);
+
+    dlg.exec();
+    this->show();
+}
+
+void Calibration::reload_value()
+{
+    for (const GSList *l = _dev_inst->dev_inst()->channels; l; l = l->next) {
+        sr_channel *const probe = (sr_channel*)l->data;
+        assert(probe);
+
+        uint64_t vgain, vgain_default;
+        uint16_t vgain_range;
+        GVariant* gvar = _dev_inst->get_config(probe, NULL, SR_CONF_VGAIN);
+        if (gvar != NULL) {
+            vgain = g_variant_get_uint64(gvar);
+            g_variant_unref(gvar);
+        }
+        gvar = _dev_inst->get_config(probe, NULL, SR_CONF_VGAIN_DEFAULT);
+        if (gvar != NULL) {
+            vgain_default = g_variant_get_uint64(gvar);
+            g_variant_unref(gvar);
+        }
+        gvar = _dev_inst->get_config(probe, NULL, SR_CONF_VGAIN_RANGE);
+        if (gvar != NULL) {
+            vgain_range = g_variant_get_uint16(gvar);
+            g_variant_unref(gvar);
+        }
+
+        uint64_t voff;
+        uint16_t voff_range;
+        gvar = _dev_inst->get_config(probe, NULL, SR_CONF_VOFF);
+        if (gvar != NULL) {
+            voff = g_variant_get_uint16(gvar);
+            g_variant_unref(gvar);
+        }
+        gvar = _dev_inst->get_config(probe, NULL, SR_CONF_VOFF_RANGE);
+        if (gvar != NULL) {
+            voff_range = g_variant_get_uint16(gvar);
+            g_variant_unref(gvar);
+        }
+
+        for(std::list<QSlider*>::iterator i = _slider_list.begin();
+            i != _slider_list.end(); i++) {
+            if ((*i)->objectName() == VGAIN+probe->index) {
+                (*i)->setRange(-vgain_range/2, vgain_range/2);
+                (*i)->setValue(vgain - vgain_default);
+            } else if ((*i)->objectName() == VOFF+probe->index) {
+                (*i)->setRange(0, voff_range);
+                (*i)->setValue(voff);
+            }
+        }
+    }
+}
+
+} // namespace dialogs
+} // namespace pv

DSView/pv/dialogs/calibration.h

@@ -0,0 +1,77 @@
+/*
+ * This file is part of the DSView project.
+ * DSView is based on PulseView.
+ *
+ * Copyright (C) 2016 DreamSourceLab <support@dreamsourcelab.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+
+#ifndef DSVIEW_PV_CALIBRATION_H
+#define DSVIEW_PV_CALIBRATION_H
+
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QPushButton>
+#include <QLabel>
+#include <QFormLayout>
+#include <QSlider>
+
+#include <list>
+#include <boost/shared_ptr.hpp>
+
+#include <pv/device/devinst.h>
+
+namespace pv {
+namespace dialogs {
+
+class Calibration : public QDialog
+{
+	Q_OBJECT
+
+private:
+    static const QString VGAIN;
+    static const QString VOFF;
+
+public:
+    Calibration(QWidget *parent);
+
+    void set_device(boost::shared_ptr<pv::device::DevInst> dev_inst);
+protected:
+	void accept();
+    void reject();
+
+private slots:
+    void set_value(int value);
+    void on_save();
+    void on_reset();
+    void reload_value();
+
+private:
+    boost::shared_ptr<pv::device::DevInst>  _dev_inst;
+
+    QPushButton *_save_btn;
+    QPushButton *_reset_btn;
+    QPushButton *_exit_btn;
+    QFormLayout *_flayout;
+    std::list <QSlider *> _slider_list;
+    std::list<QLabel *> _label_list;
+};
+
+} // namespace dialogs
+} // namespace pv
+
+#endif // DSVIEW_PV_CALIBRATION_H

DSView/pv/dialogs/deviceoptions.cpp

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -62,6 +62,10 @@ DeviceOptions::DeviceOptions(QWidget *parent, boost::shared_ptr<pv::device::DevI
         _config_button = new QPushButton(tr("Zero Adjustment"), this);
         _layout.addWidget(_config_button);
         connect(_config_button, SIGNAL(clicked()), this, SLOT(zero_adj()));
+
+        _cali_button = new QPushButton(tr("Manual Calibration"), this);
+        _layout.addWidget(_cali_button);
+        connect(_cali_button, SIGNAL(clicked()), this, SLOT(on_calibration()));
     }
 
     _layout.addStretch(1);
@@ -226,11 +230,11 @@ void DeviceOptions::disable_all_probes()
 void DeviceOptions::zero_adj()
 {
     using namespace Qt;
-    QDialog::reject();
+    QDialog::accept();
 
     QMessageBox msg(this);
     msg.setText(tr("Information"));
-    msg.setInformativeText(tr("Zero adjustment program will be started. This may take a few minutes!"));
+    msg.setInformativeText(tr("Zero adjustment program will be started. Please keep all channels out of singal input. It can take a while!"));
     //msg.setStandardButtons(QMessageBox::);
     msg.addButton(tr("Ok"), QMessageBox::AcceptRole);
     msg.addButton(tr("Cancel"), QMessageBox::RejectRole);
@@ -241,6 +245,13 @@ void DeviceOptions::zero_adj()
     }
 }
 
+void DeviceOptions::on_calibration()
+{
+    using namespace Qt;
+    QDialog::accept();
+    _dev_inst->set_config(NULL, NULL, SR_CONF_CALI, g_variant_new_boolean(true));
+}
+
 void DeviceOptions::mode_check()
 {
     bool test;

DSView/pv/dialogs/deviceoptions.h

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -71,6 +71,7 @@ private slots:
     void zero_adj();
     void mode_check();
     void channel_check();
+    void on_calibration();
 
 private:
     boost::shared_ptr<pv::device::DevInst>  _dev_inst;
@@ -85,6 +86,7 @@ private:
     QVBoxLayout _props_box_layout;
 
     QPushButton *_config_button;
+    QPushButton *_cali_button;
 	QDialogButtonBox _button_box;
 
     QTimer _mode_check;

DSView/pv/dialogs/dsomeasure.cpp

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2015 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/dialogs/dsomeasure.h

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2015 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/dialogs/fftoptions.cpp

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2016 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/dialogs/fftoptions.h

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2016 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/dialogs/protocolexp.cpp

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2016 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/dialogs/protocolexp.h

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2016 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/dialogs/protocollist.cpp

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2016 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/dialogs/protocollist.h

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2016 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/dialogs/search.cpp

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/dialogs/search.h

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/dialogs/streamoptions.cpp

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/dialogs/streamoptions.h

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/dialogs/waitingdialog.cpp

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,6 +26,9 @@
 
 #include <QMovie>
 #include <QAbstractButton>
+#include <QFuture>
+#include <QProgressDialog>
+#include <QtConcurrent/QtConcurrent>
 
 #include "libsigrok4DSL/libsigrok.h"
 #include "../view/trace.h"
@@ -37,7 +39,8 @@ using namespace std;
 namespace pv {
 namespace dialogs {
 
-const QString WaitingDialog::TIPS_INFO = tr("Waiting");
+const QString WaitingDialog::TIPS_WAIT = tr("Waiting");
+const QString WaitingDialog::TIPS_FINISHED = tr("Finished!");
 
 WaitingDialog::WaitingDialog(QWidget *parent, boost::shared_ptr<pv::device::DevInst> dev_inst) :
 	QDialog(parent),
@@ -58,7 +61,7 @@ WaitingDialog::WaitingDialog(QWidget *parent, boost::shared_ptr<pv::device::DevI
     label->setMovie(movie);
 
     tips = new QLabel(this);
-    tips->setText(TIPS_INFO);
+    tips->setText(TIPS_WAIT);
     QFont font;
     font.setPointSize(10);
     font.setBold(true);
@@ -79,12 +82,29 @@ WaitingDialog::WaitingDialog(QWidget *parent, boost::shared_ptr<pv::device::DevI
 void WaitingDialog::accept()
 {
 	using namespace Qt;
-
     movie->stop();
     timer->stop();
+    QDialog::accept();
 
-    _dev_inst->set_config(NULL, NULL, SR_CONF_ZERO_SET, g_variant_new_boolean(true));
-	QDialog::accept();
+    QFuture<void> future;
+    future = QtConcurrent::run([&]{
+        QTime dieTime = QTime::currentTime().addSecs(1);
+        _dev_inst->set_config(NULL, NULL, SR_CONF_ZERO_SET,
+                              g_variant_new_boolean(true));
+        while( QTime::currentTime() < dieTime );
+    });
+    Qt::WindowFlags flags = Qt::CustomizeWindowHint;
+    QProgressDialog dlg(tr("Save Auto Zero Result... It can take a while."),
+                        tr("Cancel"),0,0,this,flags);
+    dlg.setWindowModality(Qt::WindowModal);
+    dlg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint);
+    dlg.setCancelButton(NULL);
+
+    QFutureWatcher<void> watcher;
+    watcher.setFuture(future);
+    connect(&watcher,SIGNAL(finished()),&dlg,SLOT(cancel()));
+
+    dlg.exec();
 }
 
 void WaitingDialog::reject()
@@ -94,6 +114,27 @@ void WaitingDialog::reject()
     movie->stop();
     timer->stop();
     QDialog::reject();
+
+    QFuture<void> future;
+    future = QtConcurrent::run([&]{
+        QTime dieTime = QTime::currentTime().addSecs(1);
+        _dev_inst->set_config(NULL, NULL, SR_CONF_ZERO, g_variant_new_boolean(false));
+        _dev_inst->set_config(NULL, NULL, SR_CONF_ZERO_LOAD,
+                              g_variant_new_boolean(true));
+        while( QTime::currentTime() < dieTime );
+    });
+    Qt::WindowFlags flags = Qt::CustomizeWindowHint;
+    QProgressDialog dlg(tr("Load Current Setting... It can take a while."),
+                        tr("Cancel"),0,0,this,flags);
+    dlg.setWindowModality(Qt::WindowModal);
+    dlg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint);
+    dlg.setCancelButton(NULL);
+
+    QFutureWatcher<void> watcher;
+    connect(&watcher,SIGNAL(finished()),&dlg,SLOT(cancel()));
+    watcher.setFuture(future);
+
+    dlg.exec();
 }
 
 void WaitingDialog::start()
@@ -105,19 +146,24 @@ void WaitingDialog::start()
 
 void WaitingDialog::changeText()
 {
-    sr_status status;
     index++;
     if(index == WPOINTS_NUM + 1)
     {
-        tips->setText(TIPS_INFO);
+        tips->setText(TIPS_WAIT);
         index = 0;
-        sr_status_get(_dev_inst->dev_inst(), &status, 0, 0);
-        if (!status.zeroing) {
-            movie->stop();
-            movie->jumpToFrame(0);
-            timer->stop();
-            tips->setText("");
-            _button_box.buttons().front()->setVisible(true);
+
+        GVariant* gvar = _dev_inst->get_config(NULL, NULL, SR_CONF_ZERO);
+        if (gvar != NULL) {
+            bool zero = g_variant_get_boolean(gvar);
+            g_variant_unref(gvar);
+            if (!zero) {
+                movie->stop();
+                movie->jumpToFrame(0);
+                timer->stop();
+                tips->setAlignment(Qt::AlignHCenter);
+                tips->setText(TIPS_FINISHED);
+                _button_box.buttons().front()->setVisible(true);
+            }
         }
     } else {
         tips->setText(tips->text()+".");

DSView/pv/dialogs/waitingdialog.h

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -46,7 +45,8 @@ private:
     static const int TIP_WIDTH = 100;
     static const int TIP_HEIGHT = 40;
     static const int WPOINTS_NUM = 6;
-    static const QString TIPS_INFO;
+    static const QString TIPS_WAIT;
+    static const QString TIPS_FINISHED;
 
 public:
     WaitingDialog(QWidget *parent, boost::shared_ptr<pv::device::DevInst> dev_inst);

DSView/pv/dock/dsotriggerdock.cpp

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/dock/dsotriggerdock.h

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/dock/measuredock.cpp

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/dock/measuredock.h

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/dock/protocoldock.cpp

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/dock/protocoldock.h

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/dock/searchdock.cpp

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/dock/searchdock.h

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/dock/triggerdock.cpp

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/dock/triggerdock.h

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/mainwindow.cpp

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -194,6 +194,10 @@ void MainWindow::setup_ui()
         SLOT(instant_stop()));
     connect(_sampling_bar, SIGNAL(sample_count_changed()), _trigger_widget,
         SLOT(device_change()));
+    connect(_sampling_bar, SIGNAL(show_calibration()), _view,
+        SLOT(show_calibration()));
+    connect(_sampling_bar, SIGNAL(hide_calibration()), _view,
+        SLOT(hide_calibration()));
     connect(_dso_trigger_widget, SIGNAL(set_trig_pos(quint64)), _view,
         SLOT(set_trig_pos(quint64)));
     connect(_protocol_widget, SIGNAL(protocol_updated()), _view, SLOT(signals_changed()));
@@ -421,11 +425,7 @@ void MainWindow::run_stop()
 
 void MainWindow::instant_stop()
 {
-#ifdef TEST_MODE
-    disconnect(&test_timer, SIGNAL(timeout()),
-            this, SLOT(run_stop()));
-    test_timer_linked = false;
-#else
+
     switch(_session.get_capture_state()) {
     case SigSession::Init:
     case SigSession::Stopped:
@@ -441,16 +441,12 @@ void MainWindow::instant_stop()
         _session.stop_capture();
         break;
     }
-#endif
+
 }
 
 void MainWindow::test_data_error()
 {
-#ifdef TEST_MODE
-    disconnect(&test_timer, SIGNAL(timeout()),
-            this, SLOT(run_stop()));
-    test_timer_linked = false;
-#endif
+
     _session.stop_capture();
     QMessageBox msg(this);
     msg.setText(tr("Data Error"));
@@ -511,11 +507,7 @@ void MainWindow::capture_state_changed(int state)
                 }
             }
         }
-#ifdef TEST_MODE
-        if (state == SigSession::Stopped) {
-            test_timer.start(100);
-        }
-#endif
+
     }
 }
 

DSView/pv/mainwindow.h

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -59,6 +59,10 @@ class MeasureDock;
 class SearchDock;
 }
 
+namespace dialogs{
+class Calibration;
+}
+
 namespace view {
 class View;
 }

DSView/pv/prop/binding/binding.cpp

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/prop/binding/binding.h

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/prop/binding/binding_deviceoptions.cpp

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/prop/binding/deviceoptions.h

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/prop/bool.cpp

@@ -3,7 +3,6 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/prop/bool.h

@@ -3,7 +3,6 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/prop/double.cpp

@@ -3,7 +3,6 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/prop/double.h

@@ -3,7 +3,6 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/prop/enum.cpp

@@ -3,7 +3,6 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/prop/enum.h

@@ -3,7 +3,6 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/prop/int.cpp

@@ -3,7 +3,6 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/prop/int.h

@@ -3,7 +3,6 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/prop/property.cpp

@@ -3,7 +3,6 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/prop/property.h

@@ -3,7 +3,6 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/sigsession.cpp

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/sigsession.h

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/toolbars/filebar.cpp

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/toolbars/filebar.h

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/toolbars/logobar.cpp

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/toolbars/logobar.h

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/toolbars/samplingbar.cpp

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -204,6 +203,8 @@ shared_ptr<pv::device::DevInst> SamplingBar::get_selected_device() const
 
 void SamplingBar::on_configure()
 {
+    hide_calibration();
+
     int  ret;
     shared_ptr<pv::device::DevInst> dev_inst = get_selected_device();
     assert(dev_inst);
@@ -215,17 +216,29 @@ void SamplingBar::on_configure()
         update_sample_count_selector();
         update_sample_rate_selector();
         commit_sample_rate();
+
+        GVariant* gvar;
+        if (dev_inst->dev_inst()->mode == DSO) {
+            gvar = dev_inst->get_config(NULL, NULL, SR_CONF_ZERO);
+            if (gvar != NULL) {
+                bool zero = g_variant_get_boolean(gvar);
+                g_variant_unref(gvar);
+                if (zero)
+                    zero_adj();
+            }
+
+            gvar = dev_inst->get_config(NULL, NULL, SR_CONF_CALI);
+            if (gvar != NULL) {
+                bool cali = g_variant_get_boolean(gvar);
+                g_variant_unref(gvar);
+                if (cali) {
+                    show_calibration();
+                }
+            }
+        }
     }
 
-    GVariant* gvar = dev_inst->get_config(NULL, NULL, SR_CONF_ZERO);
-    if (gvar != NULL) {
-        bool zero = g_variant_get_boolean(gvar);
-        g_variant_unref(gvar);
-        if (zero)
-            zero_adj();
-    }
-
-    gvar = dev_inst->get_config(NULL, NULL, SR_CONF_TEST);
+    GVariant* gvar = dev_inst->get_config(NULL, NULL, SR_CONF_TEST);
     if (gvar != NULL) {
         bool test = g_variant_get_boolean(gvar);
         g_variant_unref(gvar);
@@ -316,17 +329,6 @@ void SamplingBar::set_sampling(bool sampling)
         _run_stop_button.setEnabled(true);
         _instant_button.setEnabled(true);
     } else {
-//        bool running = false;
-//        boost::shared_ptr<pv::device::DevInst> dev_inst = get_selected_device();
-//        assert(dev_inst);
-//        while (!running) {
-//            GVariant* gvar = dev_inst->get_config(NULL, NULL, SR_CONF_STATUS);
-//            if (gvar != NULL) {
-//                running = g_variant_get_boolean(gvar);
-//                g_variant_unref(gvar);
-//            }
-//            g_usleep(10000);
-//        }
         g_usleep(100000);
         if (_instant)
             _instant_button.setEnabled(true);
@@ -667,10 +669,18 @@ void SamplingBar::on_run_stop()
                 QMessageBox msg(this);
                 msg.setText(tr("Zero Adjustment"));
                 msg.setInformativeText(tr("Please adjust zero skew and save the result!"));
-                msg.setStandardButtons(QMessageBox::Ok);
+                //msg.setStandardButtons(QMessageBox::Ok);
+                msg.addButton(tr("Ok"), QMessageBox::AcceptRole);
+                msg.addButton(tr("Skip"), QMessageBox::RejectRole);
                 msg.setIcon(QMessageBox::Warning);
-                msg.exec();
-                zero_adj();
+                int ret = msg.exec();
+                if ( ret == QMessageBox::AcceptRole) {
+                    zero_adj();
+                } else {
+                    dev_inst->set_config(NULL, NULL, SR_CONF_ZERO, g_variant_new_boolean(false));
+                    enable_run_stop(true);
+                    enable_instant(true);
+                }
                 return;
             }
         }
@@ -696,14 +706,19 @@ void SamplingBar::on_instant_stop()
             if (zero) {
                 QMessageBox msg(this);
                 msg.setText(tr("Zero Adjustment"));
-                if(strcmp(dev_inst->dev_inst()->driver->name, "DSLogic") == 0)
-                    msg.setInformativeText(tr("Please adjust zero skew and save the result!\nPlease left both of channels unconnect for zero adjustment!"));
-                else
-                    msg.setInformativeText(tr("Please adjust zero skew and save the result!"));
-                msg.setStandardButtons(QMessageBox::Ok);
+                msg.setInformativeText(tr("Zero adjustment program will be started. Please keep all channels out of singal input. It can take a while!"));
+                //msg.setStandardButtons(QMessageBox::Ok);
+                msg.addButton(tr("Ok"), QMessageBox::AcceptRole);
+                msg.addButton(tr("Skip"), QMessageBox::RejectRole);
                 msg.setIcon(QMessageBox::Warning);
-                msg.exec();
-                zero_adj();
+                int ret = msg.exec();
+                if ( ret == QMessageBox::AcceptRole) {
+                    zero_adj();
+                } else {
+                    dev_inst->set_config(NULL, NULL, SR_CONF_ZERO, g_variant_new_boolean(false));
+                    enable_run_stop(true);
+                    enable_instant(true);
+                }
                 return;
             }
         }

DSView/pv/toolbars/samplingbar.h

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -52,6 +51,7 @@ class DevInst;
 
 namespace dialogs {
 class deviceoptions;
+class Calibration;
 }
 
 namespace toolbars {
@@ -96,6 +96,8 @@ signals:
     void device_selected();
     void device_updated();
     void sample_count_changed();
+    void show_calibration();
+    void hide_calibration();
 
 private:
     void update_sample_rate_selector();

DSView/pv/toolbars/trigbar.cpp

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/toolbars/trigbar.h

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/view/analogsignal.cpp

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/view/analogsignal.h

@@ -2,8 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/view/cursor.cpp

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/view/cursor.h

@@ -3,7 +3,7 @@
  * DSView is based on PulseView.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/view/decodetrace.cpp

@@ -2,6 +2,7 @@
  * This file is part of the PulseView project.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2014 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/view/decodetrace.h

@@ -2,6 +2,7 @@
  * This file is part of the PulseView project.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2014 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

DSView/pv/view/devmode.cpp

@@ -2,7 +2,7 @@
  * This file is part of the DSView project.
  * DSView is based on PulseView.
  *
- * Copyright (C) 2014 DreamSourceLab <dreamsourcelab@dreamsourcelab.com>
+ * Copyright (C) 2014 DreamSourceLab <support@dreamsourcelab.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by