X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.hpp;h=cc62d910845b012b2e1752d5973b8e7b52674be0;hb=257211b829052bb5d5fade89f518df47d96923b5;hp=dfc883f505e49ae87e708bb43f1036fed98d5728;hpb=303d6ea697468ee79f4c3f73afc57db0ce6319a8;p=pulseview.git
diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index dfc883f..cc62d91 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_HPP
-#define PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
#include
@@ -27,6 +26,10 @@
#include
+using std::pair;
+using std::shared_ptr;
+using std::vector;
+
class QIcon;
class QToolBar;
@@ -44,18 +47,20 @@ namespace data {
class Logic;
}
-namespace view {
+namespace views {
+namespace TraceView {
class LogicSignal : public Signal
{
Q_OBJECT
-private:
+public:
static const float Oversampling;
static const QColor EdgeColour;
static const QColor HighColour;
static const QColor LowColour;
+ static const QColor SamplingPointColour;
static const QColor SignalColours[10];
@@ -63,25 +68,21 @@ private:
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);
-
- virtual ~LogicSignal();
+ shared_ptr device,
+ shared_ptr base);
- std::shared_ptr data() const;
+ virtual ~LogicSignal() = default;
- std::shared_ptr logic_data() const;
+ shared_ptr data() const;
- void set_logic_data(std::shared_ptr data);
+ shared_ptr logic_data() const;
/**
* Computes the vertical extents of the contents of this row item.
* @return A pair containing the minimum and maximum y-values.
*/
- std::pair v_extents() const;
+ pair v_extents() const;
/**
* Returns the offset to show the drag handle.
@@ -94,38 +95,30 @@ public:
*/
void scale_handle_dragged(int offset);
- /**
- * 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 ViewItemPaintParams &pp);
-
/**
* 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 ViewItemPaintParams &pp);
+ */
+ void paint_mid(QPainter &p, 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);
+ */
+ virtual void paint_fore(QPainter &p, ViewItemPaintParams &pp);
private:
void paint_caps(QPainter &p, QLineF *const lines,
- std::vector< std::pair > &edges,
+ vector< pair > &edges,
bool level, double samples_per_pixel, double pixels_offset,
float x_offset, float y_offset);
void init_trigger_actions(QWidget *parent);
- const std::vector get_trigger_types() const;
- QAction* action_from_trigger_type(
- const sigrok::TriggerMatchType *match);
+ const 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);
@@ -140,8 +133,7 @@ private Q_SLOTS:
private:
int signal_height_;
- std::shared_ptr device_;
- std::shared_ptr data_;
+ shared_ptr device_;
const sigrok::TriggerMatchType *trigger_match_;
QToolBar *trigger_bar_;
@@ -156,7 +148,8 @@ private:
static QCache pixmap_cache_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP