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

Bump version to v1.00

Browse Source
This commit is contained in:
Andy Dneg
2019-09-09 00:07:19 -07:00
parent f17c612cb1
commit 45204e6a8d
867 changed files with 40976 additions and 21501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
DSView/pv/dialogs/dsomeasure.cpp Normal file → Executable file
View File

@@ -21,9 +21,14 @@
#include "dsomeasure.h"
#include "../device/devinst.h"
#include "../sigsession.h"
#include "../view/view.h"
#include <QCheckBox>
#include <QVariant>
#include <QLabel>
#include <QTabBar>
#include <QBitmap>
#include <boost/foreach.hpp>
@@ -34,31 +39,74 @@ using namespace pv::view;
namespace pv {
namespace dialogs {
DsoMeasure::DsoMeasure(QWidget *parent, boost::shared_ptr<DsoSignal> dsoSig) :
DSDialog(parent),
_dsoSig(dsoSig),
_button_box(QDialogButtonBox::Ok,
DsoMeasure::DsoMeasure(SigSession &session, View &parent,
unsigned int position, int last_sig_index) :
DSDialog((QWidget *)&parent),
_session(session),
_view(parent),
_position(position),
_button_box(QDialogButtonBox::Reset | QDialogButtonBox::Cancel,
Qt::Horizontal, this)
{
setMinimumWidth(300);
setMinimumSize(500, 400);
for (int i=DSO_MS_BEGIN+1; i<DSO_MS_END; i++) {
QCheckBox *checkBox = new QCheckBox(_dsoSig->get_ms_string(i), this);
checkBox->setProperty("id", QVariant(i));
checkBox->setChecked(dsoSig->get_ms_en(i));
_layout.addWidget(checkBox);
connect(checkBox, SIGNAL(toggled(bool)), this, SLOT(set_measure(bool)));
_measure_tab = new QTabWidget(this);
_measure_tab->setTabPosition(QTabWidget::West);
_measure_tab->setUsesScrollButtons(false);
BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session.get_signals()) {
boost::shared_ptr<view::DsoSignal> dsoSig;
if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s)) && dsoSig->enabled()) {
QWidget *measure_widget = new QWidget(this);
this->add_measure(measure_widget, dsoSig);
_measure_tab->addTab(measure_widget, QString::number(dsoSig->get_index()));
_measure_tab->tabBar()->setMinimumHeight(30);
_measure_tab->tabBar()->setPalette(QPalette(Qt::red));
measure_widget->setProperty("index", dsoSig->get_index());
if (dsoSig->get_index() == last_sig_index)
_measure_tab->setCurrentIndex(last_sig_index);
}
}
_layout.addWidget(&_button_box);
_layout.addWidget(_measure_tab);
_layout.addWidget(&_button_box, Qt::AlignHCenter | Qt::AlignBottom);
layout()->addLayout(&_layout);
setTitle(tr("Measurements"));
connect(&_button_box, SIGNAL(accepted()), this, SLOT(accept()));
connect(&_button_box, SIGNAL(rejected()), this, SLOT(accept()));
connect(_button_box.button(QDialogButtonBox::Cancel), SIGNAL(clicked()), this, SLOT(reject()));
connect(_button_box.button(QDialogButtonBox::Reset), SIGNAL(clicked()), this, SLOT(reset()));
connect(_session.get_device().get(), SIGNAL(device_updated()), this, SLOT(reject()));
}
connect(_dsoSig->get_device().get(), SIGNAL(device_updated()), this, SLOT(reject()));
void DsoMeasure::add_measure(QWidget *widget, const boost::shared_ptr<view::DsoSignal> dsoSig)
{
const int Column = 5;
const int IconSizeForText = 5;
QGridLayout *layout = new QGridLayout(widget);
layout->setMargin(0);
layout->setSpacing(0);
for (int i=DSO_MS_BEGIN+1; i<DSO_MS_END; i++) {
QToolButton *button = new QToolButton(this);
button->setProperty("id", QVariant(i));
button->setIconSize(QSize(48, 48));
QPixmap msPix(get_ms_icon(i));
QBitmap msMask = msPix.createMaskFromColor(QColor("black"), Qt::MaskOutColor);
msPix.fill(dsoSig->get_colour());
msPix.setMask(msMask);
button->setIcon(QIcon(msPix));
layout->addWidget(button,
((i-1)/Column)*IconSizeForText, (i-1)%Column,
IconSizeForText-1, 1,
Qt::AlignCenter);
layout->addWidget(new QLabel(get_ms_text(i), this),
((i-1)/Column)*IconSizeForText+4, (i-1)%Column,
1, 1,
Qt::AlignCenter);
layout->setColumnMinimumWidth((i-1)%Column, this->width()/Column);
connect(button, SIGNAL(clicked()), this, SLOT(accept()));
}
}
void DsoMeasure::set_measure(bool en)
@@ -67,21 +115,67 @@ void DsoMeasure::set_measure(bool en)
QCheckBox* sc=dynamic_cast<QCheckBox*>(sender());
if(sc != NULL) {
QVariant id = sc->property("id");
_dsoSig->set_ms_en(id.toInt(), sc->isChecked());
}
}
QString DsoMeasure::get_ms_icon(int ms_type)
{
assert(ms_type >= DSO_MS_BEGIN);
assert(ms_type < DSO_MS_END);
const QString icon_name[DSO_MS_END-DSO_MS_BEGIN] = {"blank.png",
"mFreq.png", "mPeriod.png", "mPduty.png", "mNduty.png", "mPcount.png",
"mRise.png", "mFall.png", "mPwidth.png", "mNwidth.png", "mBurst.png",
"mAmplitude.png", "mHigh.png", "mLow.png", "mRms.png", "mMean.png",
"mVpp.png", "mMax.png", "mMin.png", "mPover.png", "mNover.png"};
return ":/icons/"+icon_name[ms_type];
}
QString DsoMeasure::get_ms_text(int ms_type)
{
assert(ms_type >= DSO_MS_BEGIN);
assert(ms_type < DSO_MS_END);
const QString label_name[DSO_MS_END-DSO_MS_BEGIN] = {tr("NULL"),
tr("Freq"), tr("Period"), tr("+Duty"), tr("-Duty"), tr("+Count"),
tr("Rise"), tr("Fall"), tr("+Width"), tr("-Width"), tr("BrstW"),
tr("Ampl"), tr("High"), tr("Low"), tr("RMS"), tr("Mean"),
tr("PK-PK"), tr("Max"), tr("Min"), tr("+Over"), tr("-Over")};
return label_name[ms_type];
}
void DsoMeasure::accept()
{
using namespace Qt;
QDialog::accept();
QToolButton* sc=dynamic_cast<QToolButton*>(sender());
if(sc != NULL) {
QVariant id = sc->property("id");
enum DSO_MEASURE_TYPE ms_type = DSO_MEASURE_TYPE(id.toInt());
BOOST_FOREACH(const boost::shared_ptr<view::Signal> s, _session.get_signals()) {
boost::shared_ptr<view::DsoSignal> dsoSig;
if ((dsoSig = dynamic_pointer_cast<view::DsoSignal>(s))) {
if (_measure_tab->currentWidget()->property("index").toInt() == dsoSig->get_index()) {
_view.get_viewstatus()->set_measure(_position, false, dsoSig->get_index(), ms_type);
break;
}
}
}
}
QDialog::accept();
}
void DsoMeasure::reject()
{
using namespace Qt;
_view.get_viewstatus()->set_measure(_position, true, -1, DSO_MS_BEGIN);
QDialog::reject();
}
void DsoMeasure::reset()
{
using namespace Qt;
_view.get_viewstatus()->set_measure(_position, false, -1, DSO_MS_BEGIN);
QDialog::reject();
}