X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Flogicsignal.hpp;h=e000a3cdf9b676536b451f25874833b1d776c9aa;hb=e3ac35531f1e76a31669e821e14dbeb95a5cba63;hp=0d422d7ce5b1534ef47b1b620f7b6f1d35d7ad5a;hpb=2b81ae4682ade4109ffa442794de36ceb32045eb;p=pulseview.git
diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index 0d422d7..e000a3c 100644
--- a/pv/view/logicsignal.hpp
+++ b/pv/view/logicsignal.hpp
@@ -14,40 +14,43 @@
* 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_LOGICSIGNAL_H
-#define PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
+
+#include
#include "signal.hpp"
#include
+class QIcon;
class QToolBar;
namespace sigrok {
- class Device;
- class TriggerMatchType;
+class TriggerMatchType;
}
namespace pv {
+namespace devices {
+class Device;
+}
+
namespace data {
class Logic;
}
-namespace view {
+namespace views {
+namespace TraceView {
class LogicSignal : public Signal
{
Q_OBJECT
private:
- static const int SignalHeight;
- static const int SignalMargin;
-
static const float Oversampling;
static const QColor EdgeColour;
@@ -56,13 +59,16 @@ private:
static const QColor SignalColours[10];
+ static QColor TriggerMarkerBackgroundColour;
+ static const int TriggerMarkerPadding;
+ static const char* TriggerMarkerIcons[8];
+
public:
LogicSignal(pv::Session &session,
- std::shared_ptr device,
- std::shared_ptr channel,
- std::shared_ptr data);
+ std::shared_ptr device,
+ std::shared_ptr base);
- virtual ~LogicSignal();
+ virtual ~LogicSignal() = default;
std::shared_ptr data() const;
@@ -75,20 +81,29 @@ public:
std::pair v_extents() const;
/**
- * Paints the background layer of the signal with a QPainter
- * @param p the QPainter to paint into.
- * @param left the x-coordinate of the left edge of the signal.
- * @param right the x-coordinate of the right edge of the signal.
- **/
- void paint_back(QPainter &p, int left, int right);
+ * Returns the offset to show the drag handle.
+ */
+ int scale_handle_offset() const;
+
+ /**
+ * Handles the scale handle being dragged to an offset.
+ * @param offset the offset the scale handle was dragged to.
+ */
+ void scale_handle_dragged(int offset);
/**
* Paints the mid-layer of the signal with a QPainter
* @param p the QPainter to paint into.
- * @param left the x-coordinate of the left edge of the signal.
- * @param right the x-coordinate of the right edge of the signal.
- **/
- void paint_mid(QPainter &p, int left, int right);
+ * @param pp the painting parameters object to paint with..
+ */
+ void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
+
+ /**
+ * Paints the foreground 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_fore(QPainter &p, const ViewItemPaintParams &pp);
private:
void paint_caps(QPainter &p, QLineF *const lines,
@@ -98,17 +113,24 @@ private:
void init_trigger_actions(QWidget *parent);
- QAction* match_action(const sigrok::TriggerMatchType *match);
- const sigrok::TriggerMatchType *action_match(QAction *action);
+ const std::vector get_trigger_types() const;
+ QAction* action_from_trigger_type(
+ const sigrok::TriggerMatchType *type);
+ const sigrok::TriggerMatchType* trigger_type_from_action(
+ QAction *action);
void populate_popup_form(QWidget *parent, QFormLayout *form);
void modify_trigger();
+ static const QIcon* get_icon(const char *path);
+ static const QPixmap* get_pixmap(const char *path);
+
private Q_SLOTS:
void on_trigger();
private:
- std::shared_ptr device_;
- std::shared_ptr data_;
+ int signal_height_;
+
+ std::shared_ptr device_;
const sigrok::TriggerMatchType *trigger_match_;
QToolBar *trigger_bar_;
@@ -118,9 +140,13 @@ private:
QAction *trigger_falling_;
QAction *trigger_low_;
QAction *trigger_change_;
+
+ static QCache icon_cache_;
+ static QCache pixmap_cache_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP