X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fanalogsignal.cpp;h=41f46dfcc75b414e47fbf8dd6bf47d2d7ff8502a;hb=26a883ede0bcf68d087eda5dd2082890d36c7aef;hp=6703ce9ed8b2c1b4e40cab8b905231b284cf450e;hpb=368a37c2d818f9a7122f07e4a13df5416e05a02e;p=pulseview.git
diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 6703ce9..41f46df 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -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 .
*/
#include
@@ -31,10 +30,12 @@
#include
#include
#include
+#include
#include "analogsignal.hpp"
#include "pv/data/analog.hpp"
#include "pv/data/analogsegment.hpp"
+#include "pv/data/signalbase.hpp"
#include "pv/view/view.hpp"
#include
@@ -45,10 +46,9 @@ using std::min;
using std::shared_ptr;
using std::deque;
-using sigrok::Channel;
-
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const QColor AnalogSignal::SignalColours[4] = {
QColor(0xC4, 0xA0, 0x00), // Yellow
@@ -57,8 +57,8 @@ const QColor AnalogSignal::SignalColours[4] = {
QColor(0x4E, 0x9A, 0x06) // Green
};
-const QColor AnalogSignal::GridMajorColor = QColor(0xB0, 0xB0, 0xB0);
-const QColor AnalogSignal::GridMinorColor = QColor(0xD0, 0xD0, 0xD0);
+const QColor AnalogSignal::GridMajorColor = QColor(0, 0, 0, 40*256/100);
+const QColor AnalogSignal::GridMinorColor = QColor(0, 0, 0, 20*256/100);
const float AnalogSignal::EnvelopeThreshold = 256.0f;
@@ -66,30 +66,43 @@ const int AnalogSignal::MaximumVDivs = 10;
const int AnalogSignal::MinScaleIndex = -6;
const int AnalogSignal::MaxScaleIndex = 7;
+const int AnalogSignal::InfoTextMarginRight = 20;
+const int AnalogSignal::InfoTextMarginBottom = 5;
+
AnalogSignal::AnalogSignal(
pv::Session &session,
- shared_ptr channel,
- shared_ptr data) :
- Signal(session, channel),
- data_(data),
+ shared_ptr base) :
+ Signal(session, base),
scale_index_(4), // 20 per div
scale_index_drag_offset_(0),
div_height_(3 * QFontMetrics(QApplication::font()).height()),
vdivs_(1),
resolution_(0)
{
- set_colour(SignalColours[channel_->index() % countof(SignalColours)]);
+ base_->set_colour(SignalColours[base_->index() % countof(SignalColours)]);
update_scale();
}
shared_ptr AnalogSignal::data() const
{
- return data_;
+ return base_->analog_data();
}
-shared_ptr AnalogSignal::analog_data() const
+void AnalogSignal::save_settings(QSettings &settings) const
{
- return data_;
+ settings.setValue("vdivs", vdivs_);
+ settings.setValue("scale_index", scale_index_);
+}
+
+void AnalogSignal::restore_settings(QSettings &settings)
+{
+ if (settings.contains("vdivs"))
+ vdivs_ = settings.value("vdivs").toInt();
+
+ if (settings.contains("scale_index")) {
+ scale_index_ = settings.value("scale_index").toInt();
+ update_scale();
+ }
}
std::pair AnalogSignal::v_extents() const
@@ -124,7 +137,7 @@ void AnalogSignal::scale_handle_drag_release()
void AnalogSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
{
- if (channel_->enabled()) {
+ if (base_->enabled()) {
Trace::paint_back(p, pp);
paint_axis(p, pp, get_visual_y());
}
@@ -132,18 +145,18 @@ void AnalogSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
{
- assert(data_);
+ assert(base_->analog_data());
assert(owner_);
const int y = get_visual_y();
- if (!channel_->enabled())
+ if (!base_->enabled())
return;
paint_grid(p, y, pp.left(), pp.right());
const deque< shared_ptr > &segments =
- data_->analog_segments();
+ base_->analog_data()->analog_segments();
if (segments.empty())
return;
@@ -173,18 +186,41 @@ void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
pixels_offset, samples_per_pixel);
}
+void AnalogSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
+{
+ if (!enabled())
+ return;
+
+ const int y = get_visual_y();
+
+ // Show the info section on the right side of the trace
+ const QString infotext = QString("%1 V/div").arg(resolution_);
+
+ p.setPen(base_->colour());
+ p.setFont(QApplication::font());
+
+ const QRectF bounding_rect = QRectF(pp.left(),
+ y + v_extents().first,
+ pp.width() - InfoTextMarginRight,
+ v_extents().second - v_extents().first - InfoTextMarginBottom);
+
+ p.drawText(bounding_rect, Qt::AlignRight | Qt::AlignBottom, infotext);
+}
+
void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right)
{
- p.setPen(QPen(GridMajorColor, 0.5, Qt::DashLine));
+ p.setRenderHint(QPainter::Antialiasing, false);
+
+ p.setPen(QPen(GridMajorColor, 1, Qt::DashLine));
for (int i = 1; i <= vdivs_; i++) {
- const int dy = i * div_height_;
+ const float dy = i * div_height_;
p.drawLine(QLineF(left, y - dy, right, y - dy));
p.drawLine(QLineF(left, y + dy, right, y + dy));
}
- p.setPen(QPen(GridMinorColor, 0.5, Qt::DashLine));
+ p.setPen(QPen(GridMinorColor, 1, Qt::DashLine));
for (int i = 0; i < vdivs_; i++) {
- const int dy = i * div_height_;
+ const float dy = i * div_height_;
const float dy25 = dy + (0.25 * div_height_);
const float dy50 = dy + (0.50 * div_height_);
const float dy75 = dy + (0.75 * div_height_);
@@ -195,6 +231,8 @@ void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right)
p.drawLine(QLineF(left, y - dy75, right, y - dy75));
p.drawLine(QLineF(left, y + dy75, right, y + dy75));
}
+
+ p.setRenderHint(QPainter::Antialiasing, true);
}
void AnalogSignal::paint_trace(QPainter &p,
@@ -202,26 +240,25 @@ void AnalogSignal::paint_trace(QPainter &p,
int y, int left, const int64_t start, const int64_t end,
const double pixels_offset, const double samples_per_pixel)
{
- const int64_t sample_count = end - start;
-
- const float *const samples = segment->get_samples(start, end);
- assert(samples);
+ p.setPen(base_->colour());
- p.setPen(colour_);
-
- QPointF *points = new QPointF[sample_count];
+ QPointF *points = new QPointF[end - start];
QPointF *point = points;
+ pv::data::SegmentAnalogDataIterator* it =
+ segment->begin_sample_iteration(start);
+
for (int64_t sample = start; sample != end; sample++) {
const float x = (sample / samples_per_pixel -
pixels_offset) + left;
- *point++ = QPointF(x,
- y - samples[sample - start] * scale_);
+
+ *point++ = QPointF(x, y - *((float*)it->value) * scale_);
+ segment->continue_sample_iteration(it, 1);
}
+ segment->end_sample_iteration(it);
p.drawPolyline(points, point - points);
- delete[] samples;
delete[] points;
}
@@ -239,7 +276,7 @@ void AnalogSignal::paint_envelope(QPainter &p,
return;
p.setPen(QPen(Qt::NoPen));
- p.setBrush(colour_);
+ p.setBrush(base_->colour());
QRectF *const rects = new QRectF[e.length];
QRectF *rect = rects;
@@ -331,8 +368,11 @@ void AnalogSignal::on_vdivs_changed(int vdivs)
{
vdivs_ = vdivs;
- if (owner_)
+ if (owner_) {
+ // Call order is important, otherwise the lazy event handler won't work
owner_->extents_changed(false, true);
+ owner_->row_item_appearance_changed(false, true);
+ }
}
void AnalogSignal::on_resolution_changed(int index)
@@ -344,5 +384,6 @@ void AnalogSignal::on_resolution_changed(int index)
owner_->row_item_appearance_changed(false, true);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv