projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DecodeSignal: avoid specifying a zero samplerate to libsigrokdecode
[pulseview.git]
/
pv
/
prop
/
enum.hpp
diff --git
a/pv/prop/enum.hpp
b/pv/prop/enum.hpp
index 63f78af0d272c89215c1b770fa40a5a1b0c59bab..617ff071b3784621aa3ecac67aad215f9f9c775a 100644
(file)
--- a/
pv/prop/enum.hpp
+++ b/
pv/prop/enum.hpp
@@
-14,8
+14,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* 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 <http://www.gnu.org/licenses/>.
*/
#ifndef PULSEVIEW_PV_PROP_ENUM_HPP
*/
#ifndef PULSEVIEW_PV_PROP_ENUM_HPP
@@
-28,6
+27,9
@@
#include <QMetaType>
#include <QMetaType>
+using std::pair;
+using std::vector;
+
Q_DECLARE_METATYPE(Glib::VariantBase);
class QComboBox;
Q_DECLARE_METATYPE(Glib::VariantBase);
class QComboBox;
@@
-40,12
+42,14
@@
class Enum : public Property
Q_OBJECT;
public:
Q_OBJECT;
public:
- Enum(QString name, std::vector<std::pair<Glib::VariantBase, QString> > values,
+ Enum(QString name, QString desc,
+ vector<pair<Glib::VariantBase, QString> > values,
Getter getter, Setter setter);
Getter getter, Setter setter);
- virtual ~Enum();
+ virtual ~Enum()
= default
;
QWidget* get_widget(QWidget *parent, bool auto_commit);
QWidget* get_widget(QWidget *parent, bool auto_commit);
+ void update_widget();
void commit();
void commit();
@@
-53,12
+57,12
@@
private Q_SLOTS:
void on_current_item_changed(int);
private:
void on_current_item_changed(int);
private:
- const
std::vector< std::
pair<Glib::VariantBase, QString> > values_;
+ const
vector<
pair<Glib::VariantBase, QString> > values_;
QComboBox *selector_;
};
QComboBox *selector_;
};
-}
//
prop
-}
//
pv
+}
// namespace
prop
+}
// namespace
pv
#endif // PULSEVIEW_PV_PROP_ENUM_HPP
#endif // PULSEVIEW_PV_PROP_ENUM_HPP