X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Flogicsignal.hpp;h=273120230d0b25f02af6b95d366f8ac633b31ed0;hb=c063290ac7189bdd15221450f598504f43286b43;hp=ce843df9af37ad2d4df189435943733847a7546b;hpb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;p=pulseview.git
diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index ce843df..2731202 100644
--- a/pv/view/logicsignal.hpp
+++ b/pv/view/logicsignal.hpp
@@ -14,8 +14,7 @@
* 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_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
@@ -27,6 +26,10 @@
#include
+using std::pair;
+using std::shared_ptr;
+using std::vector;
+
class QIcon;
class QToolBar;
@@ -51,12 +54,13 @@ 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];
@@ -64,22 +68,21 @@ private:
static const int TriggerMarkerPadding;
static const char* TriggerMarkerIcons[8];
-public:
LogicSignal(pv::Session &session,
- std::shared_ptr device,
- std::shared_ptr base);
+ shared_ptr device,
+ shared_ptr base);
virtual ~LogicSignal() = default;
- std::shared_ptr data() const;
+ shared_ptr data() const;
- std::shared_ptr logic_data() const;
+ 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.
@@ -108,15 +111,14 @@ public:
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 *type);
+ 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);
@@ -131,7 +133,7 @@ private Q_SLOTS:
private:
int signal_height_;
- std::shared_ptr device_;
+ shared_ptr device_;
const sigrok::TriggerMatchType *trigger_match_;
QToolBar *trigger_bar_;