X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=inline;f=pv%2Fview%2Ftrace.hpp;h=f911985023b9f8e26af823d3ad9b11a59507db28;hb=60938e0430a0d08792ba53b86ca94153baaed74d;hp=88e54b1a7edcb37a95045a3f4cf4703a9b9dcbc3;hpb=35365c66bf6166c5607f1180016528d996a45b66;p=pulseview.git
diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index 88e54b1..f911985 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_HPP
-#define PULSEVIEW_PV_VIEW_TRACE_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
#include
#include
@@ -27,10 +26,14 @@
#include
#include
-#include
+#include
#include "tracetreeitem.hpp"
+#include "pv/data/signalbase.hpp"
+
+using std::shared_ptr;
+
class QFormLayout;
namespace pv {
@@ -39,7 +42,8 @@ namespace widgets {
class Popup;
}
-namespace view {
+namespace views {
+namespace TraceView {
class Trace : public TraceTreeItem
{
@@ -49,54 +53,22 @@ private:
static const QPen AxisPen;
static const int LabelHitPadding;
- static const QColor BrightBGColour;
- static const QColor DarkBGColour;
+ 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);
-
- /**
- * Enables or disables the coloured background for this trace.
- */
- void set_coloured_bg(bool state);
-
- /**
- * Returns true if the item may be dragged/moved.
- */
- bool is_draggable() const;
-
- /**
- * Selects or deselects the signal.
- */
- void select(bool select = true);
-
- /**
- * Computes the outline rectangle of the viewport hit-box.
- * @param rect the rectangle of the viewport area.
- * @return Returns the rectangle of the hit-box.
- */
- QRectF hit_box_rect(const ViewItemPaintParams &pp) const;
+ virtual void set_colour(QColor colour);
/**
* Paints the signal label.
@@ -123,7 +95,7 @@ protected:
* @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.
@@ -131,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 ViewItemPaintParams &pp, int y);
+ void paint_axis(QPainter &p, ViewItemPaintParams &pp, int y);
void add_colour_option(QWidget *parent, QFormLayout *form);
@@ -139,24 +111,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_, bgcolour_;
- bool coloured_bg_, coloured_bg_state_;
+ shared_ptr base_;
+ bool coloured_bg_state_;
private:
pv::widgets::Popup *popup_;
QFormLayout *popup_form_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_TRACE_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP