X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fprop%2Fint.hpp;h=1f6a64ca503fddf069090f9c9e03e2eaa44b2bc6;hb=136b891e7b6b7b1e90095c3622d8cbd19a3ab3a4;hp=a1c529fd2e6856f5e097c3e6465a5ed9e9614ac6;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;p=pulseview.git diff --git a/pv/prop/int.hpp b/pv/prop/int.hpp index a1c529fd..1f6a64ca 100644 --- a/pv/prop/int.hpp +++ b/pv/prop/int.hpp @@ -14,12 +14,11 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * along with this program; if not, see . */ -#ifndef PULSEVIEW_PV_PROP_INT_H -#define PULSEVIEW_PV_PROP_INT_H +#ifndef PULSEVIEW_PV_PROP_INT_HPP +#define PULSEVIEW_PV_PROP_INT_HPP #include @@ -27,6 +26,8 @@ #include "property.hpp" +using std::pair; + class QSpinBox; namespace pv { @@ -34,16 +35,17 @@ namespace prop { class Int : public Property { - Q_OBJECT; + Q_OBJECT public: - Int(QString name, QString suffix, - boost::optional< std::pair > range, - Getter getter, Setter setter); + Int(QString name, QString desc, QString suffix, + boost::optional< pair > range, + Getter getter, Setter setter, QString special_value_text = ""); - virtual ~Int(); + virtual ~Int() = default; QWidget* get_widget(QWidget *parent, bool auto_commit); + void update_widget(); void commit(); @@ -51,14 +53,14 @@ private Q_SLOTS: void on_value_changed(int); private: - const QString suffix_; - const boost::optional< std::pair > range_; + const QString suffix_, special_value_text_; + const boost::optional< pair > range_; Glib::VariantBase value_; QSpinBox *spin_box_; }; -} // prop -} // pv +} // namespace prop +} // namespace pv -#endif // PULSEVIEW_PV_PROP_INT_H +#endif // PULSEVIEW_PV_PROP_INT_HPP