projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #684 by implementing snap-to-edge for TimeItem-based classes
[pulseview.git]
/
pv
/
widgets
/
wellarray.hpp
diff --git
a/pv/widgets/wellarray.hpp
b/pv/widgets/wellarray.hpp
index ebe3c00019023c7370c060ef3a59d6ba6319269c..f1c25dc01fde9e0c39694594296c2bf265b6d2e5 100644
(file)
--- a/
pv/widgets/wellarray.hpp
+++ b/
pv/widgets/wellarray.hpp
@@
-39,18
+39,24
@@
**
****************************************************************************/
**
****************************************************************************/
+#ifndef PULSEVIEW_PV_WIDGETS_WELLARRAY_HPP
+#define PULSEVIEW_PV_WIDGETS_WELLARRAY_HPP
+
#include <QWidget>
#include <QWidget>
-struct QWellArrayData;
+namespace pv {
+namespace widgets {
+
+struct WellArrayData;
-class
Q
WellArray : public QWidget
+class WellArray : public QWidget
{
Q_OBJECT
Q_PROPERTY(int selectedColumn READ selectedColumn)
Q_PROPERTY(int selectedRow READ selectedRow)
public:
{
Q_OBJECT
Q_PROPERTY(int selectedColumn READ selectedColumn)
Q_PROPERTY(int selectedRow READ selectedRow)
public:
-
QWellArray(int rows, int cols, QWidget* parent=0
);
+
WellArray(int rows, int cols, QWidget* parent = nullptr
);
QString cellContent(int row, int col) const;
int selectedColumn() const { return selCol; }
QString cellContent(int row, int col) const;
int selectedColumn() const { return selCol; }
@@
-116,10
+122,10
@@
protected:
void keyPressEvent(QKeyEvent*);
void focusInEvent(QFocusEvent*);
void focusOutEvent(QFocusEvent*);
void keyPressEvent(QKeyEvent*);
void focusInEvent(QFocusEvent*);
void focusOutEvent(QFocusEvent*);
- void paintEvent(QPaintEvent
*);
+ void paintEvent(QPaintEvent*);
private:
private:
- Q_DISABLE_COPY(
Q
WellArray)
+ Q_DISABLE_COPY(WellArray)
int nrows;
int ncols;
int nrows;
int ncols;
@@
-129,5
+135,10
@@
private:
int curCol;
int selRow;
int selCol;
int curCol;
int selRow;
int selCol;
-
Q
WellArrayData *d;
+ WellArrayData *d;
};
};
+
+} // namespace widgets
+} // namespace pv
+
+#endif // PULSEVIEW_PV_WIDGETS_WELLARRAY_HPP