projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Accept user-entered sample rates when external clock is enabled
[pulseview.git]
/
pv
/
dialogs
/
settings.hpp
diff --git
a/pv/dialogs/settings.hpp
b/pv/dialogs/settings.hpp
index d981c8bd74cfa12f29759da662e10f3dd1450f2e..40142056487c8fcc509437d76d1c9629b2986589 100644
(file)
--- a/
pv/dialogs/settings.hpp
+++ b/
pv/dialogs/settings.hpp
@@
-23,6
+23,7
@@
#include <QCheckBox>
#include <QDialog>
#include <QListWidget>
#include <QCheckBox>
#include <QDialog>
#include <QListWidget>
+#include <QPlainTextEdit>
#include <QStackedWidget>
namespace pv {
#include <QStackedWidget>
namespace pv {
@@
-31,6
+32,8
@@
class DeviceManager;
namespace dialogs {
namespace dialogs {
+class PageListWidget;
+
class Settings : public QDialog
{
Q_OBJECT
class Settings : public QDialog
{
Q_OBJECT
@@
-40,28
+43,41
@@
public:
void create_pages();
QCheckBox *create_checkbox(const QString& key, const char* slot) const;
void create_pages();
QCheckBox *create_checkbox(const QString& key, const char* slot) const;
+ QPlainTextEdit *create_log_view() const;
QWidget *get_view_settings_form(QWidget *parent) const;
QWidget *get_decoder_settings_form(QWidget *parent) const;
QWidget *get_about_page(QWidget *parent) const;
QWidget *get_view_settings_form(QWidget *parent) const;
QWidget *get_decoder_settings_form(QWidget *parent) const;
QWidget *get_about_page(QWidget *parent) const;
+ QWidget *get_logging_page(QWidget *parent) const;
void accept();
void reject();
private Q_SLOTS:
void on_page_changed(QListWidgetItem *current, QListWidgetItem *previous);
void accept();
void reject();
private Q_SLOTS:
void on_page_changed(QListWidgetItem *current, QListWidgetItem *previous);
- void on_view_
alwaysZoomToFit
_changed(int state);
+ void on_view_
zoomToFitDuringAcq
_changed(int state);
void on_view_zoomToFitAfterAcq_changed(int state);
void on_view_zoomToFitAfterAcq_changed(int state);
- void on_view_colouredBG_changed(int state);
+ void on_view_triggerIsZero_changed(int state);
+ void on_view_coloredBG_changed(int state);
void on_view_stickyScrolling_changed(int state);
void on_view_showSamplingPoints_changed(int state);
void on_view_showAnalogMinorGrid_changed(int state);
void on_view_stickyScrolling_changed(int state);
void on_view_showSamplingPoints_changed(int state);
void on_view_showAnalogMinorGrid_changed(int state);
+ void on_view_showHoverMarker_changed(int state);
+ void on_view_conversionThresholdDispMode_changed(int state);
+ void on_view_defaultDivHeight_changed(int value);
+ void on_view_defaultLogicHeight_changed(int value);
void on_dec_initialStateConfigurable_changed(int state);
void on_dec_initialStateConfigurable_changed(int state);
+ void on_log_logLevel_changed(int value);
+ void on_log_bufferSize_changed(int value);
+ void on_log_saveToFile_clicked(bool checked);
+ void on_log_popOut_clicked(bool checked);
private:
DeviceManager &device_manager_;
private:
DeviceManager &device_manager_;
-
Q
ListWidget *page_list;
+
Page
ListWidget *page_list;
QStackedWidget *pages;
QStackedWidget *pages;
+
+ QPlainTextEdit *log_view_;
};
} // namespace dialogs
};
} // namespace dialogs