projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check that at least one probe is enabled before acquisition begins
[pulseview.git]
/
pv
/
view
/
analogsignal.h
diff --git
a/pv/view/analogsignal.h
b/pv/view/analogsignal.h
index b3cafd2f9310cdbeac34e665294c53e22631403d..86471537abce44236291664b98a1e74084cc187d 100644
(file)
--- a/
pv/view/analogsignal.h
+++ b/
pv/view/analogsignal.h
@@
-27,7
+27,9
@@
namespace pv {
namespace pv {
-class AnalogData;
+namespace data {
+class Analog;
+}
namespace view {
namespace view {
@@
-35,29
+37,23
@@
class AnalogSignal : public Signal
{
public:
AnalogSignal(QString name,
{
public:
AnalogSignal(QString name,
- boost::shared_ptr<pv::
AnalogData
> data);
+ boost::shared_ptr<pv::
data::Analog
> data);
/**
* Paints the signal with a QPainter
* @param p the QPainter to paint into.
/**
* 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:
-
- /**
- * When painting into the rectangle, calculate the y
- * offset of the zero point.
- **/
- int get_nominal_offset(const QRect &rect) const;
-
-private:
- boost::shared_ptr<pv::AnalogData> _data;
+ boost::shared_ptr<pv::data::Analog> _data;
};
} // namespace view
};
} // namespace view