#include <libsigrokdecode/libsigrokdecode.h>
#endif
-#include <assert.h>
-#include <limits.h>
-#include <math.h>
+#include <cassert>
+#include <climits>
+#include <cmath>
+#include <mutex>
#include <QEvent>
#include <QMouseEvent>
#include "pv/data/logic.h"
#include "pv/data/logicsnapshot.h"
+using boost::shared_lock;
+using boost::shared_mutex;
using pv::data::SignalData;
using std::back_inserter;
using std::deque;
using std::list;
+using std::lock_guard;
using std::max;
using std::make_pair;
using std::min;
const int View::MaxScrollValue = INT_MAX / 2;
-const int View::SignalHeight = 30;
-const int View::SignalMargin = 10;
-const int View::SignalSnapGridSize = 10;
-
const QColor View::CursorAreaColour(220, 231, 243);
const QSizeF View::LabelPadding(4, 0);
{
using pv::data::SignalData;
- const vector< shared_ptr<Signal> > sigs(
- session().get_signals());
-
// Make a set of all the visible data objects
set< shared_ptr<SignalData> > visible_data = get_visible_data();
if (visible_data.empty())
scale_offset_changed();
}
-list<weak_ptr<SelectableItem> > View::selected_items() const
-{
- list<weak_ptr<SelectableItem> > items;
-
- // List the selected signals
- const vector< shared_ptr<RowItem> > row_items(child_items());
- for (shared_ptr<RowItem> r : row_items) {
- if (r && r->selected())
- items.push_back(r);
- }
-
- // List the selected cursors
- if (_cursors.first()->selected())
- items.push_back(_cursors.first());
- if (_cursors.second()->selected())
- items.push_back(_cursors.second());
-
- return items;
-}
-
set< shared_ptr<SignalData> > View::get_visible_data() const
{
- const vector< shared_ptr<Signal> > sigs(
- session().get_signals());
+ shared_lock<shared_mutex> lock(session().signals_mutex());
+ const vector< shared_ptr<Signal> > &sigs(session().signals());
// Make a set of all the visible data objects
set< shared_ptr<SignalData> > visible_data;
void View::normalize_layout()
{
- const vector< shared_ptr<RowItem> > row_items(child_items());
-
int v_min = INT_MAX;
- for (const shared_ptr<RowItem> r : row_items)
+ for (const shared_ptr<RowItem> r : *this)
v_min = min(r->v_offset(), v_min);
const int delta = -min(v_min, 0);
- for (shared_ptr<RowItem> r : row_items)
+ for (shared_ptr<RowItem> r : *this)
r->set_v_offset(r->v_offset() + delta);
verticalScrollBar()->setSliderPosition(_v_offset + delta);
// Set the vertical scrollbar
verticalScrollBar()->setPageStep(areaSize.height());
- verticalScrollBar()->setRange(0,
- _viewport->get_total_height() + SignalMargin -
- areaSize.height());
+
+ const pair<int, int> extents = v_extents();
+ const int extra_scroll_height = (extents.second - extents.first) / 4;
+ verticalScrollBar()->setRange(extents.first - extra_scroll_height,
+ extents.first + extra_scroll_height);
}
void View::update_layout()
// Populate the traces
clear_child_items();
- const vector< shared_ptr<Signal> > sigs(
- session().get_signals());
+ shared_lock<shared_mutex> lock(session().signals_mutex());
+ const vector< shared_ptr<Signal> > &sigs(session().signals());
for (auto s : sigs)
add_child_item(s);
#endif
// Create the initial layout
- int offset = SignalMargin + SignalHeight;
- for (shared_ptr<RowItem> r : child_items()) {
+ int offset = 0;
+ for (shared_ptr<RowItem> r : *this) {
+ const pair<int, int> extents = r->v_extents();
+ if (r->enabled())
+ offset += -extents.first;
r->set_v_offset(offset);
- offset += SignalHeight + 2 * SignalMargin;
+ if (r->enabled())
+ offset += extents.second;
}
update_layout();
normalize_layout();
+
+ // Update the child widgets
+ _header->signals_updated();
+ _viewport->signals_updated();
}
void View::data_updated()
void View::on_hover_point_changed()
{
- const vector< shared_ptr<RowItem> > row_items(child_items());
- for (shared_ptr<RowItem> r : row_items)
+ for (shared_ptr<RowItem> r : *this)
r->hover_point_changed();
}