projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
main: Add signal handler for SIGINT
[pulseview.git]
/
pv
/
view
/
logicsignal.h
diff --git
a/pv/view/logicsignal.h
b/pv/view/logicsignal.h
index dd4a030ac1fa2de62cb5690b8a5db3490bf9426b..ad88241da34de704c783e77a7acc4bfb63763b87 100644
(file)
--- a/
pv/view/logicsignal.h
+++ b/
pv/view/logicsignal.h
@@
-27,14
+27,15
@@
namespace pv {
namespace pv {
-class LogicData;
+namespace data {
+class Logic;
+}
namespace view {
class LogicSignal : public Signal
{
private:
namespace view {
class LogicSignal : public Signal
{
private:
- static const float Margin;
static const float Oversampling;
static const QColor EdgeColour;
static const float Oversampling;
static const QColor EdgeColour;
@@
-45,18
+46,21
@@
private:
public:
LogicSignal(QString name,
public:
LogicSignal(QString name,
- boost::shared_ptr<pv::
LogicData
> data,
+ boost::shared_ptr<pv::
data::Logic
> data,
int probe_index);
/**
* Paints the signal with a QPainter
* @param p the QPainter to paint into.
int probe_index);
/**
* Paints the signal with a QPainter
* @param p the QPainter to paint into.
- * @param rect the rectangular area to draw the trace into.
+ * @param y the y-coordinate to draw the signal at.
+ * @param left the x-coordinate of the left edge of the signal.
+ * @param right the x-coordinate of the right edge of the signal.
* @param scale the scale in seconds per pixel.
* @param offset the time to show at the left hand edge of
* the view in seconds.
**/
* @param scale the scale in seconds per pixel.
* @param offset the time to show at the left hand edge of
* the view in seconds.
**/
- void paint(QPainter &p, const QRect &rect, double scale, double offset);
+ void paint(QPainter &p, int y, int left, int right, double scale,
+ double offset);
private:
private:
@@
-65,15
+69,9
@@
private:
bool level, double samples_per_pixel, double pixels_offset,
float x_offset, float y_offset);
bool level, double samples_per_pixel, double pixels_offset,
float x_offset, float y_offset);
- /**
- * When painting into the rectangle, calculate the y
- * offset of the zero point.
- **/
- int get_nominal_offset(const QRect &rect) const;
-
private:
int _probe_index;
private:
int _probe_index;
- boost::shared_ptr<pv::
LogicData
> _data;
+ boost::shared_ptr<pv::
data::Logic
> _data;
};
} // namespace view
};
} // namespace view