projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Channels: Re-arrange selector buttons
[pulseview.git]
/
pv
/
globalsettings.hpp
diff --git
a/pv/globalsettings.hpp
b/pv/globalsettings.hpp
index 05ff126dd092e9070264a8ee55afeb24bc8c2970..51212b023ab19f2e79145d991117bf804c707904 100644
(file)
--- a/
pv/globalsettings.hpp
+++ b/
pv/globalsettings.hpp
@@
-20,7
+20,6
@@
#ifndef PULSEVIEW_GLOBALSETTINGS_HPP
#define PULSEVIEW_GLOBALSETTINGS_HPP
#ifndef PULSEVIEW_GLOBALSETTINGS_HPP
#define PULSEVIEW_GLOBALSETTINGS_HPP
-#include <functional>
#include <map>
#include <glib.h>
#include <map>
#include <glib.h>
@@
-29,12
+28,18
@@
#include <QString>
#include <QVariant>
#include <QString>
#include <QVariant>
-using std::function;
using std::map;
using std::map;
-using std::
multimap
;
+using std::
vector
;
namespace pv {
namespace pv {
+class GlobalSettingsInterface
+{
+public:
+ virtual void on_setting_changed(const QString &key, const QVariant &value) = 0;
+};
+
+
class GlobalSettings : public QSettings
{
Q_OBJECT
class GlobalSettings : public QSettings
{
Q_OBJECT
@@
-42,19
+47,31
@@
class GlobalSettings : public QSettings
public:
static const QString Key_View_ZoomToFitDuringAcq;
static const QString Key_View_ZoomToFitAfterAcq;
public:
static const QString Key_View_ZoomToFitDuringAcq;
static const QString Key_View_ZoomToFitAfterAcq;
+ static const QString Key_View_TriggerIsZeroTime;
static const QString Key_View_ColouredBG;
static const QString Key_View_StickyScrolling;
static const QString Key_View_ShowSamplingPoints;
static const QString Key_View_ShowAnalogMinorGrid;
static const QString Key_View_ColouredBG;
static const QString Key_View_StickyScrolling;
static const QString Key_View_ShowSamplingPoints;
static const QString Key_View_ShowAnalogMinorGrid;
+ static const QString Key_View_ConversionThresholdDispMode;
+ static const QString Key_View_DefaultDivHeight;
+ static const QString Key_View_DefaultLogicHeight;
static const QString Key_Dec_InitialStateConfigurable;
static const QString Key_Dec_InitialStateConfigurable;
+ static const QString Key_Log_BufferSize;
+ static const QString Key_Log_NotifyOfStacktrace;
+
+ enum ConvThrDispMode {
+ ConvThrDispMode_None = 0,
+ ConvThrDispMode_Background,
+ ConvThrDispMode_Dots
+ };
public:
GlobalSettings();
void set_defaults_where_needed();
public:
GlobalSettings();
void set_defaults_where_needed();
- static void
register_change_handler(const QString key,
-
function<void(QVariant)>
cb);
+ static void
add_change_handler(GlobalSettingsInterface *cb);
+
static void remove_change_handler(GlobalSettingsInterface *
cb);
void setValue(const QString& key, const QVariant& value);
void setValue(const QString& key, const QVariant& value);
@@
-81,7
+98,7
@@
public:
static GVariant* restore_gvariant(QSettings &settings);
private:
static GVariant* restore_gvariant(QSettings &settings);
private:
- static
multimap< QString, function<void(QVariant)>
> callbacks_;
+ static
vector<GlobalSettingsInterface*
> callbacks_;
static bool tracking_;
static map<QString, QVariant> tracked_changes_;
static bool tracking_;
static map<QString, QVariant> tracked_changes_;