X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Flogicsignal.hpp;h=e000a3cdf9b676536b451f25874833b1d776c9aa;hb=09f55d9665efb3b17ba7de4bae47be6989e884fe;hp=c4588903ba83d3a5e6731d0b0a24c778620e4aa8;hpb=3eb29afdb641606c2e2e059289d8cc103d027a25;p=pulseview.git
diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index c458890..e000a3c 100644
--- a/pv/view/logicsignal.hpp
+++ b/pv/view/logicsignal.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_LOGICSIGNAL_H
-#define PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
#include
@@ -31,26 +30,27 @@ 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;
@@ -65,11 +65,10 @@ private:
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;
@@ -82,25 +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 pp the painting parameters object to paint with..
- **/
- void paint_back(QPainter &p, const RowItemPaintParams &pp);
+ * 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 pp the painting parameters object to paint with..
- **/
- void paint_mid(QPainter &p, const RowItemPaintParams &pp);
+ */
+ 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 RowItemPaintParams &pp);
+ */
+ virtual void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
private:
void paint_caps(QPainter &p, QLineF *const lines,
@@ -112,7 +115,7 @@ private:
const std::vector get_trigger_types() const;
QAction* action_from_trigger_type(
- const sigrok::TriggerMatchType *match);
+ const sigrok::TriggerMatchType *type);
const sigrok::TriggerMatchType* trigger_type_from_action(
QAction *action);
void populate_popup_form(QWidget *parent, QFormLayout *form);
@@ -125,8 +128,9 @@ 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_;
@@ -141,7 +145,8 @@ private:
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