SweepTimingWidget removed Read Only support

diff --git a/pv/widgets/sweeptimingwidget.cpp b/pv/widgets/sweeptimingwidget.cpp
index b1164891419898bd588c511edc3ab45e58edf70f..d34d07e5f7c2a43cea1ed8b870253c358c2550ad 100644 (file)
--- a/pv/widgets/sweeptimingwidget.cpp
+++ b/pv/widgets/sweeptimingwidget.cpp
@@ -29,7 +29,6 @@ SweepTimingWidget::SweepTimingWidget(const char *suffix,
        QWidget *parent) :
        QWidget(parent),
        _layout(this),
        QWidget *parent) :
        QWidget(parent),
        _layout(this),

-       _read_only_value(this),

        _value(this),
        _list(this),
        _value_type(None)
        _value(this),
        _list(this),
        _value_type(None)


@@ -46,7 +45,6 @@ SweepTimingWidget::SweepTimingWidget(const char *suffix,
 
        setLayout(&_layout);
        _layout.setMargin(0);
 
        setLayout(&_layout);
        _layout.setMargin(0);

-       _layout.addWidget(&_read_only_value);

        _layout.addWidget(&_list);
        _layout.addWidget(&_value);
 
        _layout.addWidget(&_list);
        _layout.addWidget(&_value);
 


@@ -56,15 +54,6 @@ SweepTimingWidget::SweepTimingWidget(const char *suffix,
 void SweepTimingWidget::show_none()
 {
        _value_type = None;
 void SweepTimingWidget::show_none()
 {
        _value_type = None;

-       _read_only_value.hide();
-       _value.hide();
-       _list.hide();
-}
-
-void SweepTimingWidget::show_read_only()
-{
-       _value_type = ReadOnly;
-       _read_only_value.show();

        _value.hide();
        _list.hide();
 }
        _value.hide();
        _list.hide();
 }


@@ -77,7 +66,6 @@ void SweepTimingWidget::show_min_max_step(uint64_t min, uint64_t max,
        _value.setRange(min, max);
        _value.setSingleStep(step);
 
        _value.setRange(min, max);
        _value.setSingleStep(step);
 

-       _read_only_value.hide();

        _value.show();
        _list.hide();
 }
        _value.show();
        _list.hide();
 }


@@ -95,7 +83,6 @@ void SweepTimingWidget::show_list(const uint64_t *vals, size_t count)
                g_free(s);
        }
 
                g_free(s);
        }
 

-       _read_only_value.hide();

        _value.hide();
        _list.show();
 }
        _value.hide();
        _list.show();
 }


@@ -105,7 +92,6 @@ uint64_t SweepTimingWidget::value() const
        switch(_value_type)
        {
        case None:
        switch(_value_type)
        {
        case None:

-       case ReadOnly:

                return 0;
 
        case MinMaxStep:
                return 0;
 
        case MinMaxStep:


@@ -127,8 +113,6 @@ uint64_t SweepTimingWidget::value() const
 
 void SweepTimingWidget::set_value(uint64_t value)
 {
 
 void SweepTimingWidget::set_value(uint64_t value)
 {

-       _read_only_value.setText(QString("%1").arg(value));
-

        _value.setValue(value);
 
        for (int i = 0; i < _list.count(); i++)
        _value.setValue(value);
 
        for (int i = 0; i < _list.count(); i++)

diff --git a/pv/widgets/sweeptimingwidget.h b/pv/widgets/sweeptimingwidget.h
index c4bfe37850ce29b0abf5115d74c6fdfb63846e7d..3ce79c7d0119c19af793504670667507cb775082 100644 (file)
--- a/pv/widgets/sweeptimingwidget.h
+++ b/pv/widgets/sweeptimingwidget.h
@@ -40,7 +40,6 @@ private:
        enum ValueType
        {
                None,
        enum ValueType
        {
                None,

-               ReadOnly,

                MinMaxStep,
                List
        };
                MinMaxStep,
                List
        };


@@ -49,7 +48,6 @@ public:
        SweepTimingWidget(const char *suffix, QWidget *parent = NULL);
 
        void show_none();
        SweepTimingWidget(const char *suffix, QWidget *parent = NULL);
 
        void show_none();

-       void show_read_only();

        void show_min_max_step(uint64_t min, uint64_t max, uint64_t step);
        void show_list(const uint64_t *vals, size_t count);
 
        void show_min_max_step(uint64_t min, uint64_t max, uint64_t step);
        void show_list(const uint64_t *vals, size_t count);
 


@@ -62,7 +60,6 @@ signals:
 private:
        QHBoxLayout _layout;
 
 private:
        QHBoxLayout _layout;
 

-       QLineEdit _read_only_value;

        QDoubleSpinBox _value;
        QComboBox _list;
 
        QDoubleSpinBox _value;
        QComboBox _list;