* 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 <http://www.gnu.org/licenses/>.
*/
extern "C" {
#include <tuple>
#include <boost/functional/hash.hpp>
-#include <boost/thread/locks.hpp>
-#include <boost/thread/shared_mutex.hpp>
#include <QAction>
#include <QApplication>
#include <pv/widgets/decodergroupbox.hpp>
#include <pv/widgets/decodermenu.hpp>
-using boost::shared_lock;
-using boost::shared_mutex;
-using std::dynamic_pointer_cast;
+using std::all_of;
using std::list;
-using std::lock_guard;
using std::make_pair;
using std::max;
using std::make_pair;
using std::map;
using std::min;
+using std::out_of_range;
using std::pair;
using std::shared_ptr;
+using std::make_shared;
using std::tie;
using std::unordered_set;
using std::vector;
shared_ptr<data::SignalBase> signalbase, int index) :
Trace(signalbase),
session_(session),
- signalbase_(signalbase),
row_height_(0),
max_visible_rows_(0),
delete_mapper_(this),
show_hide_mapper_(this)
{
- std::shared_ptr<pv::data::DecoderStack> decoder_stack =
- signalbase_->decoder_stack();
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
// Determine shortest string we want to see displayed in full
QFontMetrics m(QApplication::font());
min_useful_label_width_ = m.width("XX"); // e.g. two hex characters
- signalbase_->set_name(QString::fromUtf8(decoder_stack->stack().front()->decoder()->name));
- signalbase_->set_colour(DecodeColours[index % countof(DecodeColours)]);
+ base_->set_name(QString::fromUtf8(decoder_stack->stack().front()->decoder()->name));
+ base_->set_colour(DecodeColours[index % countof(DecodeColours)]);
connect(decoder_stack.get(), SIGNAL(new_decode_data()),
this, SLOT(on_new_decode_data()));
return true;
}
-std::shared_ptr<data::SignalBase> DecodeTrace::base() const
+shared_ptr<data::SignalBase> DecodeTrace::base() const
{
return base_;
}
{
using namespace pv::data::decode;
- std::shared_ptr<pv::data::DecoderStack> decoder_stack =
- signalbase_->decoder_stack();
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
const int text_height = ViewItemPaintParams::text_height();
row_height_ = (text_height * 6) / 4;
int row_title_width;
try {
row_title_width = row_title_widths_.at(row);
- } catch (std::out_of_range) {
+ } catch (out_of_range) {
const int w = p.boundingRect(QRectF(), 0, row.title()).width() +
RowTitleMargin;
row_title_widths_[row] = w;
owner_->extents_changed(false, true);
// Update the maximum row count if needed
- max_visible_rows_ = std::max(max_visible_rows_, (int)visible_rows_.size());
+ max_visible_rows_ = max(max_visible_rows_, (int)visible_rows_.size());
}
void DecodeTrace::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
{
using pv::data::decode::Decoder;
- std::shared_ptr<pv::data::DecoderStack> decoder_stack =
- signalbase_->decoder_stack();
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
assert(form);
assert(parent);
const double start = a.start_sample() / samples_per_pixel -
pixels_offset;
- const double end = a.end_sample() / samples_per_pixel -
- pixels_offset;
+ const double end = a.end_sample() / samples_per_pixel - pixels_offset;
const size_t colour = (base_colour + a.format()) % countof(Colours);
p.setPen(OutlineColours[colour]);
if (a.start_sample() == a.end_sample())
draw_instant(a, p, h, start, y);
else
- draw_range(a, p, h, start, end, y, pp,
- row_title_width);
+ draw_range(a, p, h, start, end, y, pp, row_title_width);
}
void DecodeTrace::draw_annotation_block(
// Check if all annotations are of the same type (i.e. we can use one color)
// or if we should use a neutral color (i.e. gray)
const int format = annotations.front().format();
- const bool single_format = std::all_of(
+ const bool single_format = all_of(
annotations.begin(), annotations.end(),
[&](const Annotation &a) { return a.format() == format; });
p.setBrush(QBrush((single_format ? Colours[colour] : Qt::gray),
Qt::Dense4Pattern));
p.drawRoundedRect(
- QRectF(start, top, end - start, bottom - top), h/4, h/4);
+ QRectF(start, top, end - start, bottom - top), h / 4, h / 4);
}
void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
const int ann_start = start + cap_width;
const int ann_end = end - cap_width;
- const int real_start = std::max(ann_start, pp.left() + row_title_width);
- const int real_end = std::min(ann_end, pp.right());
+ const int real_start = max(ann_start, pp.left() + row_title_width);
+ const int real_end = min(ann_end, pp.right());
const int real_width = real_end - real_start;
QRectF rect(real_start, y - h / 2, real_width, h);
double samples_per_pixel, pixels_offset;
- std::shared_ptr<pv::data::DecoderStack> decoder_stack =
- signalbase_->decoder_stack();
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
assert(decoder_stack);
if (!data || data->logic_segments().empty())
return;
- const shared_ptr<LogicSegment> segment =
- data->logic_segments().front();
+ const shared_ptr<LogicSegment> segment = data->logic_segments().front();
assert(segment);
const int64_t sample_count = (int64_t)segment->get_sample_count();
if (sample_count == 0)
samples_per_pixel - pixels_offset, left - 1.0);
const double end = min(sample_count / samples_per_pixel -
pixels_offset, right + 1.0);
- const QRectF no_decode_rect(start, y - h/2 + 0.5, end - start, h);
+ const QRectF no_decode_rect(start, y - (h / 2) + 0.5, end - start, h);
p.setPen(QPen(Qt::NoPen));
p.setBrush(Qt::white);
pair<double, double> DecodeTrace::get_pixels_offset_samples_per_pixel() const
{
- std::shared_ptr<pv::data::DecoderStack> decoder_stack =
- signalbase_->decoder_stack();
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
assert(owner_);
assert(decoder_stack);
vector<pv::data::decode::Annotation> annotations;
- std::shared_ptr<pv::data::DecoderStack> decoder_stack =
- signalbase_->decoder_stack();
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
assert(decoder_stack);
decoder_stack->get_annotation_subset(annotations, visible_rows_[row],
channel_selectors_.push_back(s);
}
- std::shared_ptr<pv::data::DecoderStack> decoder_stack =
- signalbase_->decoder_stack();
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
// Add the options
shared_ptr<binding::Decoder> binding(
const auto sigs(session_.signalbases());
vector< shared_ptr<data::SignalBase> > sig_list(sigs.begin(), sigs.end());
- std::sort(sig_list.begin(), sig_list.end(),
+ sort(sig_list.begin(), sig_list.end(),
[](const shared_ptr<data::SignalBase> &a,
const shared_ptr<data::SignalBase> &b) {
return strnatcasecmp(a->name().toStdString(),
for (const shared_ptr<data::SignalBase> &b : sig_list) {
assert(b);
- if (b->type() == sigrok::ChannelType::LOGIC && b->enabled()) {
+ if (b->logic_data() && b->enabled()) {
selector->addItem(b->name(),
qVariantFromValue((void*)b.get()));
void DecodeTrace::commit_channels()
{
- std::shared_ptr<pv::data::DecoderStack> decoder_stack =
- signalbase_->decoder_stack();
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
assert(decoder_stack);
for (shared_ptr<data::decode::Decoder> dec : decoder_stack->stack())
void DecodeTrace::on_stack_decoder(srd_decoder *decoder)
{
- std::shared_ptr<pv::data::DecoderStack> decoder_stack =
- signalbase_->decoder_stack();
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
assert(decoder);
assert(decoder_stack);
- decoder_stack->push(shared_ptr<data::decode::Decoder>(
- new data::decode::Decoder(decoder)));
+ decoder_stack->push(make_shared<data::decode::Decoder>(decoder));
decoder_stack->begin_decode();
create_popup_form();
void DecodeTrace::on_delete_decoder(int index)
{
- std::shared_ptr<pv::data::DecoderStack> decoder_stack =
- signalbase_->decoder_stack();
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
decoder_stack->remove(index);
// Update the popup
- create_popup_form();
+ create_popup_form();
decoder_stack->begin_decode();
}
{
using pv::data::decode::Decoder;
- std::shared_ptr<pv::data::DecoderStack> decoder_stack =
- signalbase_->decoder_stack();
+ shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
const list< shared_ptr<Decoder> > stack(decoder_stack->stack());
projects / pulseview.git / blobdiff