X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fanalogsignal.cpp;h=bf1f9017731f679f73d9a836ea706efc47722557;hb=459db2c5cd2ab084dcf46f9e44c43916cb3ae9cf;hp=cd57da06b6073e0143f3f859bad2b70a8120a426;hpb=73a25a6e488f1813c1cd12da085a16e4f91ed4da;p=pulseview.git
diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index cd57da0..bf1f901 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
@@ -48,7 +47,8 @@ using std::shared_ptr;
using std::deque;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const QColor AnalogSignal::SignalColours[4] = {
QColor(0xC4, 0xA0, 0x00), // Yellow
@@ -71,14 +71,13 @@ const int AnalogSignal::InfoTextMarginBottom = 5;
AnalogSignal::AnalogSignal(
pv::Session &session,
- shared_ptr base,
- shared_ptr data) :
+ shared_ptr base) :
Signal(session, base),
- data_(data),
scale_index_(4), // 20 per div
scale_index_drag_offset_(0),
div_height_(3 * QFontMetrics(QApplication::font()).height()),
- vdivs_(1),
+ pos_vdivs_(1),
+ neg_vdivs_(1),
resolution_(0)
{
base_->set_colour(SignalColours[base_->index() % countof(SignalColours)]);
@@ -87,23 +86,40 @@ AnalogSignal::AnalogSignal(
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("pos_vdivs", pos_vdivs_);
+ settings.setValue("neg_vdivs", neg_vdivs_);
+ settings.setValue("scale_index", scale_index_);
+}
+
+void AnalogSignal::restore_settings(QSettings &settings)
+{
+ if (settings.contains("pos_vdivs"))
+ pos_vdivs_ = settings.value("pos_vdivs").toInt();
+
+ if (settings.contains("neg_vdivs"))
+ neg_vdivs_ = settings.value("neg_vdivs").toInt();
+
+ if (settings.contains("scale_index")) {
+ scale_index_ = settings.value("scale_index").toInt();
+ update_scale();
+ }
}
std::pair AnalogSignal::v_extents() const
{
- const int h = vdivs_ * div_height_;
- return make_pair(-h, h);
+ const int ph = pos_vdivs_ * div_height_;
+ const int nh = neg_vdivs_ * div_height_;
+ return make_pair(-ph, nh);
}
int AnalogSignal::scale_handle_offset() const
{
- const int h = vdivs_ * div_height_;
+ const int h = (pos_vdivs_ + neg_vdivs_) * div_height_;
return ((scale_index_drag_offset_ - scale_index_) *
h / 4) - h / 2;
@@ -111,7 +127,7 @@ int AnalogSignal::scale_handle_offset() const
void AnalogSignal::scale_handle_dragged(int offset)
{
- const int h = vdivs_ * div_height_;
+ const int h = (pos_vdivs_ + neg_vdivs_) * div_height_;
scale_index_ = scale_index_drag_offset_ -
(offset + h / 2) / (h / 4);
@@ -135,7 +151,7 @@ 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();
@@ -146,7 +162,7 @@ void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
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;
@@ -201,25 +217,42 @@ void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right)
{
p.setRenderHint(QPainter::Antialiasing, false);
- p.setPen(QPen(GridMajorColor, 1, Qt::DashLine));
- for (int i = 1; i <= vdivs_; i++) {
- const float dy = i * div_height_;
- p.drawLine(QLineF(left, y - dy, right, y - dy));
- p.drawLine(QLineF(left, y + dy, right, y + dy));
+ if (pos_vdivs_ > 0) {
+ p.setPen(QPen(GridMajorColor, 1, Qt::DashLine));
+ for (int i = 1; i <= pos_vdivs_; i++) {
+ const float dy = i * div_height_;
+ p.drawLine(QLineF(left, y - dy, right, y - dy));
+ }
+
+ p.setPen(QPen(GridMinorColor, 1, Qt::DashLine));
+ for (int i = 0; i < pos_vdivs_; i++) {
+ 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_);
+ p.drawLine(QLineF(left, y - dy25, right, y - dy25));
+ p.drawLine(QLineF(left, y - dy50, right, y - dy50));
+ p.drawLine(QLineF(left, y - dy75, right, y - dy75));
+ }
}
- p.setPen(QPen(GridMinorColor, 1, Qt::DashLine));
- for (int i = 0; i < vdivs_; i++) {
- 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_);
- p.drawLine(QLineF(left, y - dy25, right, y - dy25));
- p.drawLine(QLineF(left, y + dy25, right, y + dy25));
- p.drawLine(QLineF(left, y - dy50, right, y - dy50));
- p.drawLine(QLineF(left, y + dy50, right, y + dy50));
- p.drawLine(QLineF(left, y - dy75, right, y - dy75));
- p.drawLine(QLineF(left, y + dy75, right, y + dy75));
+ if (neg_vdivs_ > 0) {
+ p.setPen(QPen(GridMajorColor, 1, Qt::DashLine));
+ for (int i = 1; i <= neg_vdivs_; i++) {
+ const float dy = i * div_height_;
+ p.drawLine(QLineF(left, y + dy, right, y + dy));
+ }
+
+ p.setPen(QPen(GridMinorColor, 1, Qt::DashLine));
+ for (int i = 0; i < neg_vdivs_; i++) {
+ 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_);
+ p.drawLine(QLineF(left, y + dy25, right, y + dy25));
+ p.drawLine(QLineF(left, y + dy50, right, y + dy50));
+ p.drawLine(QLineF(left, y + dy75, right, y + dy75));
+ }
}
p.setRenderHint(QPainter::Antialiasing, true);
@@ -230,26 +263,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());
- 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;
}
@@ -324,12 +356,19 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
QFormLayout *const layout = new QFormLayout;
// Add the number of vdivs
- QSpinBox *vdiv_sb = new QSpinBox(parent);
- vdiv_sb->setRange(1, MaximumVDivs);
- vdiv_sb->setValue(vdivs_);
- connect(vdiv_sb, SIGNAL(valueChanged(int)),
- this, SLOT(on_vdivs_changed(int)));
- layout->addRow(tr("Number of vertical divs"), vdiv_sb);
+ QSpinBox *pvdiv_sb = new QSpinBox(parent);
+ pvdiv_sb->setRange(0, MaximumVDivs);
+ pvdiv_sb->setValue(pos_vdivs_);
+ connect(pvdiv_sb, SIGNAL(valueChanged(int)),
+ this, SLOT(on_pos_vdivs_changed(int)));
+ layout->addRow(tr("Number of pos vertical divs"), pvdiv_sb);
+
+ QSpinBox *nvdiv_sb = new QSpinBox(parent);
+ nvdiv_sb->setRange(0, MaximumVDivs);
+ nvdiv_sb->setValue(neg_vdivs_);
+ connect(nvdiv_sb, SIGNAL(valueChanged(int)),
+ this, SLOT(on_neg_vdivs_changed(int)));
+ layout->addRow(tr("Number of neg vertical divs"), nvdiv_sb);
// Add the vertical resolution
resolution_cb_ = new QComboBox(parent);
@@ -355,9 +394,20 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
form->addRow(layout);
}
-void AnalogSignal::on_vdivs_changed(int vdivs)
+void AnalogSignal::on_pos_vdivs_changed(int vdivs)
+{
+ pos_vdivs_ = vdivs;
+
+ 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_neg_vdivs_changed(int vdivs)
{
- vdivs_ = vdivs;
+ neg_vdivs_ = vdivs;
if (owner_) {
// Call order is important, otherwise the lazy event handler won't work
@@ -375,5 +425,6 @@ void AnalogSignal::on_resolution_changed(int index)
owner_->row_item_appearance_changed(false, true);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv