X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.hpp;h=731ed5dbd5980b38a26477b55920ddffc165069a;hb=e0ddc2a408e3b667ca8e15d8482ecdcb03d46d30;hp=c0b94df26c00f86fbf61b5d673131e95a472165e;hpb=97904bf71258d3b522b00eb3dcae1efea6bd1298;p=pulseview.git
diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index c0b94df..731ed5d 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
@@ -27,9 +26,13 @@
#include
#include
-#include
+#include
-#include "rowitem.hpp"
+#include "tracetreeitem.hpp"
+
+#include "pv/data/signalbase.hpp"
+
+using std::shared_ptr;
class QFormLayout;
@@ -39,9 +42,10 @@ namespace widgets {
class Popup;
}
-namespace view {
+namespace views {
+namespace TraceView {
-class Trace : public RowItem
+class Trace : public TraceTreeItem
{
Q_OBJECT
@@ -49,38 +53,30 @@ private:
static const QPen AxisPen;
static const int LabelHitPadding;
+ static const QColor BrightGrayBGColour;
+ static const QColor DarkGrayBGColour;
+
protected:
- Trace(QString name);
+ Trace(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.
- */
- QColor colour() const;
-
/**
* Set the colour of the signal.
*/
- void set_colour(QColor colour);
+ virtual void set_colour(QColor colour);
/**
* 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,21 +84,18 @@ 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:
-
/**
- * Gets the text colour.
- * @remarks This colour is computed by comparing the lightness
- * of the trace colour against a threshold to determine whether
- * white or black would be more visible.
+ * 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.
*/
- QColor get_text_colour() const;
+ virtual void paint_back(QPainter &p, ViewItemPaintParams &pp);
/**
* Paints a zero axis across the viewport.
@@ -110,7 +103,7 @@ protected:
* @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, ViewItemPaintParams &pp, int y);
void add_colour_option(QWidget *parent, QFormLayout *form);
@@ -118,23 +111,28 @@ 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_;
+ shared_ptr base_;
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