X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=inline;f=pv%2Fview%2Ftrace.hpp;h=11f80ccbeb6426b0d163eecd7a2b8f36d20a7a7a;hb=ddaded8bccdb05d700b4242b7b3ef59a55b39ac0;hp=a82520ccfdc68fedf589ea8afb326c4b99016fbb;hpb=d8d724cc987b7edb6a5e4e9d0dc8415f3cca06e9;p=pulseview.git
diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index a82520c..11f80cc 100644
--- 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
- * 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_VIEW_TRACE_H
-#define PULSEVIEW_PV_VIEW_TRACE_H
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
#include
#include
@@ -29,7 +28,9 @@
#include
-#include "rowitem.hpp"
+#include "tracetreeitem.hpp"
+
+#include "pv/data/signalbase.hpp"
class QFormLayout;
@@ -39,9 +40,10 @@ namespace widgets {
class Popup;
}
-namespace view {
+namespace views {
+namespace TraceView {
-class Trace : public RowItem
+class Trace : public TraceTreeItem
{
Q_OBJECT
@@ -49,38 +51,35 @@ private:
static const QPen AxisPen;
static const int LabelHitPadding;
+ static const QColor BrightGrayBGColour;
+ static const QColor DarkGrayBGColour;
+
protected:
- Trace(QString name);
+ Trace(std::shared_ptr channel);
public:
- /**
- * Gets the name of this signal.
- */
- QString name() const;
-
/**
* Sets the name of the signal.
*/
virtual void set_name(QString name);
/**
- * Get the colour of the signal.
+ * Set the colour of the signal.
*/
- QColor colour() const;
+ virtual void set_colour(QColor colour);
/**
- * Set the colour of the signal.
+ * Enables or disables the coloured background for this trace.
*/
- void set_colour(QColor colour);
+ void set_coloured_bg(bool state);
/**
* Paints the signal label.
* @param p the QPainter to paint into.
- * @param right the x-coordinate of the right edge of the header
- * area.
+ * @param rect the rectangle of the header area.
* @param hover true if the label is being hovered over by the mouse.
*/
- virtual void paint_label(QPainter &p, int right, bool hover);
+ virtual void paint_label(QPainter &p, const QRect &rect, bool hover);
virtual QMenu* create_context_menu(QWidget *parent);
@@ -88,20 +87,26 @@ public:
/**
* Computes the outline rectangle of a label.
- * @param right the x-coordinate of the right edge of the header
- * area.
+ * @param rect the rectangle of the header area.
* @return Returns the rectangle of the signal label.
*/
- QRectF label_rect(int right) const;
+ QRectF label_rect(const QRectF &rect) const;
protected:
+ /**
+ * Paints the background layer of the signal with a QPainter.
+ * @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);
+
/**
* Paints a zero axis across the viewport.
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
* @param y the y-offset of the axis.
*/
- void paint_axis(QPainter &p, const RowItemPaintParams &pp, int y);
+ void paint_axis(QPainter &p, const ViewItemPaintParams &pp, int y);
void add_colour_option(QWidget *parent, QFormLayout *form);
@@ -109,23 +114,29 @@ protected:
virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
-private Q_SLOTS:
- void on_text_changed(const QString &text);
+protected Q_SLOTS:
+ virtual void on_name_changed(const QString &text);
- void on_colour_changed(const QColor &colour);
+ virtual void on_colour_changed(const QColor &colour);
void on_popup_closed();
+private Q_SLOTS:
+ void on_nameedit_changed(const QString &name);
+
+ void on_colouredit_changed(const QColor &colour);
+
protected:
- QString name_;
- QColor colour_;
+ std::shared_ptr base_;
+ bool coloured_bg_, coloured_bg_state_;
private:
pv::widgets::Popup *popup_;
QFormLayout *popup_form_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_TRACE_H
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP