projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace non-ASCII characters
[pulseview.git]
/
pv
/
view
/
trace.hpp
diff --git
a/pv/view/trace.hpp
b/pv/view/trace.hpp
index cb5ac15c6ec2173f14cc3d7dbde1ac298a7a333e..b6b15198451e74bbfd014e5591f8d451da531dfc 100644
(file)
--- a/
pv/view/trace.hpp
+++ b/
pv/view/trace.hpp
@@
-14,12
+14,11
@@
* 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_VIEW_TRACE_HPP
-#define PULSEVIEW_PV_VIEW_TRACE_HPP
+#ifndef PULSEVIEW_PV_VIEW
S_TRACEVIEW
_TRACE_HPP
+#define PULSEVIEW_PV_VIEW
S_TRACEVIEW
_TRACE_HPP
#include <QColor>
#include <QPainter>
#include <QColor>
#include <QPainter>
@@
-27,19
+26,28
@@
#include <QRect>
#include <QString>
#include <QRect>
#include <QString>
-#include <
stdint.h
>
+#include <
cstdint
>
#include "tracetreeitem.hpp"
#include "tracetreeitem.hpp"
+#include "pv/data/signalbase.hpp"
+
+using std::shared_ptr;
+
class QFormLayout;
namespace pv {
class QFormLayout;
namespace pv {
+namespace data {
+class SignalBase;
+}
+
namespace widgets {
class Popup;
}
namespace widgets {
class Popup;
}
-namespace view {
+namespace views {
+namespace TraceView {
class Trace : public TraceTreeItem
{
class Trace : public TraceTreeItem
{
@@
-49,37
+57,27
@@
private:
static const QPen AxisPen;
static const int LabelHitPadding;
static const QPen AxisPen;
static const int LabelHitPadding;
- static const QColor BrightBGColour;
- static const QColor DarkBGColour;
+ static const QColor Bright
Gray
BGColour;
+ static const QColor Dark
Gray
BGColour;
protected:
protected:
- Trace(
QString name
);
+ Trace(
shared_ptr<data::SignalBase> channel
);
public:
/**
public:
/**
- *
Gets the name of this signal
.
+ *
Returns the underlying SignalBase instance
.
*/
*/
-
QString nam
e() const;
+
shared_ptr<data::SignalBase> bas
e() const;
/**
* Sets the name of the signal.
*/
virtual void set_name(QString name);
/**
* Sets the name of the signal.
*/
virtual void set_name(QString name);
- /**
- * Get the colour of the signal.
- */
- QColor colour() const;
-
/**
* Set the colour of the signal.
*/
/**
* Set the colour of the signal.
*/
- void set_colour(QColor colour);
-
- /**
- * Enables or disables the coloured background for this trace.
- */
- void set_coloured_bg(bool state);
+ virtual void set_colour(QColor colour);
/**
* Paints the signal label.
/**
* Paints the signal label.
@@
-106,7
+104,7
@@
protected:
* @param p The QPainter to paint into.
* @param pp The painting parameters object to paint with.
*/
* @param p The QPainter to paint into.
* @param pp The painting parameters object to paint with.
*/
- virtual void paint_back(QPainter &p,
const
ViewItemPaintParams &pp);
+ virtual void paint_back(QPainter &p, ViewItemPaintParams &pp);
/**
* Paints a zero axis across the viewport.
/**
* Paints a zero axis across the viewport.
@@
-114,7
+112,7
@@
protected:
* @param pp the painting parameters object to paint with.
* @param y the y-offset of the axis.
*/
* @param pp the painting parameters object to paint with.
* @param y the y-offset of the axis.
*/
- void paint_axis(QPainter &p,
const
ViewItemPaintParams &pp, int y);
+ void paint_axis(QPainter &p, ViewItemPaintParams &pp, int y);
void add_colour_option(QWidget *parent, QFormLayout *form);
void add_colour_option(QWidget *parent, QFormLayout *form);
@@
-122,24
+120,28
@@
protected:
virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
-pr
ivate
Q_SLOTS:
- v
oid on_text
_changed(const QString &text);
+pr
otected
Q_SLOTS:
+ v
irtual void on_name
_changed(const QString &text);
- void on_colour_changed(const QColor &colour);
+ v
irtual v
oid on_colour_changed(const QColor &colour);
void on_popup_closed();
void on_popup_closed();
+private Q_SLOTS:
+ void on_nameedit_changed(const QString &name);
+
+ void on_colouredit_changed(const QColor &colour);
+
protected:
protected:
- QString name_;
- QColor colour_, bgcolour_;
- bool coloured_bg_, coloured_bg_state_;
+ shared_ptr<data::SignalBase> base_;
private:
pv::widgets::Popup *popup_;
QFormLayout *popup_form_;
};
private:
pv::widgets::Popup *popup_;
QFormLayout *popup_form_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_TRACE_HPP
+#endif // PULSEVIEW_PV_VIEW
S_TRACEVIEW
_TRACE_HPP