X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.cpp;h=4744567f6b0eef1d6eee0cc14e99e23e447cfae5;hp=ef916f1a57c842c9d34475eb4d7760b077c4dc63;hb=72486b789078f024e4f3404f81118c03b03e2b70;hpb=e91fb166608133382baa1a90cc022bfa47d649de diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp index ef916f1a..4744567f 100644 --- a/pv/dialogs/settings.cpp +++ b/pv/dialogs/settings.cpp @@ -23,20 +23,29 @@ #include #include +#include #include +#include #include #include #include #include +#include +#include +#include +#include +#include #include #include #include +#include #include #include "settings.hpp" #include "pv/devicemanager.hpp" #include "pv/globalsettings.hpp" +#include "pv/logging.hpp" #include @@ -49,25 +58,49 @@ using std::shared_ptr; namespace pv { namespace dialogs { +/** + * Special version of a QListView that has the width of the first column as minimum size. + * + * @note Inspired by https://github.com/qt-creator/qt-creator/blob/master/src/plugins/coreplugin/dialogs/settingsdialog.cpp + */ +class PageListWidget: public QListWidget +{ +public: + PageListWidget() : + QListWidget() + { + setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Expanding); + } + + QSize sizeHint() const final + { + int width = sizeHintForColumn(0) + frameWidth() * 2 + 5; + if (verticalScrollBar()->isVisible()) + width += verticalScrollBar()->width(); + return QSize(width, 100); + } +}; + Settings::Settings(DeviceManager &device_manager, QWidget *parent) : QDialog(parent, nullptr), device_manager_(device_manager) { - const int icon_size = 64; - resize(600, 400); - page_list = new QListWidget; - page_list->setViewMode(QListView::IconMode); - page_list->setIconSize(QSize(icon_size, icon_size)); + // Create log view + log_view_ = create_log_view(); + + // Create pages + page_list = new PageListWidget(); + page_list->setViewMode(QListView::ListMode); page_list->setMovement(QListView::Static); - page_list->setMaximumWidth(icon_size + (icon_size / 2)); - page_list->setSpacing(12); + page_list->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); pages = new QStackedWidget; create_pages(); page_list->setCurrentIndex(page_list->model()->index(0, 0)); + // Create the rest of the dialog QHBoxLayout *tab_layout = new QHBoxLayout; tab_layout->addWidget(page_list); tab_layout->addWidget(pages, Qt::AlignLeft); @@ -97,7 +130,7 @@ void Settings::create_pages() QListWidgetItem *viewButton = new QListWidgetItem(page_list); viewButton->setIcon(QIcon(":/icons/settings-views.svg")); viewButton->setText(tr("Views")); - viewButton->setTextAlignment(Qt::AlignHCenter); + viewButton->setTextAlignment(Qt::AlignVCenter); viewButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); #ifdef ENABLE_DECODE @@ -107,7 +140,7 @@ void Settings::create_pages() QListWidgetItem *decoderButton = new QListWidgetItem(page_list); decoderButton->setIcon(QIcon(":/icons/add-decoder.svg")); decoderButton->setText(tr("Decoders")); - decoderButton->setTextAlignment(Qt::AlignHCenter); + decoderButton->setTextAlignment(Qt::AlignVCenter); decoderButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); #endif @@ -117,8 +150,17 @@ void Settings::create_pages() QListWidgetItem *aboutButton = new QListWidgetItem(page_list); aboutButton->setIcon(QIcon(":/icons/information.svg")); aboutButton->setText(tr("About")); - aboutButton->setTextAlignment(Qt::AlignHCenter); + aboutButton->setTextAlignment(Qt::AlignVCenter); aboutButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); + + // Logging page + pages->addWidget(get_logging_page(pages)); + + QListWidgetItem *loggingButton = new QListWidgetItem(page_list); + loggingButton->setIcon(QIcon(":/icons/information.svg")); + loggingButton->setText(tr("Logging")); + loggingButton->setTextAlignment(Qt::AlignVCenter); + loggingButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); } QCheckBox *Settings::create_checkbox(const QString& key, const char* slot) const @@ -131,8 +173,26 @@ QCheckBox *Settings::create_checkbox(const QString& key, const char* slot) const return cb; } +QPlainTextEdit *Settings::create_log_view() const +{ + GlobalSettings settings; + + QPlainTextEdit *log_view = new QPlainTextEdit(); + + log_view->setReadOnly(true); + log_view->setWordWrapMode(QTextOption::NoWrap); + log_view->setCenterOnScroll(true); + + log_view->appendHtml(logging.get_log()); + connect(&logging, SIGNAL(logged_text(QString)), + log_view, SLOT(appendHtml(QString))); + + return log_view; +} + QWidget *Settings::get_view_settings_form(QWidget *parent) const { + GlobalSettings settings; QCheckBox *cb; QWidget *form = new QWidget(parent); @@ -145,9 +205,9 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const QFormLayout *trace_view_layout = new QFormLayout(); trace_view_group->setLayout(trace_view_layout); - cb = create_checkbox(GlobalSettings::Key_View_ColouredBG, - SLOT(on_view_colouredBG_changed(int))); - trace_view_layout->addRow(tr("Use coloured trace &background"), cb); + cb = create_checkbox(GlobalSettings::Key_View_ColoredBG, + SLOT(on_view_coloredBG_changed(int))); + trace_view_layout->addRow(tr("Use colored trace &background"), cb); cb = create_checkbox(GlobalSettings::Key_View_ZoomToFitDuringAcq, SLOT(on_view_zoomToFitDuringAcq_changed(int))); @@ -157,6 +217,10 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const SLOT(on_view_zoomToFitAfterAcq_changed(int))); trace_view_layout->addRow(tr("Perform a zoom-to-&fit when acquisition stops"), cb); + cb = create_checkbox(GlobalSettings::Key_View_TriggerIsZeroTime, + SLOT(on_view_triggerIsZero_changed(int))); + trace_view_layout->addRow(tr("Show time zero at the trigger"), cb); + cb = create_checkbox(GlobalSettings::Key_View_StickyScrolling, SLOT(on_view_stickyScrolling_changed(int))); trace_view_layout->addRow(tr("Always keep &newest samples at the right edge during capture"), cb); @@ -167,7 +231,35 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const cb = create_checkbox(GlobalSettings::Key_View_ShowAnalogMinorGrid, SLOT(on_view_showAnalogMinorGrid_changed(int))); - trace_view_layout->addRow(tr("Show analog minor grid in addition to vdiv grid"), cb); + trace_view_layout->addRow(tr("Show analog minor grid in addition to div grid"), cb); + + QComboBox *thr_disp_mode_cb = new QComboBox(); + thr_disp_mode_cb->addItem(tr("None"), GlobalSettings::ConvThrDispMode_None); + thr_disp_mode_cb->addItem(tr("Background"), GlobalSettings::ConvThrDispMode_Background); + thr_disp_mode_cb->addItem(tr("Dots"), GlobalSettings::ConvThrDispMode_Dots); + thr_disp_mode_cb->setCurrentIndex( + settings.value(GlobalSettings::Key_View_ConversionThresholdDispMode).toInt()); + connect(thr_disp_mode_cb, SIGNAL(currentIndexChanged(int)), + this, SLOT(on_view_conversionThresholdDispMode_changed(int))); + trace_view_layout->addRow(tr("Conversion threshold display mode (analog traces only)"), thr_disp_mode_cb); + + QSpinBox *default_div_height_sb = new QSpinBox(); + default_div_height_sb->setRange(20, 1000); + default_div_height_sb->setSuffix(tr(" pixels")); + default_div_height_sb->setValue( + settings.value(GlobalSettings::Key_View_DefaultDivHeight).toInt()); + connect(default_div_height_sb, SIGNAL(valueChanged(int)), this, + SLOT(on_view_defaultDivHeight_changed(int))); + trace_view_layout->addRow(tr("Default analog trace div height"), default_div_height_sb); + + QSpinBox *default_logic_height_sb = new QSpinBox(); + default_logic_height_sb->setRange(5, 1000); + default_logic_height_sb->setSuffix(tr(" pixels")); + default_logic_height_sb->setValue( + settings.value(GlobalSettings::Key_View_DefaultLogicHeight).toInt()); + connect(default_logic_height_sb, SIGNAL(valueChanged(int)), this, + SLOT(on_view_defaultLogicHeight_changed(int))); + trace_view_layout->addRow(tr("Default logic trace height"), default_logic_height_sb); return form; } @@ -194,6 +286,7 @@ QWidget *Settings::get_decoder_settings_form(QWidget *parent) const return form; #else (void)parent; + return nullptr; #endif } @@ -294,6 +387,28 @@ QWidget *Settings::get_about_page(QWidget *parent) const g_free(host); #endif + s.append(""); + s.append("" + + tr("Firmware search paths:") + ""); + + l_orig = sr_resourcepaths_get(SR_RESOURCE_FIRMWARE); + for (GSList *l = l_orig; l; l = l->next) + s.append(QString("%1").arg( + QString((char*)l->data))); + g_slist_free_full(l_orig, g_free); + +#ifdef ENABLE_DECODE + s.append(""); + s.append("" + + tr("Protocol decoder search paths:") + ""); + + l_orig = srd_searchpaths_get(); + for (GSList *l = l_orig; l; l = l->next) + s.append(QString("%1").arg( + QString((char*)l->data))); + g_slist_free_full(l_orig, g_free); +#endif + /* Set up the supported field */ s.append(""); s.append("" + @@ -356,6 +471,64 @@ QWidget *Settings::get_about_page(QWidget *parent) const return page; } +QWidget *Settings::get_logging_page(QWidget *parent) const +{ + GlobalSettings settings; + + // Log level + QSpinBox *loglevel_sb = new QSpinBox(); + loglevel_sb->setMaximum(SR_LOG_SPEW); + loglevel_sb->setValue(logging.get_log_level()); + connect(loglevel_sb, SIGNAL(valueChanged(int)), this, + SLOT(on_log_logLevel_changed(int))); + + QHBoxLayout *loglevel_layout = new QHBoxLayout(); + loglevel_layout->addWidget(new QLabel(tr("Log level:"))); + loglevel_layout->addWidget(loglevel_sb); + + // Background buffer size + QSpinBox *buffersize_sb = new QSpinBox(); + buffersize_sb->setSuffix(tr(" lines")); + buffersize_sb->setMaximum(Logging::MAX_BUFFER_SIZE); + buffersize_sb->setValue( + settings.value(GlobalSettings::Key_Log_BufferSize).toInt()); + connect(buffersize_sb, SIGNAL(valueChanged(int)), this, + SLOT(on_log_bufferSize_changed(int))); + + QHBoxLayout *buffersize_layout = new QHBoxLayout(); + buffersize_layout->addWidget(new QLabel(tr("Length of background buffer:"))); + buffersize_layout->addWidget(buffersize_sb); + + // Save to file + QPushButton *save_log_pb = new QPushButton( + QIcon::fromTheme("document-save-as", QIcon(":/icons/document-save-as.png")), + tr("&Save to File")); + connect(save_log_pb, SIGNAL(clicked(bool)), + this, SLOT(on_log_saveToFile_clicked(bool))); + + // Pop out + QPushButton *pop_out_pb = new QPushButton( + QIcon::fromTheme("window-new", QIcon(":/icons/window-new.png")), + tr("&Pop out")); + connect(pop_out_pb, SIGNAL(clicked(bool)), + this, SLOT(on_log_popOut_clicked(bool))); + + QHBoxLayout *control_layout = new QHBoxLayout(); + control_layout->addLayout(loglevel_layout); + control_layout->addLayout(buffersize_layout); + control_layout->addWidget(save_log_pb); + control_layout->addWidget(pop_out_pb); + + QVBoxLayout *root_layout = new QVBoxLayout(); + root_layout->addLayout(control_layout); + root_layout->addWidget(log_view_); + + QWidget *page = new QWidget(parent); + page->setLayout(root_layout); + + return page; +} + void Settings::accept() { GlobalSettings settings; @@ -392,10 +565,16 @@ void Settings::on_view_zoomToFitAfterAcq_changed(int state) settings.setValue(GlobalSettings::Key_View_ZoomToFitAfterAcq, state ? true : false); } -void Settings::on_view_colouredBG_changed(int state) +void Settings::on_view_triggerIsZero_changed(int state) { GlobalSettings settings; - settings.setValue(GlobalSettings::Key_View_ColouredBG, state ? true : false); + settings.setValue(GlobalSettings::Key_View_TriggerIsZeroTime, state ? true : false); +} + +void Settings::on_view_coloredBG_changed(int state) +{ + GlobalSettings settings; + settings.setValue(GlobalSettings::Key_View_ColoredBG, state ? true : false); } void Settings::on_view_stickyScrolling_changed(int state) @@ -416,11 +595,92 @@ void Settings::on_view_showAnalogMinorGrid_changed(int state) settings.setValue(GlobalSettings::Key_View_ShowAnalogMinorGrid, state ? true : false); } +void Settings::on_view_conversionThresholdDispMode_changed(int state) +{ + GlobalSettings settings; + settings.setValue(GlobalSettings::Key_View_ConversionThresholdDispMode, state); +} + +void Settings::on_view_defaultDivHeight_changed(int value) +{ + GlobalSettings settings; + settings.setValue(GlobalSettings::Key_View_DefaultDivHeight, value); +} + +void Settings::on_view_defaultLogicHeight_changed(int value) +{ + GlobalSettings settings; + settings.setValue(GlobalSettings::Key_View_DefaultLogicHeight, value); +} + void Settings::on_dec_initialStateConfigurable_changed(int state) { GlobalSettings settings; settings.setValue(GlobalSettings::Key_Dec_InitialStateConfigurable, state ? true : false); } +void Settings::on_log_logLevel_changed(int value) +{ + logging.set_log_level(value); +} + +void Settings::on_log_bufferSize_changed(int value) +{ + GlobalSettings settings; + settings.setValue(GlobalSettings::Key_Log_BufferSize, value); +} + +void Settings::on_log_saveToFile_clicked(bool checked) +{ + (void)checked; + + const QString file_name = QFileDialog::getSaveFileName( + this, tr("Save Log"), "", tr("Log Files (*.txt *.log);;All Files (*)")); + + if (file_name.isEmpty()) + return; + + QFile file(file_name); + if (file.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text)) { + QTextStream out_stream(&file); + out_stream << log_view_->toPlainText(); + + if (out_stream.status() == QTextStream::Ok) { + QMessageBox msg(this); + msg.setText(tr("Success")); + msg.setInformativeText(tr("Log saved to %1.").arg(file_name)); + msg.setStandardButtons(QMessageBox::Ok); + msg.setIcon(QMessageBox::Information); + msg.exec(); + + return; + } + } + + QMessageBox msg(this); + msg.setText(tr("Error")); + msg.setInformativeText(tr("File %1 could not be written to.").arg(file_name)); + msg.setStandardButtons(QMessageBox::Ok); + msg.setIcon(QMessageBox::Warning); + msg.exec(); +} + +void Settings::on_log_popOut_clicked(bool checked) +{ + (void)checked; + + // Create the window as a sub-window so it closes when the main window closes + QMainWindow *window = new QMainWindow(nullptr, Qt::SubWindow); + + window->setObjectName(QString::fromUtf8("Log Window")); + window->setWindowTitle(tr("%1 Log").arg(PV_TITLE)); + + // Use same width/height as the settings dialog + window->resize(width(), height()); + + window->setCentralWidget(create_log_view()); + window->show(); +} + } // namespace dialogs } // namespace pv